The Great Renaming (#3014)

* move kekztech to a single root dir

* move detrav to a single root dir

* move gtnh-lanthanides to a single root dir

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

* remove more reflection inside gt5u

* delete more reflection in gt++

* fix imports

* move bartworks and bwcrossmod

* fix proxies

* move galactigreg and ggfab

* move gtneioreplugin

* try to fix gt++ bee loader

* apply the rename rules to BW

* apply rename rules to bwcrossmod

* apply rename rules to detrav scanner mod

* apply rename rules to galacticgreg

* apply rename rules to ggfab

* apply rename rules to goodgenerator

* apply rename rules to gtnh-lanthanides

* apply rename rules to gt++

* apply rename rules to kekztech

* apply rename rules to kubatech

* apply rename rules to tectech

* apply rename rules to gt

apply the rename rules to gt

* fix tt import

* fix mui hopefully

* fix coremod except intergalactic

* rename assline recipe class

* fix a class name i stumbled on

* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib

* temporary rename of GTTooltipDataCache to old name

* fix gt client/server proxy names

969 files changed, 36855 insertions, 38287 deletions

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GTMod.java
index 1467000877..ab377561af 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GTMod.java
@@ -3,9 +3,9 @@ package gregtech;
 import static gregtech.GT_Version.VERSION_MAJOR;
 import static gregtech.GT_Version.VERSION_MINOR;
 import static gregtech.GT_Version.VERSION_PATCH;
-import static gregtech.api.GregTech_API.registerCircuitProgrammer;
+import static gregtech.api.GregTechAPI.registerCircuitProgrammer;
 import static gregtech.api.enums.Mods.Forestry;
-import static gregtech.api.util.GT_Recipe.setItemStacks;
+import static gregtech.api.util.GTRecipe.setItemStacks;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -36,7 +36,6 @@ import com.gtnewhorizon.gtnhlib.config.ConfigException;
 import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
 
 import appeng.api.AEApi;
-import bloodasp.galacticgreg.SpaceDimRegisterer;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
@@ -49,38 +48,39 @@ import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
 import cpw.mods.fml.common.event.FMLServerStartedEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
-import gregtech.api.GregTech_API;
-import gregtech.api.enchants.Enchantment_EnderDamage;
-import gregtech.api.enchants.Enchantment_Hazmat;
-import gregtech.api.enchants.Enchantment_Radioactivity;
-import gregtech.api.enums.GT_Values;
+import galacticgreg.SpaceDimRegisterer;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enchants.EnchantmentEnderDamage;
+import gregtech.api.enchants.EnchantmentHazmat;
+import gregtech.api.enchants.EnchantmentRadioactivity;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Mods;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.interfaces.internal.IGT_Mod;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.interfaces.internal.IGTMod;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.objects.ItemData;
 import gregtech.api.objects.XSTR;
 import gregtech.api.registries.LHECoolantRegistry;
-import gregtech.api.threads.GT_Runnable_MachineBlockUpdate;
-import gregtech.api.util.GT_Assemblyline_Server;
-import gregtech.api.util.GT_Forestry_Compat;
-import gregtech.api.util.GT_LanguageManager;
-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_RecipeRegistrator;
-import gregtech.api.util.GT_SpawnEventHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.threads.RunnableMachineUpdate;
+import gregtech.api.util.AssemblyLineServer;
+import gregtech.api.util.GTForestryCompat;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipeRegistrator;
+import gregtech.api.util.GTSpawnEventHandler;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.item.ItemHolder;
-import gregtech.common.GT_DummyWorld;
-import gregtech.common.GT_Network;
-import gregtech.common.GT_Proxy;
-import gregtech.common.GT_RecipeAdder;
+import gregtech.common.GTDummyWorld;
+import gregtech.common.GTNetwork;
+import gregtech.common.GTProxy;
+import gregtech.common.RecipeAdder;
 import gregtech.common.config.client.ConfigColorModulation;
 import gregtech.common.config.client.ConfigInterface;
 import gregtech.common.config.client.ConfigPreference;
@@ -99,45 +99,45 @@ import gregtech.common.config.machinestats.ConfigMicrowaveEnergyTransmitter;
 import gregtech.common.config.machinestats.ConfigSteelSolarBoiler;
 import gregtech.common.config.machinestats.ConfigTeleporter;
 import gregtech.common.config.worldgen.ConfigEndAsteroids;
-import gregtech.common.covers.GT_Cover_FacadeAE;
-import gregtech.common.misc.GT_Command;
-import gregtech.common.misc.spaceprojects.commands.SPM_Command;
-import gregtech.common.misc.spaceprojects.commands.SP_Command;
-import gregtech.common.misc.spaceprojects.commands.SpaceProject_Command;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_CraftingInput_ME;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalChestBase;
+import gregtech.common.covers.CoverFacadeAE;
+import gregtech.common.misc.GTCommand;
+import gregtech.common.misc.spaceprojects.commands.SPCommand;
+import gregtech.common.misc.spaceprojects.commands.SPMCommand;
+import gregtech.common.misc.spaceprojects.commands.SpaceProjectCommand;
+import gregtech.common.tileentities.machines.MTEHatchCraftingInputME;
+import gregtech.common.tileentities.storage.MTEDigitalChestBase;
 import gregtech.crossmod.holoinventory.HoloInventory;
 import gregtech.crossmod.waila.Waila;
-import gregtech.loaders.load.GT_CoverBehaviorLoader;
-import gregtech.loaders.load.GT_FuelLoader;
-import gregtech.loaders.load.GT_ItemIterator;
-import gregtech.loaders.load.GT_Loader_MetaTileEntities_Recipes;
-import gregtech.loaders.load.GT_SonictronLoader;
-import gregtech.loaders.misc.GT_Achievements;
-import gregtech.loaders.misc.GT_Bees;
-import gregtech.loaders.misc.GT_CoverLoader;
-import gregtech.loaders.postload.GT_BlockResistanceLoader;
-import gregtech.loaders.postload.GT_BookAndLootLoader;
-import gregtech.loaders.postload.GT_CraftingRecipeLoader;
-import gregtech.loaders.postload.GT_CropLoader;
-import gregtech.loaders.postload.GT_FakeRecipeLoader;
-import gregtech.loaders.postload.GT_ItemMaxStacksizeLoader;
-import gregtech.loaders.postload.GT_MachineRecipeLoader;
-import gregtech.loaders.postload.GT_MachineTooltipsLoader;
-import gregtech.loaders.postload.GT_MinableRegistrator;
-import gregtech.loaders.postload.GT_PostLoad;
-import gregtech.loaders.postload.GT_RecyclerBlacklistLoader;
-import gregtech.loaders.postload.GT_ScrapboxDropLoader;
-import gregtech.loaders.postload.GT_Worldgenloader;
+import gregtech.loaders.load.CoverBehaviorLoader;
+import gregtech.loaders.load.FuelLoader;
+import gregtech.loaders.load.GTItemIterator;
+import gregtech.loaders.load.MTERecipeLoader;
+import gregtech.loaders.load.SonictronLoader;
+import gregtech.loaders.misc.CoverLoader;
+import gregtech.loaders.misc.GTAchievements;
+import gregtech.loaders.misc.GTBees;
+import gregtech.loaders.postload.BlockResistanceLoader;
+import gregtech.loaders.postload.BookAndLootLoader;
+import gregtech.loaders.postload.CraftingRecipeLoader;
+import gregtech.loaders.postload.CropLoader;
+import gregtech.loaders.postload.FakeRecipeLoader;
+import gregtech.loaders.postload.GTPostLoad;
+import gregtech.loaders.postload.GTWorldgenloader;
+import gregtech.loaders.postload.ItemMaxStacksizeLoader;
+import gregtech.loaders.postload.MachineRecipeLoader;
+import gregtech.loaders.postload.MachineTooltipsLoader;
+import gregtech.loaders.postload.MinableRegistrator;
 import gregtech.loaders.postload.PosteaTransformers;
-import gregtech.loaders.preload.GT_Loader_CircuitBehaviors;
-import gregtech.loaders.preload.GT_Loader_ItemData;
-import gregtech.loaders.preload.GT_Loader_Item_Block_And_Fluid;
-import gregtech.loaders.preload.GT_Loader_MetaTileEntities;
+import gregtech.loaders.postload.RecyclerBlacklistLoader;
+import gregtech.loaders.postload.ScrapboxDropLoader;
+import gregtech.loaders.preload.GTPreLoad;
 import gregtech.loaders.preload.GT_Loader_MultiTileEntities;
-import gregtech.loaders.preload.GT_Loader_OreDictionary;
-import gregtech.loaders.preload.GT_Loader_OreProcessing;
-import gregtech.loaders.preload.GT_PreLoad;
+import gregtech.loaders.preload.LoaderCircuitBehaviors;
+import gregtech.loaders.preload.LoaderGTBlockFluid;
+import gregtech.loaders.preload.LoaderGTItemData;
+import gregtech.loaders.preload.LoaderGTOreDictionary;
+import gregtech.loaders.preload.LoaderMetaTileEntities;
+import gregtech.loaders.preload.LoaderOreProcessing;
 import ic2.api.recipe.IRecipeInput;
 import ic2.api.recipe.RecipeOutput;
 
@@ -185,7 +185,7 @@ import ic2.api.recipe.RecipeOutput;
         + " after:TConstruct;"
         + " after:Translocator;"
         + " after:gendustry;")
-public class GT_Mod implements IGT_Mod {
+public class GTMod implements IGTMod {
 
     static {
         try {
@@ -231,38 +231,38 @@ public class GT_Mod implements IGT_Mod {
     public static final int NBT_VERSION = calculateTotalGTVersion(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
 
     @Mod.Instance(Mods.Names.GREG_TECH)
-    public static GT_Mod instance;
+    public static GTMod instance;
 
     @SidedProxy(
         modId = Mods.Names.GREG_TECH,
-        clientSide = "gregtech.common.GT_Client",
-        serverSide = "gregtech.common.GT_Server")
-    public static GT_Proxy gregtechproxy;
+        clientSide = "gregtech.common.GTClient",
+        serverSide = "gregtech.common.GTServer")
+    public static GTProxy gregtechproxy;
     public static final boolean DEBUG = Boolean.getBoolean("gt.debug");;
 
     public static int MAX_IC2 = 2147483647;
-    public static GT_Achievements achievements;
+    public static GTAchievements achievements;
     @Deprecated
     public static final String aTextGeneral = "general";
     public static final String aTextIC2 = "ic2_";
     public static final Logger GT_FML_LOGGER = LogManager.getLogger("GregTech GTNH");
 
     @SuppressWarnings("deprecation")
-    public GT_Mod() {
-        GT_Values.GT = this;
-        GT_Values.DW = new GT_DummyWorld();
-        GT_Values.NW = new GT_Network();
-        GT_Values.RA = new GT_RecipeAdder();
+    public GTMod() {
+        GTValues.GT = this;
+        GTValues.DW = new GTDummyWorld();
+        GTValues.NW = new GTNetwork();
+        GTValues.RA = new RecipeAdder();
 
         for (int i = 0; i < 4; i++) {
-            GregTech_API.registerTileEntityConstructor(i, i2 -> GregTech_API.constructBaseMetaTileEntity());
+            GregTechAPI.registerTileEntityConstructor(i, i2 -> GregTechAPI.constructBaseMetaTileEntity());
         }
         for (int i = 4; i < 12; i++) {
-            GregTech_API.registerTileEntityConstructor(i, i2 -> new BaseMetaPipeEntity());
+            GregTechAPI.registerTileEntityConstructor(i, i2 -> new BaseMetaPipeEntity());
         }
 
         // noinspection deprecation// Need run-time initialization
-        GregTech_API.sRecipeAdder = GT_Values.RA;
+        GregTechAPI.sRecipeAdder = GTValues.RA;
 
         // noinspection ResultOfMethodCallIgnored// Suspicious likely pointless
         Textures.BlockIcons.VOID.name();
@@ -281,101 +281,101 @@ public class GT_Mod implements IGT_Mod {
     @Mod.EventHandler
     public void onPreLoad(FMLPreInitializationEvent aEvent) {
         Locale.setDefault(Locale.ENGLISH);
-        if (GregTech_API.sPreloadStarted) {
+        if (GregTechAPI.sPreloadStarted) {
             return;
         }
 
-        for (Runnable tRunnable : GregTech_API.sBeforeGTPreload) {
+        for (Runnable tRunnable : GregTechAPI.sBeforeGTPreload) {
             try {
                 tRunnable.run();
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
         }
 
-        GT_PreLoad.getConfiguration(aEvent.getModConfigurationDirectory());
-        GT_PreLoad.createLogFiles(
+        GTPreLoad.getConfiguration(aEvent.getModConfigurationDirectory());
+        GTPreLoad.createLogFiles(
             aEvent.getModConfigurationDirectory()
                 .getParentFile());
 
         gregtechproxy.onPreLoad();
 
-        GT_Log.out.println("GT_Mod: Setting Configs");
+        GTLog.out.println("GTMod: Setting Configs");
 
-        GT_PreLoad.loadConfig();
+        GTPreLoad.loadConfig();
 
-        new Enchantment_Hazmat();
-        new Enchantment_EnderDamage();
-        new Enchantment_Radioactivity();
+        new EnchantmentHazmat();
+        new EnchantmentEnderDamage();
+        new EnchantmentRadioactivity();
 
         Materials.init();
 
-        GT_PreLoad.initLocalization(
+        GTPreLoad.initLocalization(
             aEvent.getModConfigurationDirectory()
                 .getParentFile());
-        GT_PreLoad.adjustScrap();
+        GTPreLoad.adjustScrap();
 
         AEApi.instance()
             .registries()
             .interfaceTerminal()
-            .register(GT_MetaTileEntity_Hatch_CraftingInput_ME.class);
+            .register(MTEHatchCraftingInputME.class);
 
-        GT_PreLoad.runMineTweakerCompat();
+        GTPreLoad.runMineTweakerCompat();
 
-        new GT_Loader_OreProcessing().run();
-        new GT_Loader_OreDictionary().run();
-        new GT_Loader_ItemData().run();
-        new GT_Loader_Item_Block_And_Fluid().run();
-        new GT_Loader_MetaTileEntities().run();
-        if (GT_Values.enableMultiTileEntities) {
+        new LoaderOreProcessing().run();
+        new LoaderGTOreDictionary().run();
+        new LoaderGTItemData().run();
+        new LoaderGTBlockFluid().run();
+        new LoaderMetaTileEntities().run();
+        if (GTValues.enableMultiTileEntities) {
             new GT_Loader_MultiTileEntities().run();
         }
 
-        new GT_Loader_CircuitBehaviors().run();
-        new GT_CoverBehaviorLoader().run();
-        new GT_SonictronLoader().run();
-        new GT_SpawnEventHandler();
+        new LoaderCircuitBehaviors().run();
+        new CoverBehaviorLoader().run();
+        new SonictronLoader().run();
+        new GTSpawnEventHandler();
 
-        // populate itemstack instance for NBT check in GT_Recipe
+        // populate itemstack instance for NBT check in GTRecipe
         setItemStacks();
 
-        GT_PreLoad.sortToTheEnd();
-        GregTech_API.sPreloadFinished = true;
-        GT_Log.out.println("GT_Mod: Preload-Phase finished!");
-        GT_Log.ore.println("GT_Mod: Preload-Phase finished!");
+        GTPreLoad.sortToTheEnd();
+        GregTechAPI.sPreloadFinished = true;
+        GTLog.out.println("GTMod: Preload-Phase finished!");
+        GTLog.ore.println("GTMod: Preload-Phase finished!");
 
-        GT_UIInfos.init();
+        GTUIInfos.init();
 
-        for (Runnable tRunnable : GregTech_API.sAfterGTPreload) {
+        for (Runnable tRunnable : GregTechAPI.sAfterGTPreload) {
             try {
                 tRunnable.run();
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
         }
 
         if (FMLCommonHandler.instance()
             .getEffectiveSide()
-            .isServer()) GT_Assemblyline_Server.fillMap(aEvent);
+            .isServer()) AssemblyLineServer.fillMap(aEvent);
     }
 
     @Mod.EventHandler
     public void onLoad(FMLInitializationEvent aEvent) {
-        if (GregTech_API.sLoadStarted) {
+        if (GregTechAPI.sLoadStarted) {
             return;
         }
 
-        for (Runnable tRunnable : GregTech_API.sBeforeGTLoad) {
+        for (Runnable tRunnable : GregTechAPI.sBeforeGTLoad) {
             try {
                 tRunnable.run();
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
         }
 
         if (Forestry.isModLoaded())
-            // noinspection InstantiationOfUtilityClass//TODO: Refactor GT_Bees with proper state handling
-            new GT_Bees();
+            // noinspection InstantiationOfUtilityClass//TODO: Refactor GTBees with proper state handling
+            new GTBees();
 
         // Disable Low Grav regardless of config if Cleanroom is disabled.
         if (!gregtechproxy.mEnableCleanroom) {
@@ -395,11 +395,11 @@ public class GT_Mod implements IGT_Mod {
             }
         }, true);
 
-        new GT_Loader_MetaTileEntities_Recipes().run();
+        new MTERecipeLoader().run();
 
-        new GT_ItemIterator().run();
+        new GTItemIterator().run();
         gregtechproxy.registerUnificationEntries();
-        new GT_FuelLoader().run();
+        new FuelLoader().run();
 
         if (Mods.Waila.isModLoaded()) {
             Waila.init();
@@ -413,31 +413,31 @@ public class GT_Mod implements IGT_Mod {
         GT_FML_LOGGER.debug("Registering SpaceDimensions");
         SpaceDimRegisterer.register();
 
-        GregTech_API.sLoadFinished = true;
-        GT_Log.out.println("GT_Mod: Load-Phase finished!");
-        GT_Log.ore.println("GT_Mod: Load-Phase finished!");
+        GregTechAPI.sLoadFinished = true;
+        GTLog.out.println("GTMod: Load-Phase finished!");
+        GTLog.ore.println("GTMod: Load-Phase finished!");
 
-        for (Runnable tRunnable : GregTech_API.sAfterGTLoad) {
+        for (Runnable tRunnable : GregTechAPI.sAfterGTLoad) {
             try {
                 tRunnable.run();
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
         }
     }
 
     @Mod.EventHandler
     public void onPostLoad(FMLPostInitializationEvent aEvent) {
-        if (GregTech_API.sPostloadStarted) {
+        if (GregTechAPI.sPostloadStarted) {
             return;
         }
 
         // Seems only used by GGFab so far
-        for (Runnable tRunnable : GregTech_API.sBeforeGTPostload) {
+        for (Runnable tRunnable : GregTechAPI.sBeforeGTPostload) {
             try {
                 tRunnable.run();
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
         }
 
@@ -445,29 +445,29 @@ public class GT_Mod implements IGT_Mod {
 
         if (DEBUG) {
             // Prints all the used MTE id and their associated TE name, turned on with -Dgt.debug=true in jvm args
-            final int bound = GregTech_API.METATILEENTITIES.length;
+            final int bound = GregTechAPI.METATILEENTITIES.length;
             for (int i1 = 1; i1 < bound; i1++) {
-                if (GregTech_API.METATILEENTITIES[i1] != null) {
-                    GT_Log.out.printf("META %d %s\n", i1, GregTech_API.METATILEENTITIES[i1].getMetaName());
+                if (GregTechAPI.METATILEENTITIES[i1] != null) {
+                    GTLog.out.printf("META %d %s\n", i1, GregTechAPI.METATILEENTITIES[i1].getMetaName());
                 }
             }
         }
 
         gregtechproxy.registerUnificationEntries();
 
-        new GT_BookAndLootLoader().run();
-        new GT_ItemMaxStacksizeLoader().run();
-        new GT_BlockResistanceLoader().run();
-        new GT_RecyclerBlacklistLoader().run();
-        new GT_MinableRegistrator().run();
-        new GT_FakeRecipeLoader().run();
-        new GT_MachineRecipeLoader().run();
-        new GT_ScrapboxDropLoader().run();
-        new GT_CropLoader().run();
-        new GT_Worldgenloader().run();
-        new GT_CoverLoader().run();
-
-        GT_RecipeRegistrator.registerUsagesForMaterials(
+        new BookAndLootLoader().run();
+        new ItemMaxStacksizeLoader().run();
+        new BlockResistanceLoader().run();
+        new RecyclerBlacklistLoader().run();
+        new MinableRegistrator().run();
+        new FakeRecipeLoader().run();
+        new MachineRecipeLoader().run();
+        new ScrapboxDropLoader().run();
+        new CropLoader().run();
+        new GTWorldgenloader().run();
+        new CoverLoader().run();
+
+        GTRecipeRegistrator.registerUsagesForMaterials(
             null,
             false,
             new ItemStack(Blocks.planks, 1),
@@ -475,85 +475,85 @@ public class GT_Mod implements IGT_Mod {
             new ItemStack(Blocks.stone, 1),
             new ItemStack(Items.leather, 1));
 
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getRecipeOutput(
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getRecipeOutput(
                 null,
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L),
                 null,
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L),
                 null,
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L),
                 null,
                 null,
                 null),
             new ItemData(Materials.Tin, 10886400L));
-        GT_ModHandler.removeRecipe(
+        GTModHandler.removeRecipe(
             new ItemStack(Items.glowstone_dust, 1),
             new ItemStack(Items.glowstone_dust, 1),
             null,
             new ItemStack(Items.glowstone_dust, 1),
             new ItemStack(Items.glowstone_dust, 1));
-        GT_ModHandler.removeRecipeDelayed(
+        GTModHandler.removeRecipeDelayed(
             new ItemStack(Blocks.wooden_slab, 1, 0),
             new ItemStack(Blocks.wooden_slab, 1, 1),
             new ItemStack(Blocks.wooden_slab, 1, 2));
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.wooden_slab, 6, 0),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "WWW", 'W', new ItemStack(Blocks.planks, 1, 0) });
 
         // Save a copy of these list before activateOreDictHandler(), then loop over them.
-        Map<IRecipeInput, RecipeOutput> aMaceratorRecipeList = GT_ModHandler.getMaceratorRecipeList();
-        Map<IRecipeInput, RecipeOutput> aCompressorRecipeList = GT_ModHandler.getCompressorRecipeList();
-        Map<IRecipeInput, RecipeOutput> aExtractorRecipeList = GT_ModHandler.getExtractorRecipeList();
-        Map<IRecipeInput, RecipeOutput> aOreWashingRecipeList = GT_ModHandler.getOreWashingRecipeList();
-        Map<IRecipeInput, RecipeOutput> aThermalCentrifugeRecipeList = GT_ModHandler.getThermalCentrifugeRecipeList();
-
-        GT_Log.out.println(
-            "GT_Mod: Activating OreDictionary Handler, this can take some time, as it scans the whole OreDictionary");
+        Map<IRecipeInput, RecipeOutput> aMaceratorRecipeList = GTModHandler.getMaceratorRecipeList();
+        Map<IRecipeInput, RecipeOutput> aCompressorRecipeList = GTModHandler.getCompressorRecipeList();
+        Map<IRecipeInput, RecipeOutput> aExtractorRecipeList = GTModHandler.getExtractorRecipeList();
+        Map<IRecipeInput, RecipeOutput> aOreWashingRecipeList = GTModHandler.getOreWashingRecipeList();
+        Map<IRecipeInput, RecipeOutput> aThermalCentrifugeRecipeList = GTModHandler.getThermalCentrifugeRecipeList();
+
+        GTLog.out.println(
+            "GTMod: Activating OreDictionary Handler, this can take some time, as it scans the whole OreDictionary");
         GT_FML_LOGGER.info(
             "If your Log stops here, you were too impatient. Wait a bit more next time, before killing Minecraft with the Task Manager.");
 
-        GT_PostLoad.activateOreDictHandler();
-        GT_PostLoad.replaceVanillaMaterials();
-        GT_PostLoad.removeIc2Recipes(
+        GTPostLoad.activateOreDictHandler();
+        GTPostLoad.replaceVanillaMaterials();
+        GTPostLoad.removeIc2Recipes(
             aMaceratorRecipeList,
             aCompressorRecipeList,
             aExtractorRecipeList,
             aOreWashingRecipeList,
             aThermalCentrifugeRecipeList);
 
-        if (GT_Values.D1) {
-            GT_ModHandler.sSingleNonBlockDamagableRecipeList.forEach(
-                iRecipe -> GT_Log.out.println(
+        if (GTValues.D1) {
+            GTModHandler.sSingleNonBlockDamagableRecipeList.forEach(
+                iRecipe -> GTLog.out.println(
                     "=> " + iRecipe.getRecipeOutput()
                         .getDisplayName()));
         }
-        new GT_CraftingRecipeLoader().run();
-        GT_ModHandler.removeRecipeByOutput(ItemList.IC2_ForgeHammer.getWildcard(1L));
-        GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("machine", 1L));
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("machine", 1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+        new CraftingRecipeLoader().run();
+        GTModHandler.removeRecipeByOutput(ItemList.IC2_ForgeHammer.getWildcard(1L));
+        GTModHandler.removeRecipeByOutput(GTModHandler.getIC2Item("machine", 1L));
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("machine", 1L),
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "RRR", "RwR", "RRR", 'R', OrePrefixes.plate.get(Materials.Iron) });
 
-        GT_PostLoad.registerFluidCannerRecipes();
+        GTPostLoad.registerFluidCannerRecipes();
 
         if (Forestry.isModLoaded()) {
-            GT_Forestry_Compat.transferCentrifugeRecipes();
-            GT_Forestry_Compat.transferSqueezerRecipes();
+            GTForestryCompat.transferCentrifugeRecipes();
+            GTForestryCompat.transferSqueezerRecipes();
         }
-        GT_MetaTileEntity_DigitalChestBase.registerAEIntegration();
+        MTEDigitalChestBase.registerAEIntegration();
         ItemStack facade = AEApi.instance()
             .definitions()
             .items()
             .facade()
             .maybeItem()
-            .transform(i -> new ItemStack(i, 1, GT_Values.W))
+            .transform(i -> new ItemStack(i, 1, GTValues.W))
             .orNull();
         if (facade != null) {
-            GregTech_API.registerCover(facade, null, new GT_Cover_FacadeAE());
+            GregTechAPI.registerCover(facade, null, new CoverFacadeAE());
         }
 
         Arrays
@@ -561,10 +561,10 @@ public class GT_Mod implements IGT_Mod {
                 new String[] { "blastfurnace", "blockcutter", "inductionFurnace", "generator", "windMill", "waterMill",
                     "solarPanel", "centrifuge", "electrolyzer", "compressor", "electroFurnace", "extractor",
                     "macerator", "recycler", "metalformer", "orewashingplant", "massFabricator", "replicator", })
-            .map(tName -> GT_ModHandler.getIC2Item(tName, 1L))
-            .forEach(GT_ModHandler::removeRecipeByOutputDelayed);
+            .map(tName -> GTModHandler.getIC2Item(tName, 1L))
+            .forEach(GTModHandler::removeRecipeByOutputDelayed);
 
-        GT_PostLoad.nerfVanillaTools();
+        GTPostLoad.nerfVanillaTools();
 
         // Register postea transformers
         new PosteaTransformers().run();
@@ -577,63 +577,63 @@ public class GT_Mod implements IGT_Mod {
 
         @SuppressWarnings("UnstableApiUsage") // Stable enough for this project
         Stopwatch stopwatch = Stopwatch.createStarted();
-        GT_Log.out.println("GT_Mod: Adding buffered Recipes.");
-        GT_ModHandler.stopBufferingCraftingRecipes();
+        GTLog.out.println("GTMod: Adding buffered Recipes.");
+        GTModHandler.stopBufferingCraftingRecipes();
         // noinspection UnstableApiUsage// Stable enough for this project
         GT_FML_LOGGER.info("Executed delayed Crafting Recipes (" + stopwatch.stop() + "). Have a Cake.");
 
-        GT_Log.out.println("GT_Mod: Saving Lang File.");
-        new GT_MachineTooltipsLoader().run();
-        GT_LanguageManager.sEnglishFile.save();
-        GregTech_API.sPostloadFinished = true;
-        GT_Log.out.println("GT_Mod: PostLoad-Phase finished!");
-        GT_Log.ore.println("GT_Mod: PostLoad-Phase finished!");
-        for (Runnable tRunnable : GregTech_API.sAfterGTPostload) {
+        GTLog.out.println("GTMod: Saving Lang File.");
+        new MachineTooltipsLoader().run();
+        GTLanguageManager.sEnglishFile.save();
+        GregTechAPI.sPostloadFinished = true;
+        GTLog.out.println("GTMod: PostLoad-Phase finished!");
+        GTLog.ore.println("GTMod: PostLoad-Phase finished!");
+        for (Runnable tRunnable : GregTechAPI.sAfterGTPostload) {
             try {
                 tRunnable.run();
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
         }
-        GT_PostLoad.addFakeRecipes();
+        GTPostLoad.addFakeRecipes();
 
-        if (GregTech_API.mOutputRF || GregTech_API.mInputRF) {
-            GT_Utility.checkAvailabilities();
-            if (!GT_Utility.RF_CHECK) {
-                GregTech_API.mOutputRF = false;
-                GregTech_API.mInputRF = false;
+        if (GregTechAPI.mOutputRF || GregTechAPI.mInputRF) {
+            GTUtility.checkAvailabilities();
+            if (!GTUtility.RF_CHECK) {
+                GregTechAPI.mOutputRF = false;
+                GregTechAPI.mInputRF = false;
             }
         }
 
-        GT_PostLoad.addSolidFakeLargeBoilerFuels();
-        GT_PostLoad.identifyAnySteam();
+        GTPostLoad.addSolidFakeLargeBoilerFuels();
+        GTPostLoad.identifyAnySteam();
 
-        achievements = new GT_Achievements();
+        achievements = new GTAchievements();
 
-        GT_Recipe.GTppRecipeHelper = true;
-        GT_Log.out.println("GT_Mod: Loading finished, de-allocating temporary Init Variables.");
-        GregTech_API.sBeforeGTPreload = null;
-        GregTech_API.sAfterGTPreload = null;
-        GregTech_API.sBeforeGTLoad = null;
-        GregTech_API.sAfterGTLoad = null;
-        GregTech_API.sBeforeGTPostload = null;
-        GregTech_API.sAfterGTPostload = null;
+        GTRecipe.GTppRecipeHelper = true;
+        GTLog.out.println("GTMod: Loading finished, de-allocating temporary Init Variables.");
+        GregTechAPI.sBeforeGTPreload = null;
+        GregTechAPI.sAfterGTPreload = null;
+        GregTechAPI.sBeforeGTLoad = null;
+        GregTechAPI.sAfterGTLoad = null;
+        GregTechAPI.sBeforeGTPostload = null;
+        GregTechAPI.sAfterGTPostload = null;
 
-        GT_PostLoad.createGTtoolsCreativeTab();
+        GTPostLoad.createGTtoolsCreativeTab();
     }
 
     @Mod.EventHandler
     public void onLoadComplete(FMLLoadCompleteEvent aEvent) {
         gregtechproxy.onLoadComplete();
-        for (Runnable tRunnable : GregTech_API.sGTCompleteLoad) {
+        for (Runnable tRunnable : GregTechAPI.sGTCompleteLoad) {
             try {
                 tRunnable.run();
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
         }
-        GregTech_API.sGTCompleteLoad = null;
-        GregTech_API.sFullLoadFinished = true;
+        GregTechAPI.sGTCompleteLoad = null;
+        GregTechAPI.sFullLoadFinished = true;
     }
 
     @Mod.EventHandler
@@ -649,19 +649,19 @@ public class GT_Mod implements IGT_Mod {
     @Mod.EventHandler
     public void onServerStarting(FMLServerStartingEvent aEvent) {
 
-        for (Runnable tRunnable : GregTech_API.sBeforeGTServerstart) {
+        for (Runnable tRunnable : GregTechAPI.sBeforeGTServerstart) {
             try {
                 tRunnable.run();
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
         }
 
         gregtechproxy.onServerStarting();
-        GT_ModHandler.removeAllIC2Recipes();
-        GT_Log.out.println("GT_Mod: Unificating outputs of all known Recipe Types.");
+        GTModHandler.removeAllIC2Recipes();
+        GTLog.out.println("GTMod: Unificating outputs of all known Recipe Types.");
         ArrayList<ItemStack> tStacks = new ArrayList<>(10000);
-        GT_Log.out.println("GT_Mod: IC2 Machines");
+        GTLog.out.println("GTMod: IC2 Machines");
 
         ic2.api.recipe.Recipes.cannerBottle.getRecipes()
             .values()
@@ -714,7 +714,7 @@ public class GT_Mod implements IGT_Mod {
             .map(t -> t.items)
             .forEach(tStacks::addAll);
 
-        GT_Log.out.println("GT_Mod: Dungeon Loot");
+        GTLog.out.println("GTMod: Dungeon Loot");
         for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("dungeonChest")
             .getItems(new XSTR())) {
             tStacks.add(tContent.theItemId);
@@ -755,7 +755,7 @@ public class GT_Mod implements IGT_Mod {
             .getItems(new XSTR())) {
             tStacks.add(tContent.theItemId);
         }
-        GT_Log.out.println("GT_Mod: Smelting");
+        GTLog.out.println("GTMod: Smelting");
 
         // Deal with legacy Minecraft raw types
         tStacks.addAll(
@@ -764,7 +764,7 @@ public class GT_Mod implements IGT_Mod {
                 .values());
 
         if (gregtechproxy.mCraftingUnification) {
-            GT_Log.out.println("GT_Mod: Crafting Recipes");
+            GTLog.out.println("GTMod: Crafting Recipes");
             for (IRecipe tRecipe : CraftingManager.getInstance()
                 .getRecipeList()) {
                 if ((tRecipe instanceof IRecipe)) {
@@ -774,30 +774,30 @@ public class GT_Mod implements IGT_Mod {
         }
         for (ItemStack tOutput : tStacks) {
             if (!gregtechproxy.mRegisteredOres.contains(tOutput)) {
-                GT_OreDictUnificator.setStack(tOutput);
+                GTOreDictUnificator.setStack(tOutput);
             } else {
                 logMultilineError(GT_FML_LOGGER, generateGTErr01Message(tOutput));
                 tOutput.setStackDisplayName("ERROR! PLEASE CHECK YOUR LOG FOR 'GT-ERR-01'!");
             }
         }
-        GregTech_API.mServerStarted = true;
-        GT_Log.out.println("GT_Mod: ServerStarting-Phase finished!");
-        GT_Log.ore.println("GT_Mod: ServerStarting-Phase finished!");
+        GregTechAPI.mServerStarted = true;
+        GTLog.out.println("GTMod: ServerStarting-Phase finished!");
+        GTLog.ore.println("GTMod: ServerStarting-Phase finished!");
 
-        for (Runnable tRunnable : GregTech_API.sAfterGTServerstart) {
+        for (Runnable tRunnable : GregTechAPI.sAfterGTServerstart) {
             try {
                 tRunnable.run();
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
         }
 
-        aEvent.registerServerCommand(new GT_Command());
-        aEvent.registerServerCommand(new SP_Command());
-        aEvent.registerServerCommand(new SPM_Command());
-        aEvent.registerServerCommand(new SpaceProject_Command());
+        aEvent.registerServerCommand(new GTCommand());
+        aEvent.registerServerCommand(new SPCommand());
+        aEvent.registerServerCommand(new SPMCommand());
+        aEvent.registerServerCommand(new SpaceProjectCommand());
         // Sets a new Machine Block Update Thread everytime a world is loaded
-        GT_Runnable_MachineBlockUpdate.initExecutorService();
+        RunnableMachineUpdate.initExecutorService();
     }
 
     public boolean isServerSide() {
@@ -826,41 +826,41 @@ public class GT_Mod implements IGT_Mod {
 
     @Mod.EventHandler
     public void onIDChangingEvent(FMLModIdMappingEvent aEvent) {
-        GT_Utility.reInit();
-        GT_Recipe.reInit();
+        GTUtility.reInit();
+        GTRecipe.reInit();
         try {
-            for (Map<?, ?> gt_itemStackMap : GregTech_API.sItemStackMappings) {
-                GT_Utility.reMap(gt_itemStackMap);
+            for (Map<?, ?> gt_itemStackMap : GregTechAPI.sItemStackMappings) {
+                GTUtility.reMap(gt_itemStackMap);
             }
-            for (SetMultimap<? extends ItemHolder, ?> gt_itemStackMap : GregTech_API.itemStackMultiMaps) {
-                GT_Utility.reMap(gt_itemStackMap);
+            for (SetMultimap<? extends ItemHolder, ?> gt_itemStackMap : GregTechAPI.itemStackMultiMaps) {
+                GTUtility.reMap(gt_itemStackMap);
             }
         } catch (Throwable e) {
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
     }
 
     @Mod.EventHandler
     public void onServerStopping(FMLServerStoppingEvent aEvent) {
-        for (Runnable tRunnable : GregTech_API.sBeforeGTServerstop) {
+        for (Runnable tRunnable : GregTechAPI.sBeforeGTServerstop) {
             try {
                 tRunnable.run();
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
         }
 
         gregtechproxy.onServerStopping();
 
-        for (Runnable tRunnable : GregTech_API.sAfterGTServerstop) {
+        for (Runnable tRunnable : GregTechAPI.sAfterGTServerstop) {
             try {
                 tRunnable.run();
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
         }
         // Interrupt IDLE Threads to close down cleanly
-        GT_Runnable_MachineBlockUpdate.shutdownExecutorService();
+        RunnableMachineUpdate.shutdownExecutorService();
     }
 
     public static void logStackTrace(Throwable t) {
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTechAPI.java
index 51bf250659..6cabb8e04c 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTechAPI.java
@@ -1,6 +1,6 @@
 package gregtech.api;
 
-import static gregtech.api.enums.GT_Values.B;
+import static gregtech.api.enums.GTValues.B;
 import static gregtech.api.enums.Mods.IndustrialCraft2;
 
 import java.util.ArrayList;
@@ -37,39 +37,40 @@ import com.google.common.collect.SetMultimap;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IDamagableItem;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.internal.IGT_RecipeAdder;
+import gregtech.api.interfaces.internal.IGTRecipeAdder;
 import gregtech.api.interfaces.internal.IThaumcraftCompat;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IMachineBlockUpdateable;
-import gregtech.api.items.GT_CoolantCellIC_Item;
-import gregtech.api.items.GT_CoolantCell_Item;
-import gregtech.api.items.GT_Tool_Item;
+import gregtech.api.items.GTGenericItem;
+import gregtech.api.items.ItemCoolantCell;
+import gregtech.api.items.ItemCoolantCellIC;
+import gregtech.api.items.ItemTool;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.objects.GT_Cover_Default;
-import gregtech.api.objects.GT_Cover_None;
-import gregtech.api.objects.GT_HashSet;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.threads.GT_Runnable_Cable_Update;
-import gregtech.api.threads.GT_Runnable_MachineBlockUpdate;
-import gregtech.api.util.GT_CircuitryBehavior;
-import gregtech.api.util.GT_Config;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_CreativeTab;
-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.api.objects.GTCoverDefault;
+import gregtech.api.objects.GTCoverNone;
+import gregtech.api.objects.GTHashSet;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.threads.RunnableCableUpdate;
+import gregtech.api.threads.RunnableMachineUpdate;
+import gregtech.api.util.CircuitryBehavior;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTConfig;
+import gregtech.api.util.GTCreativeTab;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.item.ItemHolder;
-import gregtech.api.world.GT_Worldgen;
-import gregtech.common.GT_DummyWorld;
-import gregtech.common.items.GT_IntegratedCircuit_Item;
+import gregtech.api.world.GTWorldgen;
+import gregtech.common.GTDummyWorld;
+import gregtech.common.items.ItemIntegratedCircuit;
 
 /**
  * Please do not include this File in your Mod-download as it ruins compatibility, like with the IC2-API You may just
@@ -88,14 +89,14 @@ import gregtech.common.items.GT_IntegratedCircuit_Item;
  * @author Gregorius Techneticies
  */
 @SuppressWarnings("unused") // API class has legitimately unused methods and members
-public class GregTech_API {
+public class GregTechAPI {
 
     /**
      * Fixes the HashMap Mappings for ItemStacks once the Server started
      * <br>
      * <br>
      * NOTE: We use wildcards generics for the key because it could be for example {@link ItemStack} or
-     * {@link GT_ItemStack}
+     * {@link GTItemStack}
      */
     public static final Collection<Map<?, ?>> sItemStackMappings = new ArrayList<>();
     public static final Collection<SetMultimap<? extends ItemHolder, ?>> itemStackMultiMaps = new ArrayList<>();
@@ -107,23 +108,23 @@ public class GregTech_API {
     /**
      * My Creative Tab
      */
-    public static final CreativeTabs TAB_GREGTECH = new GT_CreativeTab("Main", "Main"),
-        TAB_GREGTECH_MATERIALS = new GT_CreativeTab("Materials", "Materials"),
-        TAB_GREGTECH_ORES = new GT_CreativeTab("Ores", "Ores");
+    public static final CreativeTabs TAB_GREGTECH = new GTCreativeTab("Main", "Main"),
+        TAB_GREGTECH_MATERIALS = new GTCreativeTab("Materials", "Materials"),
+        TAB_GREGTECH_ORES = new GTCreativeTab("Ores", "Ores");
 
     public static final IMetaTileEntity[] METATILEENTITIES = new IMetaTileEntity[MAXIMUM_METATILE_IDS];
     /**
      * The Icon List for Covers
      */
-    public static final Map<GT_ItemStack, ITexture> sCovers = new ConcurrentHashMap<>();
+    public static final Map<GTItemStack, ITexture> sCovers = new ConcurrentHashMap<>();
     /**
      * The List of Cover Behaviors for the Covers
      */
-    public static final Map<GT_ItemStack, GT_CoverBehaviorBase<?>> sCoverBehaviors = new ConcurrentHashMap<>();
+    public static final Map<GTItemStack, CoverBehaviorBase<?>> sCoverBehaviors = new ConcurrentHashMap<>();
     /**
      * The List of Circuit Behaviors for the Redstone Circuit Block
      */
-    public static final Map<Integer, GT_CircuitryBehavior> sCircuitryBehaviors = new ConcurrentHashMap<>();
+    public static final Map<Integer, CircuitryBehavior> sCircuitryBehaviors = new ConcurrentHashMap<>();
     /**
      * The List of Blocks, which can conduct Machine Block Updates
      */
@@ -155,18 +156,17 @@ public class GregTech_API {
     /**
      * The List of Tools, which can be used. Accepts regular damageable Items and Electric Items
      */
-    public static final GT_HashSet<GT_ItemStack> sToolList = new GT_HashSet<>(), sCrowbarList = new GT_HashSet<>(),
-        sScrewdriverList = new GT_HashSet<>(), sWrenchList = new GT_HashSet<>(), sSoftHammerList = new GT_HashSet<>(),
-        sHardHammerList = new GT_HashSet<>(), sWireCutterList = new GT_HashSet<>(),
-        sSolderingToolList = new GT_HashSet<>(), sSolderingMetalList = new GT_HashSet<>(),
-        sJackhammerList = new GT_HashSet<>();
+    public static final GTHashSet<GTItemStack> sToolList = new GTHashSet<>(), sCrowbarList = new GTHashSet<>(),
+        sScrewdriverList = new GTHashSet<>(), sWrenchList = new GTHashSet<>(), sSoftHammerList = new GTHashSet<>(),
+        sHardHammerList = new GTHashSet<>(), sWireCutterList = new GTHashSet<>(),
+        sSolderingToolList = new GTHashSet<>(), sSolderingMetalList = new GTHashSet<>(),
+        sJackhammerList = new GTHashSet<>();
     /**
      * The List of Hazmat Armors
      */
-    public static final GT_HashSet<GT_ItemStack> sGasHazmatList = new GT_HashSet<>(),
-        sBioHazmatList = new GT_HashSet<>(), sFrostHazmatList = new GT_HashSet<>(),
-        sHeatHazmatList = new GT_HashSet<>(), sRadioHazmatList = new GT_HashSet<>(),
-        sElectroHazmatList = new GT_HashSet<>();
+    public static final GTHashSet<GTItemStack> sGasHazmatList = new GTHashSet<>(), sBioHazmatList = new GTHashSet<>(),
+        sFrostHazmatList = new GTHashSet<>(), sHeatHazmatList = new GTHashSet<>(), sRadioHazmatList = new GTHashSet<>(),
+        sElectroHazmatList = new GTHashSet<>();
 
     private static final Multimap<Integer, ItemStack> sRealConfigurationList = Multimaps
         .newListMultimap(new TreeMap<>(), ArrayList::new);
@@ -184,7 +184,7 @@ public class GregTech_API {
     /**
      * Lists of all the active World generation Features, these are getting Initialized in Postload!
      */
-    public static final List<GT_Worldgen> sWorldgenList = new ArrayList<>();
+    public static final List<GTWorldgen> sWorldgenList = new ArrayList<>();
     /**
      * A List containing all the Materials, which are somehow in use by GT and therefor receive a specific Set of Items.
      */
@@ -192,18 +192,18 @@ public class GregTech_API {
     /**
      * This is the generic Cover behavior. Used for the default Covers, which have no Behavior.
      */
-    public static final GT_CoverBehavior sDefaultBehavior = new GT_Cover_Default(), sNoBehavior = new GT_Cover_None();
+    public static final CoverBehavior sDefaultBehavior = new GTCoverDefault(), sNoBehavior = new GTCoverNone();
     /**
      * For the API Version check
      */
     public static volatile int VERSION = 509;
 
     /**
-     * @deprecated Use {@link GT_Values#RA}
+     * @deprecated Use {@link GTValues#RA}
      */
     @SuppressWarnings("DeprecatedIsStillUsed") // Still need be initialized for backward compat
     @Deprecated
-    public static IGT_RecipeAdder sRecipeAdder;
+    public static IGTRecipeAdder sRecipeAdder;
     /**
      * Registers Aspects to Thaumcraft. This Object might be {@code null} if Thaumcraft isn't installed.
      */
@@ -229,7 +229,7 @@ public class GregTech_API {
     /**
      * The Configuration Objects
      */
-    public static GT_Config NEIClientFIle;
+    public static GTConfig NEIClientFIle;
 
     public static int TICKS_FOR_LAG_AVERAGING = 25, MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = 100;
     /**
@@ -288,12 +288,12 @@ public class GregTech_API {
         sItemStackMappings.add(sCovers);
         sItemStackMappings.add(sCoverBehaviors);
 
-        dummyWorlds.add(GT_DummyWorld.class);
+        dummyWorlds.add(GTDummyWorld.class);
         tryAddDummyWorld("blockrenderer6343.client.world.DummyWorld");
     }
 
     private static void tryAddDummyWorld(String className) {
-        ClassLoader cl = GregTech_API.class.getClassLoader();
+        ClassLoader cl = GregTechAPI.class.getClassLoader();
         Class<?> clazz;
         try {
             clazz = Class.forName(className, false, cl);
@@ -332,12 +332,12 @@ public class GregTech_API {
      *         Null-Pointer into it.
      */
     public static ItemStack getUnificatedOreDictStack(ItemStack aOreStack) {
-        if (!GregTech_API.sPreloadFinished) GT_Log.err.println(
-            "GregTech_API ERROR: " + aOreStack.getItem()
+        if (!GregTechAPI.sPreloadFinished) GTLog.err.println(
+            "GregTechAPI ERROR: " + aOreStack.getItem()
                 + "."
                 + aOreStack.getItemDamage()
                 + " - OreDict Unification Entries are not registered now, please call it in the postload phase.");
-        return GT_OreDictUnificator.get(true, aOreStack);
+        return GTOreDictUnificator.get(true, aOreStack);
     }
 
     /**
@@ -351,7 +351,7 @@ public class GregTech_API {
      */
     public static boolean causeMachineUpdate(World aWorld, int aX, int aY, int aZ) {
         if (aWorld != null && !aWorld.isRemote && !isDummyWorld(aWorld)) { // World might be null during World-gen
-            GT_Runnable_MachineBlockUpdate.setMachineUpdateValues(aWorld, aX, aY, aZ);
+            RunnableMachineUpdate.setMachineUpdateValues(aWorld, aX, aY, aZ);
             return true;
         }
         return false;
@@ -362,7 +362,7 @@ public class GregTech_API {
         if (aWorld == null || aWorld.isRemote || isDummyWorld(aWorld)) {
             return false;
         } // World might be null during World-gen
-        GT_Runnable_Cable_Update.setCableUpdateValues(aWorld, aX, aY, aZ);
+        RunnableCableUpdate.setCableUpdateValues(aWorld, aX, aY, aZ);
         return true;
     }
 
@@ -377,8 +377,8 @@ public class GregTech_API {
     @SuppressWarnings("UnusedReturnValue") // Retains API method signature
     public static boolean registerMachineBlock(Block aBlock, int aMeta) {
         if (aBlock == null) return false;
-        if (GregTech_API.sThaumcraftCompat != null)
-            GregTech_API.sThaumcraftCompat.registerPortholeBlacklistedBlock(aBlock);
+        if (GregTechAPI.sThaumcraftCompat != null)
+            GregTechAPI.sThaumcraftCompat.registerPortholeBlacklistedBlock(aBlock);
         sMachineIDs.put(aBlock, aMeta);
         return true;
     }
@@ -388,8 +388,8 @@ public class GregTech_API {
      */
     public static boolean registerMachineBlock(Block aBlock, boolean... aMeta) {
         if (aBlock == null || aMeta == null || aMeta.length == 0) return false;
-        if (GregTech_API.sThaumcraftCompat != null)
-            GregTech_API.sThaumcraftCompat.registerPortholeBlacklistedBlock(aBlock);
+        if (GregTechAPI.sThaumcraftCompat != null)
+            GregTechAPI.sThaumcraftCompat.registerPortholeBlacklistedBlock(aBlock);
         int rMeta = 0;
         for (byte i = 0; i < aMeta.length && i < 16; i++) if (aMeta[i]) rMeta |= B[i];
         sMachineIDs.put(aBlock, rMeta);
@@ -412,19 +412,16 @@ public class GregTech_API {
      */
     public static Item constructCoolantCellItem(String aUnlocalized, String aEnglish, int aMaxStore) {
         try {
-            return new GT_CoolantCellIC_Item(aUnlocalized, aEnglish, aMaxStore);
+            return new ItemCoolantCellIC(aUnlocalized, aEnglish, aMaxStore);
         } catch (Throwable e) {
             /* Do nothing */
         }
         try {
-            return new GT_CoolantCell_Item(aUnlocalized, aEnglish, aMaxStore);
+            return new ItemCoolantCell(aUnlocalized, aEnglish, aMaxStore);
         } catch (Throwable e) {
             /* Do nothing */
         }
-        return new gregtech.api.items.GT_Generic_Item(
-            aUnlocalized,
-            aEnglish,
-            "Doesn't work as intended, this is a Bug");
+        return new GTGenericItem(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug");
     }
 
     /**
@@ -467,10 +464,7 @@ public class GregTech_API {
         } catch (Throwable e) {
             /* Do nothing */
         }
-        return new gregtech.api.items.GT_Generic_Item(
-            aUnlocalized,
-            aEnglish,
-            "Doesn't work as intended, this is a Bug");
+        return new GTGenericItem(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug");
     }
 
     /**
@@ -490,24 +484,21 @@ public class GregTech_API {
         } catch (Throwable e) {
             /* Do nothing */
         }
-        return new gregtech.api.items.GT_Generic_Item(
-            aUnlocalized,
-            aEnglish,
-            "Doesn't work as intended, this is a Bug");
+        return new GTGenericItem(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug");
     }
 
     /**
      * Creates a new Hard Hammer Item
      */
-    public static GT_Tool_Item constructHardHammerItem(String aUnlocalized, String aEnglish, int aMaxDamage,
+    public static ItemTool constructHardHammerItem(String aUnlocalized, String aEnglish, int aMaxDamage,
         int aEntityDamage) {
         try {
-            return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_HardHammer_Item")
+            return (ItemTool) Class.forName("gregtechmod.api.items.GT_HardHammer_Item")
                 .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage);
         } catch (Throwable e) {
             /* Do nothing */
         }
-        return new gregtech.api.items.GT_Tool_Item(
+        return new ItemTool(
             aUnlocalized,
             aEnglish,
             "Doesn't work as intended, this is a Bug",
@@ -519,21 +510,21 @@ public class GregTech_API {
     /**
      * Creates a new Crowbar Item
      */
-    public static GT_Tool_Item constructCrowbarItem(String aUnlocalized, String aEnglish, int aMaxDamage,
+    public static ItemTool constructCrowbarItem(String aUnlocalized, String aEnglish, int aMaxDamage,
         int aEntityDamage) {
         try {
-            return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_CrowbarRC_Item")
+            return (ItemTool) Class.forName("gregtechmod.api.items.GT_CrowbarRC_Item")
                 .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage);
         } catch (Throwable e) {
             /* Do nothing */
         }
         try {
-            return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_Crowbar_Item")
+            return (ItemTool) Class.forName("gregtechmod.api.items.GT_Crowbar_Item")
                 .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage);
         } catch (Throwable e) {
             /* Do nothing */
         }
-        return new gregtech.api.items.GT_Tool_Item(
+        return new ItemTool(
             aUnlocalized,
             aEnglish,
             "Doesn't work as intended, this is a Bug",
@@ -545,15 +536,15 @@ public class GregTech_API {
     /**
      * Creates a new Wrench Item
      */
-    public static GT_Tool_Item constructWrenchItem(String aUnlocalized, String aEnglish, int aMaxDamage,
-        int aEntityDamage, int aDisChargedGTID) {
+    public static ItemTool constructWrenchItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage,
+        int aDisChargedGTID) {
         try {
-            return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_Wrench_Item")
+            return (ItemTool) Class.forName("gregtechmod.api.items.GT_Wrench_Item")
                 .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID);
         } catch (Throwable e) {
             /* Do nothing */
         }
-        return new gregtech.api.items.GT_Tool_Item(
+        return new ItemTool(
             aUnlocalized,
             aEnglish,
             "Doesn't work as intended, this is a Bug",
@@ -565,15 +556,15 @@ public class GregTech_API {
     /**
      * Creates a new electric Screwdriver Item
      */
-    public static GT_Tool_Item constructElectricScrewdriverItem(String aUnlocalized, String aEnglish, int aMaxDamage,
+    public static ItemTool constructElectricScrewdriverItem(String aUnlocalized, String aEnglish, int aMaxDamage,
         int aEntityDamage, int aDisChargedGTID) {
         try {
-            return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_ScrewdriverIC_Item")
+            return (ItemTool) Class.forName("gregtechmod.api.items.GT_ScrewdriverIC_Item")
                 .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID);
         } catch (Throwable e) {
             /* Do nothing */
         }
-        return new gregtech.api.items.GT_Tool_Item(
+        return new ItemTool(
             aUnlocalized,
             aEnglish,
             "Doesn't work as intended, this is a Bug",
@@ -585,15 +576,15 @@ public class GregTech_API {
     /**
      * Creates a new electric Wrench Item
      */
-    public static GT_Tool_Item constructElectricWrenchItem(String aUnlocalized, String aEnglish, int aMaxDamage,
+    public static ItemTool constructElectricWrenchItem(String aUnlocalized, String aEnglish, int aMaxDamage,
         int aEntityDamage, int aDisChargedGTID) {
         try {
-            return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_WrenchIC_Item")
+            return (ItemTool) Class.forName("gregtechmod.api.items.GT_WrenchIC_Item")
                 .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID);
         } catch (Throwable e) {
             /* Do nothing */
         }
-        return new gregtech.api.items.GT_Tool_Item(
+        return new ItemTool(
             aUnlocalized,
             aEnglish,
             "Doesn't work as intended, this is a Bug",
@@ -605,11 +596,11 @@ public class GregTech_API {
     /**
      * Creates a new electric Saw Item
      */
-    public static GT_Tool_Item constructElectricSawItem(String aUnlocalized, String aEnglish, int aMaxDamage,
+    public static ItemTool constructElectricSawItem(String aUnlocalized, String aEnglish, int aMaxDamage,
         int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak,
         int aDisChargedGTID) {
         try {
-            return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_SawIC_Item")
+            return (ItemTool) Class.forName("gregtechmod.api.items.GT_SawIC_Item")
                 .getConstructors()[0].newInstance(
                     aUnlocalized,
                     aEnglish,
@@ -622,7 +613,7 @@ public class GregTech_API {
         } catch (Throwable e) {
             /* Do nothing */
         }
-        return new gregtech.api.items.GT_Tool_Item(
+        return new ItemTool(
             aUnlocalized,
             aEnglish,
             "Doesn't work as intended, this is a Bug",
@@ -634,11 +625,11 @@ public class GregTech_API {
     /**
      * Creates a new electric Drill Item
      */
-    public static GT_Tool_Item constructElectricDrillItem(String aUnlocalized, String aEnglish, int aMaxDamage,
+    public static ItemTool constructElectricDrillItem(String aUnlocalized, String aEnglish, int aMaxDamage,
         int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak,
         int aDisChargedGTID) {
         try {
-            return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_DrillIC_Item")
+            return (ItemTool) Class.forName("gregtechmod.api.items.GT_DrillIC_Item")
                 .getConstructors()[0].newInstance(
                     aUnlocalized,
                     aEnglish,
@@ -651,7 +642,7 @@ public class GregTech_API {
         } catch (Throwable e) {
             /* Do nothing */
         }
-        return new gregtech.api.items.GT_Tool_Item(
+        return new ItemTool(
             aUnlocalized,
             aEnglish,
             "Doesn't work as intended, this is a Bug",
@@ -663,15 +654,15 @@ public class GregTech_API {
     /**
      * Creates a new electric Soldering Tool
      */
-    public static GT_Tool_Item constructElectricSolderingToolItem(String aUnlocalized, String aEnglish, int aMaxDamage,
+    public static ItemTool constructElectricSolderingToolItem(String aUnlocalized, String aEnglish, int aMaxDamage,
         int aEntityDamage, int aDisChargedGTID) {
         try {
-            return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_SolderingToolIC_Item")
+            return (ItemTool) Class.forName("gregtechmod.api.items.GT_SolderingToolIC_Item")
                 .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID);
         } catch (Throwable e) {
             /* Do nothing */
         }
-        return new gregtech.api.items.GT_Tool_Item(
+        return new ItemTool(
             aUnlocalized,
             aEnglish,
             "Doesn't work as intended, this is a Bug",
@@ -683,21 +674,15 @@ public class GregTech_API {
     /**
      * Creates a new empty electric Tool
      */
-    public static GT_Tool_Item constructEmptyElectricToolItem(String aUnlocalized, String aEnglish, int aMaxDamage,
+    public static ItemTool constructEmptyElectricToolItem(String aUnlocalized, String aEnglish, int aMaxDamage,
         int aChargedGTID) {
         try {
-            return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_EmptyToolIC_Item")
+            return (ItemTool) Class.forName("gregtechmod.api.items.GT_EmptyToolIC_Item")
                 .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aChargedGTID);
         } catch (Throwable e) {
             /* Do nothing */
         }
-        return new gregtech.api.items.GT_Tool_Item(
-            aUnlocalized,
-            aEnglish,
-            "Doesn't work as intended, this is a Bug",
-            aMaxDamage,
-            0,
-            false);
+        return new ItemTool(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, 0, false);
     }
 
     /**
@@ -716,8 +701,8 @@ public class GregTech_API {
             return sBaseMetaTileEntityClass.getDeclaredConstructor()
                 .newInstance();
         } catch (Throwable e) {
-            GT_Log.err.println("GT_Mod: Fatal Error occurred while initializing TileEntities, crashing Minecraft.");
-            e.printStackTrace(GT_Log.err);
+            GTLog.err.println("GTMod: Fatal Error occurred while initializing TileEntities, crashing Minecraft.");
+            e.printStackTrace(GTLog.err);
             throw new RuntimeException(e);
         }
     }
@@ -736,10 +721,10 @@ public class GregTech_API {
      *                available in LV+ single blocks, GT++ breakthrough circuit is offered in HV+ single blocks
      */
     public static void registerConfigurationCircuit(ItemStack aStack, int minTier) {
-        if (GT_Utility.isStackInvalid(aStack)) return;
+        if (GTUtility.isStackInvalid(aStack)) return;
         for (ItemStack tRegistered : sRealConfigurationList.values())
-            if (GT_Utility.areStacksEqual(tRegistered, aStack)) return;
-        ItemStack stack = GT_Utility.copyAmount(0, aStack);
+            if (GTUtility.areStacksEqual(tRegistered, aStack)) return;
+        ItemStack stack = GTUtility.copyAmount(0, aStack);
         sRealConfigurationList.put(minTier, stack);
         for (Map.Entry<Integer, List<ItemStack>> e : sConfigurationLists.entrySet()) {
             if (e.getKey() >= minTier) {
@@ -771,13 +756,13 @@ public class GregTech_API {
     }
 
     public static Comparator<ItemStack> getConfigurationCircuitsComparator() {
-        return Comparator.comparingInt((ItemStack is) -> is.getItem() instanceof GT_IntegratedCircuit_Item ? 0 : 1)
+        return Comparator.comparingInt((ItemStack is) -> is.getItem() instanceof ItemIntegratedCircuit ? 0 : 1)
             .thenComparing(ItemStack::getUnlocalizedName)
             .thenComparing(ItemStack::getItemDamage);
     }
 
     public static void registerCircuitProgrammer(ItemStack stack, boolean ignoreNBT, boolean useContainer) {
-        registerCircuitProgrammer(rhs -> GT_Utility.areStacksEqual(stack, rhs, ignoreNBT), useContainer);
+        registerCircuitProgrammer(rhs -> GTUtility.areStacksEqual(stack, rhs, ignoreNBT), useContainer);
     }
 
     public static void registerCircuitProgrammer(Predicate<ItemStack> predicate, boolean useContainer) {
@@ -792,23 +777,23 @@ public class GregTech_API {
         sRealCircuitProgrammerList.put(predicate, doDamage);
     }
 
-    public static void registerCover(ItemStack aStack, ITexture aCover, GT_CoverBehavior aBehavior) {
-        registerCover(aStack, aCover, (GT_CoverBehaviorBase<?>) aBehavior);
+    public static void registerCover(ItemStack aStack, ITexture aCover, CoverBehavior aBehavior) {
+        registerCover(aStack, aCover, (CoverBehaviorBase<?>) aBehavior);
     }
 
-    public static void registerCover(ItemStack aStack, ITexture aCover, GT_CoverBehaviorBase<?> aBehavior) {
-        if (!sCovers.containsKey(new GT_ItemStack(aStack))) sCovers.put(
-            new GT_ItemStack(aStack),
+    public static void registerCover(ItemStack aStack, ITexture aCover, CoverBehaviorBase<?> aBehavior) {
+        if (!sCovers.containsKey(new GTItemStack(aStack))) sCovers.put(
+            new GTItemStack(aStack),
             aCover == null || !aCover.isValidTexture() ? Textures.BlockIcons.ERROR_RENDERING[0] : aCover);
-        if (aBehavior != null) sCoverBehaviors.put(new GT_ItemStack(aStack), aBehavior);
+        if (aBehavior != null) sCoverBehaviors.put(new GTItemStack(aStack), aBehavior);
     }
 
-    public static void registerCoverBehavior(ItemStack aStack, GT_CoverBehavior aBehavior) {
-        registerCoverBehavior(aStack, (GT_CoverBehaviorBase<?>) aBehavior);
+    public static void registerCoverBehavior(ItemStack aStack, CoverBehavior aBehavior) {
+        registerCoverBehavior(aStack, (CoverBehaviorBase<?>) aBehavior);
     }
 
-    public static void registerCoverBehavior(ItemStack aStack, GT_CoverBehaviorBase<?> aBehavior) {
-        sCoverBehaviors.put(new GT_ItemStack(aStack), aBehavior == null ? sDefaultBehavior : aBehavior);
+    public static void registerCoverBehavior(ItemStack aStack, CoverBehaviorBase<?> aBehavior) {
+        sCoverBehaviors.put(new GTItemStack(aStack), aBehavior == null ? sDefaultBehavior : aBehavior);
     }
 
     /**
@@ -816,8 +801,8 @@ public class GregTech_API {
      *
      * @param aBehavior can be null
      */
-    public static void registerCover(Collection<ItemStack> aStackList, ITexture aCover, GT_CoverBehavior aBehavior) {
-        registerCover(aStackList, aCover, (GT_CoverBehaviorBase<?>) aBehavior);
+    public static void registerCover(Collection<ItemStack> aStackList, ITexture aCover, CoverBehavior aBehavior) {
+        registerCover(aStackList, aCover, (CoverBehaviorBase<?>) aBehavior);
     }
 
     /**
@@ -826,9 +811,8 @@ public class GregTech_API {
      * @param aBehavior can be null
      */
     public static void registerCover(Collection<ItemStack> aStackList, ITexture aCover,
-        GT_CoverBehaviorBase<?> aBehavior) {
-        if (aCover.isValidTexture())
-            aStackList.forEach(tStack -> GregTech_API.registerCover(tStack, aCover, aBehavior));
+        CoverBehaviorBase<?> aBehavior) {
+        if (aCover.isValidTexture()) aStackList.forEach(tStack -> GregTechAPI.registerCover(tStack, aCover, aBehavior));
     }
 
     /**
@@ -836,11 +820,11 @@ public class GregTech_API {
      *
      * @return The Cover behavior
      */
-    public static GT_CoverBehaviorBase<?> getCoverBehaviorNew(ItemStack aStack) {
+    public static CoverBehaviorBase<?> getCoverBehaviorNew(ItemStack aStack) {
         if (aStack == null || aStack.getItem() == null) return sNoBehavior;
-        GT_CoverBehaviorBase<?> rCover = sCoverBehaviors.get(new GT_ItemStack(aStack));
+        CoverBehaviorBase<?> rCover = sCoverBehaviors.get(new GTItemStack(aStack));
         if (rCover != null) return rCover;
-        rCover = sCoverBehaviors.get(new GT_ItemStack(aStack, true));
+        rCover = sCoverBehaviors.get(new GTItemStack(aStack, true));
         if (rCover != null) return rCover;
         return sDefaultBehavior;
     }
@@ -848,9 +832,9 @@ public class GregTech_API {
     /**
      * returns a Cover behavior, guaranteed to not return null
      */
-    public static GT_CoverBehaviorBase<?> getCoverBehaviorNew(int aStack) {
+    public static CoverBehaviorBase<?> getCoverBehaviorNew(int aStack) {
         if (aStack == 0) return sNoBehavior;
-        return getCoverBehaviorNew(GT_Utility.intToStack(aStack));
+        return getCoverBehaviorNew(GTUtility.intToStack(aStack));
     }
 
     /**
@@ -953,14 +937,13 @@ public class GregTech_API {
      * Generic Function to add Tools to the Lists. Contains all sanity Checks for Tools, like preventing one Tool from
      * being registered for multiple purposes as controls would override each other.
      */
-    public static boolean registerTool(ItemStack aTool, Collection<GT_ItemStack> aToolList) {
-        if (aTool == null || GT_Utility.isStackInList(aTool, sToolList)
+    public static boolean registerTool(ItemStack aTool, Collection<GTItemStack> aToolList) {
+        if (aTool == null || GTUtility.isStackInList(aTool, sToolList)
             || (!aTool.getItem()
-                .isDamageable() && !GT_ModHandler.isElectricItem(aTool)
-                && !(aTool.getItem() instanceof IDamagableItem)))
+                .isDamageable() && !GTModHandler.isElectricItem(aTool) && !(aTool.getItem() instanceof IDamagableItem)))
             return false;
-        aToolList.add(new GT_ItemStack(GT_Utility.copyAmount(1, aTool)));
-        sToolList.add(new GT_ItemStack(GT_Utility.copyAmount(1, aTool)));
+        aToolList.add(new GTItemStack(GTUtility.copyAmount(1, aTool)));
+        sToolList.add(new GTItemStack(GTUtility.copyAmount(1, aTool)));
         return true;
     }
 
@@ -981,7 +964,7 @@ public class GregTech_API {
      */
     @SideOnly(Side.CLIENT)
     public static void setItemIconRegister(IIconRegister aIconRegister) {
-        GregTech_API.sItemIcons = aIconRegister;
+        GregTechAPI.sItemIcons = aIconRegister;
     }
 
     public static void registerTileEntityConstructor(int meta, IntFunction<TileEntity> constructor) {
@@ -992,7 +975,7 @@ public class GregTech_API {
     }
 
     public static TileEntity createTileEntity(int meta) {
-        meta = GT_Utility.clamp(meta, 0, 15);
+        meta = GTUtility.clamp(meta, 0, 15);
         if (teCreators[meta] == null) return null;
         return teCreators[meta].apply(meta);
     }
diff --git a/src/main/java/gregtech/api/damagesources/GT_DamageSources.java b/src/main/java/gregtech/api/damagesources/GTDamageSources.java
index 65a2519001..44b80a57c9 100644
--- a/src/main/java/gregtech/api/damagesources/GT_DamageSources.java
+++ b/src/main/java/gregtech/api/damagesources/GTDamageSources.java
@@ -10,7 +10,7 @@ import net.minecraft.util.EntityDamageSource;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
-public class GT_DamageSources {
+public class GTDamageSources {
 
     public static DamageSource getElectricDamage() {
         return ic2.api.info.Info.DMG_ELECTRIC;
diff --git a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java b/src/main/java/gregtech/api/enchants/EnchantmentEnderDamage.java
index 07c13b3509..6c26a54976 100644
--- a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java
+++ b/src/main/java/gregtech/api/enchants/EnchantmentEnderDamage.java
@@ -10,16 +10,16 @@ import net.minecraft.potion.PotionEffect;
 
 import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_Config;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTConfig;
+import gregtech.api.util.GTLanguageManager;
 
-public class Enchantment_EnderDamage extends EnchantmentDamage {
+public class EnchantmentEnderDamage extends EnchantmentDamage {
 
-    public static Enchantment_EnderDamage INSTANCE;
+    public static EnchantmentEnderDamage INSTANCE;
 
-    public Enchantment_EnderDamage() {
-        super(GT_Config.addIDConfig(ConfigCategories.IDs.enchantments, "Disjunction", 15), 2, -1);
-        GT_LanguageManager.addStringLocalization(getName(), "Disjunction");
+    public EnchantmentEnderDamage() {
+        super(GTConfig.addIDConfig(ConfigCategories.IDs.enchantments, "Disjunction", 15), 2, -1);
+        GTLanguageManager.addStringLocalization(getName(), "Disjunction");
         Materials.Silver.setEnchantmentForTools(this, 2);
         Materials.Mercury.setEnchantmentForTools(this, 3);
         Materials.Electrum.setEnchantmentForTools(this, 3);
diff --git a/src/main/java/gregtech/api/enchants/Enchantment_Hazmat.java b/src/main/java/gregtech/api/enchants/EnchantmentHazmat.java
index ecbe654698..bbac780b71 100644
--- a/src/main/java/gregtech/api/enchants/Enchantment_Hazmat.java
+++ b/src/main/java/gregtech/api/enchants/EnchantmentHazmat.java
@@ -6,16 +6,16 @@ import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.ConfigCategories;
-import gregtech.api.util.GT_Config;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTConfig;
+import gregtech.api.util.GTLanguageManager;
 
-public class Enchantment_Hazmat extends Enchantment {
+public class EnchantmentHazmat extends Enchantment {
 
-    public static Enchantment_Hazmat INSTANCE;
+    public static EnchantmentHazmat INSTANCE;
 
-    public Enchantment_Hazmat() {
-        super(GT_Config.addIDConfig(ConfigCategories.IDs.enchantments, "Hazmat", 13), 0, EnumEnchantmentType.armor);
-        GT_LanguageManager.addStringLocalization(getName(), "Hazmat");
+    public EnchantmentHazmat() {
+        super(GTConfig.addIDConfig(ConfigCategories.IDs.enchantments, "Hazmat", 13), 0, EnumEnchantmentType.armor);
+        GTLanguageManager.addStringLocalization(getName(), "Hazmat");
         INSTANCE = this;
     }
 
diff --git a/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java b/src/main/java/gregtech/api/enchants/EnchantmentRadioactivity.java
index e68e55cd6a..77e6f52702 100644
--- a/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java
+++ b/src/main/java/gregtech/api/enchants/EnchantmentRadioactivity.java
@@ -7,17 +7,17 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_Config;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTConfig;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 
-public class Enchantment_Radioactivity extends EnchantmentDamage {
+public class EnchantmentRadioactivity extends EnchantmentDamage {
 
-    public static Enchantment_Radioactivity INSTANCE;
+    public static EnchantmentRadioactivity INSTANCE;
 
-    public Enchantment_Radioactivity() {
-        super(GT_Config.addIDConfig(ConfigCategories.IDs.enchantments, "Radioactivity", 14), 0, -1);
-        GT_LanguageManager.addStringLocalization(getName(), "Radioactivity");
+    public EnchantmentRadioactivity() {
+        super(GTConfig.addIDConfig(ConfigCategories.IDs.enchantments, "Radioactivity", 14), 0, -1);
+        GTLanguageManager.addStringLocalization(getName(), "Radioactivity");
         Materials.Plutonium.setEnchantmentForTools(this, 1)
             .setEnchantmentForArmors(this, 1);
         Materials.Uranium235.setEnchantmentForTools(this, 2)
@@ -58,7 +58,7 @@ public class Enchantment_Radioactivity extends EnchantmentDamage {
 
     @Override
     public void func_151367_b(EntityLivingBase aHurtEntity, Entity aDamagingEntity, int aLevel) {
-        GT_Utility.applyRadioactivity(aHurtEntity, aLevel, 1);
+        GTUtility.applyRadioactivity(aHurtEntity, aLevel, 1);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/enums/Dyes.java b/src/main/java/gregtech/api/enums/Dyes.java
index 3f1bc31c21..1dedcb6af0 100644
--- a/src/main/java/gregtech/api/enums/Dyes.java
+++ b/src/main/java/gregtech/api/enums/Dyes.java
@@ -7,8 +7,8 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.interfaces.IColorModulationContainer;
-import gregtech.api.objects.GT_ArrayList;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.objects.GTArrayList;
+import gregtech.api.util.GTUtility;
 
 public enum Dyes implements IColorModulationContainer {
 
@@ -50,7 +50,7 @@ public enum Dyes implements IColorModulationContainer {
     public final short[] mRGBa;
     public final short[] mOriginalRGBa;
     public final EnumChatFormatting formatting;
-    private final ArrayList<Fluid> mFluidDyes = new GT_ArrayList<>(false, 1);
+    private final ArrayList<Fluid> mFluidDyes = new GTArrayList<>(false, 1);
 
     Dyes(int aIndex, int aR, int aG, int aB, String aName) {
         this(aIndex, aR, aG, aB, aName, EnumChatFormatting.GRAY);
@@ -75,7 +75,7 @@ public enum Dyes implements IColorModulationContainer {
     }
 
     public static Dyes get(String aColor) {
-        Object tObject = GT_Utility.getFieldContent(Dyes.class, aColor, false, false);
+        Object tObject = GTUtility.getFieldContent(Dyes.class, aColor, false, false);
         if (tObject instanceof Dyes) return (Dyes) tObject;
         return _NULL;
     }
diff --git a/src/main/java/gregtech/api/enums/GTStones.java b/src/main/java/gregtech/api/enums/GTStones.java
index 82d7cb90ce..af14301a5d 100644
--- a/src/main/java/gregtech/api/enums/GTStones.java
+++ b/src/main/java/gregtech/api/enums/GTStones.java
@@ -1,14 +1,14 @@
 package gregtech.api.enums;
 
-import gregtech.api.GregTech_API;
-import gregtech.common.GT_Worldgen_Stone;
+import gregtech.api.GregTechAPI;
 import gregtech.common.StoneBuilder;
+import gregtech.common.WorldgenStone;
 
 public enum GTStones {
 
     NetherBlackgraniteTiny(new StoneBuilder().name("nether.stone.blackgranite.tiny")
         .disabledByDefault()
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(0)
         .dimension(-1)
         .size(50)
@@ -18,7 +18,7 @@ public enum GTStones {
 
     NetherBlackgraniteSmall(new StoneBuilder().name("nether.stone.blackgranite.small")
         .disabledByDefault()
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(0)
         .dimension(-1)
         .size(100)
@@ -28,7 +28,7 @@ public enum GTStones {
 
     NetherBlackgraniteMedium(new StoneBuilder().name("nether.stone.blackgranite.medium")
         .disabledByDefault()
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(0)
         .dimension(-1)
         .size(200)
@@ -38,7 +38,7 @@ public enum GTStones {
 
     NetherBlackgraniteLarge(new StoneBuilder().name("nether.stone.blackgranite.large")
         .disabledByDefault()
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(0)
         .dimension(-1)
         .size(300)
@@ -48,7 +48,7 @@ public enum GTStones {
 
     NetherBlackgraniteHuge(new StoneBuilder().name("nether.stone.blackgranite.huge")
         .disabledByDefault()
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(0)
         .dimension(-1)
         .size(400)
@@ -58,7 +58,7 @@ public enum GTStones {
 
     NetherRedgraniteTiny(new StoneBuilder().name("nether.stone.redgranite.tiny")
         .disabledByDefault()
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(8)
         .dimension(-1)
         .size(50)
@@ -68,7 +68,7 @@ public enum GTStones {
 
     NetherRedgraniteSmall(new StoneBuilder().name("nether.stone.redgranite.small")
         .disabledByDefault()
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(8)
         .dimension(-1)
         .size(100)
@@ -78,7 +78,7 @@ public enum GTStones {
 
     NetherRedgraniteMedium(new StoneBuilder().name("nether.stone.redgranite.medium")
         .disabledByDefault()
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(8)
         .dimension(-1)
         .size(200)
@@ -88,7 +88,7 @@ public enum GTStones {
 
     NetherRedgraniteLarge(new StoneBuilder().name("nether.stone.redgranite.large")
         .disabledByDefault()
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(8)
         .dimension(-1)
         .size(300)
@@ -98,7 +98,7 @@ public enum GTStones {
 
     NetherRedgraniteHuge(new StoneBuilder().name("nether.stone.redgranite.huge")
         .disabledByDefault()
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(8)
         .dimension(-1)
         .size(400)
@@ -108,7 +108,7 @@ public enum GTStones {
 
     NetherMarbleTiny(new StoneBuilder().name("nether.stone.marble.tiny")
         .disabledByDefault()
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(0)
         .dimension(-1)
         .size(50)
@@ -118,7 +118,7 @@ public enum GTStones {
 
     NetherMarbleSmall(new StoneBuilder().name("nether.stone.marble.small")
         .disabledByDefault()
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(0)
         .dimension(-1)
         .size(100)
@@ -128,7 +128,7 @@ public enum GTStones {
 
     NetherMarbleMedium(new StoneBuilder().name("nether.stone.marble.medium")
         .disabledByDefault()
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(0)
         .dimension(-1)
         .size(200)
@@ -138,7 +138,7 @@ public enum GTStones {
 
     NetherMarbleLarge(new StoneBuilder().name("nether.stone.marble.large")
         .disabledByDefault()
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(0)
         .dimension(-1)
         .size(300)
@@ -148,7 +148,7 @@ public enum GTStones {
 
     NetherMarbleHuge(new StoneBuilder().name("nether.stone.marble.huge")
         .disabledByDefault()
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(0)
         .dimension(-1)
         .size(400)
@@ -158,7 +158,7 @@ public enum GTStones {
 
     NetherBasaltTiny(new StoneBuilder().name("nether.stone.basalt.tiny")
         .disabledByDefault()
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(8)
         .dimension(-1)
         .size(50)
@@ -168,7 +168,7 @@ public enum GTStones {
 
     NetherBasaltSmall(new StoneBuilder().name("nether.stone.basalt.small")
         .disabledByDefault()
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(8)
         .dimension(-1)
         .size(100)
@@ -178,7 +178,7 @@ public enum GTStones {
 
     NetherBasaltMedium(new StoneBuilder().name("nether.stone.basalt.medium")
         .disabledByDefault()
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(8)
         .dimension(-1)
         .size(200)
@@ -188,7 +188,7 @@ public enum GTStones {
 
     NetherBasaltLarge(new StoneBuilder().name("nether.stone.basalt.large")
         .disabledByDefault()
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(8)
         .dimension(-1)
         .size(300)
@@ -198,7 +198,7 @@ public enum GTStones {
 
     NetherBasaltHuge(new StoneBuilder().name("nether.stone.basalt.huge")
         .disabledByDefault()
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(8)
         .dimension(-1)
         .size(400)
@@ -206,7 +206,7 @@ public enum GTStones {
         .heightRange(0, 120)
         .generationInVoidEnabled(false)),
     OverworldBlackgraniteTiny(new StoneBuilder().name("overworld.stone.blackgranite.tiny")
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(0)
         .dimension(0)
         .size(75)
@@ -215,7 +215,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldBlackgraniteSmall(new StoneBuilder().name("overworld.stone.blackgranite.small")
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(0)
         .dimension(0)
         .size(100)
@@ -224,7 +224,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldBlackgraniteMedium(new StoneBuilder().name("overworld.stone.blackgranite.medium")
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(0)
         .dimension(0)
         .size(200)
@@ -233,7 +233,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldBlackgraniteLarge(new StoneBuilder().name("overworld.stone.blackgranite.large")
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(0)
         .dimension(0)
         .size(300)
@@ -242,7 +242,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldBlackgraniteHuge(new StoneBuilder().name("overworld.stone.blackgranite.huge")
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(0)
         .dimension(0)
         .size(400)
@@ -251,7 +251,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldRedgraniteTiny(new StoneBuilder().name("overworld.stone.redgranite.tiny")
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(8)
         .dimension(0)
         .size(75)
@@ -260,7 +260,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldRedgraniteSmall(new StoneBuilder().name("overworld.stone.redgranite.small")
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(8)
         .dimension(0)
         .size(100)
@@ -269,7 +269,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldRedgraniteMedium(new StoneBuilder().name("overworld.stone.redgranite.medium")
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(8)
         .dimension(0)
         .size(200)
@@ -278,7 +278,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldRedgraniteLarge(new StoneBuilder().name("overworld.stone.redgranite.large")
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(8)
         .dimension(0)
         .size(300)
@@ -287,7 +287,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldRedgraniteHuge(new StoneBuilder().name("overworld.stone.redgranite.huge")
-        .block(GregTech_API.sBlockGranites)
+        .block(GregTechAPI.sBlockGranites)
         .blockMeta(8)
         .dimension(0)
         .size(400)
@@ -296,7 +296,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldMarbleTiny(new StoneBuilder().name("overworld.stone.marble.tiny")
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(0)
         .dimension(0)
         .size(75)
@@ -305,7 +305,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldMarbleSmall(new StoneBuilder().name("overworld.stone.marble.small")
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(0)
         .dimension(0)
         .size(100)
@@ -314,7 +314,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldMarbleMedium(new StoneBuilder().name("overworld.stone.marble.medium")
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(0)
         .dimension(0)
         .size(200)
@@ -323,7 +323,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldMarbleLarge(new StoneBuilder().name("overworld.stone.marble.large")
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(0)
         .dimension(0)
         .size(300)
@@ -332,7 +332,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldMarbleHuge(new StoneBuilder().name("overworld.stone.marble.huge")
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(0)
         .dimension(0)
         .size(400)
@@ -341,7 +341,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldBasaltTiny(new StoneBuilder().name("overworld.stone.basalt.tiny")
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(8)
         .dimension(0)
         .size(75)
@@ -350,7 +350,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldBasaltSmall(new StoneBuilder().name("overworld.stone.basalt.small")
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(8)
         .dimension(0)
         .size(100)
@@ -359,7 +359,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldBasaltMedium(new StoneBuilder().name("overworld.stone.basalt.medium")
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(8)
         .dimension(0)
         .size(200)
@@ -368,7 +368,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldBasaltLarge(new StoneBuilder().name("overworld.stone.basalt.large")
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(8)
         .dimension(0)
         .size(300)
@@ -377,7 +377,7 @@ public enum GTStones {
         .generationInVoidEnabled(false)),
 
     OverworldBasaltHuge(new StoneBuilder().name("overworld.stone.basalt.huge")
-        .block(GregTech_API.sBlockStones)
+        .block(GregTechAPI.sBlockStones)
         .blockMeta(8)
         .dimension(0)
         .size(400)
@@ -391,8 +391,8 @@ public enum GTStones {
         this.stone = stone;
     }
 
-    public GT_Worldgen_Stone addGTStone() {
-        return new GT_Worldgen_Stone(this.stone);
+    public WorldgenStone addGTStone() {
+        return new WorldgenStone(this.stone);
     }
 
 }
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GTValues.java
index 88972e45fc..eaca14b3ee 100644
--- a/src/main/java/gregtech/api/enums/GT_Values.java
+++ b/src/main/java/gregtech/api/enums/GTValues.java
@@ -27,11 +27,12 @@ import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidTank;
 import net.minecraftforge.oredict.OreDictionary;
 
-import gregtech.api.fluid.FluidTankGT;
+import gregtech.api.fluid.GTFluidTank;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.interfaces.internal.IGT_Mod;
-import gregtech.api.interfaces.internal.IGT_RecipeAdder;
+import gregtech.api.interfaces.internal.IGTMod;
+import gregtech.api.interfaces.internal.IGTRecipeAdder;
 import gregtech.api.net.IGT_NetworkHandler;
+import gregtech.api.util.GTChunkAssociatedData;
 
 /**
  * Made for static imports, this Class is just a Helper.
@@ -43,7 +44,7 @@ import gregtech.api.net.IGT_NetworkHandler;
  * such as this one as AutoCompleteable.
  */
 @SuppressWarnings("unused") // API Legitimately has unused fields and methods
-public class GT_Values {
+public class GTValues {
     // unused: A, C, D, G, H, I, J, K, N, O, Q, R, S, T
 
     // TODO: Rename Material Units to 'U'
@@ -354,13 +355,13 @@ public class GT_Values {
         { 0, 1, 2, 3, 4, 5, 6 } };
 
     /**
-     * The Mod Object itself. That is the GT_Mod-Object. It's needed to open GUI's and similar.
+     * The Mod Object itself. That is the GTMod-Object. It's needed to open GUI's and similar.
      */
-    public static IGT_Mod GT;
+    public static IGTMod GT;
     /**
      * Use this Object to add Recipes. (Recipe Adder)
      */
-    public static IGT_RecipeAdder RA;
+    public static IGTRecipeAdder RA;
     /**
      * For Internal Usage (Network)
      */
@@ -431,7 +432,7 @@ public class GT_Values {
      */
     public static boolean debugEntityCramming = false;
     /**
-     * Debug parameter for {@link gregtech.api.util.GT_ChunkAssociatedData}
+     * Debug parameter for {@link GTChunkAssociatedData}
      */
     public static boolean debugWorldData = false;
     /**
@@ -540,7 +541,7 @@ public class GT_Values {
     public static final int[] emptyIntArray = new int[0];
 
     public static final IFluidTank[] emptyFluidTank = new IFluidTank[0];
-    public static final FluidTankGT[] emptyFluidTankGT = new FluidTankGT[0];
+    public static final GTFluidTank[] emptyFluidTankGT = new GTFluidTank[0];
     public static final FluidTankInfo[] emptyFluidTankInfo = new FluidTankInfo[0];
     public static final FluidStack[] emptyFluidStack = new FluidStack[0];
     public static final ItemStack[] emptyItemStackArray = new ItemStack[0];
diff --git a/src/main/java/gregtech/api/enums/GT_HatchElement.java b/src/main/java/gregtech/api/enums/GT_HatchElement.java
deleted file mode 100644
index 3a21d5a2eb..0000000000
--- a/src/main/java/gregtech/api/enums/GT_HatchElement.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package gregtech.api.enums;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import gregtech.api.interfaces.IHatchElement;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
-import gregtech.api.util.GT_ExoticEnergyInputHelper;
-import gregtech.api.util.IGT_HatchAdder;
-
-public enum GT_HatchElement implements IHatchElement<GT_MetaTileEntity_MultiBlockBase> {
-
-    Muffler(GT_MetaTileEntity_MultiBlockBase::addMufflerToMachineList, GT_MetaTileEntity_Hatch_Muffler.class) {
-
-        @Override
-        public long count(GT_MetaTileEntity_MultiBlockBase t) {
-            return t.mMufflerHatches.size();
-        }
-    },
-    Maintenance(GT_MetaTileEntity_MultiBlockBase::addMaintenanceToMachineList,
-        GT_MetaTileEntity_Hatch_Maintenance.class) {
-
-        @Override
-        public long count(GT_MetaTileEntity_MultiBlockBase t) {
-            return t.mMaintenanceHatches.size();
-        }
-    },
-    InputHatch(GT_MetaTileEntity_MultiBlockBase::addInputHatchToMachineList, GT_MetaTileEntity_Hatch_Input.class) {
-
-        @Override
-        public long count(GT_MetaTileEntity_MultiBlockBase t) {
-            return t.mInputHatches.size();
-        }
-    },
-    InputBus(GT_MetaTileEntity_MultiBlockBase::addInputBusToMachineList, GT_MetaTileEntity_Hatch_InputBus.class) {
-
-        @Override
-        public long count(GT_MetaTileEntity_MultiBlockBase t) {
-            return t.mInputBusses.size();
-        }
-    },
-    OutputHatch(GT_MetaTileEntity_MultiBlockBase::addOutputHatchToMachineList, GT_MetaTileEntity_Hatch_Output.class) {
-
-        @Override
-        public long count(GT_MetaTileEntity_MultiBlockBase t) {
-            return t.mOutputHatches.size();
-        }
-    },
-    OutputBus(GT_MetaTileEntity_MultiBlockBase::addOutputBusToMachineList, GT_MetaTileEntity_Hatch_OutputBus.class) {
-
-        @Override
-        public long count(GT_MetaTileEntity_MultiBlockBase t) {
-            return t.mOutputBusses.size();
-        }
-    },
-    Energy(GT_MetaTileEntity_MultiBlockBase::addEnergyInputToMachineList, GT_MetaTileEntity_Hatch_Energy.class) {
-
-        @Override
-        public long count(GT_MetaTileEntity_MultiBlockBase t) {
-            return t.mEnergyHatches.size();
-        }
-    },
-    Dynamo(GT_MetaTileEntity_MultiBlockBase::addDynamoToMachineList, GT_MetaTileEntity_Hatch_Dynamo.class) {
-
-        @Override
-        public long count(GT_MetaTileEntity_MultiBlockBase t) {
-            return t.mDynamoHatches.size();
-        }
-    },
-    ExoticEnergy(GT_MetaTileEntity_MultiBlockBase::addExoticEnergyInputToMachineList) {
-
-        @Override
-        public List<? extends Class<? extends IMetaTileEntity>> mteClasses() {
-            return GT_ExoticEnergyInputHelper.getAllClasses();
-        }
-
-        @Override
-        public long count(GT_MetaTileEntity_MultiBlockBase t) {
-            return t.getExoticEnergyHatches()
-                .size();
-        }
-    },;
-
-    private final List<Class<? extends IMetaTileEntity>> mteClasses;
-    private final IGT_HatchAdder<GT_MetaTileEntity_MultiBlockBase> adder;
-
-    @SafeVarargs
-    GT_HatchElement(IGT_HatchAdder<GT_MetaTileEntity_MultiBlockBase> adder,
-        Class<? extends IMetaTileEntity>... mteClasses) {
-        this.mteClasses = Collections.unmodifiableList(Arrays.asList(mteClasses));
-        this.adder = adder;
-    }
-
-    @Override
-    public List<? extends Class<? extends IMetaTileEntity>> mteClasses() {
-        return mteClasses;
-    }
-
-    public IGT_HatchAdder<? super GT_MetaTileEntity_MultiBlockBase> adder() {
-        return adder;
-    }
-}
diff --git a/src/main/java/gregtech/api/enums/HatchElement.java b/src/main/java/gregtech/api/enums/HatchElement.java
new file mode 100644
index 0000000000..ae38d2a2ff
--- /dev/null
+++ b/src/main/java/gregtech/api/enums/HatchElement.java
@@ -0,0 +1,110 @@
+package gregtech.api.enums;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import gregtech.api.interfaces.IHatchElement;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.metatileentity.implementations.MTEHatchDynamo;
+import gregtech.api.metatileentity.implementations.MTEHatchEnergy;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
+import gregtech.api.metatileentity.implementations.MTEHatchMaintenance;
+import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
+import gregtech.api.metatileentity.implementations.MTEHatchOutput;
+import gregtech.api.metatileentity.implementations.MTEHatchOutputBus;
+import gregtech.api.metatileentity.implementations.MTEMultiBlockBase;
+import gregtech.api.util.ExoticEnergyInputHelper;
+import gregtech.api.util.IGTHatchAdder;
+
+public enum HatchElement implements IHatchElement<MTEMultiBlockBase> {
+
+    Muffler(MTEMultiBlockBase::addMufflerToMachineList, MTEHatchMuffler.class) {
+
+        @Override
+        public long count(MTEMultiBlockBase t) {
+            return t.mMufflerHatches.size();
+        }
+    },
+    Maintenance(MTEMultiBlockBase::addMaintenanceToMachineList, MTEHatchMaintenance.class) {
+
+        @Override
+        public long count(MTEMultiBlockBase t) {
+            return t.mMaintenanceHatches.size();
+        }
+    },
+    InputHatch(MTEMultiBlockBase::addInputHatchToMachineList, MTEHatchInput.class) {
+
+        @Override
+        public long count(MTEMultiBlockBase t) {
+            return t.mInputHatches.size();
+        }
+    },
+    InputBus(MTEMultiBlockBase::addInputBusToMachineList, MTEHatchInputBus.class) {
+
+        @Override
+        public long count(MTEMultiBlockBase t) {
+            return t.mInputBusses.size();
+        }
+    },
+    OutputHatch(MTEMultiBlockBase::addOutputHatchToMachineList, MTEHatchOutput.class) {
+
+        @Override
+        public long count(MTEMultiBlockBase t) {
+            return t.mOutputHatches.size();
+        }
+    },
+    OutputBus(MTEMultiBlockBase::addOutputBusToMachineList, MTEHatchOutputBus.class) {
+
+        @Override
+        public long count(MTEMultiBlockBase t) {
+            return t.mOutputBusses.size();
+        }
+    },
+    Energy(MTEMultiBlockBase::addEnergyInputToMachineList, MTEHatchEnergy.class) {
+
+        @Override
+        public long count(MTEMultiBlockBase t) {
+            return t.mEnergyHatches.size();
+        }
+    },
+    Dynamo(MTEMultiBlockBase::addDynamoToMachineList, MTEHatchDynamo.class) {
+
+        @Override
+        public long count(MTEMultiBlockBase t) {
+            return t.mDynamoHatches.size();
+        }
+    },
+    ExoticEnergy(MTEMultiBlockBase::addExoticEnergyInputToMachineList) {
+
+        @Override
+        public List<? extends Class<? extends IMetaTileEntity>> mteClasses() {
+            return ExoticEnergyInputHelper.getAllClasses();
+        }
+
+        @Override
+        public long count(MTEMultiBlockBase t) {
+            return t.getExoticEnergyHatches()
+                .size();
+        }
+    },;
+
+    private final List<Class<? extends IMetaTileEntity>> mteClasses;
+    private final IGTHatchAdder<MTEMultiBlockBase> adder;
+
+    @SafeVarargs
+    HatchElement(IGTHatchAdder<MTEMultiBlockBase> adder, Class<? extends IMetaTileEntity>... mteClasses) {
+        this.mteClasses = Collections.unmodifiableList(Arrays.asList(mteClasses));
+        this.adder = adder;
+    }
+
+    @Override
+    public List<? extends Class<? extends IMetaTileEntity>> mteClasses() {
+        return mteClasses;
+    }
+
+    public IGTHatchAdder<? super MTEMultiBlockBase> adder() {
+        return adder;
+    }
+}
diff --git a/src/main/java/gregtech/api/enums/HeatingCoilLevel.java b/src/main/java/gregtech/api/enums/HeatingCoilLevel.java
index f281695d5a..4d770710cc 100644
--- a/src/main/java/gregtech/api/enums/HeatingCoilLevel.java
+++ b/src/main/java/gregtech/api/enums/HeatingCoilLevel.java
@@ -79,14 +79,14 @@ public enum HeatingCoilLevel {
             if (heatLevel.getHeat() >= heat) {
                 String name = heatLevel.getName();
                 if (applyColor) {
-                    name = GT_Values.TIER_COLORS[heatLevel.getTier() + 1] + name;
+                    name = GTValues.TIER_COLORS[heatLevel.getTier() + 1] + name;
                 }
                 return name;
             }
         }
         String name = HeatingCoilLevel.MAX.getName() + "+";
         if (applyColor) {
-            name = GT_Values.TIER_COLORS[HeatingCoilLevel.MAX.getTier() + 1] + name;
+            name = GTValues.TIER_COLORS[HeatingCoilLevel.MAX.getTier() + 1] + name;
         }
         return name;
     }
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 74f169681c..dba8f510b9 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -1,7 +1,7 @@
 package gregtech.api.enums;
 
-import static gregtech.api.enums.GT_Values.NI;
-import static gregtech.api.enums.GT_Values.W;
+import static gregtech.api.enums.GTValues.NI;
+import static gregtech.api.enums.GTValues.W;
 
 import java.util.Locale;
 
@@ -11,11 +11,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 
 import gregtech.api.interfaces.IItemContainer;
-import gregtech.api.util.GT_LanguageManager;
-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.api.util.GTLanguageManager;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 /**
  * Class containing all non-OreDict Items of GregTech.
@@ -2615,14 +2615,14 @@ public enum ItemList implements IItemContainer {
         mHasNotBeenSet = false;
         if (aItem == null) return this;
         ItemStack aStack = new ItemStack(aItem, 1, 0);
-        mStack = GT_Utility.copyAmount(1, aStack);
+        mStack = GTUtility.copyAmount(1, aStack);
         return this;
     }
 
     @Override
     public IItemContainer set(ItemStack aStack) {
         mHasNotBeenSet = false;
-        mStack = GT_Utility.copyAmount(1, aStack);
+        mStack = GTUtility.copyAmount(1, aStack);
         return this;
     }
 
@@ -2635,14 +2635,14 @@ public enum ItemList implements IItemContainer {
     @Override
     public Item getItem() {
         sanityCheck();
-        if (GT_Utility.isStackInvalid(mStack)) return null;
+        if (GTUtility.isStackInvalid(mStack)) return null;
         return mStack.getItem();
     }
 
     @Override
     public Block getBlock() {
         sanityCheck();
-        return GT_Utility.getBlockFromItem(getItem());
+        return GTUtility.getBlockFromItem(getItem());
     }
 
     @Override
@@ -2658,50 +2658,50 @@ public enum ItemList implements IItemContainer {
     @Override
     public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT) {
         if (mDeprecated && !mWarned) {
-            new Exception(this + " is now deprecated").printStackTrace(GT_Log.err);
+            new Exception(this + " is now deprecated").printStackTrace(GTLog.err);
             // warn only once
             mWarned = true;
         }
-        if (GT_Utility.isStackInvalid(aStack)) return false;
-        return GT_Utility.areUnificationsEqual((ItemStack) aStack, aWildcard ? getWildcard(1) : get(1), aIgnoreNBT);
+        if (GTUtility.isStackInvalid(aStack)) return false;
+        return GTUtility.areUnificationsEqual((ItemStack) aStack, aWildcard ? getWildcard(1) : get(1), aIgnoreNBT);
     }
 
     @Override
     public ItemStack get(long aAmount, Object... aReplacements) {
         sanityCheck();
-        if (GT_Utility.isStackInvalid(mStack)) {
-            GT_Log.out.println("Object in the ItemList is null at:");
-            new NullPointerException().printStackTrace(GT_Log.out);
-            return GT_Utility.copyAmount(aAmount, aReplacements);
+        if (GTUtility.isStackInvalid(mStack)) {
+            GTLog.out.println("Object in the ItemList is null at:");
+            new NullPointerException().printStackTrace(GTLog.out);
+            return GTUtility.copyAmount(aAmount, aReplacements);
         }
-        return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(mStack));
+        return GTUtility.copyAmount(aAmount, GTOreDictUnificator.get(mStack));
     }
 
     @Override
     public ItemStack getWildcard(long aAmount, Object... aReplacements) {
         sanityCheck();
-        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-        return GT_Utility.copyAmountAndMetaData(aAmount, W, GT_OreDictUnificator.get(mStack));
+        if (GTUtility.isStackInvalid(mStack)) return GTUtility.copyAmount(aAmount, aReplacements);
+        return GTUtility.copyAmountAndMetaData(aAmount, W, GTOreDictUnificator.get(mStack));
     }
 
     @Override
     public ItemStack getUndamaged(long aAmount, Object... aReplacements) {
         sanityCheck();
-        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-        return GT_Utility.copyAmountAndMetaData(aAmount, 0, GT_OreDictUnificator.get(mStack));
+        if (GTUtility.isStackInvalid(mStack)) return GTUtility.copyAmount(aAmount, aReplacements);
+        return GTUtility.copyAmountAndMetaData(aAmount, 0, GTOreDictUnificator.get(mStack));
     }
 
     @Override
     public ItemStack getAlmostBroken(long aAmount, Object... aReplacements) {
         sanityCheck();
-        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-        return GT_Utility.copyAmountAndMetaData(aAmount, mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(mStack));
+        if (GTUtility.isStackInvalid(mStack)) return GTUtility.copyAmount(aAmount, aReplacements);
+        return GTUtility.copyAmountAndMetaData(aAmount, mStack.getMaxDamage() - 1, GTOreDictUnificator.get(mStack));
     }
 
     @Override
     public ItemStack getWithName(long aAmount, String aDisplayName, Object... aReplacements) {
         ItemStack rStack = get(1, aReplacements);
-        if (GT_Utility.isStackInvalid(rStack)) return NI;
+        if (GTUtility.isStackInvalid(rStack)) return NI;
 
         // CamelCase alphanumeric words from aDisplayName
         StringBuilder tCamelCasedDisplayNameBuilder = new StringBuilder();
@@ -2722,36 +2722,36 @@ public enum ItemList implements IItemContainer {
         // Construct a translation key from UnlocalizedName and CamelCased DisplayName
         final String tKey = rStack.getUnlocalizedName() + ".with." + tCamelCasedDisplayNameBuilder + ".name";
 
-        rStack.setStackDisplayName(GT_LanguageManager.addStringLocalization(tKey, aDisplayName));
-        return GT_Utility.copyAmount(aAmount, rStack);
+        rStack.setStackDisplayName(GTLanguageManager.addStringLocalization(tKey, aDisplayName));
+        return GTUtility.copyAmount(aAmount, rStack);
     }
 
     @Override
     public ItemStack getWithCharge(long aAmount, int aEnergy, Object... aReplacements) {
         ItemStack rStack = get(1, aReplacements);
-        if (GT_Utility.isStackInvalid(rStack)) return null;
-        GT_ModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false);
-        return GT_Utility.copyAmount(aAmount, rStack);
+        if (GTUtility.isStackInvalid(rStack)) return null;
+        GTModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false);
+        return GTUtility.copyAmount(aAmount, rStack);
     }
 
     @Override
     public ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements) {
         sanityCheck();
-        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-        return GT_Utility.copyAmountAndMetaData(aAmount, aMetaValue, GT_OreDictUnificator.get(mStack));
+        if (GTUtility.isStackInvalid(mStack)) return GTUtility.copyAmount(aAmount, aReplacements);
+        return GTUtility.copyAmountAndMetaData(aAmount, aMetaValue, GTOreDictUnificator.get(mStack));
     }
 
     @Override
     public IItemContainer registerOre(Object... aOreNames) {
         sanityCheck();
-        for (Object tOreName : aOreNames) GT_OreDictUnificator.registerOre(tOreName, get(1));
+        for (Object tOreName : aOreNames) GTOreDictUnificator.registerOre(tOreName, get(1));
         return this;
     }
 
     @Override
     public IItemContainer registerWildcardAsOre(Object... aOreNames) {
         sanityCheck();
-        for (Object tOreName : aOreNames) GT_OreDictUnificator.registerOre(tOreName, getWildcard(1));
+        for (Object tOreName : aOreNames) GTOreDictUnificator.registerOre(tOreName, getWildcard(1));
         return this;
     }
 
@@ -2767,7 +2767,7 @@ public enum ItemList implements IItemContainer {
         if (mHasNotBeenSet)
             throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
         if (mDeprecated && !mWarned) {
-            new Exception(this + " is now deprecated").printStackTrace(GT_Log.err);
+            new Exception(this + " is now deprecated").printStackTrace(GTLog.err);
             // warn only once
             mWarned = true;
         }
diff --git a/src/main/java/gregtech/api/enums/MaterialBuilder.java b/src/main/java/gregtech/api/enums/MaterialBuilder.java
index 98ed5fa3f7..89104d6e96 100644
--- a/src/main/java/gregtech/api/enums/MaterialBuilder.java
+++ b/src/main/java/gregtech/api/enums/MaterialBuilder.java
@@ -31,7 +31,7 @@ public class MaterialBuilder {
     private Dyes color = Dyes._NULL;
     private int extraData = 0;
     private List<MaterialStack> materialList = new ArrayList<>();
-    private List<TC_Aspects.TC_AspectStack> aspects = new ArrayList<>();
+    private List<TCAspects.TC_AspectStack> aspects = new ArrayList<>();
     private boolean hasCorrespondingFluid = false;
     private boolean hasCorrespondingGas = false;
     private boolean canBeCracked = false;
@@ -242,7 +242,7 @@ public class MaterialBuilder {
         return this;
     }
 
-    public MaterialBuilder setAspects(List<TC_Aspects.TC_AspectStack> aspects) {
+    public MaterialBuilder setAspects(List<TCAspects.TC_AspectStack> aspects) {
         this.aspects = aspects;
         return this;
     }
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 3d314c4742..3a963ca322 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -1,7 +1,7 @@
 package gregtech.api.enums;
 
 import static gregtech.api.enums.FluidState.GAS;
-import static gregtech.api.enums.GT_Values.M;
+import static gregtech.api.enums.GTValues.M;
 import static gregtech.api.enums.Mods.Thaumcraft;
 
 import java.util.ArrayList;
@@ -24,20 +24,20 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.TC_Aspects.TC_AspectStack;
-import gregtech.api.fluid.GT_FluidFactory;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.TCAspects.TC_AspectStack;
+import gregtech.api.fluid.GTFluidFactory;
 import gregtech.api.interfaces.IColorModulationContainer;
 import gregtech.api.interfaces.IMaterialHandler;
 import gregtech.api.interfaces.ISubTagContainer;
 import gregtech.api.objects.MaterialStack;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gregtech.common.config.gregtech.ConfigHarvestLevel;
 import gregtech.common.render.items.CosmicNeutroniumRenderer;
-import gregtech.common.render.items.GT_GeneratedMaterial_Renderer;
 import gregtech.common.render.items.GaiaSpiritRenderer;
+import gregtech.common.render.items.GeneratedMaterialRenderer;
 import gregtech.common.render.items.GlitchEffectRenderer;
 import gregtech.common.render.items.InfinityRenderer;
 import gregtech.common.render.items.TranscendentMetalRenderer;
@@ -67,7 +67,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
 
     // Spotless breaks the table below into many, many lines
     // spotless:off
-    public static Materials _NULL = new Materials(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "NULL", "NULL", 0, 0, 0, 0, false, false, 1, 1, 1, Dyes._NULL, Element._NULL, Collections.singletonList(new TC_AspectStack(TC_Aspects.VACUOS, 1)));
+    public static Materials _NULL = new Materials(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "NULL", "NULL", 0, 0, 0, 0, false, false, 1, 1, 1, Dyes._NULL, Element._NULL, Collections.singletonList(new TC_AspectStack(TCAspects.VACUOS, 1)));
     /**
      * Direct Elements
      */
@@ -352,37 +352,37 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     public static Materials Vyroxeres;
     public static Materials Yellorium;
     public static Materials Zectium;
-    public static Materials Ultimate                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Ultimate"                ,   "Ultimate"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 8)));
-    public static Materials Advanced                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Advanced"                ,   "Advanced"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 4)));
+    public static Materials Ultimate                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Ultimate"                ,   "Ultimate"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.MACHINA, 8)));
+    public static Materials Advanced                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Advanced"                ,   "Advanced"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.MACHINA, 4)));
 
     /**
      * Tiered materials, primarily Circuitry, Batteries and other Technical things
      */
-    public static Materials ULV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Primitive"               ,   "Primitive"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 1)));
-    public static Materials LV                      = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Basic"                   ,   "Basic"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 2)));
-    public static Materials MV                      = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Good"                    ,   "Good"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 3)));
-    public static Materials HV                      = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Advanced"                ,   "Advanced"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 4)));
-    public static Materials EV                      = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Data"                    ,   "Data"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 5)));
-    public static Materials IV                      = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Elite"                   ,   "Elite"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 6)));
-    public static Materials LuV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Master"                  ,   "Master"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 7)));
-    public static Materials ZPM                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Ultimate"                ,   "Ultimate"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 8)));
-    public static Materials UV                      = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Superconductor"          ,   "Superconductor"                ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 9)));
-    public static Materials UHV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Infinite"                ,   "Infinite"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 10)));
-    public static Materials UEV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Bio"                     ,   "Bio"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 11)));
-    public static Materials UIV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Optical"                 ,   "Optical"                       ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 12)));
-    public static Materials UMV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Exotic"                  ,   "Exotic"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 13)));
-    public static Materials UXV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Cosmic"                  ,   "Cosmic"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 14)));
-    public static Materials MAX                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Transcendent"            ,   "Transcendent"                  ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 15)));
-
-    public static Materials Resistor                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Resistor"                ,   "Resistor"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 1)));
-    public static Materials Diode                   = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Diode"                   ,   "Diode"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 1)));
-    public static Materials Transistor              = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Transistor"              ,   "Transistor"                    ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 1)));
-    public static Materials Capacitor               = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Capacitor"               ,   "Capacitor"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 1)));
-    public static Materials Inductor                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Inductor"                ,   "Inductor"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 1)));
-
-    public static Materials Nano                    = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Nano"                    ,   "Bio"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 11)));
-    public static Materials Piko                    = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Piko"                    ,   "Bio"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 12)));
-    public static Materials Quantum                 = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Quantum"                 ,   "Bio"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 13)));
+    public static Materials ULV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Primitive"               ,   "Primitive"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.MACHINA, 1)));
+    public static Materials LV                      = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Basic"                   ,   "Basic"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.MACHINA, 2)));
+    public static Materials MV                      = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Good"                    ,   "Good"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.MACHINA, 3)));
+    public static Materials HV                      = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Advanced"                ,   "Advanced"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.MACHINA, 4)));
+    public static Materials EV                      = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Data"                    ,   "Data"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.MACHINA, 5)));
+    public static Materials IV                      = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Elite"                   ,   "Elite"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.MACHINA, 6)));
+    public static Materials LuV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Master"                  ,   "Master"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.MACHINA, 7)));
+    public static Materials ZPM                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Ultimate"                ,   "Ultimate"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.MACHINA, 8)));
+    public static Materials UV                      = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Superconductor"          ,   "Superconductor"                ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.MACHINA, 9)));
+    public static Materials UHV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Infinite"                ,   "Infinite"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 10)));
+    public static Materials UEV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Bio"                     ,   "Bio"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 11)));
+    public static Materials UIV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Optical"                 ,   "Optical"                       ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 12)));
+    public static Materials UMV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Exotic"                  ,   "Exotic"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 13)));
+    public static Materials UXV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Cosmic"                  ,   "Cosmic"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 14)));
+    public static Materials MAX                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Transcendent"            ,   "Transcendent"                  ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 15)));
+
+    public static Materials Resistor                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Resistor"                ,   "Resistor"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 1)));
+    public static Materials Diode                   = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Diode"                   ,   "Diode"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 1)));
+    public static Materials Transistor              = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Transistor"              ,   "Transistor"                    ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 1)));
+    public static Materials Capacitor               = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Capacitor"               ,   "Capacitor"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 1)));
+    public static Materials Inductor                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Inductor"                ,   "Inductor"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 1)));
+
+    public static Materials Nano                    = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Nano"                    ,   "Bio"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 11)));
+    public static Materials Piko                    = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Piko"                    ,   "Bio"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 12)));
+    public static Materials Quantum                 = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Quantum"                 ,   "Bio"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 13)));
 
 
     /**
@@ -1029,10 +1029,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
 
     public final short[] mRGBa = new short[] { 255, 255, 255, 0 }, mMoltenRGBa = new short[] { 255, 255, 255, 0 };
     public TextureSet mIconSet;
-    public GT_GeneratedMaterial_Renderer renderer;
+    public GeneratedMaterialRenderer renderer;
     public List<MaterialStack> mMaterialList = new ArrayList<>();
     public List<Materials> mOreByProducts = new ArrayList<>(), mOreReRegistrations = new ArrayList<>();
-    public List<TC_Aspects.TC_AspectStack> mAspects = new ArrayList<>();
+    public List<TCAspects.TC_AspectStack> mAspects = new ArrayList<>();
     public ArrayList<ItemStack> mMaterialItems = new ArrayList<>();
     public Collection<SubTag> mSubTags = new LinkedHashSet<>();
     public Enchantment mEnchantmentTools = null, mEnchantmentArmors = null;
@@ -1256,7 +1256,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType,
         int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent,
         int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor,
-        List<TC_Aspects.TC_AspectStack> aAspects) {
+        List<TCAspects.TC_AspectStack> aAspects) {
         this(
             aMetaItemSubID,
             aIconSet,
@@ -1287,7 +1287,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType,
         int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent,
         int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, Element aElement,
-        List<TC_Aspects.TC_AspectStack> aAspects) {
+        List<TCAspects.TC_AspectStack> aAspects) {
         this(
             aMetaItemSubID,
             aIconSet,
@@ -1359,7 +1359,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType,
         int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent,
         int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, int aExtraData,
-        List<MaterialStack> aMaterialList, List<TC_Aspects.TC_AspectStack> aAspects) {
+        List<MaterialStack> aMaterialList, List<TCAspects.TC_AspectStack> aAspects) {
         this(
             aMetaItemSubID,
             aIconSet,
@@ -1397,15 +1397,15 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
             tAmountOfComponents += tMaterial.mAmount;
             if (tMaterial.mMaterial.mMeltingPoint > 0)
                 tMeltingPoint += tMaterial.mMaterial.mMeltingPoint * tMaterial.mAmount;
-            if (aAspects == null) for (TC_Aspects.TC_AspectStack tAspect : tMaterial.mMaterial.mAspects)
-                tAspect.addToAspectList(mAspects);
+            if (aAspects == null)
+                for (TCAspects.TC_AspectStack tAspect : tMaterial.mMaterial.mAspects) tAspect.addToAspectList(mAspects);
         }
 
         if (mMeltingPoint < 0) mMeltingPoint = (short) (tMeltingPoint / tAmountOfComponents);
 
         tAmountOfComponents *= aDensityMultiplier;
         tAmountOfComponents /= aDensityDivider;
-        if (aAspects == null) for (TC_Aspects.TC_AspectStack tAspect : mAspects)
+        if (aAspects == null) for (TCAspects.TC_AspectStack tAspect : mAspects)
             tAspect.mAmount = Math.max(1, tAspect.mAmount / Math.max(1, tAmountOfComponents));
         else mAspects.addAll(aAspects);
     }
@@ -2478,7 +2478,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
 
     public static void init() {
         new ProcessingConfig();
-        if (!GT_Mod.gregtechproxy.mEnableAllMaterials) new ProcessingModSupport();
+        if (!GTMod.gregtechproxy.mEnableAllMaterials) new ProcessingModSupport();
         mMaterialHandlers.forEach(IMaterialHandler::onMaterialsInit); // This is where addon mods can add/manipulate
                                                                       // materials
         initMaterialProperties(); // No more material addition or manipulation should be done past this point!
@@ -2538,8 +2538,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
             if (aMaterial.mMetaItemSubID >= 0) {
                 if (aMaterial.mMetaItemSubID < 1000) {
                     if (aMaterial.mHasParentMod) {
-                        if (GregTech_API.sGeneratedMaterials[aMaterial.mMetaItemSubID] == null) {
-                            GregTech_API.sGeneratedMaterials[aMaterial.mMetaItemSubID] = aMaterial;
+                        if (GregTechAPI.sGeneratedMaterials[aMaterial.mMetaItemSubID] == null) {
+                            GregTechAPI.sGeneratedMaterials[aMaterial.mMetaItemSubID] = aMaterial;
                         } else throw new IllegalArgumentException(
                             "The Material Index " + aMaterial.mMetaItemSubID
                                 + " for "
@@ -2556,7 +2556,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     }
 
     private static void addToolValues(Materials aMaterial) {
-        // Moved from GT_Proxy? (Not sure)
+        // Moved from GTProxy? (Not sure)
         aMaterial.mHandleMaterial = (aMaterial == Desh ? aMaterial.mHandleMaterial
             : aMaterial == Diamond || aMaterial == Thaumium ? Wood
                 : aMaterial.contains(SubTag.BURNING) ? Blaze
@@ -2596,10 +2596,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         }
 
         if (aMaterial.mHasPlasma) {
-            GT_Mod.gregtechproxy.addAutogeneratedPlasmaFluid(aMaterial);
+            GTMod.gregtechproxy.addAutogeneratedPlasmaFluid(aMaterial);
         }
         if (aMaterial.mHasGas) {
-            GT_FluidFactory
+            GTFluidFactory
                 .of(aMaterial.mName.toLowerCase(), aMaterial.mDefaultLocalName, aMaterial, GAS, aMaterial.mGasTemp);
         }
     }
@@ -2610,18 +2610,18 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     }
 
     private static void addHarvestLevelNerfs(Materials aMaterial) {
-        /* Moved the harvest level changes from GT_Mod to have fewer things iterating over MATERIALS_ARRAY */
-        if (GT_Mod.gregtechproxy.mChangeHarvestLevels && aMaterial.mToolQuality > 0
-            && aMaterial.mMetaItemSubID < GT_Mod.gregtechproxy.mHarvestLevel.length
+        /* Moved the harvest level changes from GTMod to have fewer things iterating over MATERIALS_ARRAY */
+        if (GTMod.gregtechproxy.mChangeHarvestLevels && aMaterial.mToolQuality > 0
+            && aMaterial.mMetaItemSubID < GTMod.gregtechproxy.mHarvestLevel.length
             && aMaterial.mMetaItemSubID >= 0) {
-            GT_Mod.gregtechproxy.mHarvestLevel[aMaterial.mMetaItemSubID] = aMaterial.mToolQuality;
+            GTMod.gregtechproxy.mHarvestLevel[aMaterial.mMetaItemSubID] = aMaterial.mToolQuality;
         }
     }
 
     private static void addHarvestLevels() {
-        GT_Mod.gregtechproxy.mChangeHarvestLevels = ConfigHarvestLevel.activateHarvestLevelChange;
-        GT_Mod.gregtechproxy.mMaxHarvestLevel = Math.min(15, ConfigHarvestLevel.maxHarvestLevel);
-        GT_Mod.gregtechproxy.mGraniteHavestLevel = ConfigHarvestLevel.graniteHarvestLevel;
+        GTMod.gregtechproxy.mChangeHarvestLevels = ConfigHarvestLevel.activateHarvestLevelChange;
+        GTMod.gregtechproxy.mMaxHarvestLevel = Math.min(15, ConfigHarvestLevel.maxHarvestLevel);
+        GTMod.gregtechproxy.mGraniteHavestLevel = ConfigHarvestLevel.graniteHarvestLevel;
     }
 
     public static void initMaterialProperties() {
@@ -2690,7 +2690,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
 
     public static String getLocalizedNameForItem(String aFormat, int aMaterialID) {
         if (aMaterialID >= 0 && aMaterialID < 1000) {
-            Materials aMaterial = GregTech_API.sGeneratedMaterials[aMaterialID];
+            Materials aMaterial = GregTechAPI.sGeneratedMaterials[aMaterialID];
             if (aMaterial != null) return aMaterial.getLocalizedNameForItem(aFormat);
         }
         return aFormat;
@@ -2814,7 +2814,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         return mMaterialItems.stream()
             .anyMatch(
                 tStack -> Arrays.stream(aStacks)
-                    .anyMatch(aStack -> GT_Utility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())));
+                    .anyMatch(aStack -> GTUtility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())));
     }
 
     /**
@@ -2824,7 +2824,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         if (aStack == null) return false;
         boolean temp = false;
         int mMaterialItems_sS = mMaterialItems.size();
-        for (int i = 0; i < mMaterialItems_sS; i++) if (GT_Utility.areStacksEqual(aStack, mMaterialItems.get(i))) {
+        for (int i = 0; i < mMaterialItems_sS; i++) if (GTUtility.areStacksEqual(aStack, mMaterialItems.get(i))) {
             mMaterialItems.remove(i--);
             temp = true;
         }
@@ -3136,43 +3136,43 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
      */
     public boolean isProperSolderingFluid() {
         return mStandardMoltenFluid != null && contains(SubTag.SOLDERING_MATERIAL)
-            && !(GregTech_API.mUseOnlyGoodSolderingMaterials && !contains(SubTag.SOLDERING_MATERIAL_GOOD));
+            && !(GregTechAPI.mUseOnlyGoodSolderingMaterials && !contains(SubTag.SOLDERING_MATERIAL_GOOD));
     }
 
     public ItemStack getCells(int amount) {
-        return GT_OreDictUnificator.get(OrePrefixes.cell, this, amount);
+        return GTOreDictUnificator.get(OrePrefixes.cell, this, amount);
     }
 
     public ItemStack getDust(int amount) {
-        return GT_OreDictUnificator.get(OrePrefixes.dust, this, amount);
+        return GTOreDictUnificator.get(OrePrefixes.dust, this, amount);
     }
 
     public ItemStack getDustSmall(int amount) {
-        return GT_OreDictUnificator.get(OrePrefixes.dustSmall, this, amount);
+        return GTOreDictUnificator.get(OrePrefixes.dustSmall, this, amount);
     }
 
     public ItemStack getDustTiny(int amount) {
-        return GT_OreDictUnificator.get(OrePrefixes.dustTiny, this, amount);
+        return GTOreDictUnificator.get(OrePrefixes.dustTiny, this, amount);
     }
 
     public ItemStack getGems(int amount) {
-        return GT_OreDictUnificator.get(OrePrefixes.gem, this, amount);
+        return GTOreDictUnificator.get(OrePrefixes.gem, this, amount);
     }
 
     public ItemStack getIngots(int amount) {
-        return GT_OreDictUnificator.get(OrePrefixes.ingot, this, amount);
+        return GTOreDictUnificator.get(OrePrefixes.ingot, this, amount);
     }
 
     public ItemStack getNuggets(int amount) {
-        return GT_OreDictUnificator.get(OrePrefixes.nugget, this, amount);
+        return GTOreDictUnificator.get(OrePrefixes.nugget, this, amount);
     }
 
     public ItemStack getBlocks(int amount) {
-        return GT_OreDictUnificator.get(OrePrefixes.block, this, amount);
+        return GTOreDictUnificator.get(OrePrefixes.block, this, amount);
     }
 
     public ItemStack getPlates(int amount) {
-        return GT_OreDictUnificator.get(OrePrefixes.plate, this, amount);
+        return GTOreDictUnificator.get(OrePrefixes.plate, this, amount);
     }
 
     public static Materials getGtMaterialFromFluid(Fluid fluid) {
@@ -3180,6 +3180,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     }
 
     public ItemStack getNanite(int amount) {
-        return GT_OreDictUnificator.get(OrePrefixes.nanite, this, amount);
+        return GTOreDictUnificator.get(OrePrefixes.nanite, this, amount);
     }
 }
diff --git a/src/main/java/gregtech/api/enums/MaterialsBotania.java b/src/main/java/gregtech/api/enums/MaterialsBotania.java
index 6fe538a0bc..6373595e91 100644
--- a/src/main/java/gregtech/api/enums/MaterialsBotania.java
+++ b/src/main/java/gregtech/api/enums/MaterialsBotania.java
@@ -9,7 +9,7 @@ import static gregtech.api.enums.OrePrefixes.rotor;
 
 import java.util.Arrays;
 
-import gregtech.api.enums.TC_Aspects.TC_AspectStack;
+import gregtech.api.enums.TCAspects.TC_AspectStack;
 
 public class MaterialsBotania {
 
@@ -28,7 +28,7 @@ public class MaterialsBotania {
         .setBlastFurnaceTemp(1500)
         .setBlastFurnaceRequired(true)
         .setAspects(
-            Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 3), new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1)))
+            Arrays.asList(new TC_AspectStack(TCAspects.METALLUM, 3), new TC_AspectStack(TCAspects.PRAECANTATIO, 1)))
         .constructMaterial();
     public static Materials Terrasteel = new MaterialBuilder(202, TextureSet.SET_METALLIC, "Terrasteel")
         .setName("Terrasteel")
@@ -45,9 +45,9 @@ public class MaterialsBotania {
         .setBlastFurnaceRequired(true)
         .setAspects(
             Arrays.asList(
-                new TC_AspectStack(TC_Aspects.METALLUM, 2),
-                new TC_AspectStack(TC_Aspects.TERRA, 1),
-                new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1)))
+                new TC_AspectStack(TCAspects.METALLUM, 2),
+                new TC_AspectStack(TCAspects.TERRA, 1),
+                new TC_AspectStack(TCAspects.PRAECANTATIO, 1)))
         .constructMaterial();
     public static Materials ElvenElementium = new MaterialBuilder(203, TextureSet.SET_METALLIC, "Elven Elementium")
         .setName("ElvenElementium")
@@ -64,9 +64,9 @@ public class MaterialsBotania {
         .setBlastFurnaceRequired(true)
         .setAspects(
             Arrays.asList(
-                new TC_AspectStack(TC_Aspects.METALLUM, 3),
-                new TC_AspectStack(TC_Aspects.PRAECANTATIO, 2),
-                new TC_AspectStack(TC_Aspects.AURAM, 1)))
+                new TC_AspectStack(TCAspects.METALLUM, 3),
+                new TC_AspectStack(TCAspects.PRAECANTATIO, 2),
+                new TC_AspectStack(TCAspects.AURAM, 1)))
         .constructMaterial();
     public static Materials Livingrock = new MaterialBuilder(204, new TextureSet("Livingrock", true), "Livingrock")
         .setName("Livingrock")
@@ -79,7 +79,7 @@ public class MaterialsBotania {
         .setOreValue(3)
         .setDensityMultiplier(1)
         .setDensityDivider(1)
-        .setAspects(Arrays.asList(new TC_AspectStack(TC_Aspects.TERRA, 2), new TC_AspectStack(TC_Aspects.VICTUS, 2)))
+        .setAspects(Arrays.asList(new TC_AspectStack(TCAspects.TERRA, 2), new TC_AspectStack(TCAspects.VICTUS, 2)))
         .constructMaterial();
     public static Materials GaiaSpirit = new Materials(
         205,
@@ -105,10 +105,10 @@ public class MaterialsBotania {
         1,
         Dyes._NULL,
         Arrays.asList(
-            new TC_AspectStack(TC_Aspects.PRAECANTATIO, 27),
-            new TC_AspectStack(TC_Aspects.AURAM, 24),
-            new TC_AspectStack(TC_Aspects.VICTUS, 24),
-            new TC_AspectStack(TC_Aspects.METALLUM, 1)));
+            new TC_AspectStack(TCAspects.PRAECANTATIO, 27),
+            new TC_AspectStack(TCAspects.AURAM, 24),
+            new TC_AspectStack(TCAspects.VICTUS, 24),
+            new TC_AspectStack(TCAspects.METALLUM, 1)));
     public static Materials Livingwood = new MaterialBuilder(206, new TextureSet("Livingwood", true), "Livingwood")
         .setName("Livingwood")
         .addDustItems()
@@ -121,7 +121,7 @@ public class MaterialsBotania {
         .setOreValue(3)
         .setDensityMultiplier(1)
         .setDensityDivider(1)
-        .setAspects(Arrays.asList(new TC_AspectStack(TC_Aspects.ARBOR, 4), new TC_AspectStack(TC_Aspects.VICTUS, 2)))
+        .setAspects(Arrays.asList(new TC_AspectStack(TCAspects.ARBOR, 4), new TC_AspectStack(TCAspects.VICTUS, 2)))
         .constructMaterial();
     public static Materials Dreamwood = new MaterialBuilder(207, new TextureSet("Dreamwood", true), "Dreamwood")
         .setName("Dreamwood")
@@ -137,9 +137,9 @@ public class MaterialsBotania {
         .setDensityDivider(1)
         .setAspects(
             Arrays.asList(
-                new TC_AspectStack(TC_Aspects.ARBOR, 4),
-                new TC_AspectStack(TC_Aspects.AURAM, 2),
-                new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1)))
+                new TC_AspectStack(TCAspects.ARBOR, 4),
+                new TC_AspectStack(TCAspects.AURAM, 2),
+                new TC_AspectStack(TCAspects.PRAECANTATIO, 1)))
         .constructMaterial();
     public static Materials ManaDiamond = new Materials(
         208,
@@ -165,9 +165,9 @@ public class MaterialsBotania {
         1,
         Dyes._NULL,
         Arrays.asList(
-            new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 4),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 4)));
+            new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 4),
+            new TCAspects.TC_AspectStack(TCAspects.VITREUS, 4),
+            new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 4)));
     public static Materials BotaniaDragonstone = new Materials(
         209,
         TextureSet.SET_DIAMOND,
@@ -192,9 +192,9 @@ public class MaterialsBotania {
         1,
         Dyes._NULL,
         Arrays.asList(
-            new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 6),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 6),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 4)));
+            new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 6),
+            new TCAspects.TC_AspectStack(TCAspects.VITREUS, 6),
+            new TCAspects.TC_AspectStack(TCAspects.AURAM, 4)));
 
     public static void init() {
         GaiaSpirit.mChemicalFormula = "Gs";
diff --git a/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java b/src/main/java/gregtech/api/enums/MaterialsGTNH.java
index b65ac53499..12a53f6b86 100644
--- a/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
+++ b/src/main/java/gregtech/api/enums/MaterialsGTNH.java
@@ -1,12 +1,12 @@
 package gregtech.api.enums;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 
 import gregtech.api.interfaces.IMaterialHandler;
 
-public class GTNH_ExtraMaterials implements IMaterialHandler {
+public class MaterialsGTNH implements IMaterialHandler {
 
-    public GTNH_ExtraMaterials() {
+    public MaterialsGTNH() {
         GT_FML_LOGGER.info("Registering GTNH-Materials (post Java 64kb limit)");
         Materials.add(this);
     }
diff --git a/src/main/java/gregtech/api/enums/MaterialsKevlar.java b/src/main/java/gregtech/api/enums/MaterialsKevlar.java
index 6612bc8b65..bea0c0d244 100644
--- a/src/main/java/gregtech/api/enums/MaterialsKevlar.java
+++ b/src/main/java/gregtech/api/enums/MaterialsKevlar.java
@@ -21,8 +21,8 @@ public class MaterialsKevlar {
                 new MaterialStack(Materials.Oxygen, 2))
             .setAspects(
                 Arrays.asList(
-                    new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1),
-                    new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1)))
+                    new TCAspects.TC_AspectStack(TCAspects.TERRA, 1),
+                    new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1)))
             .constructMaterial(); // C15H10N2O2
     public static Materials DiaminodiphenylmethanMixture = new MaterialBuilder(
         795,
@@ -39,8 +39,8 @@ public class MaterialsKevlar {
                 new MaterialStack(Materials.Nitrogen, 2))
             .setAspects(
                 Arrays.asList(
-                    new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1),
-                    new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1)))
+                    new TCAspects.TC_AspectStack(TCAspects.AQUA, 1),
+                    new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1)))
             .constructMaterial(); // C13H14N2
     public static Materials DiphenylmethaneDiisocyanateMixture = new MaterialBuilder(
         794,
@@ -58,8 +58,8 @@ public class MaterialsKevlar {
                 new MaterialStack(Materials.Oxygen, 2))
             .setAspects(
                 Arrays.asList(
-                    new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1),
-                    new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1)))
+                    new TCAspects.TC_AspectStack(TCAspects.AQUA, 1),
+                    new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1)))
             .constructMaterial(); // C15H10N2O2
     public static Materials Butyraldehyde = new MaterialBuilder(793, TextureSet.SET_FLUID, "Butyraldehyde")
         .setName("Butyraldehyde")
@@ -74,8 +74,8 @@ public class MaterialsKevlar {
             new MaterialStack(Materials.Oxygen, 1))
         .setAspects(
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1)))
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1)))
         .constructMaterial(); // C4H8O
     public static Materials Isobutyraldehyde = new MaterialBuilder(792, TextureSet.SET_FLUID, "Isobutyraldehyde")
         .setName("Isobutyraldehyde")
@@ -91,8 +91,8 @@ public class MaterialsKevlar {
             new MaterialStack(Materials.Oxygen, 1))
         .setAspects(
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1)))
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1)))
         .constructMaterial(); // C4H8O
     public static Materials NickelTetracarbonyl = new MaterialBuilder(791, TextureSet.SET_FLUID, "Nickel Tetracarbonyl")
         .setName("NickelTetracarbonyl")
@@ -107,8 +107,8 @@ public class MaterialsKevlar {
             new MaterialStack(Materials.Oxygen, 4))
         .setAspects(
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1)))
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1)))
         .constructMaterial(); // C4NiO4
     public static Materials KevlarCatalyst = new MaterialBuilder(790, TextureSet.SET_DULL, "Polyurethane Catalyst A")
         .setName("PolyurethaneCatalystADust")
@@ -118,8 +118,8 @@ public class MaterialsKevlar {
         .setMeltingPoint(300)
         .setAspects(
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1)))
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1),
+                new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 1)))
         .constructMaterial();
     public static Materials EthyleneOxide = new MaterialBuilder(789, TextureSet.SET_FLUID, "Ethylene Oxide")
         .setName("EthyleneOxide")
@@ -134,8 +134,8 @@ public class MaterialsKevlar {
             new MaterialStack(Materials.Oxygen, 1))
         .setAspects(
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1)))
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1)))
         .constructMaterial(); // C2H4O
     public static Materials SiliconOil = new MaterialBuilder(788, TextureSet.SET_FLUID, "Silicon Oil")
         .setName("SiliconOil")
@@ -146,8 +146,8 @@ public class MaterialsKevlar {
         .setMeltingPoint(473)
         .setAspects(
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1)))
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1)))
         .constructMaterial();
     public static Materials Ethyleneglycol = new MaterialBuilder(787, TextureSet.SET_FLUID, "Ethylene Glycol")
         .setName("EthyleneGlycol")
@@ -162,8 +162,8 @@ public class MaterialsKevlar {
             new MaterialStack(Materials.Oxygen, 2))
         .setAspects(
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1)))
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1)))
         .constructMaterial(); // C2H6O2
     public static Materials Acetaldehyde = new MaterialBuilder(786, TextureSet.SET_FLUID, "Acetaldehyde")
         .setName("Acetaldehyde")
@@ -178,8 +178,8 @@ public class MaterialsKevlar {
             new MaterialStack(Materials.Oxygen, 1))
         .setAspects(
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1)))
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1)))
         .constructMaterial(); // C2H4O
     public static Materials Pentaerythritol = new MaterialBuilder(785, TextureSet.SET_DULL, "Pentaerythritol")
         .setName("Pentaerythritol")
@@ -193,8 +193,8 @@ public class MaterialsKevlar {
             new MaterialStack(Materials.Oxygen, 4))
         .setAspects(
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1)))
+                new TCAspects.TC_AspectStack(TCAspects.TERRA, 1),
+                new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 1)))
         .constructMaterial(); // C5H12O4
     public static Materials PolyurethaneResin = new MaterialBuilder(784, TextureSet.SET_FLUID, "Polyurethane Resin")
         .setName("PolyurethaneResin")
@@ -219,8 +219,8 @@ public class MaterialsKevlar {
                 new MaterialStack(Materials.Oxygen, 1))
             .setAspects(
                 Arrays.asList(
-                    new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1),
-                    new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1)))
+                    new TCAspects.TC_AspectStack(TCAspects.TERRA, 1),
+                    new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1)))
             .constructMaterial(); // C5H9NO
     public static Materials TerephthaloylChloride = new MaterialBuilder(
         782,
@@ -237,8 +237,8 @@ public class MaterialsKevlar {
                 new MaterialStack(Materials.Oxygen, 2))
             .setAspects(
                 Arrays.asList(
-                    new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1),
-                    new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1)))
+                    new TCAspects.TC_AspectStack(TCAspects.TERRA, 1),
+                    new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1)))
             .constructMaterial(); // C8H4Cl2O2
     public static Materials Acetylene = new MaterialBuilder(781, TextureSet.SET_FLUID, "Acetylene").setName("Acetylene")
         .addCell()
@@ -274,8 +274,8 @@ public class MaterialsKevlar {
             new MaterialStack(Materials.Oxygen, 2))
         .setAspects(
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1)))
+                new TCAspects.TC_AspectStack(TCAspects.TERRA, 1),
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1)))
         .constructMaterial(); // C6H6N2O2
     public static Materials ParaPhenylenediamine = new MaterialBuilder(
         779,
@@ -291,8 +291,8 @@ public class MaterialsKevlar {
                 new MaterialStack(Materials.Nitrogen, 2))
             .setAspects(
                 Arrays.asList(
-                    new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1),
-                    new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1)))
+                    new TCAspects.TC_AspectStack(TCAspects.TERRA, 1),
+                    new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1)))
             .constructMaterial(); // C6H6N2
     public static Materials Methylamine = new MaterialBuilder(778, TextureSet.SET_FLUID, "Methylamine")
         .setName("Methylamine")
diff --git a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java
index 7542e1f600..49ab432c5f 100644
--- a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java
+++ b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java
@@ -283,7 +283,7 @@ public class MaterialsUEVplus {
         1,
         1,
         Dyes._NULL,
-        Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1)))
+        Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1)))
             .setProcessingMaterialTierEU(TierEU.RECIPE_UEV)
             .disableAutoGeneratedBlastFurnaceRecipes()
             .disableAutoGeneratedVacuumFreezerRecipe();
@@ -310,7 +310,7 @@ public class MaterialsUEVplus {
         1000,
         1000,
         Dyes.dyeBlack,
-        Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1)))
+        Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1)))
             .disableAutoGeneratedBlastFurnaceRecipes()
             .disableAutoGeneratedVacuumFreezerRecipe()
             .setProcessingMaterialTierEU(TierEU.RECIPE_UHV);
@@ -337,7 +337,7 @@ public class MaterialsUEVplus {
         1,
         1,
         Dyes._NULL,
-        Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1)))
+        Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1)))
             .setProcessingMaterialTierEU(TierEU.RECIPE_UIV);
     public static Materials RawStarMatter = new Materials(
         584,
@@ -485,7 +485,7 @@ public class MaterialsUEVplus {
         1,
         1,
         Dyes._NULL,
-        Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1)))
+        Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1)))
             .setProcessingMaterialTierEU(TierEU.RECIPE_UMV);
 
     public static Materials Eternity = new Materials(
@@ -511,7 +511,7 @@ public class MaterialsUEVplus {
         1,
         1,
         Dyes._NULL,
-        Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1)))
+        Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1)))
             .disableAutoGeneratedBlastFurnaceRecipes()
             .disableAutoGeneratedVacuumFreezerRecipe()
             .setProcessingMaterialTierEU(TierEU.RECIPE_UMV);
@@ -563,7 +563,7 @@ public class MaterialsUEVplus {
         1,
         1,
         Dyes._NULL,
-        Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1)))
+        Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1)))
             .setProcessingMaterialTierEU(TierEU.RECIPE_UMV);
 
     public static Materials QuarkGluonPlasma = new Materials(
@@ -661,7 +661,7 @@ public class MaterialsUEVplus {
         1,
         1,
         Dyes._NULL,
-        Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 1)))
+        Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ITER, 1)))
             .disableAutoGeneratedBlastFurnaceRecipes()
             .disableAutoGeneratedVacuumFreezerRecipe()
             .setProcessingMaterialTierEU(TierEU.RECIPE_UEV);
@@ -689,7 +689,7 @@ public class MaterialsUEVplus {
         1,
         1,
         Dyes._NULL,
-        Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1)))
+        Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.SENSUS, 1)))
             .disableAutoGeneratedBlastFurnaceRecipes()
             .disableAutoGeneratedVacuumFreezerRecipe()
             .setProcessingMaterialTierEU(TierEU.RECIPE_UEV);
@@ -717,7 +717,7 @@ public class MaterialsUEVplus {
         1,
         1,
         Dyes._NULL,
-        Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1)))
+        Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.SENSUS, 1)))
             .disableAutoGeneratedBlastFurnaceRecipes()
             .disableAutoGeneratedVacuumFreezerRecipe()
             .setProcessingMaterialTierEU(TierEU.RECIPE_UEV)
@@ -746,7 +746,7 @@ public class MaterialsUEVplus {
         1,
         1,
         Dyes._NULL,
-        Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 150)))
+        Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.VACUOS, 150)))
             .disableAutoGeneratedBlastFurnaceRecipes()
             .disableAutoGeneratedVacuumFreezerRecipe();
 
diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java
index 04a61c713e..4d11475ac4 100644
--- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java
+++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java
@@ -560,10 +560,10 @@ public enum MetaTileEntityIDs {
     GT_Dehydrator_IV(814),
     GT_Dehydrator_LuV(815),
     GT_Dehydrator_ZPM(816),
-    GT_FluidTank_ULV(817),
-    GT_FluidTank_LV(818),
-    GT_FluidTank_MV(819),
-    GT_FluidTank_HV(820),
+    GTFluidTank_ULV(817),
+    GTFluidTank_LV(818),
+    GTFluidTank_MV(819),
+    GTFluidTank_HV(820),
     COMET_Cyclotron(828),
     Industrial_FishingPond(829),
     Geothermal_Engine_EV(830),
diff --git a/src/main/java/gregtech/api/enums/OreMixes.java b/src/main/java/gregtech/api/enums/OreMixes.java
index c5c306baab..0a4b2fbc4e 100644
--- a/src/main/java/gregtech/api/enums/OreMixes.java
+++ b/src/main/java/gregtech/api/enums/OreMixes.java
@@ -1,15 +1,15 @@
 package gregtech.api.enums;
 
-import static bloodasp.galacticgreg.api.enums.DimensionDef.*;
+import static galacticgreg.api.enums.DimensionDef.*;
 import static gregtech.common.OreMixBuilder.NETHER;
 import static gregtech.common.OreMixBuilder.OW;
 import static gregtech.common.OreMixBuilder.THE_END;
 import static gregtech.common.OreMixBuilder.TWILIGHT_FOREST;
 
-import bloodasp.galacticgreg.GT_Worldgen_GT_Ore_Layer_Space;
-import bloodasp.galacticgreg.api.enums.DimensionDef;
-import gregtech.common.GT_Worldgen_GT_Ore_Layer;
+import galacticgreg.WorldgenOreLayerSpace;
+import galacticgreg.api.enums.DimensionDef;
 import gregtech.common.OreMixBuilder;
+import gregtech.common.WorldgenGTOreLayer;
 
 public enum OreMixes {
 
@@ -972,11 +972,11 @@ public enum OreMixes {
         this.oreMixBuilder = oreMixBuilder;
     }
 
-    public GT_Worldgen_GT_Ore_Layer addGTOreLayer() {
-        return new GT_Worldgen_GT_Ore_Layer(this.oreMixBuilder);
+    public WorldgenGTOreLayer addGTOreLayer() {
+        return new WorldgenGTOreLayer(this.oreMixBuilder);
     }
 
-    public GT_Worldgen_GT_Ore_Layer_Space addGaGregOreLayer() {
-        return new GT_Worldgen_GT_Ore_Layer_Space(this.oreMixBuilder);
+    public WorldgenOreLayerSpace addGaGregOreLayer() {
+        return new WorldgenOreLayerSpace(this.oreMixBuilder);
     }
 }
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index 7beaea9254..5f1ca97e83 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -1,8 +1,8 @@
 package gregtech.api.enums;
 
-import static gregtech.api.enums.GT_Values.B;
-import static gregtech.api.enums.GT_Values.D2;
-import static gregtech.api.enums.GT_Values.M;
+import static gregtech.api.enums.GTValues.B;
+import static gregtech.api.enums.GTValues.D2;
+import static gregtech.api.enums.GTValues.M;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -15,16 +15,16 @@ import net.minecraft.item.ItemStack;
 
 import com.google.common.collect.ImmutableList;
 
-import gregtech.api.enums.TC_Aspects.TC_AspectStack;
+import gregtech.api.enums.TCAspects.TC_AspectStack;
 import gregtech.api.interfaces.ICondition;
 import gregtech.api.interfaces.IOreRecipeRegistrator;
 import gregtech.api.interfaces.ISubTagContainer;
-import gregtech.api.objects.GT_ArrayList;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.objects.GTArrayList;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.objects.ItemData;
 import gregtech.api.objects.MaterialStack;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 import gregtech.loaders.materialprocessing.ProcessingModSupport;
 import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
 import it.unimi.dsi.fastutil.objects.ObjectSet;
@@ -932,7 +932,7 @@ public enum OrePrefixes {
         bulletGtLarge.mSecondaryMaterial = new MaterialStack(Materials.Brass, ingot.mMaterialAmount / 3);
     }
 
-    public final ArrayList<ItemStack> mPrefixedItems = new GT_ArrayList<>(false, 16);
+    public final ArrayList<ItemStack> mPrefixedItems = new GTArrayList<>(false, 16);
     public final short mTextureIndex;
     public final String mRegularLocalName, mLocalizedMaterialPre, mLocalizedMaterialPost;
     public final boolean mIsUsedForOreProcessing, mIsEnchantable, mIsUnificatable, mIsMaterialBased, mIsSelfReferencing,
@@ -957,7 +957,7 @@ public enum OrePrefixes {
     private final ObjectSet<ItemStack> mContainsTestCache = new ObjectOpenCustomHashSet<>(
         512,
         0.5f,
-        GT_ItemStack.ITEMSTACK_HASH_STRATEGY2);
+        GTItemStack.ITEMSTACK_HASH_STRATEGY2);
     public static final List<OrePrefixes> mPreventableComponents = new LinkedList<>(
         Arrays.asList(
             OrePrefixes.gem,
@@ -1037,36 +1037,36 @@ public enum OrePrefixes {
         mTextureIndex = (short) aTextureindex;
 
         if (name().startsWith("ore")) {
-            new TC_AspectStack(TC_Aspects.TERRA, 1).addToAspectList(mAspects);
+            new TC_AspectStack(TCAspects.TERRA, 1).addToAspectList(mAspects);
         } else if (name().startsWith("wire") || name().startsWith("cable")) {
-            new TC_AspectStack(TC_Aspects.ELECTRUM, 1).addToAspectList(mAspects);
+            new TC_AspectStack(TCAspects.ELECTRUM, 1).addToAspectList(mAspects);
         } else if (name().startsWith("dust")) {
-            new TC_AspectStack(TC_Aspects.PERDITIO, 1).addToAspectList(mAspects);
+            new TC_AspectStack(TCAspects.PERDITIO, 1).addToAspectList(mAspects);
         } else if (name().startsWith("crushed")) {
-            new TC_AspectStack(TC_Aspects.PERFODIO, 1).addToAspectList(mAspects);
+            new TC_AspectStack(TCAspects.PERFODIO, 1).addToAspectList(mAspects);
         } else if (name().startsWith("ingot") || name().startsWith("nugget")) {
-            new TC_AspectStack(TC_Aspects.METALLUM, 1).addToAspectList(mAspects);
+            new TC_AspectStack(TCAspects.METALLUM, 1).addToAspectList(mAspects);
         } else if (name().startsWith("armor")) {
-            new TC_AspectStack(TC_Aspects.TUTAMEN, 1).addToAspectList(mAspects);
+            new TC_AspectStack(TCAspects.TUTAMEN, 1).addToAspectList(mAspects);
         } else if (name().startsWith("stone")) {
-            new TC_AspectStack(TC_Aspects.TERRA, 1).addToAspectList(mAspects);
+            new TC_AspectStack(TCAspects.TERRA, 1).addToAspectList(mAspects);
         } else if (name().startsWith("pipe")) {
-            new TC_AspectStack(TC_Aspects.ITER, 1).addToAspectList(mAspects);
+            new TC_AspectStack(TCAspects.ITER, 1).addToAspectList(mAspects);
         } else if (name().startsWith("gear")) {
-            new TC_AspectStack(TC_Aspects.MOTUS, 1).addToAspectList(mAspects);
-            new TC_AspectStack(TC_Aspects.MACHINA, 1).addToAspectList(mAspects);
+            new TC_AspectStack(TCAspects.MOTUS, 1).addToAspectList(mAspects);
+            new TC_AspectStack(TCAspects.MACHINA, 1).addToAspectList(mAspects);
         } else if (name().startsWith("frame") || name().startsWith("plate")) {
-            new TC_AspectStack(TC_Aspects.FABRICO, 1).addToAspectList(mAspects);
+            new TC_AspectStack(TCAspects.FABRICO, 1).addToAspectList(mAspects);
         } else if (name().startsWith("tool")) {
-            new TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2).addToAspectList(mAspects);
+            new TC_AspectStack(TCAspects.INSTRUMENTUM, 2).addToAspectList(mAspects);
         } else if (name().startsWith("gem") || name().startsWith("crystal") || name().startsWith("lens")) {
-            new TC_AspectStack(TC_Aspects.VITREUS, 1).addToAspectList(mAspects);
+            new TC_AspectStack(TCAspects.VITREUS, 1).addToAspectList(mAspects);
         } else if (name().startsWith("circuit")) {
-            new TC_AspectStack(TC_Aspects.COGNITIO, 1).addToAspectList(mAspects);
+            new TC_AspectStack(TCAspects.COGNITIO, 1).addToAspectList(mAspects);
         } else if (name().startsWith("computer")) {
-            new TC_AspectStack(TC_Aspects.COGNITIO, 4).addToAspectList(mAspects);
+            new TC_AspectStack(TCAspects.COGNITIO, 4).addToAspectList(mAspects);
         } else if (name().startsWith("battery")) {
-            new TC_AspectStack(TC_Aspects.ELECTRUM, 1).addToAspectList(mAspects);
+            new TC_AspectStack(TCAspects.ELECTRUM, 1).addToAspectList(mAspects);
         }
     }
 
@@ -1113,7 +1113,7 @@ public enum OrePrefixes {
     }
 
     public static OrePrefixes getPrefix(String aPrefixName, OrePrefixes aReplacement) {
-        Object tObject = GT_Utility.getFieldContent(OrePrefixes.class, aPrefixName, false, false);
+        Object tObject = GTUtility.getFieldContent(OrePrefixes.class, aPrefixName, false, false);
         if (tObject instanceof OrePrefixes) return (OrePrefixes) tObject;
         return aReplacement;
     }
@@ -1145,13 +1145,13 @@ public enum OrePrefixes {
     }
 
     public boolean contains(ItemStack aStack) {
-        return !GT_Utility.isStackInvalid(aStack) && mContainsTestCache.contains(aStack);
+        return !GTUtility.isStackInvalid(aStack) && mContainsTestCache.contains(aStack);
     }
 
     public boolean containsUnCached(ItemStack aStack) {
         // In case someone needs this
         for (ItemStack tStack : mPrefixedItems) {
-            if (GT_Utility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())) {
+            if (GTUtility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())) {
                 return true;
             }
         }
@@ -1197,20 +1197,20 @@ public enum OrePrefixes {
         }
 
         if (!((aMaterial != Materials._NULL || mIsSelfReferencing || !mIsMaterialBased)
-            && GT_Utility.isStackValid(aStack))) {
+            && GTUtility.isStackValid(aStack))) {
             return;
         }
 
         for (IOreRecipeRegistrator tRegistrator : mOreProcessing) {
-            if (D2) GT_Log.ore.println(
+            if (D2) GTLog.ore.println(
                 "Processing '" + aOreDictName
                     + "' with the Prefix '"
                     + name()
                     + "' and the Material '"
                     + aMaterial.mName
                     + "' at "
-                    + GT_Utility.getClassName(tRegistrator));
-            tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GT_Utility.copyAmount(1, aStack));
+                    + GTUtility.getClassName(tRegistrator));
+            tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GTUtility.copyAmount(1, aStack));
         }
     }
 
diff --git a/src/main/java/gregtech/api/enums/SmallOres.java b/src/main/java/gregtech/api/enums/SmallOres.java
index 6de67bc3b9..3cd15b5f86 100644
--- a/src/main/java/gregtech/api/enums/SmallOres.java
+++ b/src/main/java/gregtech/api/enums/SmallOres.java
@@ -1,43 +1,43 @@
 package gregtech.api.enums;
 
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Anubis;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Asteroids;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.BarnardE;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.BarnardF;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Callisto;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Ceres;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Deimos;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Enceladus;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.EndAsteroids;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Ganymede;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Haumea;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Horus;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Io;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.KuiperBelt;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.MakeMake;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Mars;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.MehenBelt;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Mercury;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Miranda;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Moon;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Oberon;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Phobos;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Pluto;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Proteus;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Seth;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.TcetiE;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Titan;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Triton;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.VegaB;
-import static bloodasp.galacticgreg.api.enums.DimensionDef.Venus;
+import static galacticgreg.api.enums.DimensionDef.Anubis;
+import static galacticgreg.api.enums.DimensionDef.Asteroids;
+import static galacticgreg.api.enums.DimensionDef.BarnardE;
+import static galacticgreg.api.enums.DimensionDef.BarnardF;
+import static galacticgreg.api.enums.DimensionDef.Callisto;
+import static galacticgreg.api.enums.DimensionDef.Ceres;
+import static galacticgreg.api.enums.DimensionDef.Deimos;
+import static galacticgreg.api.enums.DimensionDef.Enceladus;
+import static galacticgreg.api.enums.DimensionDef.EndAsteroids;
+import static galacticgreg.api.enums.DimensionDef.Ganymede;
+import static galacticgreg.api.enums.DimensionDef.Haumea;
+import static galacticgreg.api.enums.DimensionDef.Horus;
+import static galacticgreg.api.enums.DimensionDef.Io;
+import static galacticgreg.api.enums.DimensionDef.KuiperBelt;
+import static galacticgreg.api.enums.DimensionDef.MakeMake;
+import static galacticgreg.api.enums.DimensionDef.Mars;
+import static galacticgreg.api.enums.DimensionDef.MehenBelt;
+import static galacticgreg.api.enums.DimensionDef.Mercury;
+import static galacticgreg.api.enums.DimensionDef.Miranda;
+import static galacticgreg.api.enums.DimensionDef.Moon;
+import static galacticgreg.api.enums.DimensionDef.Oberon;
+import static galacticgreg.api.enums.DimensionDef.Phobos;
+import static galacticgreg.api.enums.DimensionDef.Pluto;
+import static galacticgreg.api.enums.DimensionDef.Proteus;
+import static galacticgreg.api.enums.DimensionDef.Seth;
+import static galacticgreg.api.enums.DimensionDef.TcetiE;
+import static galacticgreg.api.enums.DimensionDef.Titan;
+import static galacticgreg.api.enums.DimensionDef.Triton;
+import static galacticgreg.api.enums.DimensionDef.VegaB;
+import static galacticgreg.api.enums.DimensionDef.Venus;
 import static gregtech.common.SmallOreBuilder.NETHER;
 import static gregtech.common.SmallOreBuilder.OW;
 import static gregtech.common.SmallOreBuilder.THE_END;
 import static gregtech.common.SmallOreBuilder.TWILIGHT_FOREST;
 
-import bloodasp.galacticgreg.GT_Worldgen_GT_Ore_SmallPieces_Space;
-import gregtech.common.GT_Worldgen_GT_Ore_SmallPieces;
+import galacticgreg.WorldgenOreSmallSpace;
 import gregtech.common.SmallOreBuilder;
+import gregtech.common.WorldgenGTOreSmallPieces;
 
 public enum SmallOres {
 
@@ -545,11 +545,11 @@ public enum SmallOres {
         this.smallOreBuilder = smallOreBuilder;
     }
 
-    public GT_Worldgen_GT_Ore_SmallPieces addGTSmallOre() {
-        return new GT_Worldgen_GT_Ore_SmallPieces(this.smallOreBuilder);
+    public WorldgenGTOreSmallPieces addGTSmallOre() {
+        return new WorldgenGTOreSmallPieces(this.smallOreBuilder);
     }
 
-    public GT_Worldgen_GT_Ore_SmallPieces_Space addGaGregSmallOre() {
-        return new GT_Worldgen_GT_Ore_SmallPieces_Space(this.smallOreBuilder);
+    public WorldgenOreSmallSpace addGaGregSmallOre() {
+        return new WorldgenOreSmallSpace(this.smallOreBuilder);
     }
 }
diff --git a/src/main/java/gregtech/api/enums/SoundResource.java b/src/main/java/gregtech/api/enums/SoundResource.java
index 712c1b5016..e2a6b2630a 100644
--- a/src/main/java/gregtech/api/enums/SoundResource.java
+++ b/src/main/java/gregtech/api/enums/SoundResource.java
@@ -12,6 +12,8 @@ import net.minecraft.util.ResourceLocation;
 
 import com.google.common.collect.Maps;
 
+import gregtech.api.GregTechAPI;
+
 /**
  * Enumerates known sounds with id and resource-location
  *
@@ -361,7 +363,7 @@ public enum SoundResource {
     /**
      * Provides a backward-compatible Sounds {@code Map<Integer, String>} sound list
      *
-     * @return The map for the deprecated {@link gregtech.api.GregTech_API#sSoundList}
+     * @return The map for the deprecated {@link GregTechAPI#sSoundList}
      * @deprecated This method is planned for removal.
      *             <p>
      *             Use this {@link SoundResource} enum instead.
diff --git a/src/main/java/gregtech/api/enums/TAE.java b/src/main/java/gregtech/api/enums/TAE.java
index 246b2006ea..79d3037a5a 100644
--- a/src/main/java/gregtech/api/enums/TAE.java
+++ b/src/main/java/gregtech/api/enums/TAE.java
@@ -8,9 +8,9 @@ import gregtech.api.interfaces.ITexture;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture;
 
 public class TAE {
 
@@ -19,7 +19,7 @@ public class TAE {
     public static int gtPPLastUsedIndex = 64;
     public static int secondaryIndex = 0;
 
-    public static HashMap<Integer, GTPP_CopiedBlockTexture> mTAE = new HashMap<>();
+    public static HashMap<Integer, GTPPCopiedBlockTexture> mTAE = new HashMap<>();
     private static final HashSet<Integer> mFreeSlots = new HashSet<>(64);
 
     static {
@@ -31,23 +31,23 @@ public class TAE {
 
     /**
      *
-     * @param aPage                   - The Texture page (0-3)
-     * @param aID                     - The ID on the specified page (0-15)
-     * @param GTPP_CopiedBlockTexture - The Texture to register
+     * @param aPage                  - The Texture page (0-3)
+     * @param aID                    - The ID on the specified page (0-15)
+     * @param GTPPCopiedBlockTexture - The Texture to register
      * @return - Did it register correctly?
      */
-    public static boolean registerTexture(int aPage, int aID, GTPP_CopiedBlockTexture GTPP_CopiedBlockTexture) {
+    public static boolean registerTexture(int aPage, int aID, GTPPCopiedBlockTexture GTPPCopiedBlockTexture) {
         int aRealID = aID + (aPage * 16);
-        return registerTexture(64 + aRealID, GTPP_CopiedBlockTexture);
+        return registerTexture(64 + aRealID, GTPPCopiedBlockTexture);
     }
 
-    public static boolean registerTexture(int aID, GTPP_CopiedBlockTexture GTPP_CopiedBlockTexture) {
+    public static boolean registerTexture(int aID, GTPPCopiedBlockTexture GTPPCopiedBlockTexture) {
         if (mFreeSlots.contains(aID)) {
             mFreeSlots.remove(aID);
-            mTAE.put(aID, GTPP_CopiedBlockTexture);
+            mTAE.put(aID, GTPPCopiedBlockTexture);
             return true;
         } else {
-            CORE.crash("Tried to register texture with ID " + aID + " to TAE, but it is already in use.");
+            GTPPCore.crash("Tried to register texture with ID " + aID + " to TAE, but it is already in use.");
             return false; // Dead Code
         }
     }
@@ -69,7 +69,7 @@ public class TAE {
         Logger.INFO("Free Page slots within TAE: " + aPageAndSlotFree);
         Logger.INFO("Filling them with ERROR textures.");
         for (int aFreeSlot : aTemp.values()) {
-            registerTexture(aFreeSlot, new GTPP_CopiedBlockTexture(ModBlocks.blockCasingsTieredGTPP, 1, 15));
+            registerTexture(aFreeSlot, new GTPPCopiedBlockTexture(ModBlocks.blockCasingsTieredGTPP, 1, 15));
         }
         Logger.INFO("Finalising TAE.");
         for (int aKeyTae : mTAE.keySet()) {
@@ -78,7 +78,7 @@ public class TAE {
         Logger.INFO("Finalised TAE.");
     }
 
-    private static boolean registerTextures(GTPP_CopiedBlockTexture GTPP_CopiedBlockTexture) {
+    private static boolean registerTextures(GTPPCopiedBlockTexture GTPPCopiedBlockTexture) {
         try {
             // Handle page 2.
             Logger.INFO("[TAE} Registering Texture, Last used casing ID is " + gtPPLastUsedIndex + ".");
@@ -87,7 +87,7 @@ public class TAE {
                 if (x != null) {
                     ITexture[][] h = (ITexture[][]) x.get(null);
                     if (h != null) {
-                        h[64][secondaryIndex++] = GTPP_CopiedBlockTexture;
+                        h[64][secondaryIndex++] = GTPPCopiedBlockTexture;
                         x.set(null, h);
                         Logger
                             .INFO("[TAE} Registered Texture with ID " + (secondaryIndex - 1) + " in secondary index.");
@@ -98,7 +98,7 @@ public class TAE {
 
             // set to page 1.
             else {
-                Textures.BlockIcons.setCasingTextureForId(gtPPLastUsedIndex, GTPP_CopiedBlockTexture);
+                Textures.BlockIcons.setCasingTextureForId(gtPPLastUsedIndex, GTPPCopiedBlockTexture);
                 Logger.INFO("[TAE} Registered Texture with ID " + (gtPPLastUsedIndex) + " in main index.");
                 gtPPLastUsedIndex++;
                 return true;
diff --git a/src/main/java/gregtech/api/enums/TC_Aspects.java b/src/main/java/gregtech/api/enums/TCAspects.java
index 24d19b0b73..31ec9c0bc8 100644
--- a/src/main/java/gregtech/api/enums/TC_Aspects.java
+++ b/src/main/java/gregtech/api/enums/TCAspects.java
@@ -2,7 +2,7 @@ package gregtech.api.enums;
 
 import java.util.List;
 
-public enum TC_Aspects {
+public enum TCAspects {
 
     AER(1),
     ALIENIS(20),
@@ -66,16 +66,16 @@ public enum TC_Aspects {
 
     public final int mValue;
 
-    TC_Aspects(int aValue) {
+    TCAspects(int aValue) {
         mValue = aValue;
     }
 
     public static class TC_AspectStack {
 
-        public TC_Aspects mAspect;
+        public TCAspects mAspect;
         public long mAmount;
 
-        public TC_AspectStack(TC_Aspects aAspect, long aAmount) {
+        public TC_AspectStack(TCAspects aAspect, long aAmount) {
             mAspect = aAspect;
             mAmount = aAmount;
         }
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index 7caa8f41e5..7e5aedbcea 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -9,11 +9,11 @@ import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 public class Textures {
 
@@ -1762,17 +1762,17 @@ public class Textures {
                     Dyes.getModulation(j - 1, Dyes.MACHINE_METAL.mRGBa));
             casingTexturePages[0] = new ITexture[128];
             // adds some known pages, modders also can do it...
-            GT_Utility.addTexturePage((byte) 1);
-            GT_Utility.addTexturePage((byte) 2);
-            GT_Utility.addTexturePage((byte) 8);
-            GT_Utility.addTexturePage((byte) 16);
+            GTUtility.addTexturePage((byte) 1);
+            GTUtility.addTexturePage((byte) 2);
+            GTUtility.addTexturePage((byte) 8);
+            GTUtility.addTexturePage((byte) 16);
             setCasingTextureForId(ERROR_TEXTURE_INDEX, ERROR_RENDERING[0]);
         }
 
         IIcon mIcon;
 
         BlockIcons() {
-            GregTech_API.sGTBlockIconload.add(this);
+            GregTechAPI.sGTBlockIconload.add(this);
         }
 
         public static ITexture getCasingTextureForId(int id) {
@@ -1813,7 +1813,7 @@ public class Textures {
 
         @Override
         public void run() {
-            mIcon = GregTech_API.sBlockIcons.registerIcon(GregTech.getResourcePath("iconsets", this.toString()));
+            mIcon = GregTechAPI.sBlockIcons.registerIcon(GregTech.getResourcePath("iconsets", this.toString()));
         }
 
         public static class CustomIcon implements IIconContainer, Runnable {
@@ -1823,12 +1823,12 @@ public class Textures {
 
             public CustomIcon(String aIconName) {
                 mIconName = !aIconName.contains(":") ? GregTech.getResourcePath(aIconName) : aIconName;
-                GregTech_API.sGTBlockIconload.add(this);
+                GregTechAPI.sGTBlockIconload.add(this);
             }
 
             @Override
             public void run() {
-                mIcon = GregTech_API.sBlockIcons.registerIcon(mIconName);
+                mIcon = GregTechAPI.sBlockIcons.registerIcon(mIconName);
             }
 
             @Override
@@ -1918,7 +1918,7 @@ public class Textures {
         IIcon mIcon, mOverlay;
 
         ItemIcons() {
-            GregTech_API.sGTItemIconload.add(this);
+            GregTechAPI.sGTItemIconload.add(this);
         }
 
         @Override
@@ -1938,8 +1938,8 @@ public class Textures {
 
         @Override
         public void run() {
-            mIcon = GregTech_API.sItemIcons.registerIcon(GregTech.getResourcePath("iconsets", this.toString()));
-            mOverlay = GregTech_API.sItemIcons.registerIcon(GregTech.getResourcePath("iconsets", this + "_OVERLAY"));
+            mIcon = GregTechAPI.sItemIcons.registerIcon(GregTech.getResourcePath("iconsets", this.toString()));
+            mOverlay = GregTechAPI.sItemIcons.registerIcon(GregTech.getResourcePath("iconsets", this + "_OVERLAY"));
         }
 
         public static class CustomIcon implements IIconContainer, Runnable {
@@ -1949,7 +1949,7 @@ public class Textures {
 
             public CustomIcon(String aIconName) {
                 mIconName = aIconName;
-                GregTech_API.sGTItemIconload.add(this);
+                GregTechAPI.sGTItemIconload.add(this);
             }
 
             @Override
@@ -1969,8 +1969,8 @@ public class Textures {
 
             @Override
             public void run() {
-                mIcon = GregTech_API.sItemIcons.registerIcon(GregTech.getResourcePath(mIconName));
-                mOverlay = GregTech_API.sItemIcons.registerIcon(GregTech.getResourcePath(mIconName + "_OVERLAY"));
+                mIcon = GregTechAPI.sItemIcons.registerIcon(GregTech.getResourcePath(mIconName));
+                mOverlay = GregTechAPI.sItemIcons.registerIcon(GregTech.getResourcePath(mIconName + "_OVERLAY"));
             }
         }
     }
diff --git a/src/main/java/gregtech/api/enums/Tier.java b/src/main/java/gregtech/api/enums/Tier.java
index 2d64444283..572f2e8b2a 100644
--- a/src/main/java/gregtech/api/enums/Tier.java
+++ b/src/main/java/gregtech/api/enums/Tier.java
@@ -1,6 +1,6 @@
 package gregtech.api.enums;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 /**
  * Experimental Class for later
diff --git a/src/main/java/gregtech/api/enums/TierEU.java b/src/main/java/gregtech/api/enums/TierEU.java
index 26b6393115..713f48b3ff 100644
--- a/src/main/java/gregtech/api/enums/TierEU.java
+++ b/src/main/java/gregtech/api/enums/TierEU.java
@@ -1,40 +1,40 @@
 package gregtech.api.enums;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 public class TierEU {
 
     // Do NOT use these for crafting recipes as they are exactly 1A! Use RECIPE_ULV etc.
-    public static final long ULV = V[GTVoltageIndex.ULV];
-    public static final long LV = V[GTVoltageIndex.LV];
-    public static final long MV = V[GTVoltageIndex.MV];
-    public static final long HV = V[GTVoltageIndex.HV];
-    public static final long EV = V[GTVoltageIndex.EV];
-    public static final long IV = V[GTVoltageIndex.IV];
-    public static final long LuV = V[GTVoltageIndex.LuV];
-    public static final long ZPM = V[GTVoltageIndex.ZPM];
-    public static final long UV = V[GTVoltageIndex.UV];
-    public static final long UHV = V[GTVoltageIndex.UHV];
-    public static final long UEV = V[GTVoltageIndex.UEV];
-    public static final long UIV = V[GTVoltageIndex.UIV];
-    public static final long UMV = V[GTVoltageIndex.UMV];
-    public static final long UXV = V[GTVoltageIndex.UXV];
-    public static final long MAX = V[GTVoltageIndex.MAX];
+    public static final long ULV = V[VoltageIndex.ULV];
+    public static final long LV = V[VoltageIndex.LV];
+    public static final long MV = V[VoltageIndex.MV];
+    public static final long HV = V[VoltageIndex.HV];
+    public static final long EV = V[VoltageIndex.EV];
+    public static final long IV = V[VoltageIndex.IV];
+    public static final long LuV = V[VoltageIndex.LuV];
+    public static final long ZPM = V[VoltageIndex.ZPM];
+    public static final long UV = V[VoltageIndex.UV];
+    public static final long UHV = V[VoltageIndex.UHV];
+    public static final long UEV = V[VoltageIndex.UEV];
+    public static final long UIV = V[VoltageIndex.UIV];
+    public static final long UMV = V[VoltageIndex.UMV];
+    public static final long UXV = V[VoltageIndex.UXV];
+    public static final long MAX = V[VoltageIndex.MAX];
 
     // Use me for recipes.
-    public static final long RECIPE_ULV = GT_Values.VP[GTVoltageIndex.ULV];
-    public static final long RECIPE_LV = GT_Values.VP[GTVoltageIndex.LV];
-    public static final long RECIPE_MV = GT_Values.VP[GTVoltageIndex.MV];
-    public static final long RECIPE_HV = GT_Values.VP[GTVoltageIndex.HV];
-    public static final long RECIPE_EV = GT_Values.VP[GTVoltageIndex.EV];
-    public static final long RECIPE_IV = GT_Values.VP[GTVoltageIndex.IV];
-    public static final long RECIPE_LuV = GT_Values.VP[GTVoltageIndex.LuV];
-    public static final long RECIPE_ZPM = GT_Values.VP[GTVoltageIndex.ZPM];
-    public static final long RECIPE_UV = GT_Values.VP[GTVoltageIndex.UV];
-    public static final long RECIPE_UHV = GT_Values.VP[GTVoltageIndex.UHV];
-    public static final long RECIPE_UEV = GT_Values.VP[GTVoltageIndex.UEV];
-    public static final long RECIPE_UIV = GT_Values.VP[GTVoltageIndex.UIV];
-    public static final long RECIPE_UMV = GT_Values.VP[GTVoltageIndex.UMV];
-    public static final long RECIPE_UXV = GT_Values.VP[GTVoltageIndex.UXV];
-    public static final long RECIPE_MAX = GT_Values.VP[GTVoltageIndex.MAX];
+    public static final long RECIPE_ULV = GTValues.VP[VoltageIndex.ULV];
+    public static final long RECIPE_LV = GTValues.VP[VoltageIndex.LV];
+    public static final long RECIPE_MV = GTValues.VP[VoltageIndex.MV];
+    public static final long RECIPE_HV = GTValues.VP[VoltageIndex.HV];
+    public static final long RECIPE_EV = GTValues.VP[VoltageIndex.EV];
+    public static final long RECIPE_IV = GTValues.VP[VoltageIndex.IV];
+    public static final long RECIPE_LuV = GTValues.VP[VoltageIndex.LuV];
+    public static final long RECIPE_ZPM = GTValues.VP[VoltageIndex.ZPM];
+    public static final long RECIPE_UV = GTValues.VP[VoltageIndex.UV];
+    public static final long RECIPE_UHV = GTValues.VP[VoltageIndex.UHV];
+    public static final long RECIPE_UEV = GTValues.VP[VoltageIndex.UEV];
+    public static final long RECIPE_UIV = GTValues.VP[VoltageIndex.UIV];
+    public static final long RECIPE_UMV = GTValues.VP[VoltageIndex.UMV];
+    public static final long RECIPE_UXV = GTValues.VP[VoltageIndex.UXV];
+    public static final long RECIPE_MAX = GTValues.VP[VoltageIndex.MAX];
 }
diff --git a/src/main/java/gregtech/api/enums/VoidingMode.java b/src/main/java/gregtech/api/enums/VoidingMode.java
index 8ae9dda57d..c41236c8ab 100644
--- a/src/main/java/gregtech/api/enums/VoidingMode.java
+++ b/src/main/java/gregtech/api/enums/VoidingMode.java
@@ -8,28 +8,27 @@ import javax.annotation.Nonnull;
 
 import com.gtnewhorizons.modularui.api.drawable.UITexture;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 
 public enum VoidingMode {
 
     /**
      * Voids nothing, protects both item and fluid
      */
-    VOID_NONE(true, true, GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_VOID_EXCESS_NONE, "none"),
+    VOID_NONE(true, true, GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_VOID_EXCESS_NONE, "none"),
     /**
      * Voids item, protects fluid
      */
-    VOID_ITEM(false, true, GT_UITextures.BUTTON_STANDARD_PRESSED, GT_UITextures.OVERLAY_BUTTON_VOID_EXCESS_ITEM,
-        "item"),
+    VOID_ITEM(false, true, GTUITextures.BUTTON_STANDARD_PRESSED, GTUITextures.OVERLAY_BUTTON_VOID_EXCESS_ITEM, "item"),
     /**
      * Voids fluid, protects item
      */
-    VOID_FLUID(true, false, GT_UITextures.BUTTON_STANDARD_PRESSED, GT_UITextures.OVERLAY_BUTTON_VOID_EXCESS_FLUID,
+    VOID_FLUID(true, false, GTUITextures.BUTTON_STANDARD_PRESSED, GTUITextures.OVERLAY_BUTTON_VOID_EXCESS_FLUID,
         "fluid"),
     /**
      * Voids all, protects nothing
      */
-    VOID_ALL(false, false, GT_UITextures.BUTTON_STANDARD_PRESSED, GT_UITextures.OVERLAY_BUTTON_VOID_EXCESS_ALL, "all");
+    VOID_ALL(false, false, GTUITextures.BUTTON_STANDARD_PRESSED, GTUITextures.OVERLAY_BUTTON_VOID_EXCESS_ALL, "all");
 
     /**
      * Default set of voiding mode you will probably support.
diff --git a/src/main/java/gregtech/api/enums/GTVoltageIndex.java b/src/main/java/gregtech/api/enums/VoltageIndex.java
index c5c2c215b0..f0303b27b0 100644
--- a/src/main/java/gregtech/api/enums/GTVoltageIndex.java
+++ b/src/main/java/gregtech/api/enums/VoltageIndex.java
@@ -1,6 +1,6 @@
 package gregtech.api.enums;
 
-public class GTVoltageIndex {
+public class VoltageIndex {
 
     public final static int ULV = 0;
     public final static int LV = 1;
@@ -18,5 +18,5 @@ public class GTVoltageIndex {
     public final static int UXV = 13;
     public final static int MAX = 14;
 
-    private GTVoltageIndex() {}
+    private VoltageIndex() {}
 }
diff --git a/src/main/java/gregtech/api/fluid/GT_FluidFactory.java b/src/main/java/gregtech/api/fluid/GTFluidFactory.java
index 7c65956c69..291cdf3384 100644
--- a/src/main/java/gregtech/api/fluid/GT_FluidFactory.java
+++ b/src/main/java/gregtech/api/fluid/GTFluidFactory.java
@@ -6,9 +6,9 @@ import net.minecraftforge.fluids.FluidRegistry;
 
 import gregtech.api.enums.FluidState;
 import gregtech.api.enums.Materials;
-import gregtech.api.interfaces.fluid.IGT_Fluid;
-import gregtech.api.interfaces.fluid.IGT_FluidBuilder;
-import gregtech.common.fluid.GT_FluidBuilder;
+import gregtech.api.interfaces.fluid.IGTFluid;
+import gregtech.api.interfaces.fluid.IGTFluidBuilder;
+import gregtech.common.fluid.GTFluidBuilder;
 
 /**
  * <p>
@@ -17,12 +17,12 @@ import gregtech.common.fluid.GT_FluidBuilder;
  * <ol>
  * <li>
  * <p>
- * Build {@link IGT_Fluid} instances.
+ * Build {@link IGTFluid} instances.
  * </p>
  * </li>
  * <li>
  * <p>
- * Register the corresponding {@link Fluid}, built from an {@link IGT_Fluid}, to the {@link FluidRegistry}:
+ * Register the corresponding {@link Fluid}, built from an {@link IGTFluid}, to the {@link FluidRegistry}:
  * </p>
  * <ul>
  * <li>
@@ -40,15 +40,15 @@ import gregtech.common.fluid.GT_FluidBuilder;
  * </ol>
  */
 @SuppressWarnings("unused") // API might legitimately expose unused methods within this local project's scope
-public class GT_FluidFactory {
+public class GTFluidFactory {
 
     /**
      * Helper for quick fluid creation and registration
      *
      * @param fluidName     The name key of the {@link Fluid} to register in the {@link FluidRegistry}
-     * @param localizedName The localized name of this {@link IGT_Fluid}
-     * @param material      The {@link Materials} of this {@link IGT_Fluid}
-     * @param state         The {@link FluidState} of this {@link IGT_Fluid}
+     * @param localizedName The localized name of this {@link IGTFluid}
+     * @param material      The {@link Materials} of this {@link IGTFluid}
+     * @param state         The {@link FluidState} of this {@link IGTFluid}
      * @param temperature   The fluid temperature in Kelvin
      * @return the registered {@link Fluid}
      */
@@ -65,8 +65,8 @@ public class GT_FluidFactory {
      * Helper for quick fluid creation and registration
      *
      * @param fluidName     The name key of the {@link Fluid} to register in the {@link FluidRegistry}
-     * @param localizedName The localized name of this {@link IGT_Fluid}
-     * @param state         The {@link FluidState} of this {@link IGT_Fluid}
+     * @param localizedName The localized name of this {@link IGTFluid}
+     * @param state         The {@link FluidState} of this {@link IGTFluid}
      * @param temperature   The fluid temperature in Kelvin
      * @return the registered {@link Fluid}
      */
@@ -79,12 +79,12 @@ public class GT_FluidFactory {
     }
 
     /**
-     * Gets an {@link IGT_Fluid} builder instance
+     * Gets an {@link IGTFluid} builder instance
      *
      * @param fluidName The name key of the {@link Fluid} to register in the {@link FluidRegistry}
-     * @return the {@link IGT_FluidBuilder} instance
+     * @return the {@link IGTFluidBuilder} instance
      */
-    public static IGT_FluidBuilder builder(final String fluidName) {
-        return new GT_FluidBuilder(fluidName);
+    public static IGTFluidBuilder builder(final String fluidName) {
+        return new GTFluidBuilder(fluidName);
     }
 }
diff --git a/src/main/java/gregtech/api/fluid/FluidTankGT.java b/src/main/java/gregtech/api/fluid/GTFluidTank.java
index 0c224985e6..46fc098000 100644
--- a/src/main/java/gregtech/api/fluid/FluidTankGT.java
+++ b/src/main/java/gregtech/api/fluid/GTFluidTank.java
@@ -15,11 +15,11 @@ import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidTank;
 
 import gregtech.api.interfaces.fluid.IFluidStore;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class FluidTankGT implements IFluidTank, IFluidStore {
+public class GTFluidTank implements IFluidTank, IFluidStore {
 
-    public final FluidTankGT[] AS_ARRAY = new FluidTankGT[] { this };
+    public final GTFluidTank[] AS_ARRAY = new GTFluidTank[] { this };
     private FluidStack mFluid;
     private long mCapacity = 0, mAmount = 0;
     private boolean mPreventDraining = false, mVoidExcess = false, mChangedFluids = false;
@@ -30,15 +30,15 @@ public class FluidTankGT implements IFluidTank, IFluidStore {
     /** Gives you a Tank Index in case there is multiple Tanks on a TileEntity that cares. */
     public int mIndex = 0;
 
-    public FluidTankGT() {
+    public GTFluidTank() {
         mCapacity = Long.MAX_VALUE;
     }
 
-    public FluidTankGT(long aCapacity) {
+    public GTFluidTank(long aCapacity) {
         mCapacity = aCapacity;
     }
 
-    public FluidTankGT(FluidStack aFluid) {
+    public GTFluidTank(FluidStack aFluid) {
         mFluid = aFluid;
         if (aFluid != null) {
             mCapacity = aFluid.amount;
@@ -46,33 +46,33 @@ public class FluidTankGT implements IFluidTank, IFluidStore {
         }
     }
 
-    public FluidTankGT(FluidStack aFluid, long aCapacity) {
+    public GTFluidTank(FluidStack aFluid, long aCapacity) {
         mFluid = aFluid;
         mCapacity = aCapacity;
         mAmount = (aFluid == null ? 0 : aFluid.amount);
     }
 
-    public FluidTankGT(FluidStack aFluid, long aAmount, long aCapacity) {
+    public GTFluidTank(FluidStack aFluid, long aAmount, long aCapacity) {
         mFluid = aFluid;
         mCapacity = aCapacity;
         mAmount = (aFluid == null ? 0 : aAmount);
     }
 
-    public FluidTankGT(Fluid aFluid, long aAmount) {
+    public GTFluidTank(Fluid aFluid, long aAmount) {
         this(new FluidStack(aFluid, saturatedCast(aAmount)));
         mAmount = aAmount;
     }
 
-    public FluidTankGT(Fluid aFluid, long aAmount, long aCapacity) {
+    public GTFluidTank(Fluid aFluid, long aAmount, long aCapacity) {
         this(new FluidStack(aFluid, saturatedCast(aAmount)), aCapacity);
         mAmount = aAmount;
     }
 
-    public FluidTankGT(NBTTagCompound aNBT, String aKey, long aCapacity) {
+    public GTFluidTank(NBTTagCompound aNBT, String aKey, long aCapacity) {
         this(aNBT.hasKey(aKey) ? aNBT.getCompoundTag(aKey) : null, aCapacity);
     }
 
-    public FluidTankGT(NBTTagCompound aNBT, long aCapacity) {
+    public GTFluidTank(NBTTagCompound aNBT, long aCapacity) {
         mCapacity = aCapacity;
         if (aNBT != null && !aNBT.hasNoTags()) {
             mFluid = FluidStack.loadFluidStackFromNBT(aNBT);
@@ -80,7 +80,7 @@ public class FluidTankGT implements IFluidTank, IFluidStore {
         }
     }
 
-    public FluidTankGT readFromNBT(NBTTagCompound aNBT, String aKey) {
+    public GTFluidTank readFromNBT(NBTTagCompound aNBT, String aKey) {
         if (aNBT.hasKey(aKey)) {
             aNBT = aNBT.getCompoundTag(aKey);
             if (aNBT != null && !aNBT.hasNoTags()) {
@@ -269,7 +269,7 @@ public class FluidTankGT implements IFluidTank, IFluidStore {
     }
 
     /** Resets Tank Contents entirely */
-    public FluidTankGT setEmpty() {
+    public GTFluidTank setEmpty() {
         mFluid = null;
         mChangedFluids = true;
         mAmount = 0;
@@ -277,7 +277,7 @@ public class FluidTankGT implements IFluidTank, IFluidStore {
     }
 
     /** Sets Fluid Content, taking Amount from the Fluid Parameter */
-    public FluidTankGT setFluid(FluidStack aFluid) {
+    public GTFluidTank setFluid(FluidStack aFluid) {
         mFluid = aFluid;
         mChangedFluids = true;
         mAmount = (aFluid == null ? 0 : aFluid.amount);
@@ -285,7 +285,7 @@ public class FluidTankGT implements IFluidTank, IFluidStore {
     }
 
     /** Sets Fluid Content and Amount */
-    public FluidTankGT setFluid(FluidStack aFluid, long aAmount) {
+    public GTFluidTank setFluid(FluidStack aFluid, long aAmount) {
         mFluid = aFluid;
         mChangedFluids = true;
         mAmount = (aFluid == null ? 0 : aAmount);
@@ -293,7 +293,7 @@ public class FluidTankGT implements IFluidTank, IFluidStore {
     }
 
     /** Sets Fluid Content, taking Amount from the Tank Parameter */
-    public FluidTankGT setFluid(FluidTankGT aTank) {
+    public GTFluidTank setFluid(GTFluidTank aTank) {
         mFluid = new FluidStack(aTank.mFluid, saturatedCast(aTank.mAmount));
         mChangedFluids = true;
         mAmount = aTank.mAmount;
@@ -301,48 +301,48 @@ public class FluidTankGT implements IFluidTank, IFluidStore {
     }
 
     /** Sets the Tank Index for easier Reverse Mapping. */
-    public FluidTankGT setIndex(int aIndex) {
+    public GTFluidTank setIndex(int aIndex) {
         mIndex = aIndex;
         return this;
     }
 
     /** Sets the Capacity */
-    public FluidTankGT setCapacity(long aCapacity) {
+    public GTFluidTank setCapacity(long aCapacity) {
         if (aCapacity >= 0) mCapacity = aCapacity;
         return this;
     }
 
     /** Sets the Capacity Multiplier */
-    public FluidTankGT setCapacityMultiplier(long aCapacityMultiplier) {
+    public GTFluidTank setCapacityMultiplier(long aCapacityMultiplier) {
         if (aCapacityMultiplier >= 0) mAdjustableMultiplier = aCapacityMultiplier;
         return this;
     }
 
     /** Sets Tank capacity Map, should it be needed. */
-    public FluidTankGT setCapacity(Map<String, Long> aMap, long aCapacityMultiplier) {
+    public GTFluidTank setCapacity(Map<String, Long> aMap, long aCapacityMultiplier) {
         mAdjustableCapacity = aMap;
         mAdjustableMultiplier = aCapacityMultiplier;
         return this;
     }
 
     /** Always keeps at least 0 Liters of Fluid instead of setting it to null */
-    public FluidTankGT setPreventDraining() {
+    public GTFluidTank setPreventDraining() {
         return setPreventDraining(true);
     }
 
     /** Always keeps at least 0 Liters of Fluid instead of setting it to null */
-    public FluidTankGT setPreventDraining(boolean aPrevent) {
+    public GTFluidTank setPreventDraining(boolean aPrevent) {
         mPreventDraining = aPrevent;
         return this;
     }
 
     /** Voids any Overlow */
-    public FluidTankGT setVoidExcess() {
+    public GTFluidTank setVoidExcess() {
         return setVoidExcess(true);
     }
 
     /** Voids any Overlow */
-    public FluidTankGT setVoidExcess(boolean aVoidExcess) {
+    public GTFluidTank setVoidExcess(boolean aVoidExcess) {
         mVoidExcess = aVoidExcess;
         return this;
     }
@@ -382,7 +382,7 @@ public class FluidTankGT implements IFluidTank, IFluidStore {
     }
 
     public boolean contains(FluidStack aFluid) {
-        return GT_Utility.areFluidsEqual(mFluid, aFluid);
+        return GTUtility.areFluidsEqual(mFluid, aFluid);
     }
 
     public boolean has(long aAmount) {
@@ -460,12 +460,12 @@ public class FluidTankGT implements IFluidTank, IFluidStore {
         return new FluidTankInfo(isEmpty() ? null : mFluid.copy(), saturatedCast(capacity()));
     }
 
-    public static FluidStack[] getFluidsFromTanks(FluidTankGT[] tanks) {
+    public static FluidStack[] getFluidsFromTanks(GTFluidTank[] tanks) {
         if (tanks == null) {
             return null;
         }
         List<FluidStack> fluidStacks = new ArrayList<>();
-        for (FluidTankGT tank : tanks) {
+        for (GTFluidTank tank : tanks) {
             if (tank.getFluid() != null) {
                 fluidStacks.add(tank.getFluid());
             }
@@ -480,6 +480,6 @@ public class FluidTankGT implements IFluidTank, IFluidStore {
 
     @Override
     public boolean canStoreFluid(@Nonnull FluidStack fluidStack) {
-        return GT_Utility.areFluidsEqual(mFluid, fluidStack);
+        return GTUtility.areFluidsEqual(mFluid, fluidStack);
     }
 }
diff --git a/src/main/java/gregtech/api/graphs/GenerateNodeMap.java b/src/main/java/gregtech/api/graphs/GenerateNodeMap.java
index 7289f0faad..7eb8382e87 100644
--- a/src/main/java/gregtech/api/graphs/GenerateNodeMap.java
+++ b/src/main/java/gregtech/api/graphs/GenerateNodeMap.java
@@ -1,6 +1,6 @@
 package gregtech.api.graphs;
 
-import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES;
+import static gregtech.api.enums.GTValues.ALL_VALID_SIDES;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java b/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java
index 95f9aee32d..4203bbdc0a 100644
--- a/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java
+++ b/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java
@@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import cofh.api.energy.IEnergyReceiver;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.graphs.consumers.ConsumerNode;
 import gregtech.api.graphs.consumers.EmptyPowerConsumer;
 import gregtech.api.graphs.consumers.NodeEnergyConnected;
@@ -20,7 +20,7 @@ import gregtech.api.interfaces.tileentity.IEnergyConnected;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
+import gregtech.api.metatileentity.implementations.MTECable;
 import ic2.api.energy.tile.IEnergySink;
 
 // node map generator for power distribution
@@ -32,8 +32,7 @@ public class GenerateNodeMapPower extends GenerateNodeMap {
 
     @Override
     protected boolean isPipe(TileEntity aTileEntity) {
-        return super.isPipe(aTileEntity)
-            && ((BaseMetaPipeEntity) aTileEntity).getMetaTileEntity() instanceof GT_MetaPipeEntity_Cable;
+        return super.isPipe(aTileEntity) && ((BaseMetaPipeEntity) aTileEntity).getMetaTileEntity() instanceof MTECable;
     }
 
     @Override
@@ -74,7 +73,7 @@ public class GenerateNodeMapPower extends GenerateNodeMap {
                 aConsumers.add(tConsumerNode);
                 return true;
             }
-        } else if (GregTech_API.mOutputRF && aTileEntity instanceof IEnergyReceiver receiver) {
+        } else if (GregTechAPI.mOutputRF && aTileEntity instanceof IEnergyReceiver receiver) {
             ConsumerNode tConsumerNode = new NodeEnergyReceiver(aNodeValue, receiver, side, aConsumers);
             aConsumers.add(tConsumerNode);
             return true;
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
index 4f35922029..e9364f922b 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
@@ -8,13 +8,13 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import cofh.api.energy.IEnergyReceiver;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.SoundResource;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder;
-import gregtech.common.GT_Pollution;
+import gregtech.common.Pollution;
 
 // consumer for RF machines
 public class NodeEnergyReceiver extends ConsumerNode {
@@ -29,7 +29,7 @@ public class NodeEnergyReceiver extends ConsumerNode {
     @Override
     public int injectEnergy(long aVoltage, long aMaxAmps) {
         ForgeDirection tDirection = mSide;
-        int rfOut = GT_Utility.safeInt(aVoltage * GregTech_API.mEUtoRF / 100);
+        int rfOut = GTUtility.safeInt(aVoltage * GregTechAPI.mEUtoRF / 100);
         int ampsUsed = 0;
         if (mRestRF < rfOut) {
             mRestRF += rfOut;
@@ -40,7 +40,7 @@ public class NodeEnergyReceiver extends ConsumerNode {
             mRestRF -= consumed;
             return ampsUsed;
         }
-        if (GregTech_API.mRFExplosions && GregTech_API.sMachineExplosions
+        if (GregTechAPI.mRFExplosions && GregTechAPI.sMachineExplosions
             && ((IEnergyReceiver) mTileEntity).getMaxEnergyStored(tDirection) < rfOut * 600L) {
             explode(rfOut);
         }
@@ -49,14 +49,14 @@ public class NodeEnergyReceiver extends ConsumerNode {
 
     // copied from IEnergyConnected
     private void explode(int aRfOut) {
-        if (aRfOut > 32L * GregTech_API.mEUtoRF / 100L) {
-            float tStrength = GT_Values.getExplosionPowerForVoltage(aRfOut);
+        if (aRfOut > 32L * GregTechAPI.mEUtoRF / 100L) {
+            float tStrength = GTValues.getExplosionPowerForVoltage(aRfOut);
             int tX = mTileEntity.xCoord, tY = mTileEntity.yCoord, tZ = mTileEntity.zCoord;
             World tWorld = mTileEntity.getWorldObj();
-            GT_Utility.sendSoundToPlayers(tWorld, SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1, tX, tY, tZ);
+            GTUtility.sendSoundToPlayers(tWorld, SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1, tX, tY, tZ);
             tWorld.setBlock(tX, tY, tZ, Blocks.air);
-            if (GregTech_API.sMachineExplosions) if (GT_Mod.gregtechproxy.mPollution) GT_Pollution
-                .addPollution(tWorld.getChunkFromBlockCoords(tX, tZ), GT_Mod.gregtechproxy.mPollutionOnExplosion);
+            if (GregTechAPI.sMachineExplosions) if (GTMod.gregtechproxy.mPollution) Pollution
+                .addPollution(tWorld.getChunkFromBlockCoords(tX, tZ), GTMod.gregtechproxy.mPollutionOnExplosion);
 
             new WorldSpawnedEventBuilder.ExplosionEffectEventBuilder().setStrength(tStrength)
                 .setSmoking(true)
diff --git a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java
index d09cf059e9..e9421056af 100644
--- a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java
+++ b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java
@@ -5,7 +5,7 @@ import net.minecraft.server.MinecraftServer;
 import gregtech.api.enums.TickTime;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
+import gregtech.api.metatileentity.implementations.MTECable;
 import gregtech.api.util.AveragePerTickCounter;
 
 // path for cables
@@ -49,7 +49,7 @@ public class PowerNodePath extends NodePath {
         if (aVoltage > mMaxVoltage) {
             lock.addTileEntity(null);
             for (MetaPipeEntity tCable : mPipes) {
-                if (((GT_MetaPipeEntity_Cable) tCable).mVoltage < this.mVoltage) {
+                if (((MTECable) tCable).mVoltage < this.mVoltage) {
                     BaseMetaPipeEntity tBaseCable = (BaseMetaPipeEntity) tCable.getBaseMetaTileEntity();
                     if (tBaseCable != null) {
                         tBaseCable.setToFire();
@@ -75,7 +75,7 @@ public class PowerNodePath extends NodePath {
         if (this.mAmps > mMaxAmps * 40) {
             lock.addTileEntity(null);
             for (MetaPipeEntity tCable : mPipes) {
-                if (((GT_MetaPipeEntity_Cable) tCable).mAmperage * 40 < this.mAmps) {
+                if (((MTECable) tCable).mAmperage * 40 < this.mAmps) {
                     BaseMetaPipeEntity tBaseCable = (BaseMetaPipeEntity) tCable.getBaseMetaTileEntity();
                     if (tBaseCable != null) {
                         tBaseCable.setToFire();
@@ -107,10 +107,10 @@ public class PowerNodePath extends NodePath {
         mMaxAmps = Integer.MAX_VALUE;
         mMaxVoltage = Integer.MAX_VALUE;
         for (MetaPipeEntity tCable : mPipes) {
-            if (tCable instanceof GT_MetaPipeEntity_Cable) {
-                mMaxAmps = Math.min(((GT_MetaPipeEntity_Cable) tCable).mAmperage, mMaxAmps);
-                mLoss += ((GT_MetaPipeEntity_Cable) tCable).mCableLossPerMeter;
-                mMaxVoltage = Math.min(((GT_MetaPipeEntity_Cable) tCable).mVoltage, mMaxVoltage);
+            if (tCable instanceof MTECable) {
+                mMaxAmps = Math.min(((MTECable) tCable).mAmperage, mMaxAmps);
+                mLoss += ((MTECable) tCable).mCableLossPerMeter;
+                mMaxVoltage = Math.min(((MTECable) tCable).mVoltage, mMaxVoltage);
             }
         }
     }
diff --git a/src/main/java/gregtech/api/gui/GT_GUIColorOverride.java b/src/main/java/gregtech/api/gui/GUIColorOverride.java
index 6ade7b030d..aa796d2b63 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIColorOverride.java
+++ b/src/main/java/gregtech/api/gui/GUIColorOverride.java
@@ -15,11 +15,11 @@ import com.google.common.util.concurrent.UncheckedExecutionException;
 
 import cpw.mods.fml.relauncher.FMLLaunchHandler;
 import cpw.mods.fml.relauncher.Side;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.util.ColorsMetadataSection;
 
 @SuppressWarnings("UnstableApiUsage")
-public class GT_GUIColorOverride {
+public class GUIColorOverride {
 
     private static final Object NOT_FOUND = new Object();
     private static final LoadingCache<ResourceLocation, Object> cache = CacheBuilder.newBuilder()
@@ -39,29 +39,29 @@ public class GT_GUIColorOverride {
                 return NOT_FOUND;
             }
         });
-    private static final GT_GUIColorOverride FALLBACK = new GT_GUIColorOverride();
+    private static final GUIColorOverride FALLBACK = new GUIColorOverride();
     private ColorsMetadataSection cmSection;
 
-    public static GT_GUIColorOverride get(String fullLocation) {
+    public static GUIColorOverride get(String fullLocation) {
         // see other get for more info
         if (FMLLaunchHandler.side() != Side.CLIENT) return FALLBACK;
-        return new GT_GUIColorOverride(new ResourceLocation(fullLocation));
+        return new GUIColorOverride(new ResourceLocation(fullLocation));
     }
 
-    public static GT_GUIColorOverride get(ResourceLocation path) {
+    public static GUIColorOverride get(ResourceLocation path) {
         // use dummy fallback if there isn't such thing as a resource pack.
         // #side() usually has two possible return value, but since this might be called by test code, it might
         // also return null when in test env. Using #isClient will cause a NPE. A plain inequality test won't.
         // FMLCommonHandler's #getSide() might trigger a NPE when in test env, so no.
         if (FMLLaunchHandler.side() != Side.CLIENT) return FALLBACK;
-        return new GT_GUIColorOverride(path);
+        return new GUIColorOverride(path);
     }
 
-    private GT_GUIColorOverride() {
+    private GUIColorOverride() {
         cmSection = null;
     }
 
-    private GT_GUIColorOverride(ResourceLocation resourceLocation) {
+    private GUIColorOverride(ResourceLocation resourceLocation) {
         try {
             Object metadata = cache.get(resourceLocation);
             if (metadata != NOT_FOUND) cmSection = (ColorsMetadataSection) metadata;
@@ -80,7 +80,7 @@ public class GT_GUIColorOverride {
     }
 
     public boolean sGuiTintingEnabled() {
-        return sLoaded() ? cmSection.sGuiTintingEnabled() : GregTech_API.sColoredGUI;
+        return sLoaded() ? cmSection.sGuiTintingEnabled() : GregTechAPI.sColoredGUI;
     }
 
     public boolean sLoaded() {
diff --git a/src/main/java/gregtech/api/gui/modularui/GT_CoverUIBuildContext.java b/src/main/java/gregtech/api/gui/modularui/CoverUIBuildContext.java
index f98d6099fc..2bf8795c5c 100644
--- a/src/main/java/gregtech/api/gui/modularui/GT_CoverUIBuildContext.java
+++ b/src/main/java/gregtech/api/gui/modularui/CoverUIBuildContext.java
@@ -7,7 +7,7 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 
 import gregtech.api.interfaces.tileentity.ICoverable;
 
-public class GT_CoverUIBuildContext extends UIBuildContext {
+public class CoverUIBuildContext extends UIBuildContext {
 
     // cover data is not synced to client, while ID is
     private final int coverID;
@@ -24,7 +24,7 @@ public class GT_CoverUIBuildContext extends UIBuildContext {
      * @param anotherWindow   If cover UI is shown on top of another window
      * @param guiColorization The color used to render machine's GUI
      */
-    public GT_CoverUIBuildContext(EntityPlayer player, int coverID, ForgeDirection side, ICoverable tile,
+    public CoverUIBuildContext(EntityPlayer player, int coverID, ForgeDirection side, ICoverable tile,
         boolean anotherWindow, int guiColorization) {
         super(player);
         this.coverID = coverID;
@@ -41,7 +41,7 @@ public class GT_CoverUIBuildContext extends UIBuildContext {
      * @param tile          Tile this cover is attached to
      * @param anotherWindow If cover GUI is shown in opened on top of another window
      */
-    public GT_CoverUIBuildContext(EntityPlayer player, int coverID, ForgeDirection side, ICoverable tile,
+    public CoverUIBuildContext(EntityPlayer player, int coverID, ForgeDirection side, ICoverable tile,
         boolean anotherWindow) {
         this(player, coverID, side, tile, anotherWindow, tile.getGUIColorization());
     }
diff --git a/src/main/java/gregtech/api/gui/modularui/GT_UIInfos.java b/src/main/java/gregtech/api/gui/modularui/GTUIInfos.java
index ea9a39bdf8..ede4b54e08 100644
--- a/src/main/java/gregtech/api/gui/modularui/GT_UIInfos.java
+++ b/src/main/java/gregtech/api/gui/modularui/GTUIInfos.java
@@ -23,13 +23,13 @@ import com.gtnewhorizons.modularui.common.internal.wrapper.ModularUIContainer;
 
 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.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
-import gregtech.api.net.GT_Packet_SendCoverData;
-import gregtech.api.util.GT_CoverBehaviorBase;
+import gregtech.api.net.GTPacketSendCoverData;
+import gregtech.api.util.CoverBehaviorBase;
 
-public class GT_UIInfos {
+public class GTUIInfos {
 
     public static void init() {}
 
@@ -70,7 +70,7 @@ public class GT_UIInfos {
                     .container((player, world, x, y, z) -> {
                         final TileEntity te = world.getTileEntity(x, y, z);
                         if (!(te instanceof ICoverable gtTileEntity)) return null;
-                        final GT_CoverBehaviorBase<?> cover = gtTileEntity.getCoverBehaviorAtSideNew(side);
+                        final CoverBehaviorBase<?> cover = gtTileEntity.getCoverBehaviorAtSideNew(side);
                         return createCoverContainer(
                             player,
                             cover::createWindow,
@@ -83,7 +83,7 @@ public class GT_UIInfos {
                         if (!world.isRemote) return null;
                         final TileEntity te = world.getTileEntity(x, y, z);
                         if (!(te instanceof ICoverable gtTileEntity)) return null;
-                        final GT_CoverBehaviorBase<?> cover = gtTileEntity.getCoverBehaviorAtSideNew(side);
+                        final CoverBehaviorBase<?> cover = gtTileEntity.getCoverBehaviorAtSideNew(side);
                         return createCoverGuiContainer(
                             player,
                             cover::createWindow,
@@ -109,13 +109,13 @@ public class GT_UIInfos {
     }
 
     /**
-     * Opens cover UI, created by {@link GT_CoverBehaviorBase#createWindow}.
+     * Opens cover UI, created by {@link CoverBehaviorBase#createWindow}.
      */
     public static void openCoverUI(ICoverable tileEntity, EntityPlayer player, ForgeDirection side) {
         if (tileEntity.isClientSide()) return;
 
-        GT_Values.NW.sendToPlayer(
-            new GT_Packet_SendCoverData(
+        GTValues.NW.sendToPlayer(
+            new GTPacketSendCoverData(
                 side,
                 tileEntity.getCoverIDAtSide(side),
                 tileEntity.getComplexCoverDataAtSide(side),
@@ -162,9 +162,9 @@ public class GT_UIInfos {
     }
 
     private static ModularUIContainer createCoverContainer(EntityPlayer player,
-        Function<GT_CoverUIBuildContext, ModularWindow> windowCreator, Runnable onWidgetUpdate, int coverID,
+        Function<CoverUIBuildContext, ModularWindow> windowCreator, Runnable onWidgetUpdate, int coverID,
         ForgeDirection side, ICoverable tile) {
-        final GT_CoverUIBuildContext buildContext = new GT_CoverUIBuildContext(player, coverID, side, tile, false);
+        final CoverUIBuildContext buildContext = new CoverUIBuildContext(player, coverID, side, tile, false);
         final ModularWindow window = windowCreator.apply(buildContext);
         if (window == null) return null;
         return new ModularUIContainer(new ModularUIContext(buildContext, onWidgetUpdate), window);
@@ -172,8 +172,7 @@ public class GT_UIInfos {
 
     @SideOnly(Side.CLIENT)
     private static ModularGui createCoverGuiContainer(EntityPlayer player,
-        Function<GT_CoverUIBuildContext, ModularWindow> windowCreator, int coverID, ForgeDirection side,
-        ICoverable tile) {
+        Function<CoverUIBuildContext, ModularWindow> windowCreator, int coverID, ForgeDirection side, ICoverable tile) {
         final ModularUIContainer container = createCoverContainer(player, windowCreator, null, coverID, side, tile);
         if (container == null) {
             return null;
diff --git a/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java b/src/main/java/gregtech/api/gui/modularui/GTUITextures.java
index 6031399c06..125e1640b0 100644
--- a/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java
+++ b/src/main/java/gregtech/api/gui/modularui/GTUITextures.java
@@ -10,7 +10,7 @@ import com.gtnewhorizons.modularui.api.drawable.AdaptableUITexture;
 import com.gtnewhorizons.modularui.api.drawable.FallbackableUITexture;
 import com.gtnewhorizons.modularui.api.drawable.UITexture;
 
-public class GT_UITextures {
+public class GTUITextures {
 
     public static final UITexture TRANSPARENT = UITexture.fullImage(GregTech.ID, "gui/picture/transparent");
 
diff --git a/src/main/java/gregtech/api/gui/modularui/GUITextureSet.java b/src/main/java/gregtech/api/gui/modularui/GUITextureSet.java
index 18d7741421..0063d59346 100644
--- a/src/main/java/gregtech/api/gui/modularui/GUITextureSet.java
+++ b/src/main/java/gregtech/api/gui/modularui/GUITextureSet.java
@@ -30,29 +30,26 @@ public class GUITextureSet {
     private UITexture gregtechLogo;
 
     public static final GUITextureSet DEFAULT = new GUITextureSet()
-        .setMainBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT)
+        .setMainBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT)
         .setItemSlot(ModularUITextures.ITEM_SLOT)
         .setFluidSlot(ModularUITextures.FLUID_SLOT)
-        .setCoverTab(
-            GT_UITextures.TAB_COVER_NORMAL,
-            GT_UITextures.TAB_COVER_HIGHLIGHT,
-            GT_UITextures.TAB_COVER_DISABLED)
-        .setTitleTab(GT_UITextures.TAB_TITLE, GT_UITextures.TAB_TITLE_DARK, GT_UITextures.TAB_TITLE_ANGULAR)
-        .setGregTechLogo(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT);
+        .setCoverTab(GTUITextures.TAB_COVER_NORMAL, GTUITextures.TAB_COVER_HIGHLIGHT, GTUITextures.TAB_COVER_DISABLED)
+        .setTitleTab(GTUITextures.TAB_TITLE, GTUITextures.TAB_TITLE_DARK, GTUITextures.TAB_TITLE_ANGULAR)
+        .setGregTechLogo(GTUITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT);
 
     public static final Function<SteamVariant, GUITextureSet> STEAM = steamVariant -> new GUITextureSet()
-        .setMainBackground(GT_UITextures.BACKGROUND_STEAM.get(steamVariant))
-        .setItemSlot(GT_UITextures.SLOT_ITEM_STEAM.get(steamVariant))
-        .setFluidSlot(GT_UITextures.SLOT_FLUID_STEAM.get(steamVariant))
+        .setMainBackground(GTUITextures.BACKGROUND_STEAM.get(steamVariant))
+        .setItemSlot(GTUITextures.SLOT_ITEM_STEAM.get(steamVariant))
+        .setFluidSlot(GTUITextures.SLOT_FLUID_STEAM.get(steamVariant))
         .setCoverTab(
-            GT_UITextures.TAB_COVER_STEAM_NORMAL.get(steamVariant),
-            GT_UITextures.TAB_COVER_STEAM_HIGHLIGHT.get(steamVariant),
-            GT_UITextures.TAB_COVER_STEAM_DISABLED.get(steamVariant))
+            GTUITextures.TAB_COVER_STEAM_NORMAL.get(steamVariant),
+            GTUITextures.TAB_COVER_STEAM_HIGHLIGHT.get(steamVariant),
+            GTUITextures.TAB_COVER_STEAM_DISABLED.get(steamVariant))
         .setTitleTab(
-            GT_UITextures.TAB_TITLE_STEAM.getAdaptable(steamVariant),
-            GT_UITextures.TAB_TITLE_DARK_STEAM.getAdaptable(steamVariant),
-            GT_UITextures.TAB_TITLE_ANGULAR_STEAM.getAdaptable(steamVariant))
-        .setGregTechLogo(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_STEAM.get(steamVariant));
+            GTUITextures.TAB_TITLE_STEAM.getAdaptable(steamVariant),
+            GTUITextures.TAB_TITLE_DARK_STEAM.getAdaptable(steamVariant),
+            GTUITextures.TAB_TITLE_ANGULAR_STEAM.getAdaptable(steamVariant))
+        .setGregTechLogo(GTUITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_STEAM.get(steamVariant));
 
     public GUITextureSet() {}
 
diff --git a/src/main/java/gregtech/api/gui/widgets/GT_CoverTickRateButton.java b/src/main/java/gregtech/api/gui/widgets/CoverTickRateButton.java
index 883ffb4079..ab05a98925 100644
--- a/src/main/java/gregtech/api/gui/widgets/GT_CoverTickRateButton.java
+++ b/src/main/java/gregtech/api/gui/widgets/CoverTickRateButton.java
@@ -1,6 +1,6 @@
 package gregtech.api.gui.widgets;
 
-import static gregtech.api.gui.modularui.GT_UITextures.OVERLAY_BUTTON_HOURGLASS;
+import static gregtech.api.gui.modularui.GTUITextures.OVERLAY_BUTTON_HOURGLASS;
 import static gregtech.common.covers.CoverInfo.MAX_TICK_RATE_ADDITION;
 
 import java.util.List;
@@ -16,18 +16,18 @@ import com.gtnewhorizons.modularui.api.widget.Widget;
 import com.gtnewhorizons.modularui.common.widget.ButtonWidget;
 import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.common.covers.CoverInfo;
 
-public class GT_CoverTickRateButton extends ButtonWidget {
+public class CoverTickRateButton extends ButtonWidget {
 
-    private static final UITexture BACKGROUND = GT_UITextures.BUTTON_COVER_NORMAL.getSubArea(0, 0, 1, 0.5f);
+    private static final UITexture BACKGROUND = GTUITextures.BUTTON_COVER_NORMAL.getSubArea(0, 0, 1, 0.5f);
 
     private final CoverInfo coverInfo;
     private int clientTickRate;
     private int tickRateAddition;
 
-    public GT_CoverTickRateButton(@NotNull CoverInfo coverInfo, @NotNull IWidgetBuilder<?> builder) {
+    public CoverTickRateButton(@NotNull CoverInfo coverInfo, @NotNull IWidgetBuilder<?> builder) {
         this.coverInfo = coverInfo;
         this.clientTickRate = coverInfo.getTickRate();
         this.tickRateAddition = coverInfo.getTickRateAddition();
diff --git a/src/main/java/gregtech/api/gui/widgets/GT_LockedWhileActiveButton.java b/src/main/java/gregtech/api/gui/widgets/LockedWhileActiveButton.java
index 9a93a8fadf..0e793372c5 100644
--- a/src/main/java/gregtech/api/gui/widgets/GT_LockedWhileActiveButton.java
+++ b/src/main/java/gregtech/api/gui/widgets/LockedWhileActiveButton.java
@@ -16,15 +16,15 @@ import com.gtnewhorizons.modularui.api.widget.Widget;
 import com.gtnewhorizons.modularui.common.widget.ButtonWidget;
 import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
 
-public class GT_LockedWhileActiveButton extends ButtonWidget {
+public class LockedWhileActiveButton extends ButtonWidget {
 
     @NotNull
     private final IMachineProgress machine;
 
-    public GT_LockedWhileActiveButton(@NotNull IMachineProgress machine, @NotNull ModularWindow.Builder builder) {
+    public LockedWhileActiveButton(@NotNull IMachineProgress machine, @NotNull ModularWindow.Builder builder) {
         super();
         this.machine = machine;
 
@@ -74,7 +74,7 @@ public class GT_LockedWhileActiveButton extends ButtonWidget {
     private IDrawable[] appendLockedOverlay(@NotNull IDrawable[] drawables) {
         if (machine.isActive()) {
             final IDrawable[] copy = Arrays.copyOf(drawables, drawables.length + 1);
-            copy[drawables.length] = GT_UITextures.OVERLAY_BUTTON_LOCKED;
+            copy[drawables.length] = GTUITextures.OVERLAY_BUTTON_LOCKED;
             return copy;
         }
         return drawables;
diff --git a/src/main/java/gregtech/api/gui/widgets/GT_PhantomItemButton.java b/src/main/java/gregtech/api/gui/widgets/PhantomItemButton.java
index 4e2d144aa7..e13266b33f 100644
--- a/src/main/java/gregtech/api/gui/widgets/GT_PhantomItemButton.java
+++ b/src/main/java/gregtech/api/gui/widgets/PhantomItemButton.java
@@ -16,18 +16,18 @@ import com.gtnewhorizons.modularui.api.forge.IItemHandlerModifiable;
 import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.metatileentity.IItemLockable;
 
 /**
  * Creates a phantom item in a GUI. Useful for filtering.
  */
-public class GT_PhantomItemButton extends SlotWidget {
+public class PhantomItemButton extends SlotWidget {
 
     public static final IDrawable[] FILTER_BACKGROUND = { ModularUITextures.ITEM_SLOT,
-        GT_UITextures.OVERLAY_SLOT_FILTER };
+        GTUITextures.OVERLAY_SLOT_FILTER };
 
-    public GT_PhantomItemButton(final IItemLockable delegate) {
+    public PhantomItemButton(final IItemLockable delegate) {
         super(BaseSlot.phantom(new PhantomItemDelegate(delegate), 0));
         controlsAmount = false;
     }
diff --git a/src/main/java/gregtech/api/interfaces/ICleanroomReceiver.java b/src/main/java/gregtech/api/interfaces/ICleanroomReceiver.java
index b0d42f9aec..b26c7035c7 100644
--- a/src/main/java/gregtech/api/interfaces/ICleanroomReceiver.java
+++ b/src/main/java/gregtech/api/interfaces/ICleanroomReceiver.java
@@ -4,9 +4,11 @@ import javax.annotation.Nullable;
 
 import net.minecraft.tileentity.TileEntity;
 
+import gregtech.common.Pollution;
+
 /**
  * Implement this interface for TileEntities that can have association to cleanroom.
- * Calling {@link gregtech.common.GT_Pollution#addPollution(TileEntity, int)} from this machine
+ * Calling {@link Pollution#addPollution(TileEntity, int)} from this machine
  * will pollute associated cleanroom.
  */
 public interface ICleanroomReceiver {
diff --git a/src/main/java/gregtech/api/interfaces/IConfigurationCircuitSupport.java b/src/main/java/gregtech/api/interfaces/IConfigurationCircuitSupport.java
index 8dde8163c8..5f225b0b4f 100644
--- a/src/main/java/gregtech/api/interfaces/IConfigurationCircuitSupport.java
+++ b/src/main/java/gregtech/api/interfaces/IConfigurationCircuitSupport.java
@@ -4,7 +4,7 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 
 /**
  * Implement this interface if your tileentity (or metatileentity) supports configuration circuits to resolve recipe
@@ -24,7 +24,7 @@ public interface IConfigurationCircuitSupport {
      * This list is unmodifiable. Its elements are not supposed to be modified in any way!
      */
     default List<ItemStack> getConfigurationCircuits() {
-        return GregTech_API.getConfigurationCircuitList(100);
+        return GregTechAPI.getConfigurationCircuitList(100);
     }
 
     /**
diff --git a/src/main/java/gregtech/api/interfaces/IFoodStat.java b/src/main/java/gregtech/api/interfaces/IFoodStat.java
index c768c5ca1c..4b1bd121e9 100644
--- a/src/main/java/gregtech/api/interfaces/IFoodStat.java
+++ b/src/main/java/gregtech/api/interfaces/IFoodStat.java
@@ -4,34 +4,34 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.items.MetaBaseItem;
 
 public interface IFoodStat {
 
     /**
      * Warning the "aPlayer" Parameter may be null!
      */
-    int getFoodLevel(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer);
+    int getFoodLevel(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer);
 
     /**
      * Warning the "aPlayer" Parameter may be null!
      */
-    float getSaturation(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer);
+    float getSaturation(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer);
 
     /**
      * Warning the "aPlayer" Parameter may be null!
      */
-    boolean alwaysEdible(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer);
+    boolean alwaysEdible(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer);
 
     /**
      * Warning the "aPlayer" Parameter may be null!
      */
-    boolean isRotten(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer);
+    boolean isRotten(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer);
 
     /**
      * Warning the "aPlayer" Parameter may be null!
      */
-    EnumAction getFoodAction(GT_MetaBase_Item aItem, ItemStack aStack);
+    EnumAction getFoodAction(MetaBaseItem aItem, ItemStack aStack);
 
-    void onEaten(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer);
+    void onEaten(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer);
 }
diff --git a/src/main/java/gregtech/api/interfaces/IGT_ItemWithMaterialRenderer.java b/src/main/java/gregtech/api/interfaces/IGT_ItemWithMaterialRenderer.java
index 4bf0311544..1dc460f3de 100644
--- a/src/main/java/gregtech/api/interfaces/IGT_ItemWithMaterialRenderer.java
+++ b/src/main/java/gregtech/api/interfaces/IGT_ItemWithMaterialRenderer.java
@@ -6,22 +6,24 @@ import net.minecraft.util.IIcon;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.common.render.items.GT_GeneratedMaterial_Renderer;
+import gregtech.common.render.items.GeneratedItemRenderer;
+import gregtech.common.render.items.GeneratedMaterialRenderer;
+import gregtech.common.render.items.MetaGeneratedItemRenderer;
 
 public interface IGT_ItemWithMaterialRenderer {
 
     /**
-     * @return If allow using {@link gregtech.common.render.items.GT_MetaGenerated_Item_Renderer} to render item
+     * @return If allow using {@link MetaGeneratedItemRenderer} to render item
      */
     boolean shouldUseCustomRenderer(int aMetaData);
 
     /**
      * @return Custom renderer of the Material with offset < 32000
      */
-    GT_GeneratedMaterial_Renderer getMaterialRenderer(int aMetaData);
+    GeneratedMaterialRenderer getMaterialRenderer(int aMetaData);
 
     /**
-     * If this returns false, renderer falls back to {@link gregtech.common.render.items.GT_GeneratedItem_Renderer}
+     * If this returns false, renderer falls back to {@link GeneratedItemRenderer}
      */
     boolean allowMaterialRenderer(int aMetaData);
 
diff --git a/src/main/java/gregtech/api/interfaces/IHatchElement.java b/src/main/java/gregtech/api/interfaces/IHatchElement.java
index 482b7899ab..9618c1ee1b 100644
--- a/src/main/java/gregtech/api/interfaces/IHatchElement.java
+++ b/src/main/java/gregtech/api/interfaces/IHatchElement.java
@@ -11,18 +11,17 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import com.google.common.collect.ImmutableList;
 import com.gtnewhorizon.structurelib.structure.IStructureElement;
-import com.gtnewhorizon.structurelib.structure.StructureUtility;
 
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_StructureUtility;
-import gregtech.api.util.IGT_HatchAdder;
+import gregtech.api.util.GTStructureUtility;
+import gregtech.api.util.IGTHatchAdder;
 
 public interface IHatchElement<T> {
 
     List<? extends Class<? extends IMetaTileEntity>> mteClasses();
 
-    IGT_HatchAdder<? super T> adder();
+    IGTHatchAdder<? super T> adder();
 
     String name();
 
@@ -44,7 +43,7 @@ public interface IHatchElement<T> {
         return new HatchElement<>(aClasses, null, null, null, this);
     }
 
-    default <T2 extends T> IHatchElement<T2> withAdder(IGT_HatchAdder<T2> aAdder) {
+    default <T2 extends T> IHatchElement<T2> withAdder(IGTHatchAdder<T2> aAdder) {
         if (aAdder == null) throw new IllegalArgumentException();
         return new HatchElement<>(null, aAdder, null, null, this);
     }
@@ -61,7 +60,7 @@ public interface IHatchElement<T> {
 
     default <T2 extends T> IStructureElement<T2> newAny(int aCasingIndex, int aDot) {
         if (aCasingIndex < 0 || aDot < 0) throw new IllegalArgumentException();
-        return GT_StructureUtility.<T2>buildHatchAdder()
+        return GTStructureUtility.<T2>buildHatchAdder()
             .anyOf(this)
             .casingIndex(aCasingIndex)
             .dot(aDot)
@@ -73,17 +72,17 @@ public interface IHatchElement<T> {
     default <T2 extends T> IStructureElement<T2> newAnyOrCasing(int aCasingIndex, int aDot, Block casingBlock,
         int casingMeta) {
         if (aCasingIndex < 0 || aDot < 0) throw new IllegalArgumentException();
-        return GT_StructureUtility.<T2>buildHatchAdder()
+        return GTStructureUtility.<T2>buildHatchAdder()
             .anyOf(this)
             .casingIndex(aCasingIndex)
             .dot(aDot)
             .continueIfSuccess()
-            .buildAndChain(StructureUtility.ofBlock(casingBlock, casingMeta));
+            .buildAndChain(com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock(casingBlock, casingMeta));
     }
 
     default <T2 extends T> IStructureElement<T2> newAny(int aCasingIndex, int aDot, ForgeDirection... allowedFacings) {
         if (aCasingIndex < 0 || aDot < 0) throw new IllegalArgumentException();
-        return GT_StructureUtility.<T2>buildHatchAdder()
+        return GTStructureUtility.<T2>buildHatchAdder()
             .anyOf(this)
             .casingIndex(aCasingIndex)
             .dot(aDot)
@@ -96,7 +95,7 @@ public interface IHatchElement<T> {
     default <T2 extends T> IStructureElement<T2> newAny(int aCasingIndex, int aDot,
         BiPredicate<? super T2, ? super IGregTechTileEntity> aShouldSkip) {
         if (aCasingIndex < 0 || aDot < 0 || aShouldSkip == null) throw new IllegalArgumentException();
-        return GT_StructureUtility.<T2>buildHatchAdder()
+        return GTStructureUtility.<T2>buildHatchAdder()
             .anyOf(this)
             .casingIndex(aCasingIndex)
             .dot(aDot)
@@ -131,7 +130,7 @@ class HatchElementEither<T> implements IHatchElement<T> {
     }
 
     @Override
-    public IGT_HatchAdder<? super T> adder() {
+    public IGTHatchAdder<? super T> adder() {
         return ((t, te, i) -> first.adder()
             .apply(t, te, i)
             || second.adder()
@@ -153,12 +152,12 @@ class HatchElementEither<T> implements IHatchElement<T> {
 class HatchElement<T> implements IHatchElement<T> {
 
     private final List<Class<? extends IMetaTileEntity>> mClasses;
-    private final IGT_HatchAdder<? super T> mAdder;
+    private final IGTHatchAdder<? super T> mAdder;
     private final String mName;
     private final IHatchElement<? super T> mBacking;
     private final ToLongFunction<? super T> mCount;
 
-    public HatchElement(List<Class<? extends IMetaTileEntity>> aMteClasses, IGT_HatchAdder<? super T> aAdder,
+    public HatchElement(List<Class<? extends IMetaTileEntity>> aMteClasses, IGTHatchAdder<? super T> aAdder,
         String aName, ToLongFunction<? super T> aCount, IHatchElement<? super T> aBacking) {
         this.mClasses = aMteClasses;
         this.mAdder = aAdder;
@@ -173,7 +172,7 @@ class HatchElement<T> implements IHatchElement<T> {
     }
 
     @Override
-    public IGT_HatchAdder<? super T> adder() {
+    public IGTHatchAdder<? super T> adder() {
         return mAdder == null ? mBacking.adder() : mAdder;
     }
 
@@ -194,7 +193,7 @@ class HatchElement<T> implements IHatchElement<T> {
     }
 
     @Override
-    public <T2 extends T> IHatchElement<T2> withAdder(IGT_HatchAdder<T2> aAdder) {
+    public <T2 extends T> IHatchElement<T2> withAdder(IGTHatchAdder<T2> aAdder) {
         if (aAdder == null) throw new IllegalArgumentException();
         return new HatchElement<>(mClasses, aAdder, mName, mCount, mBacking);
     }
diff --git a/src/main/java/gregtech/api/interfaces/IIconContainer.java b/src/main/java/gregtech/api/interfaces/IIconContainer.java
index 525721bb5c..319615b58d 100644
--- a/src/main/java/gregtech/api/interfaces/IIconContainer.java
+++ b/src/main/java/gregtech/api/interfaces/IIconContainer.java
@@ -1,6 +1,6 @@
 package gregtech.api.interfaces;
 
-import static gregtech.api.enums.GT_Values.UNCOLORED_RGBA;
+import static gregtech.api.enums.GTValues.UNCOLORED_RGBA;
 
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
diff --git a/src/main/java/gregtech/api/interfaces/IItemBehaviour.java b/src/main/java/gregtech/api/interfaces/IItemBehaviour.java
index 67bb505c6b..d9f8706824 100644
--- a/src/main/java/gregtech/api/interfaces/IItemBehaviour.java
+++ b/src/main/java/gregtech/api/interfaces/IItemBehaviour.java
@@ -13,7 +13,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.enums.SubTag;
-import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.items.MetaBaseItem;
 
 public interface IItemBehaviour<E extends Item> {
 
@@ -37,7 +37,7 @@ public interface IItemBehaviour<E extends Item> {
 
     ItemStack onDispense(E aItem, IBlockSource aSource, ItemStack aStack);
 
-    boolean hasProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack);
+    boolean hasProjectile(MetaBaseItem aItem, SubTag aProjectileType, ItemStack aStack);
 
     EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY,
         double aZ);
diff --git a/src/main/java/gregtech/api/interfaces/INetworkUpdatableItem.java b/src/main/java/gregtech/api/interfaces/INetworkUpdatableItem.java
index 1dd36d9998..4af8ec232c 100644
--- a/src/main/java/gregtech/api/interfaces/INetworkUpdatableItem.java
+++ b/src/main/java/gregtech/api/interfaces/INetworkUpdatableItem.java
@@ -4,8 +4,10 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
+import gregtech.api.net.GTPacketUpdateItem;
+
 /**
- * Together with {@link gregtech.api.net.GT_Packet_UpdateItem} you can request server side to update item in hand with a
+ * Together with {@link GTPacketUpdateItem} you can request server side to update item in hand with a
  * NBT tag.
  * <p>
  * Usual NBT tag size limit applies.
diff --git a/src/main/java/gregtech/api/interfaces/IRecipeMap.java b/src/main/java/gregtech/api/interfaces/IRecipeMap.java
index ce48b29927..c6184bee34 100644
--- a/src/main/java/gregtech/api/interfaces/IRecipeMap.java
+++ b/src/main/java/gregtech/api/interfaces/IRecipeMap.java
@@ -7,9 +7,9 @@ import java.util.function.Function;
 
 import javax.annotation.Nonnull;
 
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTUtility;
 
 /**
  * Represents the target of a recipe adding action, usually, but not necessarily, is a recipe map itself.
@@ -33,7 +33,7 @@ public interface IRecipeMap {
      * Actually add the recipe represented by the builder. CAN modify the builder's internal states!!!
      */
     @Nonnull
-    Collection<GT_Recipe> doAdd(GT_RecipeBuilder builder);
+    Collection<GTRecipe> doAdd(GTRecipeBuilder builder);
 
     /**
      * Return a variant of this recipe map that will perform a deep copy on input recipe builder before doing anything
@@ -45,7 +45,7 @@ public interface IRecipeMap {
         return newRecipeMap(b -> doAdd(b.copy()));
     }
 
-    static IRecipeMap newRecipeMap(Function<? super GT_RecipeBuilder, Collection<GT_Recipe>> func) {
+    static IRecipeMap newRecipeMap(Function<? super GTRecipeBuilder, Collection<GTRecipe>> func) {
         return new IRecipeMap() {
 
             private final Collection<IRecipeMap> downstreams = new ArrayList<>();
@@ -57,9 +57,9 @@ public interface IRecipeMap {
 
             @Nonnull
             @Override
-            public Collection<GT_Recipe> doAdd(GT_RecipeBuilder builder) {
-                List<Collection<GT_Recipe>> ret = new ArrayList<>();
-                Collection<GT_Recipe> out = func.apply(builder);
+            public Collection<GTRecipe> doAdd(GTRecipeBuilder builder) {
+                List<Collection<GTRecipe>> ret = new ArrayList<>();
+                Collection<GTRecipe> out = func.apply(builder);
                 ret.add(out);
                 builder.clearInvalid();
                 if (!out.isEmpty()) {
@@ -67,7 +67,7 @@ public interface IRecipeMap {
                         ret.add(downstream.doAdd(builder));
                     }
                 }
-                return GT_Utility.concat(ret);
+                return GTUtility.concat(ret);
             }
         };
     }
diff --git a/src/main/java/gregtech/api/interfaces/IRedstoneCircuitBlock.java b/src/main/java/gregtech/api/interfaces/IRedstoneCircuitBlock.java
index 0eea6ca3a4..a0a362c4e5 100644
--- a/src/main/java/gregtech/api/interfaces/IRedstoneCircuitBlock.java
+++ b/src/main/java/gregtech/api/interfaces/IRedstoneCircuitBlock.java
@@ -5,7 +5,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehavior;
+import gregtech.api.util.CoverBehavior;
 
 /**
  * Implemented by the MetaTileEntity of the Redstone Circuit Block
@@ -36,7 +36,7 @@ public interface IRedstoneCircuitBlock {
     /**
      * If this Side is Covered up and therefor not doing any Redstone
      */
-    GT_CoverBehavior getCover(ForgeDirection side);
+    CoverBehavior getCover(ForgeDirection side);
 
     int getCoverID(ForgeDirection side);
 
diff --git a/src/main/java/gregtech/api/interfaces/IToolStats.java b/src/main/java/gregtech/api/interfaces/IToolStats.java
index 9d8da63b6c..6f506a6ee1 100644
--- a/src/main/java/gregtech/api/interfaces/IToolStats.java
+++ b/src/main/java/gregtech/api/interfaces/IToolStats.java
@@ -16,7 +16,7 @@ import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
 import net.minecraftforge.event.world.BlockEvent;
 
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
 /**
  * The Stats for GT Tools. Not including any Material Modifiers.
@@ -33,7 +33,7 @@ public interface IToolStats {
     /**
      * Called when this gets added to a Tool Item
      */
-    void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID);
+    void onStatsAddedToTool(MetaGeneratedTool aItem, int aID);
 
     /**
      * @implNote if you are only modifying drops, override
diff --git a/src/main/java/gregtech/api/interfaces/fluid/IGTFluid.java b/src/main/java/gregtech/api/interfaces/fluid/IGTFluid.java
new file mode 100644
index 0000000000..b3765d37db
--- /dev/null
+++ b/src/main/java/gregtech/api/interfaces/fluid/IGTFluid.java
@@ -0,0 +1,14 @@
+package gregtech.api.interfaces.fluid;
+
+import net.minecraftforge.fluids.FluidRegistry;
+
+@SuppressWarnings("unused") // API might legitimately expose unused methods within this local project's scope
+public interface IGTFluid {
+
+    /**
+     * Adds this {@link IGTFluid} to the {@link FluidRegistry} and internally-implemented registrations
+     *
+     * @return {@link IGTRegisteredFluid} The GregTech registered fluid
+     */
+    IGTRegisteredFluid addFluid();
+}
diff --git a/src/main/java/gregtech/api/interfaces/fluid/IGT_FluidBuilder.java b/src/main/java/gregtech/api/interfaces/fluid/IGTFluidBuilder.java
index f15b148fcb..2902824873 100644
--- a/src/main/java/gregtech/api/interfaces/fluid/IGT_FluidBuilder.java
+++ b/src/main/java/gregtech/api/interfaces/fluid/IGTFluidBuilder.java
@@ -10,87 +10,87 @@ import net.minecraftforge.fluids.FluidRegistry;
 import gregtech.api.enums.FluidState;
 
 @SuppressWarnings("unused") // API might legitimately expose unused methods within this local project's scope
-public interface IGT_FluidBuilder {
+public interface IGTFluidBuilder {
 
     /**
      * @param colorRGBA The {@code short[]} RGBA color of the {@link Fluid} or {@code null} for no defined RGBA color
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withColorRGBA(final short[] colorRGBA);
+    IGTFluidBuilder withColorRGBA(final short[] colorRGBA);
 
     /**
-     * @param localizedName The localized name of this {@link IGT_FluidBuilder}
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @param localizedName The localized name of this {@link IGTFluidBuilder}
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withLocalizedName(final String localizedName);
+    IGTFluidBuilder withLocalizedName(final String localizedName);
 
     /**
-     * @param fluidState  The {@link FluidState} of this {@link IGT_FluidBuilder}
-     * @param temperature The Kelvin temperature of this {@link IGT_FluidBuilder}
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @param fluidState  The {@link FluidState} of this {@link IGTFluidBuilder}
+     * @param temperature The Kelvin temperature of this {@link IGTFluidBuilder}
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withStateAndTemperature(final FluidState fluidState, final int temperature);
+    IGTFluidBuilder withStateAndTemperature(final FluidState fluidState, final int temperature);
 
     /**
      * @param stillIconResourceLocation the {@link ResourceLocation} of the still fluid icon
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withStillIconResourceLocation(final ResourceLocation stillIconResourceLocation);
+    IGTFluidBuilder withStillIconResourceLocation(final ResourceLocation stillIconResourceLocation);
 
     /**
      * @param flowingIconResourceLocation the {@link ResourceLocation} of the flowing fluid icon
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withFlowingIconResourceLocation(final ResourceLocation flowingIconResourceLocation);
+    IGTFluidBuilder withFlowingIconResourceLocation(final ResourceLocation flowingIconResourceLocation);
 
     /**
-     * @param textureName The name of the GregTech mod texture of this {@link IGT_FluidBuilder}
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @param textureName The name of the GregTech mod texture of this {@link IGTFluidBuilder}
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withTextureName(final String textureName);
+    IGTFluidBuilder withTextureName(final String textureName);
 
     /**
-     * @param fluidBlock the {@link Block} implementation of the {@link IGT_Fluid}
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @param fluidBlock the {@link Block} implementation of the {@link IGTFluid}
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withFluidBlock(final Block fluidBlock);
+    IGTFluidBuilder withFluidBlock(final Block fluidBlock);
 
     /**
      * @param fromFluid the {@link Fluid} to copy the icons from
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withIconsFrom(@Nonnull final Fluid fromFluid);
+    IGTFluidBuilder withIconsFrom(@Nonnull final Fluid fromFluid);
 
     /**
      * @param stillIconResourceLocation   The {@link ResourceLocation} of the still fluid texture
      * @param flowingIconResourceLocation The {@link ResourceLocation} of the flowing fluid texture
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withTextures(final ResourceLocation stillIconResourceLocation,
+    IGTFluidBuilder withTextures(final ResourceLocation stillIconResourceLocation,
         final ResourceLocation flowingIconResourceLocation);
 
     /**
-     * Builds the {@link IGT_Fluid}
+     * Builds the {@link IGTFluid}
      *
-     * @return the built {@link IGT_Fluid}
+     * @return the built {@link IGTFluid}
      */
-    IGT_Fluid build();
+    IGTFluid build();
 
     /**
-     * Builds, then adds the {@link IGT_Fluid} to the {@link FluidRegistry}
+     * Builds, then adds the {@link IGTFluid} to the {@link FluidRegistry}
      *
-     * @return the {@link IGT_Fluid}
+     * @return the {@link IGTFluid}
      * @see #build()
-     * @see IGT_Fluid#addFluid()
+     * @see IGTFluid#addFluid()
      */
-    IGT_RegisteredFluid buildAndRegister();
+    IGTRegisteredFluid buildAndRegister();
 }
diff --git a/src/main/java/gregtech/api/interfaces/fluid/IGT_RegisteredFluid.java b/src/main/java/gregtech/api/interfaces/fluid/IGTRegisteredFluid.java
index 181824874c..b2796ed3f7 100644
--- a/src/main/java/gregtech/api/interfaces/fluid/IGT_RegisteredFluid.java
+++ b/src/main/java/gregtech/api/interfaces/fluid/IGTRegisteredFluid.java
@@ -7,54 +7,54 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 import gregtech.api.enums.FluidState;
 import gregtech.api.enums.Materials;
 
-public interface IGT_RegisteredFluid {
+public interface IGTRegisteredFluid {
 
     /**
-     * Registers the containers in the {@link FluidContainerRegistry} for this {@link IGT_RegisteredFluid}
+     * Registers the containers in the {@link FluidContainerRegistry} for this {@link IGTRegisteredFluid}
      *
      * @param fullContainer  The full fluid container
      * @param emptyContainer The empty fluid container
      * @param containerSize  The size of the container
-     * @return The {@link IGT_RegisteredFluid} for call chaining
+     * @return The {@link IGTRegisteredFluid} for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_RegisteredFluid registerContainers(final ItemStack fullContainer, final ItemStack emptyContainer,
+    IGTRegisteredFluid registerContainers(final ItemStack fullContainer, final ItemStack emptyContainer,
         final int containerSize);
 
     /**
      * Registers the bucket-sized 1000L containers in the {@link FluidContainerRegistry} for this
-     * {@link IGT_RegisteredFluid}
+     * {@link IGTRegisteredFluid}
      *
-     * @param fullContainer  The full container to associate with this {@link IGT_RegisteredFluid}
-     * @param emptyContainer The empty container associate with this {@link IGT_RegisteredFluid}
-     * @return {@link IGT_RegisteredFluid} for call chaining
+     * @param fullContainer  The full container to associate with this {@link IGTRegisteredFluid}
+     * @param emptyContainer The empty container associate with this {@link IGTRegisteredFluid}
+     * @return {@link IGTRegisteredFluid} for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_RegisteredFluid registerBContainers(final ItemStack fullContainer, final ItemStack emptyContainer);
+    IGTRegisteredFluid registerBContainers(final ItemStack fullContainer, final ItemStack emptyContainer);
 
     /**
      * Registers the potion-sized 250L containers in the {@link FluidContainerRegistry} for this
-     * {@link IGT_RegisteredFluid}
+     * {@link IGTRegisteredFluid}
      *
-     * @param fullContainer  The full container to associate with this {@link IGT_RegisteredFluid}
-     * @param emptyContainer The empty container associate with this {@link IGT_RegisteredFluid}
-     * @return {@link IGT_RegisteredFluid} self for call chaining
+     * @param fullContainer  The full container to associate with this {@link IGTRegisteredFluid}
+     * @param emptyContainer The empty container associate with this {@link IGTRegisteredFluid}
+     * @return {@link IGTRegisteredFluid} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_RegisteredFluid registerPContainers(final ItemStack fullContainer, final ItemStack emptyContainer);
+    IGTRegisteredFluid registerPContainers(final ItemStack fullContainer, final ItemStack emptyContainer);
 
     /**
-     * Updates the {@link Materials}'s fluids from this {@link IGT_RegisteredFluid}'s state
+     * Updates the {@link Materials}'s fluids from this {@link IGTRegisteredFluid}'s state
      *
-     * @param material the {@link Materials} to configure based on this {@link IGT_RegisteredFluid} and
+     * @param material the {@link Materials} to configure based on this {@link IGTRegisteredFluid} and
      *                 {@link FluidState}
-     * @return The {@link IGT_RegisteredFluid} for call chaining
+     * @return The {@link IGTRegisteredFluid} for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_RegisteredFluid configureMaterials(final Materials material);
+    IGTRegisteredFluid configureMaterials(final Materials material);
 
     /**
-     * @return this {@link IGT_RegisteredFluid} cast to {@link Fluid}
+     * @return this {@link IGTRegisteredFluid} cast to {@link Fluid}
      */
     Fluid asFluid();
 }
diff --git a/src/main/java/gregtech/api/interfaces/fluid/IGT_Fluid.java b/src/main/java/gregtech/api/interfaces/fluid/IGT_Fluid.java
deleted file mode 100644
index 7c8b2b3f11..0000000000
--- a/src/main/java/gregtech/api/interfaces/fluid/IGT_Fluid.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package gregtech.api.interfaces.fluid;
-
-import net.minecraftforge.fluids.FluidRegistry;
-
-@SuppressWarnings("unused") // API might legitimately expose unused methods within this local project's scope
-public interface IGT_Fluid {
-
-    /**
-     * Adds this {@link IGT_Fluid} to the {@link FluidRegistry} and internally-implemented registrations
-     *
-     * @return {@link IGT_RegisteredFluid} The GregTech registered fluid
-     */
-    IGT_RegisteredFluid addFluid();
-}
diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_CraftingRecipe.java b/src/main/java/gregtech/api/interfaces/internal/IGTCraftingRecipe.java
index 3f29736470..beacd71f95 100644
--- a/src/main/java/gregtech/api/interfaces/internal/IGT_CraftingRecipe.java
+++ b/src/main/java/gregtech/api/interfaces/internal/IGTCraftingRecipe.java
@@ -2,7 +2,7 @@ package gregtech.api.interfaces.internal;
 
 import net.minecraft.item.crafting.IRecipe;
 
-public interface IGT_CraftingRecipe extends IRecipe {
+public interface IGTCraftingRecipe extends IRecipe {
 
     boolean isRemovable();
 }
diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_Mod.java b/src/main/java/gregtech/api/interfaces/internal/IGTMod.java
index dbf888ef96..f47a7ef645 100644
--- a/src/main/java/gregtech/api/interfaces/internal/IGT_Mod.java
+++ b/src/main/java/gregtech/api/interfaces/internal/IGTMod.java
@@ -9,7 +9,7 @@ import net.minecraft.world.World;
  * <p/>
  * Don't even think about including this File in your Mod.
  */
-public interface IGT_Mod {
+public interface IGTMod {
 
     /**
      * This means that Server specific Basefiles are definitely existing! Not if the World is actually server side or
diff --git a/src/main/java/gregtech/api/interfaces/internal/IGTRecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGTRecipeAdder.java
new file mode 100644
index 0000000000..a4d554428e
--- /dev/null
+++ b/src/main/java/gregtech/api/interfaces/internal/IGTRecipeAdder.java
@@ -0,0 +1,8 @@
+package gregtech.api.interfaces.internal;
+
+import gregtech.api.util.GTRecipeBuilder;
+
+public interface IGTRecipeAdder {
+
+    GTRecipeBuilder stdBuilder();
+}
diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
deleted file mode 100644
index e3c3a8cbaa..0000000000
--- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package gregtech.api.interfaces.internal;
-
-import gregtech.api.util.GT_RecipeBuilder;
-
-public interface IGT_RecipeAdder {
-
-    GT_RecipeBuilder stdBuilder();
-}
diff --git a/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java b/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java
index 5d99f83689..2cb2e6fd84 100644
--- a/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java
+++ b/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java
@@ -6,8 +6,8 @@ import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.TC_Aspects;
-import gregtech.api.enums.TC_Aspects.TC_AspectStack;
+import gregtech.api.enums.TCAspects;
+import gregtech.api.enums.TCAspects.TC_AspectStack;
 
 public interface IThaumcraftCompat {
 
@@ -35,10 +35,10 @@ public interface IThaumcraftCompat {
     Object addCrucibleRecipe(String aResearch, Object aInput, ItemStack aOutput, List<TC_AspectStack> aAspects);
 
     Object addInfusionRecipe(String aResearch, ItemStack aMainInput, ItemStack[] aSideInputs, ItemStack aOutput,
-        int aInstability, List<TC_Aspects.TC_AspectStack> aAspects);
+        int aInstability, List<TCAspects.TC_AspectStack> aAspects);
 
     Object addInfusionEnchantmentRecipe(String aResearch, Enchantment aEnchantment, int aInstability,
-        List<TC_Aspects.TC_AspectStack> aAspects, ItemStack[] aSideInputs);
+        List<TCAspects.TC_AspectStack> aAspects, ItemStack[] aSideInputs);
 
     Object addResearch(String aResearch, String aName, String aText, String[] aParentResearches, String aCategory,
         ItemStack aIcon, int aComplexity, int aType, int aX, int aY, List<TC_AspectStack> aAspects,
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java
index 4959f8b060..824925f928 100644
--- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java
@@ -34,8 +34,8 @@ import gregtech.api.interfaces.tileentity.IGearEnergyTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IGregtechWailaProvider;
 import gregtech.api.interfaces.tileentity.IMachineBlockUpdateable;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_Util;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.util.GTUtil;
 
 /**
  * Warning, this Interface has just been made to be able to add multiple kinds of MetaTileEntities (Cables, Pipes,
@@ -127,7 +127,7 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
      * If a Cover of that Type can be placed on this Side. Also Called when the Facing of the Block Changes and a Cover
      * is on said Side.
      */
-    boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack);
+    boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack);
 
     /**
      * When a Player right-clicks the Facing with a Screwdriver.
@@ -400,7 +400,7 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
         if (getBaseMetaTileEntity() != null) {
             return getBaseMetaTileEntity().getGUIColorization();
         } else {
-            return GT_Util.getRGBInt(Dyes.MACHINE_METAL.getRGBA());
+            return GTUtil.getRGBInt(Dyes.MACHINE_METAL.getRGBA());
         }
     }
 
diff --git a/src/main/java/gregtech/api/interfaces/modularui/ControllerWithOptionalFeatures.java b/src/main/java/gregtech/api/interfaces/modularui/IControllerWithOptionalFeatures.java
index 8574de7007..d203d9fc87 100644
--- a/src/main/java/gregtech/api/interfaces/modularui/ControllerWithOptionalFeatures.java
+++ b/src/main/java/gregtech/api/interfaces/modularui/IControllerWithOptionalFeatures.java
@@ -20,7 +20,7 @@ import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.VoidingMode;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.tileentity.IRecipeLockable;
 import gregtech.api.interfaces.tileentity.IVoidable;
 
@@ -36,7 +36,7 @@ import gregtech.api.interfaces.tileentity.IVoidable;
  * <li>Multiple machine modes</li>
  * </ul>
  */
-public interface ControllerWithOptionalFeatures extends IVoidable, IRecipeLockable {
+public interface IControllerWithOptionalFeatures extends IVoidable, IRecipeLockable {
 
     boolean isAllowedToWork();
 
@@ -59,11 +59,11 @@ public interface ControllerWithOptionalFeatures extends IVoidable, IRecipeLockab
                     : SoundResource.GUI_BUTTON_DOWN.resourceLocation)
             .setBackground(() -> {
                 if (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(this::isAllowedToWork, val -> {
@@ -96,7 +96,7 @@ public interface ControllerWithOptionalFeatures extends IVoidable, IRecipeLockab
                 ret.add(getVoidingMode().buttonTexture);
                 ret.add(getVoidingMode().buttonOverlay);
                 if (!supportsVoidProtection()) {
-                    ret.add(GT_UITextures.OVERLAY_BUTTON_FORBIDDEN);
+                    ret.add(GTUITextures.OVERLAY_BUTTON_FORBIDDEN);
                 }
                 return ret.toArray(new IDrawable[0]);
             })
@@ -185,7 +185,7 @@ public interface ControllerWithOptionalFeatures extends IVoidable, IRecipeLockab
             .setBackground(() -> {
                 List<UITexture> ret = new ArrayList<>();
                 if (supportsMachineModeSwitch()) {
-                    ret.add(GT_UITextures.BUTTON_STANDARD);
+                    ret.add(GTUITextures.BUTTON_STANDARD);
                     ret.add(getMachineModeIcon(getMachineMode()));
                 } else return null;
                 return ret.toArray(new IDrawable[0]);
@@ -227,22 +227,22 @@ public interface ControllerWithOptionalFeatures extends IVoidable, IRecipeLockab
             .setBackground(() -> {
                 List<UITexture> ret = new ArrayList<>();
                 if (isInputSeparationEnabled()) {
-                    ret.add(GT_UITextures.BUTTON_STANDARD_PRESSED);
+                    ret.add(GTUITextures.BUTTON_STANDARD_PRESSED);
                     if (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 (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 (!supportsInputSeparation()) {
-                    ret.add(GT_UITextures.OVERLAY_BUTTON_FORBIDDEN);
+                    ret.add(GTUITextures.OVERLAY_BUTTON_FORBIDDEN);
                 }
                 return ret.toArray(new IDrawable[0]);
             })
@@ -287,22 +287,22 @@ public interface ControllerWithOptionalFeatures extends IVoidable, IRecipeLockab
             .setBackground(() -> {
                 List<UITexture> ret = new ArrayList<>();
                 if (isBatchModeEnabled()) {
-                    ret.add(GT_UITextures.BUTTON_STANDARD_PRESSED);
+                    ret.add(GTUITextures.BUTTON_STANDARD_PRESSED);
                     if (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 (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 (!supportsBatchMode()) {
-                    ret.add(GT_UITextures.OVERLAY_BUTTON_FORBIDDEN);
+                    ret.add(GTUITextures.OVERLAY_BUTTON_FORBIDDEN);
                 }
                 return ret.toArray(new IDrawable[0]);
             })
@@ -329,22 +329,22 @@ public interface ControllerWithOptionalFeatures extends IVoidable, IRecipeLockab
             .setBackground(() -> {
                 List<UITexture> ret = new ArrayList<>();
                 if (isRecipeLockingEnabled()) {
-                    ret.add(GT_UITextures.BUTTON_STANDARD_PRESSED);
+                    ret.add(GTUITextures.BUTTON_STANDARD_PRESSED);
                     if (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 (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 (!supportsSingleRecipeLocking()) {
-                    ret.add(GT_UITextures.OVERLAY_BUTTON_FORBIDDEN);
+                    ret.add(GTUITextures.OVERLAY_BUTTON_FORBIDDEN);
                 }
                 return ret.toArray(new IDrawable[0]);
             })
@@ -374,11 +374,11 @@ public interface ControllerWithOptionalFeatures extends IVoidable, IRecipeLockab
             .setBackground(() -> {
                 List<UITexture> ret = new ArrayList<>();
                 if (getStructureUpdateTime() > -20) {
-                    ret.add(GT_UITextures.BUTTON_STANDARD_PRESSED);
+                    ret.add(GTUITextures.BUTTON_STANDARD_PRESSED);
                 } else {
-                    ret.add(GT_UITextures.BUTTON_STANDARD);
+                    ret.add(GTUITextures.BUTTON_STANDARD);
                 }
-                ret.add(GT_UITextures.OVERLAY_BUTTON_STRUCTURE_UPDATE);
+                ret.add(GTUITextures.OVERLAY_BUTTON_STRUCTURE_UPDATE);
                 return ret.toArray(new IDrawable[0]);
             })
             .attachSyncer(
diff --git a/src/main/java/gregtech/api/interfaces/modularui/IGetTitleColor.java b/src/main/java/gregtech/api/interfaces/modularui/IGetTitleColor.java
index 76d94ee299..442ad05efd 100644
--- a/src/main/java/gregtech/api/interfaces/modularui/IGetTitleColor.java
+++ b/src/main/java/gregtech/api/interfaces/modularui/IGetTitleColor.java
@@ -1,11 +1,11 @@
 package gregtech.api.interfaces.modularui;
 
 import gregtech.api.enums.Dyes;
-import gregtech.api.util.GT_Util;
+import gregtech.api.util.GTUtil;
 
 public interface IGetTitleColor {
 
     default int getTitleColor() {
-        return GT_Util.getRGBaInt(Dyes.dyeWhite.getRGBA());
+        return GTUtil.getRGBaInt(Dyes.dyeWhite.getRGBA());
     }
 }
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IColoredTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IColoredTileEntity.java
index ec760dd346..852817add2 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IColoredTileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IColoredTileEntity.java
@@ -1,7 +1,7 @@
 package gregtech.api.interfaces.tileentity;
 
 import gregtech.api.enums.Dyes;
-import gregtech.api.util.GT_Util;
+import gregtech.api.util.GTUtil;
 
 public interface IColoredTileEntity {
 
@@ -21,7 +21,6 @@ public interface IColoredTileEntity {
      * @return Actual color shown on GUI
      */
     default int getGUIColorization() {
-        return GT_Util
-            .getRGBInt((getColorization() != -1 ? Dyes.get(getColorization()) : Dyes.MACHINE_METAL).getRGBA());
+        return GTUtil.getRGBInt((getColorization() != -1 ? Dyes.get(getColorization()) : Dyes.MACHINE_METAL).getRGBA());
     }
 }
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java b/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java
index 8834678984..00ae2db9bd 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java
@@ -4,8 +4,8 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_CoverBehaviorBase;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.CoverBehaviorBase;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.covers.CoverInfo;
 
@@ -49,9 +49,9 @@ public interface ICoverable extends IRedstoneTileEntity, IHasInventory, IBasicEn
     ItemStack getCoverItemAtSide(ForgeDirection side);
 
     @Deprecated
-    GT_CoverBehavior getCoverBehaviorAtSide(ForgeDirection side);
+    CoverBehavior getCoverBehaviorAtSide(ForgeDirection side);
 
-    default GT_CoverBehaviorBase<?> getCoverBehaviorAtSideNew(ForgeDirection side) {
+    default CoverBehaviorBase<?> getCoverBehaviorAtSideNew(ForgeDirection side) {
         return getCoverBehaviorAtSide(side);
     }
 
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
index 91a9759e47..6dbc6bd5b8 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
@@ -8,10 +8,10 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import cofh.api.energy.IEnergyReceiver;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.logic.PowerLogic;
 import gregtech.api.logic.interfaces.PowerLogicHost;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import ic2.api.energy.tile.IEnergySink;
 
 /**
@@ -97,8 +97,8 @@ public interface IEnergyConnected extends IColoredTileEntity {
                         while (amperage > usedAmperes && sink.getDemandedEnergy() > 0
                             && sink.injectEnergy(oppositeSide, voltage, voltage) < voltage) usedAmperes++;
                     }
-                } else if (GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver receiver) {
-                    final int rfOut = GT_Utility.safeInt(voltage * GregTech_API.mEUtoRF / 100);
+                } else if (GregTechAPI.mOutputRF && tTileEntity instanceof IEnergyReceiver receiver) {
+                    final int rfOut = GTUtility.safeInt(voltage * GregTechAPI.mEUtoRF / 100);
                     if (receiver.receiveEnergy(oppositeSide, rfOut, true) == rfOut) {
                         receiver.receiveEnergy(oppositeSide, rfOut, false);
                         usedAmperes++;
@@ -152,7 +152,7 @@ public interface IEnergyConnected extends IColoredTileEntity {
                 emitterLogic.removeEnergyUnsafe(usedAmperes * voltage);
                 return;
             }
-    
+
             if (tileEntity instanceof IEnergySink sink) {
                 if (sink.acceptsEnergyFrom((TileEntity) emitter, oppositeSide)) {
                     while (amperage > usedAmperes && sink.getDemandedEnergy() > 0
@@ -164,8 +164,8 @@ public interface IEnergyConnected extends IColoredTileEntity {
                 }
             }
 
-            if (GregTech_API.mOutputRF && tileEntity instanceof IEnergyReceiver receiver) {
-                final int rfOut = GT_Utility.safeInt(voltage * GregTech_API.mEUtoRF / 100);
+            if (GregTechAPI.mOutputRF && tileEntity instanceof IEnergyReceiver receiver) {
+                final int rfOut = GTUtility.safeInt(voltage * GregTechAPI.mEUtoRF / 100);
                 if (receiver.receiveEnergy(oppositeSide, rfOut, true) == rfOut) {
                     receiver.receiveEnergy(oppositeSide, rfOut, false);
                     usedAmperes++;
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
index d8231ee544..9e6b4c57c0 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
@@ -22,7 +22,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.modularui.IAddInventorySlots;
 import gregtech.api.interfaces.modularui.IGetGUITextureSet;
 import gregtech.api.util.shutdown.ShutDownReason;
-import gregtech.common.blocks.GT_Block_Machines;
+import gregtech.common.blocks.BlockMachines;
 
 /**
  * A simple compound Interface for all my TileEntities.
@@ -186,7 +186,7 @@ public interface IGregTechTileEntity extends ITexturedTileEntity, IGearEnergyTil
 
     /**
      * A randomly called display update to be able to add particles or other items for display The event is proxied by
-     * the {@link GT_Block_Machines#randomDisplayTick}
+     * the {@link BlockMachines#randomDisplayTick}
      */
     @SideOnly(Side.CLIENT)
     default void onRandomDisplayTick() {
diff --git a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java b/src/main/java/gregtech/api/items/BlockLongDistancePipe.java
index 31a44f3dbc..3de95981f5 100644
--- a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java
+++ b/src/main/java/gregtech/api/items/BlockLongDistancePipe.java
@@ -17,27 +17,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.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.blocks.GT_Item_LongDistancePipe;
-import gregtech.common.blocks.GT_Material_Machines;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.common.blocks.ItemLongDistancePipe;
+import gregtech.common.blocks.MaterialMachines;
 
-public class GT_Block_LongDistancePipe extends GT_Generic_Block {
+public class BlockLongDistancePipe extends GTGenericBlock {
 
     public IIconContainer[] mIcons;
 
-    public GT_Block_LongDistancePipe() {
-        super(GT_Item_LongDistancePipe.class, "gt.block.longdistancepipe", new GT_Material_Machines());
+    public BlockLongDistancePipe() {
+        super(ItemLongDistancePipe.class, "gt.block.longdistancepipe", new MaterialMachines());
         setStepSound(soundTypeMetal);
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
-        GregTech_API.registerMachineBlock(this, -1);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH);
+        GregTechAPI.registerMachineBlock(this, -1);
 
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Long Distance Fluid Pipeline Pipe");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Long Distance Item Pipeline Pipe");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Long Distance Fluid Pipeline Pipe");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Long Distance Item Pipeline Pipe");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this");
 
         ItemList.Long_Distance_Pipeline_Fluid_Pipe.set(new ItemStack(this, 1, 0));
         ItemList.Long_Distance_Pipeline_Item_Pipe.set(new ItemStack(this, 1, 1));
@@ -48,14 +48,14 @@ public class GT_Block_LongDistancePipe extends GT_Generic_Block {
     @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);
         }
     }
 
     @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);
         super.breakBlock(aWorld, aX, aY, aZ, aBlock, aMetaData);
     }
 
diff --git a/src/main/java/gregtech/api/items/GT_Generic_Block.java b/src/main/java/gregtech/api/items/GTGenericBlock.java
index 7aaef6d5ca..314849e8cf 100644
--- a/src/main/java/gregtech/api/items/GT_Generic_Block.java
+++ b/src/main/java/gregtech/api/items/GTGenericBlock.java
@@ -1,22 +1,22 @@
 package gregtech.api.items;
 
-import static gregtech.api.enums.GT_Values.W;
+import static gregtech.api.enums.GTValues.W;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemBlock;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_Generic_Block extends Block {
+public class GTGenericBlock extends Block {
 
     protected final String mUnlocalizedName;
 
-    protected GT_Generic_Block(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) {
+    protected GTGenericBlock(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) {
         super(aMaterial);
         setBlockName(mUnlocalizedName = aName);
         GameRegistry.registerBlock(this, aItemClass, getUnlocalizedName());
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + W + ".name", "Any Sub Block of this one");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + "." + W + ".name", "Any Sub Block of this one");
     }
 }
diff --git a/src/main/java/gregtech/api/items/GT_Generic_Item.java b/src/main/java/gregtech/api/items/GTGenericItem.java
index 3fe2083a96..4f0994bb12 100644
--- a/src/main/java/gregtech/api/items/GT_Generic_Item.java
+++ b/src/main/java/gregtech/api/items/GTGenericItem.java
@@ -23,30 +23,30 @@ 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.SubTag;
 import gregtech.api.interfaces.IProjectileItem;
-import gregtech.api.util.GT_Config;
-import gregtech.api.util.GT_LanguageManager;
-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.GTModHandler;
+import gregtech.api.util.GTUtility;
 
 /**
  * Extended by most Items, also used as a fallback Item, to prevent the accidental deletion when Errors occur.
  */
-public class GT_Generic_Item extends Item implements IProjectileItem {
+public class GTGenericItem extends Item implements IProjectileItem {
 
     private final String mName, mTooltip;
     protected IIcon mIcon;
 
-    public GT_Generic_Item(String aUnlocalized, String aEnglish, String aEnglishTooltip) {
+    public GTGenericItem(String aUnlocalized, String aEnglish, String aEnglishTooltip) {
         super();
         mName = "gt." + aUnlocalized;
-        GT_LanguageManager.addStringLocalization(mName + ".name", aEnglish);
-        if (GT_Utility.isStringValid(aEnglishTooltip))
-            GT_LanguageManager.addStringLocalization(mTooltip = mName + ".tooltip_main", aEnglishTooltip);
+        GTLanguageManager.addStringLocalization(mName + ".name", aEnglish);
+        if (GTUtility.isStringValid(aEnglishTooltip))
+            GTLanguageManager.addStringLocalization(mTooltip = mName + ".tooltip_main", aEnglishTooltip);
         else mTooltip = null;
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH);
         GameRegistry.registerItem(this, mName, GregTech.ID);
         BlockDispenser.dispenseBehaviorRegistry.putObject(this, new GT_Item_Dispense());
     }
@@ -69,7 +69,7 @@ public class GT_Generic_Item extends Item implements IProjectileItem {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerIcons(IIconRegister aIconRegister) {
-        mIcon = aIconRegister.registerIcon(GregTech.getResourcePath(GT_Config.troll ? "troll" : mName));
+        mIcon = aIconRegister.registerIcon(GregTech.getResourcePath(GTConfig.troll ? "troll" : mName));
     }
 
     @Override
@@ -90,8 +90,8 @@ public class GT_Generic_Item extends Item implements IProjectileItem {
     public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) {
         if (getMaxDamage() > 0 && !getHasSubtypes())
             aList.add((aStack.getMaxDamage() - getDamage(aStack)) + " / " + aStack.getMaxDamage());
-        if (mTooltip != null) aList.add(GT_LanguageManager.getTranslation(mTooltip));
-        if (GT_ModHandler.isElectricItem(aStack)) aList.add("Tier: " + getTier(aStack));
+        if (mTooltip != null) aList.add(GTLanguageManager.getTranslation(mTooltip));
+        if (GTModHandler.isElectricItem(aStack)) aList.add("Tier: " + getTier(aStack));
         addAdditionalToolTips(aList, aStack, aPlayer);
     }
 
@@ -144,14 +144,14 @@ public class GT_Generic_Item extends Item implements IProjectileItem {
     }
 
     public String transItem(String aKey, String aEnglish) {
-        return GT_LanguageManager.addStringLocalization("Item_DESCRIPTION_Index_" + aKey, aEnglish);
+        return GTLanguageManager.addStringLocalization("Item_DESCRIPTION_Index_" + aKey, aEnglish);
     }
 
     public static class GT_Item_Dispense extends BehaviorProjectileDispense {
 
         @Override
         public ItemStack dispenseStack(IBlockSource aSource, ItemStack aStack) {
-            return ((GT_Generic_Item) aStack.getItem()).onDispense(aSource, aStack);
+            return ((GTGenericItem) aStack.getItem()).onDispense(aSource, aStack);
         }
 
         @Override
diff --git a/src/main/java/gregtech/api/items/GT_BreederCell_Item.java b/src/main/java/gregtech/api/items/ItemBreederCell.java
index 438b0f467e..33a4ce3253 100644
--- a/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
+++ b/src/main/java/gregtech/api/items/ItemBreederCell.java
@@ -1,6 +1,6 @@
 package gregtech.api.items;
 
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.util.GTUtility.formatNumbers;
 
 import java.util.List;
 import java.util.function.Supplier;
@@ -12,10 +12,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import ic2.api.reactor.IReactor;
 import ic2.api.reactor.IReactorComponent;
 import ic2.core.IC2Potion;
@@ -25,7 +25,7 @@ import ic2.core.IC2Potion;
  *
  * @author glee8e
  */
-public class GT_BreederCell_Item extends GT_Generic_Item implements IReactorComponent {
+public class ItemBreederCell extends GTGenericItem implements IReactorComponent {
 
     protected final int mHeatBonusStep;
     protected final int mHeatBonusMultiplier;
@@ -34,17 +34,17 @@ public class GT_BreederCell_Item extends GT_Generic_Item implements IReactorComp
     protected boolean hidden = false;
     protected boolean neiAdded = false;
 
-    public GT_BreederCell_Item(String aUnlocalized, String aEnglish, String aEnglishTooltip, int aHeatBonusStep,
+    public ItemBreederCell(String aUnlocalized, String aEnglish, String aEnglishTooltip, int aHeatBonusStep,
         int aHeatBonusMultiplier, int aRequiredPulse, Supplier<ItemStack> aProduct) {
         super(aUnlocalized, aEnglish, aEnglishTooltip);
         this.mHeatBonusStep = aHeatBonusStep;
         this.mHeatBonusMultiplier = aHeatBonusMultiplier;
         this.setMaxDamage(aRequiredPulse);
         setNoRepair();
-        GregTech_API.sAfterGTPostload.add(() -> {
+        GregTechAPI.sAfterGTPostload.add(() -> {
             mProduct = aProduct.get();
             if (!hidden && !neiAdded) {
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(new ItemStack(this))
                     .itemOutputs(mProduct)
                     .setNEIDesc(
@@ -61,12 +61,12 @@ public class GT_BreederCell_Item extends GT_Generic_Item implements IReactorComp
         });
     }
 
-    public GT_BreederCell_Item setDeflector() {
+    public ItemBreederCell setDeflector() {
         deflector = true;
         return this;
     }
 
-    public GT_BreederCell_Item setHidden() {
+    public ItemBreederCell setHidden() {
         hidden = true;
         return this;
     }
@@ -74,7 +74,7 @@ public class GT_BreederCell_Item extends GT_Generic_Item implements IReactorComp
     @Override
     public void onUpdate(ItemStack stack, World world, Entity entity, int slotIndex, boolean isCurrentItem) {
         if ((entity instanceof EntityLivingBase entityLiving)) {
-            if (!GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
+            if (!GTUtility.isWearingFullRadioHazmat(entityLiving)) {
                 IC2Potion.radiation.applyTo(entityLiving, 20, 1);
             }
         }
diff --git a/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java b/src/main/java/gregtech/api/items/ItemCoolantCell.java
index 6ed7dae3b0..31eb6bc599 100644
--- a/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java
+++ b/src/main/java/gregtech/api/items/ItemCoolantCell.java
@@ -8,20 +8,20 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import ic2.core.util.StackUtil;
 
-public class GT_CoolantCell_Item extends GT_Generic_Item {
+public class ItemCoolantCell extends GTGenericItem {
 
     protected final int heatStorage;
 
-    public GT_CoolantCell_Item(String aUnlocalized, String aEnglish, int aMaxStore) {
+    public ItemCoolantCell(String aUnlocalized, String aEnglish, int aMaxStore) {
         super(aUnlocalized, aEnglish, null);
         this.setMaxStackSize(1);
         this.setMaxDamage(100);
         setNoRepair();
         this.heatStorage = aMaxStore;
-        this.setCreativeTab(GregTech_API.TAB_GREGTECH);
+        this.setCreativeTab(GregTechAPI.TAB_GREGTECH);
     }
 
     protected static int getHeatOfStack(ItemStack aStack) {
diff --git a/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java b/src/main/java/gregtech/api/items/ItemCoolantCellIC.java
index eb3c6276cf..00643996d3 100644
--- a/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java
+++ b/src/main/java/gregtech/api/items/ItemCoolantCellIC.java
@@ -5,9 +5,9 @@ import net.minecraft.item.ItemStack;
 import ic2.api.reactor.IReactor;
 import ic2.api.reactor.IReactorComponent;
 
-public class GT_CoolantCellIC_Item extends GT_CoolantCell_Item implements IReactorComponent {
+public class ItemCoolantCellIC extends ItemCoolantCell implements IReactorComponent {
 
-    public GT_CoolantCellIC_Item(String aUnlocalized, String aEnglish, int aMaxStore) {
+    public ItemCoolantCellIC(String aUnlocalized, String aEnglish, int aMaxStore) {
         super(aUnlocalized, aEnglish, aMaxStore);
     }
 
diff --git a/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java b/src/main/java/gregtech/api/items/ItemEnergyArmor.java
index df820f928a..77c8d0991a 100644
--- a/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java
+++ b/src/main/java/gregtech/api/items/ItemEnergyArmor.java
@@ -25,19 +25,19 @@ import net.minecraftforge.event.entity.living.LivingFallEvent;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 
-public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
+public class ItemEnergyArmor extends ItemArmor implements ISpecialArmor {
 
     public static Map<EntityPlayer, Float> jumpChargeMap = new ConcurrentHashMap<>();
     public int mCharge, mTransfer, mTier, mDamageEnergyCost, mSpecials;
     public boolean mChargeProvider;
     public double mArmorAbsorbtionPercentage;
 
-    public GT_EnergyArmor_Item(int aID, String aUnlocalized, String aEnglish, int aCharge, int aTransfer, int aTier,
+    public ItemEnergyArmor(int aID, String aUnlocalized, String aEnglish, int aCharge, int aTransfer, int aTier,
         int aDamageEnergyCost, int aSpecials, double aArmorAbsorbtionPercentage, boolean aChargeProvider, int aType,
         int aArmorIndex) {
         super(ArmorMaterial.DIAMOND, aArmorIndex, aType);
@@ -45,7 +45,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
         setMaxDamage(100);
         setNoRepair();
         setUnlocalizedName(aUnlocalized);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".name", aEnglish);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".name", aEnglish);
         mCharge = Math.max(1, aCharge);
         mTransfer = Math.max(1, aTransfer);
         mTier = Math.max(1, aTier);
@@ -54,7 +54,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
         mDamageEnergyCost = Math.max(0, aDamageEnergyCost);
         mArmorAbsorbtionPercentage = aArmorAbsorbtionPercentage;
 
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH);
 
         MinecraftForge.EVENT_BUS.register(this);
     }
@@ -109,29 +109,29 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
 
         if (!aPlayer.worldObj.isRemote && (mSpecials & 1) != 0) {
             int airSupply = aPlayer.getAir();
-            if (GT_ModHandler.canUseElectricItem(aStack, 1000) && airSupply < 50) {
+            if (GTModHandler.canUseElectricItem(aStack, 1000) && airSupply < 50) {
                 aPlayer.setAir(airSupply + 250);
-                GT_ModHandler.useElectricItem(aStack, 1000, aPlayer);
+                GTModHandler.useElectricItem(aStack, 1000, aPlayer);
             }
         }
 
         if (!aPlayer.worldObj.isRemote && (mSpecials & 4) != 0) {
-            if (GT_ModHandler.canUseElectricItem(aStack, 50000) && aPlayer.getFoodStats()
+            if (GTModHandler.canUseElectricItem(aStack, 50000) && aPlayer.getFoodStats()
                 .needFood()) {
                 aPlayer.getFoodStats()
                     .addStats(1, 0.0F);
-                GT_ModHandler.useElectricItem(aStack, 50000, aPlayer);
+                GTModHandler.useElectricItem(aStack, 50000, aPlayer);
             }
         }
 
         if ((mSpecials & 8) != 0) {
-            if (GT_ModHandler.canUseElectricItem(aStack, 10000) && aPlayer.isPotionActive(Potion.poison)) {
-                GT_Utility.removePotion(aPlayer, Potion.poison.id);
-                GT_ModHandler.useElectricItem(aStack, 10000, aPlayer);
+            if (GTModHandler.canUseElectricItem(aStack, 10000) && aPlayer.isPotionActive(Potion.poison)) {
+                GTUtility.removePotion(aPlayer, Potion.poison.id);
+                GTModHandler.useElectricItem(aStack, 10000, aPlayer);
             }
-            if (GT_ModHandler.canUseElectricItem(aStack, 100000) && aPlayer.isPotionActive(Potion.wither)) {
-                GT_Utility.removePotion(aPlayer, Potion.wither.id);
-                GT_ModHandler.useElectricItem(aStack, 100000, aPlayer);
+            if (GTModHandler.canUseElectricItem(aStack, 100000) && aPlayer.isPotionActive(Potion.wither)) {
+                GTUtility.removePotion(aPlayer, Potion.wither.id);
+                GTModHandler.useElectricItem(aStack, 100000, aPlayer);
             }
         }
 
@@ -142,9 +142,9 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
         if (!aPlayer.worldObj.isRemote && (mSpecials & 128) != 0) {
             float jumpCharge = jumpChargeMap.getOrDefault(aPlayer, 1.0F);
 
-            if (GT_ModHandler.canUseElectricItem(aStack, 1000) && aPlayer.onGround && jumpCharge < 1.0F) {
+            if (GTModHandler.canUseElectricItem(aStack, 1000) && aPlayer.onGround && jumpCharge < 1.0F) {
                 jumpCharge = 1.0F;
-                GT_ModHandler.useElectricItem(aStack, 1000, aPlayer);
+                GTModHandler.useElectricItem(aStack, 1000, aPlayer);
             }
 
             if (aPlayer.motionY >= 0.0D && jumpCharge > 0.0F && !aPlayer.isInWater()) {
@@ -157,14 +157,14 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
         }
 
         if ((mSpecials & 256) != 0) {
-            if (GT_ModHandler.canUseElectricItem(aStack, 100) && aPlayer.isSprinting()
+            if (GTModHandler.canUseElectricItem(aStack, 100) && aPlayer.isSprinting()
                 && (aPlayer.onGround && Math.abs(aPlayer.motionX) + Math.abs(aPlayer.motionZ) > 0.10000000149011612D
                     || aPlayer.isInWater())) {
-                GT_ModHandler.useElectricItem(aStack, 100, aPlayer);
+                GTModHandler.useElectricItem(aStack, 100, aPlayer);
                 float bonus = 0.22F;
 
                 if (aPlayer.isInWater()) {
-                    GT_ModHandler.useElectricItem(aStack, 100, aPlayer);
+                    GTModHandler.useElectricItem(aStack, 100, aPlayer);
                     bonus = 0.1F;
 
                     if (aPlayer.motionY > 0) {
@@ -177,25 +177,24 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
         }
 
         if ((mSpecials & 512) != 0) {
-            if (GT_ModHandler.canUseElectricItem(aStack, 10000)) {
-                GT_ModHandler.useElectricItem(aStack, 10000, aPlayer);
+            if (GTModHandler.canUseElectricItem(aStack, 10000)) {
+                GTModHandler.useElectricItem(aStack, 10000, aPlayer);
                 aPlayer.addPotionEffect(new PotionEffect(Potion.invisibility.getId(), 25, 1, true));
             }
         }
 
         if (!aPlayer.worldObj.isRemote && (mSpecials & (16 | 32)) != 0) {
-            // if (GregTech_API.sWorldTickCounter%20==0) {
+            // if (GregTechAPI.sWorldTickCounter%20==0) {
             ItemStack tTargetChargeItem = aStack, tTargetDechargeItem = aStack;
 
-            if (GT_ModHandler.chargeElectricItem(tTargetChargeItem, 1, Integer.MAX_VALUE, true, true) < 1) {
+            if (GTModHandler.chargeElectricItem(tTargetChargeItem, 1, Integer.MAX_VALUE, true, true) < 1) {
                 tTargetChargeItem = aPlayer.inventory.armorInventory[2];
             }
-            if (GT_ModHandler.dischargeElectricItem(tTargetDechargeItem, 10, Integer.MAX_VALUE, true, true, true)
-                < 10) {
+            if (GTModHandler.dischargeElectricItem(tTargetDechargeItem, 10, Integer.MAX_VALUE, true, true, true) < 10) {
                 tTargetDechargeItem = aPlayer.inventory.armorInventory[2];
             }
 
-            if (tTargetChargeItem == null || !GT_ModHandler.isElectricItem(tTargetChargeItem)) {
+            if (tTargetChargeItem == null || !GTModHandler.isElectricItem(tTargetChargeItem)) {
                 tTargetChargeItem = null;
             }
 
@@ -204,15 +203,15 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
                 MathHelper.floor_double(aPlayer.posY + 1),
                 MathHelper.floor_double(aPlayer.posZ))) {
                 if ((mSpecials & 32) != 0 && tTargetChargeItem != null) {
-                    GT_ModHandler.chargeElectricItem(tTargetChargeItem, 20, Integer.MAX_VALUE, true, false);
+                    GTModHandler.chargeElectricItem(tTargetChargeItem, 20, Integer.MAX_VALUE, true, false);
                 }
             } else {
                 /*
                  * TODO: if ((mSpecials & 16) != 0 && tTargetDechargeItem != null &&
-                 * GT_ModHandler.canUseElectricItem(tTargetDechargeItem, 10)) { if (aPlayer.worldObj.getBlock
+                 * GTModHandler.canUseElectricItem(tTargetDechargeItem, 10)) { if (aPlayer.worldObj.getBlock
                  * ((int)aPlayer.posX, (int)aPlayer.posY+1, (int)aPlayer.posZ) == Blocks.air) aPlayer.worldObj.setBlock
-                 * ((int)aPlayer.posX, (int)aPlayer.posY+1, (int)aPlayer.posZ, GregTech_API.sBlockList[3]);
-                 * GT_ModHandler.useElectricItem(tTargetDechargeItem, 10, aPlayer); }
+                 * ((int)aPlayer.posX, (int)aPlayer.posY+1, (int)aPlayer.posZ, GregTechAPI.sBlockList[3]);
+                 * GTModHandler.useElectricItem(tTargetDechargeItem, 10, aPlayer); }
                  */
                 // }
             }
@@ -228,7 +227,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item aItem, CreativeTabs creativeTab, List<ItemStack> outputSubItems) {
         ItemStack tCharged = new ItemStack(this, 1), tUncharged = new ItemStack(this, 1, getMaxDamage());
-        GT_ModHandler.chargeElectricItem(tCharged, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false);
+        GTModHandler.chargeElectricItem(tCharged, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false);
         outputSubItems.add(tCharged);
         outputSubItems.add(tUncharged);
     }
@@ -286,9 +285,9 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
                 if (armor != null && armor.getItem() == this && (mSpecials & 2) != 0) {
                     int distanceFactor = (int) event.distance - 3;
                     int energyCost = (this.mDamageEnergyCost * distanceFactor) / 4;
-                    if (energyCost <= GT_ModHandler
+                    if (energyCost <= GTModHandler
                         .dischargeElectricItem(armor, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true)) {
-                        GT_ModHandler.dischargeElectricItem(armor, energyCost, Integer.MAX_VALUE, true, false, true);
+                        GTModHandler.dischargeElectricItem(armor, energyCost, Integer.MAX_VALUE, true, false, true);
                         event.setCanceled(true);
                         break;
                     }
@@ -303,9 +302,10 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
         return new ISpecialArmor.ArmorProperties(
             (source == DamageSource.fall && (mSpecials & 2) != 0) ? 10 : 0,
             getBaseAbsorptionRatio() * mArmorAbsorbtionPercentage,
-            mDamageEnergyCost > 0 ? 25
-                * GT_ModHandler.dischargeElectricItem(armor, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true)
-                / mDamageEnergyCost : 0);
+            mDamageEnergyCost > 0
+                ? 25 * GTModHandler.dischargeElectricItem(armor, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true)
+                    / mDamageEnergyCost
+                : 0);
     }
 
     @Override
@@ -316,8 +316,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
     @Override
     public void damageArmor(EntityLivingBase entity, ItemStack itemStack, DamageSource source, int damage,
         int slotIndex) {
-        GT_ModHandler
-            .dischargeElectricItem(itemStack, damage * mDamageEnergyCost, Integer.MAX_VALUE, true, false, true);
+        GTModHandler.dischargeElectricItem(itemStack, damage * mDamageEnergyCost, Integer.MAX_VALUE, true, false, true);
     }
 
     private double getBaseAbsorptionRatio() {
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java b/src/main/java/gregtech/api/items/ItemRadioactiveCell.java
index c927737889..6efc652ef9 100644
--- a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
+++ b/src/main/java/gregtech/api/items/ItemRadioactiveCell.java
@@ -1,6 +1,6 @@
 package gregtech.api.items;
 
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.util.GTUtility.formatNumbers;
 
 import java.util.List;
 
@@ -9,17 +9,17 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 
-import gregtech.common.items.GT_DepletetCell_Item;
+import gregtech.common.items.ItemDepletedCell;
 import ic2.api.item.IBoxable;
 import ic2.core.util.StackUtil;
 
-public class GT_RadioactiveCell_Item extends GT_Generic_Item implements IBoxable {
+public class ItemRadioactiveCell extends GTGenericItem implements IBoxable {
 
     protected int cellCount;
     protected int maxDmg;
     protected int dura;
 
-    public GT_RadioactiveCell_Item(String aUnlocalized, String aEnglish, int aCellcount) {
+    public ItemRadioactiveCell(String aUnlocalized, String aEnglish, int aCellcount) {
         super(aUnlocalized, aEnglish, null);
         this.setMaxStackSize(64);
         this.setMaxDamage(100);
@@ -143,7 +143,7 @@ public class GT_RadioactiveCell_Item extends GT_Generic_Item implements IBoxable
             case 2, 3, 4 -> EnumChatFormatting.GRAY;
             default -> EnumChatFormatting.DARK_GRAY;
         };
-        EnumChatFormatting color1 = this instanceof GT_DepletetCell_Item ? color2 = EnumChatFormatting.DARK_GRAY
+        EnumChatFormatting color1 = this instanceof ItemDepletedCell ? color2 = EnumChatFormatting.DARK_GRAY
             : EnumChatFormatting.WHITE;
         aList.add(
             color1 + String.format(
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java b/src/main/java/gregtech/api/items/ItemRadioactiveCellIC.java
index 2509cf6261..de60fe9c33 100644
--- a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
+++ b/src/main/java/gregtech/api/items/ItemRadioactiveCellIC.java
@@ -7,16 +7,16 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import ic2.api.reactor.IReactor;
 import ic2.api.reactor.IReactorComponent;
 import ic2.core.IC2Potion;
 import ic2.core.init.MainConfig;
 import ic2.core.util.ConfigUtil;
 
-public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implements IReactorComponent {
+public class ItemRadioactiveCellIC extends ItemRadioactiveCell implements IReactorComponent {
 
     private static final int MYSTERIOUS_MULTIPLIER_HEAT = 4;
     public final int numberOfCells;
@@ -26,7 +26,7 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
     public final ItemStack sDepleted;
     public final boolean sMox;
 
-    public GT_RadioactiveCellIC_Item(String aUnlocalized, String aEnglish, int aCellcount, int maxDamage, float aEnergy,
+    public ItemRadioactiveCellIC(String aUnlocalized, String aEnglish, int aCellcount, int maxDamage, float aEnergy,
         int aRadiation, float aHeat, ItemStack aDepleted, boolean aMox) {
         super(aUnlocalized, aEnglish, aCellcount);
         setMaxStackSize(64);
@@ -46,7 +46,7 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
             // see ic2.core.block.reactor.tileentity.TileEntityNuclearReactorElectric.getOfferedEnergy
             // don't ask, just accept
             float nukePowerMult = 5.0f * ConfigUtil.getFloat(MainConfig.get(), "balance/energy/generator/nuclear");
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(new ItemStack(this))
                 .itemOutputs(aDepleted)
                 .setNEIDesc(
@@ -198,7 +198,7 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
     @Override
     public void onUpdate(ItemStack stack, World world, Entity entity, int slotIndex, boolean isCurrentItem) {
         if (this.sRadiation > 0 && (entity instanceof EntityLivingBase entityLiving)) {
-            if (!GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
+            if (!GTUtility.isWearingFullRadioHazmat(entityLiving)) {
                 IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10);
             }
         }
diff --git a/src/main/java/gregtech/api/items/GT_Tool_Item.java b/src/main/java/gregtech/api/items/ItemTool.java
index 9f78bdc3fc..0de68fc90e 100644
--- a/src/main/java/gregtech/api/items/GT_Tool_Item.java
+++ b/src/main/java/gregtech/api/items/ItemTool.java
@@ -2,19 +2,19 @@ package gregtech.api.items;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GTModHandler;
 
 /**
  * This is just a basic Tool, which has normal durability and could break Blocks.
  */
-public class GT_Tool_Item extends GT_Generic_Item {
+public class ItemTool extends GTGenericItem {
 
-    public GT_Tool_Item(String aUnlocalized, String aEnglish, String aTooltip, int aMaxDamage, int aEntityDamage,
+    public ItemTool(String aUnlocalized, String aEnglish, String aTooltip, int aMaxDamage, int aEntityDamage,
         boolean aSwingIfUsed) {
         this(aUnlocalized, aEnglish, aTooltip, aMaxDamage, aEntityDamage, aSwingIfUsed, -1, -1);
     }
 
-    public GT_Tool_Item(String aUnlocalized, String aEnglish, String aTooltip, int aMaxDamage, int aEntityDamage,
+    public ItemTool(String aUnlocalized, String aEnglish, String aTooltip, int aMaxDamage, int aEntityDamage,
         boolean aSwingIfUsed, int aChargedGTID, int aDisChargedGTID) {
         this(
             aUnlocalized,
@@ -29,13 +29,13 @@ public class GT_Tool_Item extends GT_Generic_Item {
             0.0F);
     }
 
-    public GT_Tool_Item(String aUnlocalized, String aEnglish, String aTooltip, int aMaxDamage, int aEntityDamage,
+    public ItemTool(String aUnlocalized, String aEnglish, String aTooltip, int aMaxDamage, int aEntityDamage,
         boolean aSwingIfUsed, int aChargedGTID, int aDisChargedGTID, int aToolQuality, float aToolStrength) {
         super(aUnlocalized, aEnglish, aTooltip);
         setMaxDamage(aMaxDamage);
         setMaxStackSize(1);
         setNoRepair();
         setFull3D();
-        GT_ModHandler.registerBoxableItemToToolBox(new ItemStack(this));
+        GTModHandler.registerBoxableItemToToolBox(new ItemStack(this));
     }
 }
diff --git a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java b/src/main/java/gregtech/api/items/MetaBaseItem.java
index 481c0b5a08..23726c96e9 100644
--- a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
+++ b/src/main/java/gregtech/api/items/MetaBaseItem.java
@@ -1,8 +1,8 @@
 package gregtech.api.items;
 
-import static gregtech.api.enums.GT_Values.D1;
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.enums.GTValues.D1;
+import static gregtech.api.enums.GTValues.V;
+import static gregtech.api.util.GTUtility.formatNumbers;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,27 +25,27 @@ import net.minecraftforge.fluids.IFluidContainerItem;
 
 import gregtech.api.enums.SubTag;
 import gregtech.api.interfaces.IItemBehaviour;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
 import ic2.api.item.IElectricItemManager;
 import ic2.api.item.ISpecialElectricItem;
 
-public abstract class GT_MetaBase_Item extends GT_Generic_Item
+public abstract class MetaBaseItem extends GTGenericItem
     implements ISpecialElectricItem, IElectricItemManager, IFluidContainerItem {
 
     /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */
-    private final ConcurrentHashMap<Short, ArrayList<IItemBehaviour<GT_MetaBase_Item>>> mItemBehaviors = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<Short, ArrayList<IItemBehaviour<MetaBaseItem>>> mItemBehaviors = new ConcurrentHashMap<>();
 
     /**
      * Creates the Item using these Parameters.
      *
      * @param aUnlocalized The Unlocalized Name of this Item.
      */
-    public GT_MetaBase_Item(String aUnlocalized) {
+    public MetaBaseItem(String aUnlocalized) {
         super(aUnlocalized, "Generated Item", null);
         setHasSubtypes(true);
         setMaxDamage(0);
@@ -60,9 +60,9 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
      * @param aBehavior  the Click Behavior you want to add.
      * @return the Item itself for convenience in constructing.
      */
-    public final GT_MetaBase_Item addItemBehavior(int aMetaValue, IItemBehaviour<GT_MetaBase_Item> aBehavior) {
+    public final MetaBaseItem addItemBehavior(int aMetaValue, IItemBehaviour<MetaBaseItem> aBehavior) {
         if (aMetaValue < 0 || aMetaValue >= 32766 || aBehavior == null) return this;
-        ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors
+        ArrayList<IItemBehaviour<MetaBaseItem>> tList = mItemBehaviors
             .computeIfAbsent((short) aMetaValue, k -> new ArrayList<>(1));
         tList.add(aBehavior);
         return this;
@@ -74,8 +74,8 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
 
     @Override
     public boolean hasProjectile(SubTag aProjectileType, ItemStack aStack) {
-        ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
-        if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList)
+        ArrayList<IItemBehaviour<MetaBaseItem>> tList = mItemBehaviors.get((short) getDamage(aStack));
+        if (tList != null) for (IItemBehaviour<MetaBaseItem> tBehavior : tList)
             if (tBehavior.hasProjectile(this, aProjectileType, aStack)) return true;
         return super.hasProjectile(aProjectileType, aStack);
     }
@@ -83,8 +83,8 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
     @Override
     public EntityArrow getProjectile(SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY,
         double aZ) {
-        ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
-        if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList) {
+        ArrayList<IItemBehaviour<MetaBaseItem>> tList = mItemBehaviors.get((short) getDamage(aStack));
+        if (tList != null) for (IItemBehaviour<MetaBaseItem> tBehavior : tList) {
             EntityArrow rArrow = tBehavior.getProjectile(this, aProjectileType, aStack, aWorld, aX, aY, aZ);
             if (rArrow != null) return rArrow;
         }
@@ -94,8 +94,8 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
     @Override
     public EntityArrow getProjectile(SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity,
         float aSpeed) {
-        ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
-        if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList) {
+        ArrayList<IItemBehaviour<MetaBaseItem>> tList = mItemBehaviors.get((short) getDamage(aStack));
+        if (tList != null) for (IItemBehaviour<MetaBaseItem> tBehavior : tList) {
             EntityArrow rArrow = tBehavior.getProjectile(this, aProjectileType, aStack, aWorld, aEntity, aSpeed);
             if (rArrow != null) return rArrow;
         }
@@ -104,16 +104,16 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
 
     @Override
     public ItemStack onDispense(IBlockSource aSource, ItemStack aStack) {
-        ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
-        if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList)
+        ArrayList<IItemBehaviour<MetaBaseItem>> tList = mItemBehaviors.get((short) getDamage(aStack));
+        if (tList != null) for (IItemBehaviour<MetaBaseItem> tBehavior : tList)
             if (tBehavior.canDispense(this, aSource, aStack)) return tBehavior.onDispense(this, aSource, aStack);
         return super.onDispense(aSource, aStack);
     }
 
     @Override
     public boolean isItemStackUsable(ItemStack aStack) {
-        ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
-        if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList)
+        ArrayList<IItemBehaviour<MetaBaseItem>> tList = mItemBehaviors.get((short) getDamage(aStack));
+        if (tList != null) for (IItemBehaviour<MetaBaseItem> tBehavior : tList)
             if (!tBehavior.isItemStackUsable(this, aStack)) return false;
         return super.isItemStackUsable(aStack);
     }
@@ -122,9 +122,9 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
     public boolean onLeftClickEntity(ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {
         use(aStack, 0, aPlayer);
         isItemStackUsable(aStack);
-        ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
+        ArrayList<IItemBehaviour<MetaBaseItem>> tList = mItemBehaviors.get((short) getDamage(aStack));
         try {
-            if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList)
+            if (tList != null) for (IItemBehaviour<MetaBaseItem> tBehavior : tList)
                 if (tBehavior.onLeftClickEntity(this, aStack, aPlayer, aEntity)) {
                     if (aStack.stackSize <= 0) aPlayer.destroyCurrentEquippedItem();
                     return true;
@@ -134,7 +134,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
                 return false;
             }
         } catch (Throwable e) {
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return false;
     }
@@ -144,9 +144,9 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
         int ordinalSide, float hitX, float hitY, float hitZ) {
         use(aStack, 0, aPlayer);
         isItemStackUsable(aStack);
-        ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
+        ArrayList<IItemBehaviour<MetaBaseItem>> tList = mItemBehaviors.get((short) getDamage(aStack));
         try {
-            if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList)
+            if (tList != null) for (IItemBehaviour<MetaBaseItem> tBehavior : tList)
                 if (tBehavior.onItemUse(this, aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ)) {
                     if (aStack.stackSize <= 0) aPlayer.destroyCurrentEquippedItem();
                     return true;
@@ -156,7 +156,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
                 return false;
             }
         } catch (Throwable e) {
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return false;
     }
@@ -166,9 +166,9 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
         int ordinalSide, float hitX, float hitY, float hitZ) {
         use(aStack, 0, aPlayer);
         isItemStackUsable(aStack);
-        ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
+        ArrayList<IItemBehaviour<MetaBaseItem>> tList = mItemBehaviors.get((short) getDamage(aStack));
         try {
-            if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList) if (tBehavior.onItemUseFirst(
+            if (tList != null) for (IItemBehaviour<MetaBaseItem> tBehavior : tList) if (tBehavior.onItemUseFirst(
                 this,
                 aStack,
                 aPlayer,
@@ -188,7 +188,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
                 return false;
             }
         } catch (Throwable e) {
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return false;
     }
@@ -197,12 +197,12 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
     public ItemStack onItemRightClick(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
         use(aStack, 0, aPlayer);
         isItemStackUsable(aStack);
-        ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
+        ArrayList<IItemBehaviour<MetaBaseItem>> tList = mItemBehaviors.get((short) getDamage(aStack));
         try {
-            if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList)
+            if (tList != null) for (IItemBehaviour<MetaBaseItem> tBehavior : tList)
                 aStack = tBehavior.onItemRightClick(this, aStack, aWorld, aPlayer);
         } catch (Throwable e) {
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return aStack;
     }
@@ -210,10 +210,10 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
     @Override
     public final void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) {
         String tKey = getUnlocalizedName(aStack) + ".tooltip";
-        String[] tStrings = GT_LanguageManager.getTranslation(tKey)
+        String[] tStrings = GTLanguageManager.getTranslation(tKey)
             .split("/n ");
         for (String tString : tStrings)
-            if (GT_Utility.isStringValid(tString) && !tKey.equals(tString)) aList.add(tString);
+            if (GTUtility.isStringValid(tString) && !tKey.equals(tString)) aList.add(tString);
 
         Long[] tStats = getElectricStats(aStack);
         if (tStats != null) {
@@ -247,7 +247,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
             FluidStack tFluid = getFluidContent(aStack);
             aList.add(
                 EnumChatFormatting.BLUE + ((tFluid == null ? transItem("012", "No Fluids Contained")
-                    : GT_Utility.getFluidName(tFluid, true))) + EnumChatFormatting.GRAY);
+                    : GTUtility.getFluidName(tFluid, true))) + EnumChatFormatting.GRAY);
             aList.add(
                 EnumChatFormatting.BLUE + String.format(
                     transItem("013", "%sL / %sL"),
@@ -255,8 +255,8 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
                     "" + formatNumbers(tStats[0])) + EnumChatFormatting.GRAY);
         }
 
-        ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
-        if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList)
+        ArrayList<IItemBehaviour<MetaBaseItem>> tList = mItemBehaviors.get((short) getDamage(aStack));
+        if (tList != null) for (IItemBehaviour<MetaBaseItem> tBehavior : tList)
             aList = tBehavior.getAdditionalToolTips(this, aList, aStack);
 
         addAdditionalToolTips(aList, aStack, aPlayer);
@@ -264,8 +264,8 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
 
     @Override
     public void onUpdate(ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand) {
-        ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
-        if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList)
+        ArrayList<IItemBehaviour<MetaBaseItem>> tList = mItemBehaviors.get((short) getDamage(aStack));
+        if (tList != null) for (IItemBehaviour<MetaBaseItem> tBehavior : tList)
             tBehavior.onUpdate(this, aStack, aWorld, aPlayer, aTimer, aIsInHand);
     }
 
@@ -352,7 +352,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
         if (aPlayer == null || aPlayer.worldObj.isRemote) return;
         for (int i = 1; i < 5; i++) {
             ItemStack tArmor = aPlayer.getEquipmentInSlot(i);
-            if (GT_ModHandler.isElectricItem(tArmor)) {
+            if (GTModHandler.isElectricItem(tArmor)) {
                 IElectricItem tArmorItem = (IElectricItem) tArmor.getItem();
                 if (tArmorItem.canProvideEnergy(tArmor) && tArmorItem.getTier(tArmor) >= getTier(aStack)) {
                     double tCharge = ElectricItem.manager.discharge(
@@ -403,7 +403,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
      * false); chargeFromArmor(aStack, aPlayer); return false; }
      * @Override public final void chargeFromArmor(ItemStack aStack, EntityLivingBase aPlayer) { if (aPlayer == null ||
      * aPlayer.worldObj.isRemote) return; for (int i = 1; i < 5; i++) { ItemStack tArmor =
-     * aPlayer.getEquipmentInSlot(i); if (GT_ModHandler.isElectricItem(tArmor)) { IElectricItem tArmorItem =
+     * aPlayer.getEquipmentInSlot(i); if (GTModHandler.isElectricItem(tArmor)) { IElectricItem tArmorItem =
      * (IElectricItem)tArmor.getItem(); if (tArmorItem.canProvideEnergy(tArmor) && tArmorItem.getTier(tArmor) >=
      * getTier(aStack)) { int tCharge = ElectricItem.manager.discharge(tArmor, charge(aStack, Integer.MAX_VALUE-1,
      * Integer.MAX_VALUE, true, true), Integer.MAX_VALUE, true, false); if (tCharge > 0) { charge(aStack, tCharge,
@@ -460,11 +460,11 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
     public int fill(ItemStack aStack, FluidStack aFluid, boolean doFill) {
         if (aStack == null || aStack.stackSize != 1) return 0;
 
-        ItemStack tStack = GT_Utility.fillFluidContainer(aFluid, aStack, false, false);
+        ItemStack tStack = GTUtility.fillFluidContainer(aFluid, aStack, false, false);
         if (tStack != null) {
             aStack.setItemDamage(tStack.getItemDamage());
             aStack.func_150996_a(tStack.getItem());
-            return GT_Utility.getFluidForFilledItem(tStack, false).amount;
+            return GTUtility.getFluidForFilledItem(tStack, false).amount;
         }
 
         Long[] tStats = getFluidContainerStats(aStack);
@@ -513,9 +513,9 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
     public FluidStack drain(ItemStack aStack, int maxDrain, boolean doDrain) {
         if (aStack == null || aStack.stackSize != 1) return null;
 
-        FluidStack tFluid = GT_Utility.getFluidForFilledItem(aStack, false);
+        FluidStack tFluid = GTUtility.getFluidForFilledItem(aStack, false);
         if (tFluid != null && maxDrain >= tFluid.amount) {
-            ItemStack tStack = GT_Utility.getContainerItem(aStack, false);
+            ItemStack tStack = GTUtility.getContainerItem(aStack, false);
             if (tStack == null) {
                 if (doDrain) aStack.stackSize = 0;
                 return tFluid;
@@ -547,7 +547,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
 
     public FluidStack getFluidContent(ItemStack aStack) {
         Long[] tStats = getFluidContainerStats(aStack);
-        if (tStats == null || tStats[0] <= 0) return GT_Utility.getFluidForFilledItem(aStack, false);
+        if (tStats == null || tStats[0] <= 0) return GTUtility.getFluidForFilledItem(aStack, false);
         NBTTagCompound tNBT = aStack.getTagCompound();
         return tNBT == null ? null : FluidStack.loadFluidStackFromNBT(tNBT.getCompoundTag("GT.FluidContent"));
     }
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java b/src/main/java/gregtech/api/items/MetaGeneratedItem.java
index 465c4bc9d6..449b1ced24 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java
+++ b/src/main/java/gregtech/api/items/MetaGeneratedItem.java
@@ -1,10 +1,10 @@
 package gregtech.api.items;
 
-import static gregtech.api.enums.GT_Values.D1;
+import static gregtech.api.enums.GTValues.D1;
 import static gregtech.api.enums.Mods.AppleCore;
 import static gregtech.api.enums.Mods.GregTech;
 import static gregtech.api.recipe.RecipeMaps.cannerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,24 +25,24 @@ import net.minecraft.world.World;
 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.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.Mods;
 import gregtech.api.enums.SubTag;
-import gregtech.api.enums.TC_Aspects.TC_AspectStack;
+import gregtech.api.enums.TCAspects.TC_AspectStack;
 import gregtech.api.interfaces.IFoodStat;
 import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.IItemBehaviour;
 import gregtech.api.interfaces.IItemContainer;
 import gregtech.api.objects.ItemData;
-import gregtech.api.util.GT_Config;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.render.items.GT_GeneratedMaterial_Renderer;
+import gregtech.api.util.GTConfig;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.render.items.GeneratedMaterialRenderer;
 import squeek.applecore.api.food.FoodValues;
 import squeek.applecore.api.food.IEdible;
 import squeek.applecore.api.food.ItemFoodProxy;
@@ -63,7 +63,7 @@ import squeek.applecore.api.food.ItemFoodProxy;
  *         Item.
  */
 @Optional.Interface(iface = "squeek.applecore.api.food.IEdible", modid = Mods.Names.APPLE_CORE)
-public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements IGT_ItemWithMaterialRenderer, IEdible {
+public abstract class MetaGeneratedItem extends MetaBaseItem implements IGT_ItemWithMaterialRenderer, IEdible {
 
     /**
      * All instances of this Item Class are listed here. This gets used to register the Renderer to all Items of this
@@ -71,7 +71,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
      * <p/>
      * You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item.
      */
-    public static final ConcurrentHashMap<String, GT_MetaGenerated_Item> sInstances = new ConcurrentHashMap<>();
+    public static final ConcurrentHashMap<String, MetaGeneratedItem> sInstances = new ConcurrentHashMap<>();
 
     /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */
 
@@ -90,9 +90,9 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
      *
      * @param aUnlocalized The Unlocalized Name of this Item.
      */
-    public GT_MetaGenerated_Item(String aUnlocalized, short aOffset, short aItemAmount) {
+    public MetaGeneratedItem(String aUnlocalized, short aOffset, short aItemAmount) {
         super(aUnlocalized);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
         setHasSubtypes(true);
         setMaxDamage(0);
         mEnabledItems = new BitSet(aItemAmount);
@@ -124,8 +124,8 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
             }
             mEnabledItems.set(aID);
             mVisibleItems.set(aID);
-            GT_LanguageManager.addStringLocalization(getUnlocalizedName(rStack) + ".name", aEnglish);
-            GT_LanguageManager.addStringLocalization(getUnlocalizedName(rStack) + ".tooltip", aToolTip);
+            GTLanguageManager.addStringLocalization(getUnlocalizedName(rStack) + ".name", aEnglish);
+            GTLanguageManager.addStringLocalization(getUnlocalizedName(rStack) + ".tooltip", aToolTip);
             List<TC_AspectStack> tAspects = new ArrayList<>();
             // Important Stuff to do first
             for (Object tRandomData : aRandomData) if (tRandomData instanceof SubTag) {
@@ -134,7 +134,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
                     continue;
                 }
                 if (tRandomData == SubTag.NO_UNIFICATION) {
-                    GT_OreDictUnificator.addToBlacklist(rStack);
+                    GTOreDictUnificator.addToBlacklist(rStack);
                 }
             }
             // now check for the rest
@@ -145,7 +145,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
                     if (((IFoodStat) tRandomData).getFoodAction(this, rStack) == EnumAction.eat) {
                         int tFoodValue = ((IFoodStat) tRandomData).getFoodLevel(this, rStack, null);
                         if (tFoodValue > 0) {
-                            GT_Values.RA.stdBuilder()
+                            GTValues.RA.stdBuilder()
                                 .itemInputs(rStack, ItemList.IC2_Food_Can_Empty.get(tFoodValue))
                                 .itemOutputs(
                                     ((IFoodStat) tRandomData).isRotten(this, rStack, null)
@@ -161,7 +161,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
                 if (tRandomData instanceof IItemBehaviour) {
                     // The cast below from is not safe. If you know how to make it safe, please do.
                     // noinspection unchecked
-                    addItemBehavior(mOffset + aID, (IItemBehaviour<GT_MetaBase_Item>) tRandomData);
+                    addItemBehavior(mOffset + aID, (IItemBehaviour<MetaBaseItem>) tRandomData);
                     tUseOreDict = false;
                 }
                 if (tRandomData instanceof IItemContainer) {
@@ -176,16 +176,16 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
                     continue;
                 }
                 if (tRandomData instanceof ItemData) {
-                    if (GT_Utility.isStringValid(tRandomData)) GT_OreDictUnificator.registerOre(tRandomData, rStack);
-                    else GT_OreDictUnificator.addItemData(rStack, (ItemData) tRandomData);
+                    if (GTUtility.isStringValid(tRandomData)) GTOreDictUnificator.registerOre(tRandomData, rStack);
+                    else GTOreDictUnificator.addItemData(rStack, (ItemData) tRandomData);
                     continue;
                 }
                 if (tUseOreDict) {
-                    GT_OreDictUnificator.registerOre(tRandomData, rStack);
+                    GTOreDictUnificator.registerOre(tRandomData, rStack);
                 }
             }
-            if (GregTech_API.sThaumcraftCompat != null)
-                GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false);
+            if (GregTechAPI.sThaumcraftCompat != null)
+                GregTechAPI.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false);
             return rStack;
         }
         return null;
@@ -198,7 +198,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
      * @param aFoodBehavior the Food Behavior you want to add.
      * @return the Item itself for convenience in constructing.
      */
-    public final GT_MetaGenerated_Item setFoodBehavior(int aMetaValue, IFoodStat aFoodBehavior) {
+    public final MetaGeneratedItem setFoodBehavior(int aMetaValue, IFoodStat aFoodBehavior) {
         if (aMetaValue < 0 || aMetaValue >= mOffset + mEnabledItems.length()) return this;
         if (aFoodBehavior == null) mFoodStats.remove((short) aMetaValue);
         else mFoodStats.put((short) aMetaValue, aFoodBehavior);
@@ -212,7 +212,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
      * @param aValue     200 = 1 Burn Process = 500 EU, max = 32767 (that is 81917.5 EU)
      * @return the Item itself for convenience in constructing.
      */
-    public final GT_MetaGenerated_Item setBurnValue(int aMetaValue, int aValue) {
+    public final MetaGeneratedItem setBurnValue(int aMetaValue, int aValue) {
         if (aMetaValue < 0 || aMetaValue >= mOffset + mEnabledItems.length() || aValue < 0) return this;
         if (aValue == 0) mBurnValues.remove((short) aMetaValue);
         else mBurnValues.put((short) aMetaValue, aValue > Short.MAX_VALUE ? Short.MAX_VALUE : (short) aValue);
@@ -230,8 +230,8 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
      *                       this Battery charge/discharge-able.
      * @return the Item itself for convenience in constructing.
      */
-    public final GT_MetaGenerated_Item setElectricStats(int aMetaValue, long aMaxCharge, long aTransferLimit,
-        long aTier, long aSpecialData, boolean aUseAnimations) {
+    public final MetaGeneratedItem setElectricStats(int aMetaValue, long aMaxCharge, long aTransferLimit, long aTier,
+        long aSpecialData, boolean aUseAnimations) {
         if (aMetaValue < 0 || aMetaValue >= mOffset + mEnabledItems.length()) return this;
         if (aMaxCharge == 0) mElectricStats.remove((short) aMetaValue);
         else {
@@ -251,7 +251,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
      * @param aStacksize item stack size
      * @return the Item itself for convenience in constructing.
      */
-    public final GT_MetaGenerated_Item setFluidContainerStats(int aMetaValue, long aCapacity, long aStacksize) {
+    public final MetaGeneratedItem setFluidContainerStats(int aMetaValue, long aCapacity, long aStacksize) {
         if (aMetaValue < 0 || aMetaValue >= mOffset + mEnabledItems.length()) return this;
         if (aCapacity < 0) mElectricStats.remove((short) aMetaValue);
         else mFluidContainerStats.put((short) aMetaValue, new Long[] { aCapacity, Math.max(1, aStacksize) });
@@ -295,7 +295,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
     }
 
     @Override
-    public GT_GeneratedMaterial_Renderer getMaterialRenderer(int aMetaData) {
+    public GeneratedMaterialRenderer getMaterialRenderer(int aMetaData) {
         return null;
     }
 
@@ -381,10 +381,10 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
         for (short i = 0; i < j; i++) if (mEnabledItems.get(i)) {
             for (byte k = 1; k < mIconList[i].length; k++) {
                 mIconList[i][k] = aIconRegister.registerIcon(
-                    GregTech.getResourcePath(GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i + "/" + k));
+                    GregTech.getResourcePath(GTConfig.troll ? "troll" : getUnlocalizedName() + "/" + i + "/" + k));
             }
             mIconList[i][0] = aIconRegister
-                .registerIcon(GregTech.getResourcePath(GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i));
+                .registerIcon(GregTech.getResourcePath(GTConfig.troll ? "troll" : getUnlocalizedName() + "/" + i));
         }
     }
 
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java b/src/main/java/gregtech/api/items/MetaGeneratedItemX01.java
index db41a3c35b..29fc849a6f 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java
+++ b/src/main/java/gregtech/api/items/MetaGeneratedItemX01.java
@@ -1,6 +1,6 @@
 package gregtech.api.items;
 
-import static gregtech.api.enums.GT_Values.M;
+import static gregtech.api.enums.GTValues.M;
 
 import java.util.List;
 
@@ -11,13 +11,13 @@ import net.minecraft.util.IIcon;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.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.GT_Utility;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 /**
  * @author Gregorius Techneticies
@@ -34,7 +34,7 @@ import gregtech.api.util.GT_Utility;
  *         These Items can also have special RightClick abilities, electric Charge or even be set to become a Food alike
  *         Item.
  */
-public abstract class GT_MetaGenerated_Item_X01 extends GT_MetaGenerated_Item {
+public abstract class MetaGeneratedItemX01 extends MetaGeneratedItem {
 
     protected final OrePrefixes mPrefix;
     protected final int mIconSetIndex;
@@ -47,32 +47,32 @@ public abstract class GT_MetaGenerated_Item_X01 extends GT_MetaGenerated_Item {
      * @param aIconSetIndex    The TextureSet Index to be used. -1 for Defaulting to the Data contained in the Prefix.
      *                         (this is only to be used for selecting the Icon in getIconContainer, nothing else)
      */
-    public GT_MetaGenerated_Item_X01(String aUnlocalized, OrePrefixes aGeneratedPrefix, int aIconSetIndex) {
+    public MetaGeneratedItemX01(String aUnlocalized, OrePrefixes aGeneratedPrefix, int aIconSetIndex) {
         super(aUnlocalized, (short) 32000, (short) 766);
         mPrefix = aGeneratedPrefix;
         mIconSetIndex = aIconSetIndex >= 0 ? aIconSetIndex
             : aGeneratedPrefix.mTextureIndex >= 0 ? aGeneratedPrefix.mTextureIndex : 0;
 
-        for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) {
+        for (int i = 0; i < GregTechAPI.sGeneratedMaterials.length; i++) {
             OrePrefixes tPrefix = mPrefix;
             if (tPrefix == null) continue;
-            Materials tMaterial = GregTech_API.sGeneratedMaterials[i];
+            Materials tMaterial = GregTechAPI.sGeneratedMaterials[i];
             if (tMaterial == null) continue;
             if (mPrefix.doGenerateItem(tMaterial)) {
                 ItemStack tStack = new ItemStack(this, 1, i);
-                GT_LanguageManager.addStringLocalization(
+                GTLanguageManager.addStringLocalization(
                     getUnlocalizedName(tStack) + ".name",
-                    GT_LanguageManager.i18nPlaceholder ? getDefaultLocalizationFormat(tPrefix, tMaterial, i)
+                    GTLanguageManager.i18nPlaceholder ? getDefaultLocalizationFormat(tPrefix, tMaterial, i)
                         : getDefaultLocalization(tPrefix, tMaterial, i));
-                GT_LanguageManager.addStringLocalization(
+                GTLanguageManager.addStringLocalization(
                     getUnlocalizedName(tStack) + ".tooltip",
                     tMaterial.getToolTip(tPrefix.mMaterialAmount / M));
                 String tOreName = getOreDictString(tPrefix, tMaterial);
                 tPrefix = OrePrefixes.getOrePrefix(tOreName);
                 if (tPrefix != null && tPrefix.mIsUnificatable) {
-                    GT_OreDictUnificator.set(tPrefix, OrePrefixes.getMaterial(tOreName, tPrefix), tStack);
+                    GTOreDictUnificator.set(tPrefix, OrePrefixes.getMaterial(tOreName, tPrefix), tStack);
                 } else {
-                    GT_OreDictUnificator.registerOre(tOreName, tStack);
+                    GTOreDictUnificator.registerOre(tOreName, tStack);
                 }
             }
         }
@@ -136,10 +136,10 @@ public abstract class GT_MetaGenerated_Item_X01 extends GT_MetaGenerated_Item {
     @Override
     public ItemStack getContainerItem(ItemStack aStack) {
         int aMetaData = aStack.getItemDamage();
-        if (aMetaData < GregTech_API.sGeneratedMaterials.length && aMetaData >= 0) {
-            Materials aMaterial = GregTech_API.sGeneratedMaterials[aMetaData];
+        if (aMetaData < GregTechAPI.sGeneratedMaterials.length && aMetaData >= 0) {
+            Materials aMaterial = GregTechAPI.sGeneratedMaterials[aMetaData];
             if (aMaterial != null && aMaterial != Materials.Empty && aMaterial != Materials._NULL) {
-                return GT_Utility.copyAmount(1, mPrefix.mContainerItem);
+                return GTUtility.copyAmount(1, mPrefix.mContainerItem);
             }
         }
         return null;
@@ -148,39 +148,36 @@ public abstract class GT_MetaGenerated_Item_X01 extends GT_MetaGenerated_Item {
     @Override
     public short[] getRGBa(ItemStack aStack) {
         int aMetaData = getDamage(aStack);
-        return aMetaData < GregTech_API.sGeneratedMaterials.length
-            && GregTech_API.sGeneratedMaterials[aMetaData] != null ? GregTech_API.sGeneratedMaterials[aMetaData].mRGBa
-                : Materials._NULL.mRGBa;
+        return aMetaData < GregTechAPI.sGeneratedMaterials.length && GregTechAPI.sGeneratedMaterials[aMetaData] != null
+            ? GregTechAPI.sGeneratedMaterials[aMetaData].mRGBa
+            : Materials._NULL.mRGBa;
     }
 
     @Override
     public final IIconContainer getIconContainer(int aMetaData) {
-        return aMetaData < GregTech_API.sGeneratedMaterials.length
-            && GregTech_API.sGeneratedMaterials[aMetaData] != null
-                ? getIconContainer(aMetaData, GregTech_API.sGeneratedMaterials[aMetaData])
-                : null;
+        return aMetaData < GregTechAPI.sGeneratedMaterials.length && GregTechAPI.sGeneratedMaterials[aMetaData] != null
+            ? getIconContainer(aMetaData, GregTechAPI.sGeneratedMaterials[aMetaData])
+            : null;
     }
 
     @Override
     @SideOnly(Side.CLIENT)
     public final void getSubItems(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) {
-        for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++)
-            if (mPrefix.doGenerateItem(GregTech_API.sGeneratedMaterials[i]) && doesShowInCreative(
-                mPrefix,
-                GregTech_API.sGeneratedMaterials[i],
-                GregTech_API.sDoShowAllItemsInCreative)) {
-                    ItemStack tStack = new ItemStack(this, 1, i);
-                    isItemStackUsable(tStack);
-                    aList.add(tStack);
-                }
+        for (int i = 0; i < GregTechAPI.sGeneratedMaterials.length; i++) if (mPrefix
+            .doGenerateItem(GregTechAPI.sGeneratedMaterials[i])
+            && doesShowInCreative(mPrefix, GregTechAPI.sGeneratedMaterials[i], GregTechAPI.sDoShowAllItemsInCreative)) {
+                ItemStack tStack = new ItemStack(this, 1, i);
+                isItemStackUsable(tStack);
+                aList.add(tStack);
+            }
         super.getSubItems(aItem, aCreativeTab, aList);
     }
 
     @Override
     public final IIcon getIconFromDamage(int aMetaData) {
         if (aMetaData < 0) return null;
-        if (aMetaData < GregTech_API.sGeneratedMaterials.length) {
-            Materials tMaterial = GregTech_API.sGeneratedMaterials[aMetaData];
+        if (aMetaData < GregTechAPI.sGeneratedMaterials.length) {
+            Materials tMaterial = GregTechAPI.sGeneratedMaterials[aMetaData];
             if (tMaterial == null) return null;
             IIconContainer tIcon = getIconContainer(aMetaData, tMaterial);
             if (tIcon != null) return tIcon.getIcon();
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java b/src/main/java/gregtech/api/items/MetaGeneratedItemX32.java
index c344397e4e..cb83804ae1 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
+++ b/src/main/java/gregtech/api/items/MetaGeneratedItemX32.java
@@ -1,6 +1,6 @@
 package gregtech.api.items;
 
-import static gregtech.api.enums.GT_Values.M;
+import static gregtech.api.enums.GTValues.M;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,15 +12,15 @@ import net.minecraft.util.IIcon;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.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_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.render.items.GT_GeneratedMaterial_Renderer;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.render.items.GeneratedMaterialRenderer;
 
 /**
  * @author Gregorius Techneticies
@@ -37,7 +37,7 @@ import gregtech.common.render.items.GT_GeneratedMaterial_Renderer;
  *         These Items can also have special RightClick abilities, electric Charge or even be set to become a Food alike
  *         Item.
  */
-public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
+public abstract class MetaGeneratedItemX32 extends MetaGeneratedItem {
 
     protected final OrePrefixes[] mGeneratedPrefixList;
 
@@ -47,7 +47,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
      * @param aUnlocalized         The Unlocalized Name of this Item.
      * @param aGeneratedPrefixList The OreDict Prefixes you want to have generated.
      */
-    public GT_MetaGenerated_Item_X32(String aUnlocalized, OrePrefixes... aGeneratedPrefixList) {
+    public MetaGeneratedItemX32(String aUnlocalized, OrePrefixes... aGeneratedPrefixList) {
         super(aUnlocalized, (short) 32000, (short) 766);
         mGeneratedPrefixList = Arrays.copyOf(aGeneratedPrefixList, 32);
 
@@ -55,27 +55,27 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
             OrePrefixes tPrefix = mGeneratedPrefixList[i / 1000];
             if (tPrefix == null) continue;
             if (tPrefix == OrePrefixes.___placeholder___) continue;
-            Materials tMaterial = GregTech_API.sGeneratedMaterials[i % 1000];
+            Materials tMaterial = GregTechAPI.sGeneratedMaterials[i % 1000];
             if (tMaterial == null) continue;
             if (doesMaterialAllowGeneration(tPrefix, tMaterial)) {
                 ItemStack tStack = new ItemStack(this, 1, i);
-                GT_LanguageManager.addStringLocalization(
+                GTLanguageManager.addStringLocalization(
                     getUnlocalizedName(tStack) + ".name",
-                    GT_LanguageManager.i18nPlaceholder ? getDefaultLocalizationFormat(tPrefix, tMaterial, i)
+                    GTLanguageManager.i18nPlaceholder ? getDefaultLocalizationFormat(tPrefix, tMaterial, i)
                         : getDefaultLocalization(tPrefix, tMaterial, i));
-                GT_LanguageManager.addStringLocalization(
+                GTLanguageManager.addStringLocalization(
                     getUnlocalizedName(tStack) + ".tooltip",
                     tMaterial.getToolTip(tPrefix.mMaterialAmount / M));
                 if (tPrefix.mIsUnificatable) {
-                    GT_OreDictUnificator.set(tPrefix, tMaterial, tStack);
+                    GTOreDictUnificator.set(tPrefix, tMaterial, tStack);
                 } else {
-                    GT_OreDictUnificator.registerOre(tPrefix.get(tMaterial), tStack);
+                    GTOreDictUnificator.registerOre(tPrefix.get(tMaterial), tStack);
                 }
                 if ((tPrefix == OrePrefixes.stick || tPrefix == OrePrefixes.wireFine || tPrefix == OrePrefixes.ingot)
                     && (tMaterial == Materials.Lead || tMaterial == Materials.Tin
                         || tMaterial == Materials.SolderingAlloy)) {
-                    GregTech_API.sSolderingMetalList.add(tStack);
-                    GT_ModHandler.registerBoxableItemToToolBox(tStack);
+                    GregTechAPI.sSolderingMetalList.add(tStack);
+                    GTModHandler.registerBoxableItemToToolBox(tStack);
                 }
             }
         }
@@ -88,7 +88,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
      */
     @Override
     public short[] getRGBa(ItemStack aStack) {
-        Materials tMaterial = GregTech_API.sGeneratedMaterials[getDamage(aStack) % 1000];
+        Materials tMaterial = GregTechAPI.sGeneratedMaterials[getDamage(aStack) % 1000];
         return tMaterial == null ? Materials._NULL.mRGBa : tMaterial.mRGBa;
     }
 
@@ -163,10 +163,10 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
     public ItemStack getContainerItem(ItemStack aStack) {
         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 = mGeneratedPrefixList[aDamage / 1000];
-                if (aPrefix != null) return GT_Utility.copyAmount(1, aPrefix.mContainerItem);
+                if (aPrefix != null) return GTUtility.copyAmount(1, aPrefix.mContainerItem);
             }
         }
         return null;
@@ -174,14 +174,14 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
 
     @Override
     public final IIconContainer getIconContainer(int aMetaData) {
-        return GregTech_API.sGeneratedMaterials[aMetaData % 1000] == null ? null
-            : getIconContainer(aMetaData, GregTech_API.sGeneratedMaterials[aMetaData % 1000]);
+        return GregTechAPI.sGeneratedMaterials[aMetaData % 1000] == null ? null
+            : getIconContainer(aMetaData, GregTechAPI.sGeneratedMaterials[aMetaData % 1000]);
     }
 
     @Override
-    public GT_GeneratedMaterial_Renderer getMaterialRenderer(int aMetaData) {
-        return GregTech_API.sGeneratedMaterials[aMetaData % 1000] == null ? null
-            : GregTech_API.sGeneratedMaterials[aMetaData % 1000].renderer;
+    public GeneratedMaterialRenderer getMaterialRenderer(int aMetaData) {
+        return GregTechAPI.sGeneratedMaterials[aMetaData % 1000] == null ? null
+            : GregTechAPI.sGeneratedMaterials[aMetaData % 1000].renderer;
     }
 
     @Override
@@ -189,10 +189,10 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
     public final void getSubItems(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) {
         for (int i = 0; i < 32000; i++) {
             OrePrefixes aPrefix = mGeneratedPrefixList[i / 1000];
-            Materials aMaterial = GregTech_API.sGeneratedMaterials[i % 1000];
+            Materials aMaterial = GregTechAPI.sGeneratedMaterials[i % 1000];
             if (aPrefix != null && aMaterial != null) {
                 if (doesMaterialAllowGeneration(aPrefix, aMaterial)
-                    && doesShowInCreative(aPrefix, aMaterial, GregTech_API.sDoShowAllItemsInCreative)) {
+                    && doesShowInCreative(aPrefix, aMaterial, GregTechAPI.sDoShowAllItemsInCreative)) {
                     ItemStack tStack = new ItemStack(this, 1, i);
                     isItemStackUsable(tStack);
                     aList.add(tStack);
@@ -206,7 +206,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
     public final IIcon getIconFromDamage(int aMetaData) {
         if (aMetaData < 0) return null;
         if (aMetaData < 32000) {
-            Materials tMaterial = GregTech_API.sGeneratedMaterials[aMetaData % 1000];
+            Materials tMaterial = GregTechAPI.sGeneratedMaterials[aMetaData % 1000];
             if (tMaterial == null) return null;
             IIconContainer tIcon = getIconContainer(aMetaData, tMaterial);
             if (tIcon != null) return tIcon.getIcon();
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/MetaGeneratedTool.java
index cec93169ec..6487a67a6b 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
+++ b/src/main/java/gregtech/api/items/MetaGeneratedTool.java
@@ -1,7 +1,7 @@
 package gregtech.api.items;
 
-import static gregtech.api.util.GT_Utility.formatNumbers;
-import static gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_Steam.calculateLooseFlow;
+import static gregtech.api.util.GTUtility.formatNumbers;
+import static gregtech.common.tileentities.machines.multi.MTELargeTurbineSteam.calculateLooseFlow;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -44,24 +44,24 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.api.tool.ITool;
 import forestry.api.arboriculture.IToolGrafter;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enchants.Enchantment_Radioactivity;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enchants.EnchantmentRadioactivity;
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.TC_Aspects.TC_AspectStack;
+import gregtech.api.enums.TCAspects.TC_AspectStack;
 import gregtech.api.interfaces.IDamagableItem;
 import gregtech.api.interfaces.IToolStats;
-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.tools.GT_Tool_Turbine;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.tools.ToolTurbine;
 import mods.railcraft.api.core.items.IToolCrowbar;
 import mrtjp.projectred.api.IScrewdriver;
 
 /**
  * This is an example on how you can create a Tool ItemStack, in this case a Bismuth Wrench:
- * GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(GT_MetaGenerated_Tool_01.WRENCH, 1,
+ * GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(MetaGeneratedTool01.WRENCH, 1,
  * Materials.Bismuth, Materials.Bismuth, null);
  */
 @Optional.InterfaceList(
@@ -71,7 +71,7 @@ import mrtjp.projectred.api.IScrewdriver;
         @Optional.Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraftAPI|tools"),
         @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = "EnderIOAPI|Tools"),
         @Optional.Interface(iface = "mrtjp.projectred.api.IScrewdriver", modid = "ProjRed|Core"), })
-public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
+public abstract class MetaGeneratedTool extends MetaBaseItem
     implements IDamagableItem, IToolGrafter, IToolCrowbar, IToolWrench, ITool, IScrewdriver, IAEWrench {
 
     /**
@@ -80,7 +80,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
      * <p/>
      * You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item.
      */
-    public static final ConcurrentHashMap<String, GT_MetaGenerated_Tool> sInstances = new ConcurrentHashMap<>();
+    public static final ConcurrentHashMap<String, MetaGeneratedTool> sInstances = new ConcurrentHashMap<>();
 
     /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */
 
@@ -91,9 +91,9 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
      *
      * @param aUnlocalized The Unlocalized Name of this Item.
      */
-    public GT_MetaGenerated_Tool(String aUnlocalized) {
+    public MetaGeneratedTool(String aUnlocalized) {
         super(aUnlocalized);
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH);
         setMaxStackSize(1);
         sInstances.put(getUnlocalizedName(), this);
     }
@@ -188,11 +188,11 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
         Object... aOreDictNamesAndAspects) {
         if (aToolTip == null) aToolTip = "";
         if (aID >= 0 && aID < 32766 && aID % 2 == 0) {
-            GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + aID + ".name", aEnglish);
-            GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + aID + ".tooltip", aToolTip);
-            GT_LanguageManager
+            GTLanguageManager.addStringLocalization(getUnlocalizedName() + "." + aID + ".name", aEnglish);
+            GTLanguageManager.addStringLocalization(getUnlocalizedName() + "." + aID + ".tooltip", aToolTip);
+            GTLanguageManager
                 .addStringLocalization(getUnlocalizedName() + "." + (aID + 1) + ".name", aEnglish + " (Empty)");
-            GT_LanguageManager
+            GTLanguageManager
                 .addStringLocalization(getUnlocalizedName() + "." + (aID + 1) + ".tooltip", "You need to recharge it");
             mToolStats.put((short) aID, aToolStats);
             mToolStats.put((short) (aID + 1), aToolStats);
@@ -202,11 +202,11 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
             for (Object tOreDictNameOrAspect : aOreDictNamesAndAspects) {
                 if (tOreDictNameOrAspect instanceof TC_AspectStack)
                     ((TC_AspectStack) tOreDictNameOrAspect).addToAspectList(tAspects);
-                else GT_OreDictUnificator.registerOre(tOreDictNameOrAspect, rStack);
+                else GTOreDictUnificator.registerOre(tOreDictNameOrAspect, rStack);
             }
-            if (GregTech_API.sThaumcraftCompat != null)
-                GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false);
-            GT_ModHandler.registerBoxableItemToToolBox(rStack);
+            if (GregTechAPI.sThaumcraftCompat != null)
+                GregTechAPI.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false);
+            GTModHandler.registerBoxableItemToToolBox(rStack);
             return rStack;
         }
         return null;
@@ -252,7 +252,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
     }
 
     /**
-     * Called by the Block Harvesting Event within the GT_Proxy
+     * Called by the Block Harvesting Event within the GTProxy
      */
     @Mod.EventHandler
     public void onHarvestBlockEvent(ArrayList<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock,
@@ -310,7 +310,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
     public boolean onLeftClickEntity(ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {
         IToolStats tStats = getToolStats(aStack);
         if (tStats == null || !isItemStackUsable(aStack)) return true;
-        GT_Utility.doSoundAtClient(tStats.getEntityHitSound(), 1, 1.0F);
+        GTUtility.doSoundAtClient(tStats.getEntityHitSound(), 1, 1.0F);
         if (super.onLeftClickEntity(aStack, aPlayer, aEntity)) return true;
         if (aEntity.canAttackWithItem() && !aEntity.hitByEntity(aPlayer)) {
             float tMagicDamage = tStats.getMagicDamageAgainstEntity(
@@ -420,7 +420,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
         IToolStats tStats = getToolStats(aStack);
         int tOffset = getElectricStats(aStack) != null ? 2 : 1;
         if (tStats != null) {
-            if (tStats instanceof GT_Tool_Turbine) {
+            if (tStats instanceof ToolTurbine) {
 
                 // Durability -> toolMaxDamage
                 // % Efficiency -> toolCombatDamage -> toolQuality
@@ -434,9 +434,9 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                 @SuppressWarnings("AccessStaticViaInstance")
                 float aOptFlow = (Math.max(
                     Float.MIN_NORMAL,
-                    ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack)
+                    ((MetaGeneratedTool) aStack.getItem()).getToolStats(aStack)
                         .getSpeedMultiplier()
-                        * ((GT_MetaGenerated_Tool) aStack.getItem()).getPrimaryMaterial(aStack).mToolSpeed
+                        * ((MetaGeneratedTool) aStack.getItem()).getPrimaryMaterial(aStack).mToolSpeed
                         * 50F));
                 aList.add(
                     tOffset + 0,
@@ -464,7 +464,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                         transItem("006", "Optimal Steam flow: %s L/t"),
                         "" + EnumChatFormatting.GOLD
                             + formatNumbers(
-                                GT_Utility.safeInt(
+                                GTUtility.safeInt(
                                     (long) (Math.max(
                                         Float.MIN_NORMAL,
                                         tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed
@@ -476,7 +476,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                         transItem("900", "Energy from Optimal Steam Flow: %s EU/t"),
                         "" + EnumChatFormatting.GOLD
                             + formatNumbers(
-                                GT_Utility.safeInt(
+                                GTUtility.safeInt(
                                     (long) (Math.max(
                                         Float.MIN_NORMAL,
                                         tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed
@@ -520,7 +520,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                         transItem("902", "Optimal SC Steam flow: %s L/t"),
                         "" + EnumChatFormatting.GOLD
                             + formatNumbers(
-                                GT_Utility.safeInt(
+                                GTUtility.safeInt(
                                     (long) (Math.max(
                                         Float.MIN_NORMAL,
                                         tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed
@@ -532,7 +532,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                         transItem("903", "Energy from Optimal SC Steam Flow: %s EU/t"),
                         "" + EnumChatFormatting.GOLD
                             + formatNumbers(
-                                GT_Utility.safeInt(
+                                GTUtility.safeInt(
                                     (long) (Math.max(
                                         Float.MIN_NORMAL,
                                         tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed
@@ -545,7 +545,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                         transItem("007", "Energy from Optimal Gas Flow: %s EU/t"),
                         "" + EnumChatFormatting.GOLD
                             + formatNumbers(
-                                GT_Utility.safeInt(
+                                GTUtility.safeInt(
                                     (long) (Math.max(
                                         Float.MIN_NORMAL,
                                         tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed
@@ -560,7 +560,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                         transItem("008", "Energy from Optimal Plasma Flow: %s EU/t"),
                         "" + EnumChatFormatting.GOLD
                             + formatNumbers(
-                                GT_Utility.safeInt(
+                                GTUtility.safeInt(
                                     (long) (Math.max(
                                         Float.MIN_NORMAL,
                                         tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed
@@ -572,7 +572,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                 aList.add(
                     tOffset + 14,
                     EnumChatFormatting.GRAY + "(EU/t values include efficiency and are not 100% accurate)");
-                int toolQualityLevel = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolQuality;
+                int toolQualityLevel = MetaGeneratedTool.getPrimaryMaterial(aStack).mToolQuality;
                 int overflowMultiplier = 0;
                 if (toolQualityLevel >= 6) {
                     overflowMultiplier = 3;
@@ -679,8 +679,8 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
             setToolDamage(aStack, tNewDamage);
             if (tNewDamage >= getToolMaxDamage(aStack)) {
                 IToolStats tStats = getToolStats(aStack);
-                if (tStats == null || GT_Utility.setStack(aStack, tStats.getBrokenItem(aStack)) == null) {
-                    if (tStats != null) GT_Utility.doSoundAtClient(tStats.getBreakingSound(), 1, 1.0F);
+                if (tStats == null || GTUtility.setStack(aStack, tStats.getBrokenItem(aStack)) == null) {
+                    if (tStats != null) GTUtility.doSoundAtClient(tStats.getBreakingSound(), 1, 1.0F);
                     if (aStack.stackSize > 0) aStack.stackSize--;
                 }
             }
@@ -693,8 +693,8 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                 setToolDamage(aStack, tNewDamage);
                 if (tNewDamage >= getToolMaxDamage(aStack)) {
                     IToolStats tStats = getToolStats(aStack);
-                    if (tStats == null || GT_Utility.setStack(aStack, tStats.getBrokenItem(aStack)) == null) {
-                        if (tStats != null) GT_Utility.doSoundAtClient(tStats.getBreakingSound(), 1, 1.0F);
+                    if (tStats == null || GTUtility.setStack(aStack, tStats.getBrokenItem(aStack)) == null) {
+                        if (tStats != null) GTUtility.doSoundAtClient(tStats.getBreakingSound(), 1, 1.0F);
                         if (aStack.stackSize > 0) aStack.stackSize--;
                     }
                 }
@@ -731,7 +731,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
         if (!isItemStackUsable(aStack)) return false;
         IToolStats tStats = getToolStats(aStack);
         if (tStats == null) return false;
-        GT_Utility.doSoundAtClient(tStats.getMiningSound(), 1, 1.0F);
+        GTUtility.doSoundAtClient(tStats.getMiningSound(), 1, 1.0F);
         doDamage(
             aStack,
             (int) Math.max(1, aBlock.getBlockHardness(aWorld, aX, aY, aZ) * tStats.getToolDamagePerBlockBreak()));
@@ -750,15 +750,15 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
 
     private ItemStack getContainerItem(ItemStack aStack, boolean playSound) {
         if (!isItemStackUsable(aStack)) return null;
-        aStack = GT_Utility.copyAmount(1, aStack);
+        aStack = GTUtility.copyAmount(1, aStack);
         IToolStats tStats = getToolStats(aStack);
         if (tStats == null) return null;
         doDamage(aStack, tStats.getToolDamagePerContainerCraft());
         aStack = aStack.stackSize > 0 ? aStack : null;
-        if (playSound && GT_Mod.gregtechproxy.mTicksUntilNextCraftSound <= 0) {
-            GT_Mod.gregtechproxy.mTicksUntilNextCraftSound = 10;
+        if (playSound && GTMod.gregtechproxy.mTicksUntilNextCraftSound <= 0) {
+            GTMod.gregtechproxy.mTicksUntilNextCraftSound = 10;
             String sound = (aStack == null) ? tStats.getBreakingSound() : tStats.getCraftingSound();
-            GT_Utility.doSoundAtClient(sound, 1, 1.0F);
+            GTUtility.doSoundAtClient(sound, 1, 1.0F);
         }
         return aStack;
     }
@@ -831,7 +831,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
     @Override
     public boolean canUse(EntityPlayer player, ItemStack stack) {
         if (player == null) return false;
-        if (GT_Utility.isStackInvalid(stack) || !isItemStackUsable(stack)) return false;
+        if (GTUtility.isStackInvalid(stack) || !isItemStackUsable(stack)) return false;
         IToolStats tStats = getToolStats(stack);
         return tStats != null && tStats.isScrewdriver();
     }
@@ -839,7 +839,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
     @Override
     public void damageScrewdriver(EntityPlayer player, ItemStack stack) {
         if (player == null) return;
-        if (GT_Utility.isStackInvalid(stack) || !isItemStackUsable(stack)) return;
+        if (GTUtility.isStackInvalid(stack) || !isItemStackUsable(stack)) return;
         IToolStats tStats = getToolStats(stack);
         if (tStats != null) doDamage(stack, tStats.getToolDamagePerEntityAttack());
     }
@@ -935,7 +935,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
         }
         for (Entry<Integer, Integer> tEntry : tMap.entrySet()) {
             if (tEntry.getKey() == 33 || (tEntry.getKey() == 20 && tEntry.getValue() > 2)
-                || tEntry.getKey() == Enchantment_Radioactivity.INSTANCE.effectId)
+                || tEntry.getKey() == EnchantmentRadioactivity.INSTANCE.effectId)
                 tResult.put(tEntry.getKey(), tEntry.getValue());
             else switch (Enchantment.enchantmentsList[tEntry.getKey()].type) {
                 case weapon:
diff --git a/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java b/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java
index 3c05d8bed0..ed953d9477 100644
--- a/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java
+++ b/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java
@@ -11,9 +11,9 @@ import gregtech.api.interfaces.tileentity.IVoidable;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_ParallelHelper;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.OverclockCalculator;
+import gregtech.api.util.ParallelHelper;
 
 /**
  * Logic class to calculate result of recipe check from inputs.
@@ -23,7 +23,7 @@ public abstract class AbstractProcessingLogic<P extends AbstractProcessingLogic<
 
     protected IVoidable machine;
     protected Supplier<RecipeMap<?>> recipeMapSupplier;
-    protected GT_Recipe lastRecipe;
+    protected GTRecipe lastRecipe;
     protected RecipeMap<?> lastRecipeMap;
     protected ItemStack[] outputItems;
     protected FluidStack[] outputFluids;
@@ -229,8 +229,8 @@ public abstract class AbstractProcessingLogic<P extends AbstractProcessingLogic<
      * At this point, inputs have been already consumed.
      */
     @Nonnull
-    protected CheckRecipeResult applyRecipe(@Nonnull GT_Recipe recipe, @Nonnull GT_ParallelHelper helper,
-        @Nonnull GT_OverclockCalculator calculator, @Nonnull CheckRecipeResult result) {
+    protected CheckRecipeResult applyRecipe(@Nonnull GTRecipe recipe, @Nonnull ParallelHelper helper,
+        @Nonnull OverclockCalculator calculator, @Nonnull CheckRecipeResult result) {
         if (recipe.mCanBeBuffered) {
             lastRecipe = recipe;
         } else {
@@ -267,8 +267,8 @@ public abstract class AbstractProcessingLogic<P extends AbstractProcessingLogic<
     /**
      * Override to tweak final duration that will be set as a result of this logic class.
      */
-    protected double calculateDuration(@Nonnull GT_Recipe recipe, @Nonnull GT_ParallelHelper helper,
-        @Nonnull GT_OverclockCalculator calculator) {
+    protected double calculateDuration(@Nonnull GTRecipe recipe, @Nonnull ParallelHelper helper,
+        @Nonnull OverclockCalculator calculator) {
         return calculator.getDuration() * helper.getDurationMultiplierDouble();
     }
 
@@ -276,7 +276,7 @@ public abstract class AbstractProcessingLogic<P extends AbstractProcessingLogic<
      * Override to do additional check for found recipe if needed.
      */
     @Nonnull
-    protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) {
+    protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) {
         return CheckRecipeResultRegistry.SUCCESSFUL;
     }
 
@@ -289,7 +289,7 @@ public abstract class AbstractProcessingLogic<P extends AbstractProcessingLogic<
      * all inputs!
      */
     @Nonnull
-    protected CheckRecipeResult onRecipeStart(@Nonnull GT_Recipe recipe) {
+    protected CheckRecipeResult onRecipeStart(@Nonnull GTRecipe recipe) {
         return CheckRecipeResultRegistry.SUCCESSFUL;
     }
 
@@ -297,8 +297,8 @@ public abstract class AbstractProcessingLogic<P extends AbstractProcessingLogic<
      * Override to tweak overclock logic if needed.
      */
     @Nonnull
-    protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe recipe) {
-        return new GT_OverclockCalculator().setRecipeEUt(recipe.mEUt)
+    protected OverclockCalculator createOverclockCalculator(@Nonnull GTRecipe recipe) {
+        return new OverclockCalculator().setRecipeEUt(recipe.mEUt)
             .setAmperage(availableAmperage)
             .setEUt(availableVoltage)
             .setDuration(recipe.mDuration)
diff --git a/src/main/java/gregtech/api/logic/ItemInventoryLogic.java b/src/main/java/gregtech/api/logic/ItemInventoryLogic.java
index 69005216b8..22d4a9a627 100644
--- a/src/main/java/gregtech/api/logic/ItemInventoryLogic.java
+++ b/src/main/java/gregtech/api/logic/ItemInventoryLogic.java
@@ -25,12 +25,12 @@ import com.gtnewhorizons.modularui.api.widget.Widget;
 import com.gtnewhorizons.modularui.common.widget.Scrollable;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.item.ItemHolder;
 
 /**
  * Generic Item logic for MuTEs.
- * 
+ *
  * @author BlueWeabo
  */
 public class ItemInventoryLogic {
@@ -101,7 +101,7 @@ public class ItemInventoryLogic {
     }
 
     /**
-     * 
+     *
      * @return The Item Inventory Logic as an NBTTagCompound to be saved in another nbt as how one wants.
      */
     @Nonnull
@@ -150,7 +150,7 @@ public class ItemInventoryLogic {
             final NBTTagCompound tNBT = nbtList.getCompoundTagAt(i);
             final int tSlot = tNBT.getShort("s");
             if (tSlot >= 0 && tSlot < inventory.getSlots()) {
-                inventory.setStackInSlot(tSlot, GT_Utility.loadItem(tNBT));
+                inventory.setStackInSlot(tSlot, GTUtility.loadItem(tNBT));
             }
         }
     }
diff --git a/src/main/java/gregtech/api/logic/MuTEProcessingLogic.java b/src/main/java/gregtech/api/logic/MuTEProcessingLogic.java
index da53c8875d..0d6bf4cac9 100644
--- a/src/main/java/gregtech/api/logic/MuTEProcessingLogic.java
+++ b/src/main/java/gregtech/api/logic/MuTEProcessingLogic.java
@@ -24,10 +24,10 @@ import gregtech.api.logic.interfaces.ProcessingLogicHost;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
-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.OverclockCalculator;
+import gregtech.api.util.ParallelHelper;
 
 /**
  * Processing logic class, dedicated for MultiTileEntities.
@@ -81,13 +81,13 @@ public class MuTEProcessingLogic<P extends MuTEProcessingLogic<P>> extends Abstr
     }
 
     @Nonnull
-    protected CheckRecipeResult processRecipe(@Nonnull List<GT_Recipe> recipes, @Nonnull ItemInventoryLogic itemInput,
+    protected CheckRecipeResult processRecipe(@Nonnull List<GTRecipe> recipes, @Nonnull ItemInventoryLogic itemInput,
         @Nonnull FluidInventoryLogic fluidInput) {
         CheckRecipeResult result = CheckRecipeResultRegistry.INTERNAL_ERROR;
-        for (GT_Recipe recipe : recipes) {
+        for (GTRecipe recipe : recipes) {
             Objects.requireNonNull(recipe);
-            GT_ParallelHelper helper = createParallelHelper(recipe, itemInput, fluidInput);
-            GT_OverclockCalculator calculator = createOverclockCalculator(recipe);
+            ParallelHelper helper = createParallelHelper(recipe, itemInput, fluidInput);
+            OverclockCalculator calculator = createOverclockCalculator(recipe);
             helper.setCalculator(calculator);
             helper.build();
             result = helper.getResult();
@@ -112,9 +112,9 @@ public class MuTEProcessingLogic<P extends MuTEProcessingLogic<P>> extends Abstr
     }
 
     @Nonnull
-    protected GT_ParallelHelper createParallelHelper(@Nonnull GT_Recipe recipe, @Nonnull ItemInventoryLogic itemInput,
+    protected ParallelHelper createParallelHelper(@Nonnull GTRecipe recipe, @Nonnull ItemInventoryLogic itemInput,
         @Nonnull FluidInventoryLogic fluidInput) {
-        return new GT_ParallelHelper().setRecipe(recipe)
+        return new ParallelHelper().setRecipe(recipe)
             .setItemInputInventory(itemInput)
             .setFluidInputInventory(fluidInput)
             .setAvailableEUt(availableVoltage * availableAmperage)
@@ -197,7 +197,7 @@ public class MuTEProcessingLogic<P extends MuTEProcessingLogic<P>> extends Abstr
         if (outputItems != null) {
             NBTTagList itemOutputsNBT = new NBTTagList();
             for (ItemStack item : outputItems) {
-                itemOutputsNBT.appendTag(GT_Utility.saveItem(item));
+                itemOutputsNBT.appendTag(GTUtility.saveItem(item));
             }
             logicNBT.setTag("itemOutputs", itemOutputsNBT);
         }
@@ -226,7 +226,7 @@ public class MuTEProcessingLogic<P extends MuTEProcessingLogic<P>> extends Abstr
             NBTTagList itemOutputsNBT = logicNBT.getTagList("itemOutputs", TAG_COMPOUND);
             outputItems = new ItemStack[itemOutputsNBT.tagCount()];
             for (int i = 0; i < itemOutputsNBT.tagCount(); i++) {
-                outputItems[i] = GT_Utility.loadItem(itemOutputsNBT.getCompoundTagAt(i));
+                outputItems[i] = GTUtility.loadItem(itemOutputsNBT.getCompoundTagAt(i));
             }
         }
         if (logicNBT.hasKey("fluidOutputs")) {
diff --git a/src/main/java/gregtech/api/logic/PowerLogic.java b/src/main/java/gregtech/api/logic/PowerLogic.java
index ad19987a76..afc1877deb 100644
--- a/src/main/java/gregtech/api/logic/PowerLogic.java
+++ b/src/main/java/gregtech/api/logic/PowerLogic.java
@@ -8,12 +8,12 @@ import javax.annotation.Nonnull;
 
 import net.minecraft.nbt.NBTTagCompound;
 
-import gregtech.api.enums.GT_Values.NBT;
+import gregtech.api.enums.GTValues.NBT;
 
 /**
  * Power logic for machines. This is used to store all the important variables for a machine to have energy and use it
  * in any way.
- * 
+ *
  * @author BlueWeabo, Maxim
  */
 public class PowerLogic {
@@ -122,7 +122,7 @@ public class PowerLogic {
     /**
      * Injecting energy in the multiblock ampere per ampere until full or until we have added the maximum possible
      * amperes for this tick
-     * 
+     *
      * @param voltage           At what voltage are the amps?
      * @param availableAmperage How much amperage do we have available
      * @return Amount of amperes used
@@ -218,7 +218,7 @@ public class PowerLogic {
 
     /**
      * Saves the power logic to its own nbt tag before saving it to the given one.
-     * 
+     *
      * @param nbt Tag where you want to save the power logic tag to.
      */
     public void saveToNBT(NBTTagCompound nbt) {
@@ -233,7 +233,7 @@ public class PowerLogic {
 
     /**
      * Loads the power logic from its own nbt after getting it from the given one
-     * 
+     *
      * @param nbt Tag where the power logic tag was saved to
      */
     public void loadFromNBT(NBTTagCompound nbt) {
diff --git a/src/main/java/gregtech/api/logic/ProcessingLogic.java b/src/main/java/gregtech/api/logic/ProcessingLogic.java
index 4d203ed80f..63c8f6494e 100644
--- a/src/main/java/gregtech/api/logic/ProcessingLogic.java
+++ b/src/main/java/gregtech/api/logic/ProcessingLogic.java
@@ -14,9 +14,9 @@ import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SingleRecipeCheck;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_ParallelHelper;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.OverclockCalculator;
+import gregtech.api.util.ParallelHelper;
 
 /**
  * Logic class to calculate result of recipe check from inputs, based on recipemap.
@@ -119,10 +119,10 @@ public class ProcessingLogic extends AbstractProcessingLogic<ProcessingLogic> {
                 recipeLockableMachine.getSingleRecipeCheck()
                     .getRecipe()).checkRecipeResult;
         }
-        Stream<GT_Recipe> matchedRecipes = findRecipeMatches(recipeMap);
-        Iterable<GT_Recipe> recipeIterable = matchedRecipes::iterator;
+        Stream<GTRecipe> matchedRecipes = findRecipeMatches(recipeMap);
+        Iterable<GTRecipe> recipeIterable = matchedRecipes::iterator;
         CheckRecipeResult checkRecipeResult = CheckRecipeResultRegistry.NO_RECIPE;
-        for (GT_Recipe matchedRecipe : recipeIterable) {
+        for (GTRecipe matchedRecipe : recipeIterable) {
             CalculationResult foundResult = validateAndCalculateRecipe(matchedRecipe);
             if (foundResult.successfullyConsumedInputs) {
                 // Successfully found and set recipe, so return it
@@ -143,14 +143,14 @@ public class ProcessingLogic extends AbstractProcessingLogic<ProcessingLogic> {
      * @param recipe The recipe which will be checked and processed
      */
     @Nonnull
-    private CalculationResult validateAndCalculateRecipe(@Nonnull GT_Recipe recipe) {
+    private CalculationResult validateAndCalculateRecipe(@Nonnull GTRecipe recipe) {
         CheckRecipeResult result = validateRecipe(recipe);
         if (!result.wasSuccessful()) {
             return CalculationResult.ofFailure(result);
         }
 
-        GT_ParallelHelper helper = createParallelHelper(recipe);
-        GT_OverclockCalculator calculator = createOverclockCalculator(recipe);
+        ParallelHelper helper = createParallelHelper(recipe);
+        OverclockCalculator calculator = createOverclockCalculator(recipe);
         helper.setCalculator(calculator);
         helper.build();
 
@@ -170,7 +170,7 @@ public class ProcessingLogic extends AbstractProcessingLogic<ProcessingLogic> {
      * Override this method if it doesn't work with normal recipemaps.
      */
     @Nonnull
-    protected Stream<GT_Recipe> findRecipeMatches(@Nullable RecipeMap<?> map) {
+    protected Stream<GTRecipe> findRecipeMatches(@Nullable RecipeMap<?> map) {
         if (map == null) {
             return Stream.empty();
         }
@@ -186,8 +186,8 @@ public class ProcessingLogic extends AbstractProcessingLogic<ProcessingLogic> {
      * Override to tweak parallel logic if needed.
      */
     @Nonnull
-    protected GT_ParallelHelper createParallelHelper(@Nonnull GT_Recipe recipe) {
-        return new GT_ParallelHelper().setRecipe(recipe)
+    protected ParallelHelper createParallelHelper(@Nonnull GTRecipe recipe) {
+        return new ParallelHelper().setRecipe(recipe)
             .setItemInputs(inputItems)
             .setFluidInputs(inputFluids)
             .setAvailableEUt(availableVoltage * availableAmperage)
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
index 2bc560f8e7..aae3ddcebb 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
@@ -1,7 +1,7 @@
 package gregtech.api.metatileentity;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
-import static gregtech.api.enums.GT_Values.NW;
+import static gregtech.GTMod.GT_FML_LOGGER;
+import static gregtech.api.enums.GTValues.NW;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,8 +25,8 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.graphs.Lock;
@@ -38,13 +38,13 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IDebugableTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IPipeRenderedTileEntity;
-import gregtech.api.net.GT_Packet_TileEntity;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_CoverBehaviorBase;
-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.api.net.GTPacketTileEntity;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gregtech.common.covers.CoverInfo;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
@@ -59,7 +59,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
 
     public byte mConnections = IConnectable.NO_CONNECTION;
     protected MetaPipeEntity mMetaTileEntity;
-    private final int[] mTimeStatistics = new int[GregTech_API.TICKS_FOR_LAG_AVERAGING];
+    private final int[] mTimeStatistics = new int[GregTechAPI.TICKS_FOR_LAG_AVERAGING];
     private boolean hasTimeStatisticsStarted;
     private boolean mWorkUpdate = false, mWorks = true;
     private byte mColor = 0, oColor = 0, oStrongRedstone = 0, oRedstoneData = 63, oTextureData = 0, oUpdateData = 0,
@@ -214,7 +214,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
                             | IConnectable.HAS_HARDENEDFOAM);
                     }
                     if (mTickTimer > 12 && oldConnections != mConnections)
-                        GregTech_API.causeCableUpdate(worldObj, xCoord, yCoord, zCoord);
+                        GregTechAPI.causeCableUpdate(worldObj, xCoord, yCoord, zCoord);
                 }
                 mMetaTileEntity.onPreTick(this, mTickTimer);
                 if (!hasValidMetaTileEntity()) return;
@@ -264,14 +264,14 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
             }
         } catch (Throwable e) {
             e.printStackTrace();
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
 
         if (isServerSide() && hasTimeStatisticsStarted && hasValidMetaTileEntity()) {
             tTime = System.nanoTime() - tTime;
             mTimeStatisticsIndex = (mTimeStatisticsIndex + 1) % mTimeStatistics.length;
             mTimeStatistics[mTimeStatisticsIndex] = (int) tTime;
-            if (tTime > 0 && tTime > (GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING * 1000000L)
+            if (tTime > 0 && tTime > (GregTechAPI.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING * 1000000L)
                 && mTickTimer > 1000
                 && getMetaTileEntity().doTickProfilingMessageDuringThisTick()
                 && mLagWarningCount++ < 10)
@@ -296,7 +296,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
         if (mSendClientData) {
             NW.sendPacketToAllPlayersInRange(
                 worldObj,
-                new GT_Packet_TileEntity(
+                new GTPacketTileEntity(
                     xCoord,
                     (short) yCoord,
                     zCoord,
@@ -438,7 +438,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
                 tList.add(
                     "Caused " + (mLagWarningCount >= 10 ? "more than 10" : mLagWarningCount)
                         + " Lag Spike Warnings (anything taking longer than "
-                        + GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING
+                        + GregTechAPI.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING
                         + "ms) on the Server.");
             }
             if (mMetaTileEntity != null) {
@@ -491,13 +491,13 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
         markDirty();
         mInventoryChanged = true;
         if (canAccessData()) mMetaTileEntity
-            .setInventorySlotContents(aIndex, worldObj.isRemote ? aStack : GT_OreDictUnificator.setStack(true, aStack));
+            .setInventorySlotContents(aIndex, worldObj.isRemote ? aStack : GTOreDictUnificator.setStack(true, aStack));
     }
 
     @Override
     public String getInventoryName() {
         if (canAccessData()) return mMetaTileEntity.getInventoryName();
-        if (GregTech_API.METATILEENTITIES[mID] != null) return GregTech_API.METATILEENTITIES[mID].getInventoryName();
+        if (GregTechAPI.METATILEENTITIES[mID] != null) return GregTechAPI.METATILEENTITIES[mID].getInventoryName();
         return "";
     }
 
@@ -776,7 +776,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
 
     @Override
     public ArrayList<ItemStack> getDrops() {
-        final ItemStack rStack = new ItemStack(GregTech_API.sBlockMachines, 1, mID);
+        final ItemStack rStack = new ItemStack(GregTechAPI.sBlockMachines, 1, mID);
         final NBTTagCompound tNBT = new NBTTagCompound();
 
         writeCoverNBT(tNBT, true);
@@ -799,7 +799,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
             // Configure Cover, sneak can also be: screwdriver, wrench, side cutter, soldering iron
             if (aPlayer.isSneaking()) {
                 final ForgeDirection tSide = (getCoverIDAtSide(side) == 0)
-                    ? GT_Utility.determineWrenchingSide(side, aX, aY, aZ)
+                    ? GTUtility.determineWrenchingSide(side, aX, aY, aZ)
                     : side;
                 return (getCoverInfoAtSide(tSide).hasCoverGUI());
             } else if (getCoverBehaviorAtSideNew(side).onCoverRightclickClient(side, this, aPlayer, aX, aY, aZ)) {
@@ -810,19 +810,19 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
             final ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
             if (tCurrentItem != null) {
                 if (getColorization() >= 0
-                    && GT_Utility.areStacksEqual(new ItemStack(Items.water_bucket, 1), tCurrentItem)) {
+                    && GTUtility.areStacksEqual(new ItemStack(Items.water_bucket, 1), tCurrentItem)) {
                     mMetaTileEntity.markDirty();
                     tCurrentItem.func_150996_a(Items.bucket);
                     setColorization((byte) -1);
                     return true;
                 }
-                final ForgeDirection tSide = GT_Utility.determineWrenchingSide(side, aX, aY, aZ);
-                if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWrenchList)) {
+                final ForgeDirection tSide = GTUtility.determineWrenchingSide(side, aX, aY, aZ);
+                if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWrenchList)) {
 
                     if (mMetaTileEntity.onWrenchRightClick(side, tSide, aPlayer, aX, aY, aZ, tCurrentItem)) {
                         mMetaTileEntity.markDirty();
-                        GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer);
-                        GT_Utility.sendSoundToPlayers(
+                        GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer);
+                        GTUtility.sendSoundToPlayers(
                             worldObj,
                             SoundResource.IC2_TOOLS_WRENCH,
                             1.0F,
@@ -833,15 +833,15 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
                     }
                     return true;
                 }
-                if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sScrewdriverList)) {
+                if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sScrewdriverList)) {
                     if (getCoverIDAtSide(side) == 0 && getCoverIDAtSide(tSide) != 0) {
-                        if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 200, aPlayer)) {
+                        if (GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 200, aPlayer)) {
                             setCoverDataAtSide(
                                 tSide,
                                 getCoverInfoAtSide(tSide).onCoverScrewdriverClick(aPlayer, 0.5F, 0.5F, 0.5F));
                             mMetaTileEntity.onScrewdriverRightClick(tSide, aPlayer, aX, aY, aZ, tCurrentItem);
                             mMetaTileEntity.markDirty();
-                            GT_Utility.sendSoundToPlayers(
+                            GTUtility.sendSoundToPlayers(
                                 worldObj,
                                 SoundResource.IC2_TOOLS_WRENCH,
                                 1.0F,
@@ -851,13 +851,13 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
                                 zCoord);
                         }
                     } else {
-                        if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
+                        if (GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
                             setCoverDataAtSide(
                                 side,
                                 getCoverInfoAtSide(side).onCoverScrewdriverClick(aPlayer, aX, aY, aZ));
                             mMetaTileEntity.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ, tCurrentItem);
                             mMetaTileEntity.markDirty();
-                            GT_Utility.sendSoundToPlayers(
+                            GTUtility.sendSoundToPlayers(
                                 worldObj,
                                 SoundResource.IC2_TOOLS_WRENCH,
                                 1.0F,
@@ -870,21 +870,21 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
                     return true;
                 }
 
-                if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sHardHammerList)) {
+                if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sHardHammerList)) {
                     return true;
                 }
 
-                if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSoftHammerList)) {
-                    if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
+                if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSoftHammerList)) {
+                    if (GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
                         if (mWorks) disableWorking();
                         else enableWorking();
                         mMetaTileEntity.markDirty();
-                        GT_Utility.sendChatToPlayer(
+                        GTUtility.sendChatToPlayer(
                             aPlayer,
-                            GT_Utility.trans("090", "Machine Processing: ")
-                                + (isAllowedToWork() ? GT_Utility.trans("088", "Enabled")
-                                    : GT_Utility.trans("087", "Disabled")));
-                        GT_Utility.sendSoundToPlayers(
+                            GTUtility.trans("090", "Machine Processing: ")
+                                + (isAllowedToWork() ? GTUtility.trans("088", "Enabled")
+                                    : GTUtility.trans("087", "Disabled")));
+                        GTUtility.sendSoundToPlayers(
                             worldObj,
                             SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE,
                             1.0F,
@@ -896,11 +896,11 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
                     return true;
                 }
 
-                if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWireCutterList)) {
+                if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWireCutterList)) {
                     if (mMetaTileEntity.onWireCutterRightClick(side, tSide, aPlayer, aX, aY, aZ, tCurrentItem)) {
                         mMetaTileEntity.markDirty();
                         // logic handled internally
-                        GT_Utility.sendSoundToPlayers(
+                        GTUtility.sendSoundToPlayers(
                             worldObj,
                             SoundResource.IC2_TOOLS_WRENCH,
                             1.0F,
@@ -913,11 +913,11 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
                     return true;
                 }
 
-                if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList)) {
+                if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSolderingToolList)) {
                     if (mMetaTileEntity.onSolderingToolRightClick(side, tSide, aPlayer, aX, aY, aZ, tCurrentItem)) {
                         mMetaTileEntity.markDirty();
                         // logic handled internally
-                        GT_Utility.sendSoundToPlayers(
+                        GTUtility.sendSoundToPlayers(
                             worldObj,
                             SoundResource.IC2_TOOLS_BATTERY_USE,
                             1.0F,
@@ -925,16 +925,16 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
                             xCoord,
                             yCoord,
                             zCoord);
-                    } else if (GT_ModHandler.useSolderingIron(tCurrentItem, aPlayer)) {
+                    } else if (GTModHandler.useSolderingIron(tCurrentItem, aPlayer)) {
                         mMetaTileEntity.markDirty();
                         mStrongRedstone ^= tSide.flag;
-                        GT_Utility.sendChatToPlayer(
+                        GTUtility.sendChatToPlayer(
                             aPlayer,
-                            GT_Utility.trans("091", "Redstone Output at Side ") + tSide
-                                + GT_Utility.trans("092", " set to: ")
-                                + ((mStrongRedstone & tSide.flag) != 0 ? GT_Utility.trans("093", "Strong")
-                                    : GT_Utility.trans("094", "Weak")));
-                        GT_Utility.sendSoundToPlayers(
+                            GTUtility.trans("091", "Redstone Output at Side ") + tSide
+                                + GTUtility.trans("092", " set to: ")
+                                + ((mStrongRedstone & tSide.flag) != 0 ? GTUtility.trans("093", "Strong")
+                                    : GTUtility.trans("094", "Weak")));
+                        GTUtility.sendSoundToPlayers(
                             worldObj,
                             SoundResource.IC2_TOOLS_BATTERY_USE,
                             3.0F,
@@ -954,17 +954,17 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
                 final CoverInfo coverInfo = getCoverInfoAtSide(coverSide);
 
                 if (coverInfo.getCoverID() == 0) {
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCovers.keySet())) {
-                        final GT_CoverBehaviorBase<?> coverBehavior = GregTech_API.getCoverBehaviorNew(tCurrentItem);
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sCovers.keySet())) {
+                        final CoverBehaviorBase<?> coverBehavior = GregTechAPI.getCoverBehaviorNew(tCurrentItem);
                         if (coverBehavior.isCoverPlaceable(coverSide, tCurrentItem, this)
-                            && mMetaTileEntity.allowCoverOnSide(coverSide, new GT_ItemStack(tCurrentItem))) {
+                            && mMetaTileEntity.allowCoverOnSide(coverSide, new GTItemStack(tCurrentItem))) {
 
                             setCoverItemAtSide(coverSide, tCurrentItem);
                             coverBehavior.onPlayerAttach(aPlayer, tCurrentItem, this, side);
 
                             mMetaTileEntity.markDirty();
                             if (!aPlayer.capabilities.isCreativeMode) tCurrentItem.stackSize--;
-                            GT_Utility.sendSoundToPlayers(
+                            GTUtility.sendSoundToPlayers(
                                 worldObj,
                                 SoundResource.IC2_TOOLS_WRENCH,
                                 1.0F,
@@ -976,9 +976,9 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
                         return true;
                     }
                 } else {
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCrowbarList)) {
-                        if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
-                            GT_Utility.sendSoundToPlayers(
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sCrowbarList)) {
+                        if (GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
+                            GTUtility.sendSoundToPlayers(
                                 worldObj,
                                 SoundResource.RANDOM_BREAK,
                                 1.0F,
@@ -993,7 +993,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
                     }
                 }
             } else if (aPlayer.isSneaking()) { // Sneak click, no tool -> open cover config or turn back.
-                side = (getCoverIDAtSide(side) == 0) ? GT_Utility.determineWrenchingSide(side, aX, aY, aZ) : side;
+                side = (getCoverIDAtSide(side) == 0) ? GTUtility.determineWrenchingSide(side, aX, aY, aZ) : side;
                 final CoverInfo coverInfo = getCoverInfoAtSide(side);
                 return coverInfo.isValid() && coverInfo.onCoverShiftRightClick(aPlayer);
             }
@@ -1064,7 +1064,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
         final CoverInfo coverInfo = getCoverInfoAtSide(ForgeDirection.getOrientation(ordinalSide));
         if (canAccessData() && (coverInfo.letsItemsOut(-1) || coverInfo.letsItemsIn(-1)))
             return mMetaTileEntity.getAccessibleSlotsFromSide(ordinalSide);
-        return GT_Values.emptyIntArray;
+        return GTValues.emptyIntArray;
     }
 
     /**
@@ -1164,7 +1164,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
 
     @Override
     public UUID getOwnerUuid() {
-        return GT_Utility.defaultUuid;
+        return GTUtility.defaultUuid;
     }
 
     @Override
@@ -1276,15 +1276,15 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
 
     @Override
     public boolean addStackToSlot(int aIndex, ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return true;
+        if (GTUtility.isStackInvalid(aStack)) return true;
         if (aIndex < 0 || aIndex >= getSizeInventory()) return false;
         final ItemStack tStack = getStackInSlot(aIndex);
-        if (GT_Utility.isStackInvalid(tStack)) {
+        if (GTUtility.isStackInvalid(tStack)) {
             setInventorySlotContents(aIndex, aStack);
             return true;
         }
-        aStack = GT_OreDictUnificator.get(aStack);
-        if (GT_Utility.areStacksEqual(tStack, aStack)
+        aStack = GTOreDictUnificator.get(aStack);
+        if (GTUtility.areStacksEqual(tStack, aStack)
             && tStack.stackSize + aStack.stackSize <= Math.min(aStack.getMaxStackSize(), getInventoryStackLimit())) {
             markDirty();
             tStack.stackSize += aStack.stackSize;
@@ -1295,7 +1295,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
 
     @Override
     public boolean addStackToSlot(int aIndex, ItemStack aStack, int aAmount) {
-        return addStackToSlot(aIndex, GT_Utility.copyAmount(aAmount, aStack));
+        return addStackToSlot(aIndex, GTUtility.copyAmount(aAmount, aStack));
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 27a6216cff..1229dfcc5b 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -1,8 +1,8 @@
 package gregtech.api.metatileentity;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
-import static gregtech.api.enums.GT_Values.NW;
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.GTMod.GT_FML_LOGGER;
+import static gregtech.api.enums.GTValues.NW;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
 
 import java.lang.reflect.Field;
@@ -54,9 +54,9 @@ import appeng.me.helpers.IGridProxyable;
 import appeng.tile.TileEvent;
 import appeng.tile.events.TileEventType;
 import cpw.mods.fml.relauncher.ReflectionHelper;
-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.ItemList;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
@@ -71,19 +71,19 @@ import gregtech.api.interfaces.tileentity.IDebugableTileEntity;
 import gregtech.api.interfaces.tileentity.IEnergyConnected;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IGregtechWailaProvider;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.net.GT_Packet_TileEntity;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.metatileentity.implementations.MTEBasicMachine;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.net.GTPacketTileEntity;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.objects.blockupdate.BlockUpdateHandler;
-import gregtech.api.util.GT_CoverBehaviorBase;
-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.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.shutdown.ShutDownReason;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
-import gregtech.common.GT_Pollution;
+import gregtech.common.Pollution;
 import gregtech.common.covers.CoverInfo;
 import ic2.api.Direction;
 import mcp.mobius.waila.api.IWailaConfigHandler;
@@ -102,7 +102,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
         .findField(EntityItem.class, "health", "field_70291_e");
     private final boolean[] mActiveEUInputs = new boolean[] { false, false, false, false, false, false };
     private final boolean[] mActiveEUOutputs = new boolean[] { false, false, false, false, false, false };
-    private final int[] mTimeStatistics = new int[GregTech_API.TICKS_FOR_LAG_AVERAGING];
+    private final int[] mTimeStatistics = new int[GregTechAPI.TICKS_FOR_LAG_AVERAGING];
     private boolean hasTimeStatisticsStarted;
     public long mLastSoundTick = 0;
     public boolean mWasShutdown = false;
@@ -125,7 +125,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
     private long oOutput = 0, mAcceptedAmperes = Long.MAX_VALUE;
     private long mLastCheckTick = 0;
     private String mOwnerName = "";
-    private UUID mOwnerUuid = GT_Utility.defaultUuid;
+    private UUID mOwnerUuid = GTUtility.defaultUuid;
     private NBTTagCompound mRecipeStuff = new NBTTagCompound();
     private int cableUpdateDelay = 30;
 
@@ -242,7 +242,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
      */
     public void chargeItem(ItemStack aStack) {
         decreaseStoredEU(
-            GT_ModHandler.chargeElectricItem(
+            GTModHandler.chargeElectricItem(
                 aStack,
                 (int) Math.min(Integer.MAX_VALUE, getStoredEU()),
                 (int) Math.min(Integer.MAX_VALUE, mMetaTileEntity.getOutputTier()),
@@ -256,7 +256,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
      */
     public void dischargeItem(ItemStack aStack) {
         increaseStoredEnergyUnits(
-            GT_ModHandler.dischargeElectricItem(
+            GTModHandler.dischargeElectricItem(
                 aStack,
                 (int) Math.min(Integer.MAX_VALUE, getEUCapacity() - getStoredEU()),
                 (int) Math.min(Integer.MAX_VALUE, mMetaTileEntity.getInputTier()),
@@ -351,7 +351,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                     }
 
                     if (mNeedsUpdate) {
-                        if (GT_Mod.gregtechproxy.mUseBlockUpdateHandler) {
+                        if (GTMod.gregtechproxy.mUseBlockUpdateHandler) {
                             BlockUpdateHandler.Instance.enqueueBlockUpdate(worldObj, getLocation());
                         } else {
                             worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
@@ -424,7 +424,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
 
                         if (mMetaTileEntity.isEnetOutput() && oOutput > 0) {
                             final long tOutputVoltage = Math
-                                .max(oOutput, oOutput + (1L << Math.max(0, GT_Utility.getTier(oOutput) - 1)));
+                                .max(oOutput, oOutput + (1L << Math.max(0, GTUtility.getTier(oOutput) - 1)));
                             final long tUsableAmperage = Math.min(
                                 getOutputAmperage(),
                                 (getStoredEU() - mMetaTileEntity.getMinimumStoredEU()) / tOutputVoltage);
@@ -436,7 +436,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                             }
                         }
                         if (getEUCapacity() > 0) {
-                            if (GregTech_API.sMachineFireExplosions && getRandomNumber(1000) == 0) {
+                            if (GregTechAPI.sMachineFireExplosions && getRandomNumber(1000) == 0) {
                                 final Block tBlock = getBlockAtSide(ForgeDirection.getOrientation(getRandomNumber(6)));
                                 if (tBlock instanceof BlockFire) doEnergyExplosion();
                             }
@@ -446,7 +446,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                                 return;
                             }
 
-                            if (GregTech_API.sMachineRainExplosions) {
+                            if (GregTechAPI.sMachineRainExplosions) {
                                 if (mMetaTileEntity.willExplodeInRain()) {
                                     if (getRandomNumber(1000) == 0 && isRainPossible()) {
                                         // Short-circuit so raincheck happens before isRainExposed,
@@ -457,12 +457,12 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                                         if (worldObj.isRaining() && isRainExposed()) {
                                             if (getRandomNumber(10) == 0) {
                                                 try {
-                                                    GT_Mod.achievements.issueAchievement(
+                                                    GTMod.achievements.issueAchievement(
                                                         this.getWorldObj()
                                                             .getPlayerEntityByName(mOwnerName),
                                                         "badweather");
                                                 } catch (Exception ignored) {}
-                                                GT_Log.exp.println(
+                                                GTLog.exp.println(
                                                     "Machine at: " + this.getXCoord()
                                                         + " | "
                                                         + this.getYCoord()
@@ -473,7 +473,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                                                         + " explosion due to rain!");
                                                 doEnergyExplosion();
                                             } else {
-                                                GT_Log.exp.println(
+                                                GTLog.exp.println(
                                                     "Machine at: " + this.getXCoord()
                                                         + " | "
                                                         + this.getYCoord()
@@ -489,16 +489,16 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                                             mRunningThroughTick = false;
                                             return;
                                         }
-                                        if (GregTech_API.sMachineThunderExplosions && worldObj.isThundering()
+                                        if (GregTechAPI.sMachineThunderExplosions && worldObj.isThundering()
                                             && getRandomNumber(3) == 0
                                             && isRainExposed()) {
                                             try {
-                                                GT_Mod.achievements.issueAchievement(
+                                                GTMod.achievements.issueAchievement(
                                                     this.getWorldObj()
                                                         .getPlayerEntityByName(mOwnerName),
                                                     "badweather");
                                             } catch (Exception ignored) {}
-                                            GT_Log.exp.println(
+                                            GTLog.exp.println(
                                                 "Machine at: " + this.getXCoord()
                                                     + " | "
                                                     + this.getYCoord()
@@ -591,8 +591,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                         tData = mMetaTileEntity.getUpdateData();
                         if (tData != oUpdateData)
                             sendBlockEvent(GregTechTileClientEvents.CHANGE_CUSTOM_DATA, oUpdateData = tData);
-                        if (mMetaTileEntity instanceof GT_MetaTileEntity_Hatch) {
-                            tData = ((GT_MetaTileEntity_Hatch) mMetaTileEntity).getTexturePage();
+                        if (mMetaTileEntity instanceof MTEHatch) {
+                            tData = ((MTEHatch) mMetaTileEntity).getTexturePage();
                             if (tData != oTexturePage) sendBlockEvent(
                                 GregTechTileClientEvents.CHANGE_CUSTOM_DATA,
                                 (byte) ((oTexturePage = tData) | 0x80)); // set last bit as a flag for page
@@ -628,12 +628,12 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
             }
         } catch (Throwable e) {
             e.printStackTrace();
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
             try {
                 mMetaTileEntity.onTickFail(this, mTickTimer);
             } catch (Throwable ex) {
                 ex.printStackTrace();
-                ex.printStackTrace(GT_Log.err);
+                ex.printStackTrace(GTLog.err);
             }
         }
 
@@ -641,7 +641,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
             tTime = System.nanoTime() - tTime;
             mTimeStatisticsIndex = (mTimeStatisticsIndex + 1) % mTimeStatistics.length;
             mTimeStatistics[mTimeStatisticsIndex] = (int) tTime;
-            if (tTime > 0 && tTime > (GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING * 1_000_000L)
+            if (tTime > 0 && tTime > (GregTechAPI.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING * 1_000_000L)
                 && mTickTimer > 1000
                 && getMetaTileEntity().doTickProfilingMessageDuringThisTick()
                 && mLagWarningCount++ < 10)
@@ -684,7 +684,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
         if (mSendClientData) {
             NW.sendPacketToAllPlayersInRange(
                 worldObj,
-                new GT_Packet_TileEntity(
+                new GTPacketTileEntity(
                     xCoord,
                     (short) yCoord,
                     zCoord,
@@ -699,8 +699,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                         | (mRedstone ? 16 : 0)
                         | (mLockUpgrade ? 32 : 0)
                         | (mWorks ? 64 : 0)),
-                    oTexturePage = (hasValidMetaTileEntity() && mMetaTileEntity instanceof GT_MetaTileEntity_Hatch)
-                        ? ((GT_MetaTileEntity_Hatch) mMetaTileEntity).getTexturePage()
+                    oTexturePage = (hasValidMetaTileEntity() && mMetaTileEntity instanceof MTEHatch)
+                        ? ((MTEHatch) mMetaTileEntity).getTexturePage()
                         : 0,
                     oUpdateData = hasValidMetaTileEntity() ? mMetaTileEntity.getUpdateData() : 0,
                     oRedstoneData = (byte) (((mSidedRedstone[0] > 0) ? 1 : 0) | ((mSidedRedstone[1] > 0) ? 2 : 0)
@@ -747,9 +747,9 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
             try {
                 mMetaTileEntity.receiveClientEvent((byte) aEventID, (byte) aValue);
             } catch (Throwable e) {
-                GT_Log.err.println(
+                GTLog.err.println(
                     "Encountered Exception while receiving Data from the Server, the Client should've been crashed by now, but I prevented that. Please report immediately to GregTech Intergalactical!!!");
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
         }
 
@@ -768,8 +768,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                     if (hasValidMetaTileEntity()) {
                         if ((aValue & 0x80) == 0) // Is texture index
                             mMetaTileEntity.onValueUpdate((byte) (aValue & 0x7F));
-                        else if (mMetaTileEntity instanceof GT_MetaTileEntity_Hatch) // is texture page and hatch
-                            ((GT_MetaTileEntity_Hatch) mMetaTileEntity).onTexturePageUpdate((byte) (aValue & 0x7F));
+                        else if (mMetaTileEntity instanceof MTEHatch) // is texture page and hatch
+                            ((MTEHatch) mMetaTileEntity).onTexturePageUpdate((byte) (aValue & 0x7F));
                     }
                 }
                 case GregTechTileClientEvents.CHANGE_COLOR -> {
@@ -836,11 +836,11 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                 int samples = mTimeStatistics.length - amountOfZero;
                 if (samples > 0) {
                     tList.add(
-                        "Average CPU load of ~" + GT_Utility.formatNumbers(tAverageTime / samples)
+                        "Average CPU load of ~" + GTUtility.formatNumbers(tAverageTime / samples)
                             + "ns over "
-                            + GT_Utility.formatNumbers(samples)
+                            + GTUtility.formatNumbers(samples)
                             + " ticks with worst time of "
-                            + GT_Utility.formatNumbers(tWorstTime)
+                            + GTUtility.formatNumbers(tWorstTime)
                             + "ns.");
                 }
             } else {
@@ -848,9 +848,9 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                 tList.add("Just started tick time statistics.");
             }
             tList.add(
-                "Recorded " + GT_Utility.formatNumbers(mMetaTileEntity.mSoundRequests)
+                "Recorded " + GTUtility.formatNumbers(mMetaTileEntity.mSoundRequests)
                     + " sound requests in "
-                    + GT_Utility.formatNumbers(mTickTimer - mLastCheckTick)
+                    + GTUtility.formatNumbers(mTickTimer - mLastCheckTick)
                     + " ticks.");
             mLastCheckTick = mTickTimer;
             mMetaTileEntity.mSoundRequests = 0;
@@ -858,7 +858,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                 tList.add(
                     "Caused " + (mLagWarningCount >= 10 ? "more than 10" : mLagWarningCount)
                         + " Lag Spike Warnings (anything taking longer than "
-                        + GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING
+                        + GregTechAPI.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING
                         + "ms) on the Server.");
             }
             tList.add(
@@ -867,8 +867,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
         }
         if (aLogLevel > 0) {
             if (getSteamCapacity() > 0 && hasSteamEngineUpgrade()) tList.add(
-                GT_Utility.formatNumbers(getStoredSteam()) + " of "
-                    + GT_Utility.formatNumbers(getSteamCapacity())
+                GTUtility.formatNumbers(getStoredSteam()) + " of "
+                    + GTUtility.formatNumbers(getSteamCapacity())
                     + " Steam");
             tList.add(
                 "Machine is " + (mActive ? EnumChatFormatting.GREEN + "active" + EnumChatFormatting.RESET
@@ -907,7 +907,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
 
             if (mMetaTileEntity.shouldTriggerBlockUpdate()) {
                 // If we're triggering a block update this will call onMachineBlockUpdate()
-                GregTech_API.causeMachineUpdate(worldObj, xCoord, yCoord, zCoord);
+                GregTechAPI.causeMachineUpdate(worldObj, xCoord, yCoord, zCoord);
             } else {
                 // If we're not trigger a cascading one, call the update here.
                 onMachineBlockUpdate();
@@ -934,14 +934,14 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
             markDirty();
             mMetaTileEntity.setInventorySlotContents(
                 aIndex,
-                worldObj.isRemote ? aStack : GT_OreDictUnificator.setStack(true, aStack));
+                worldObj.isRemote ? aStack : GTOreDictUnificator.setStack(true, aStack));
         }
     }
 
     @Override
     public String getInventoryName() {
         if (canAccessData()) return mMetaTileEntity.getInventoryName();
-        if (GregTech_API.METATILEENTITIES[mID] != null) return GregTech_API.METATILEENTITIES[mID].getInventoryName();
+        if (GregTechAPI.METATILEENTITIES[mID] != null) return GregTechAPI.METATILEENTITIES[mID].getInventoryName();
         return "";
     }
 
@@ -1374,7 +1374,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
 
     public void doEnergyExplosion() {
         if (getUniversalEnergyCapacity() > 0 && getUniversalEnergyStored() >= getUniversalEnergyCapacity() / 5) {
-            GT_Log.exp.println(
+            GTLog.exp.println(
                 "Energy Explosion, injected " + getUniversalEnergyStored()
                     + "EU >= "
                     + getUniversalEnergyCapacity() / 5D
@@ -1383,7 +1383,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
             doExplosion(
                 oOutput * (getUniversalEnergyStored() >= getUniversalEnergyCapacity() ? 4
                     : getUniversalEnergyStored() >= getUniversalEnergyCapacity() / 2 ? 2 : 1));
-            GT_Mod.achievements.issueAchievement(
+            GTMod.achievements.issueAchievement(
                 this.getWorldObj()
                     .getPlayerEntityByName(mOwnerName),
                 "electricproblems");
@@ -1394,7 +1394,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
     public void doExplosion(long aAmount) {
         if (canAccessData()) {
             // This is only for Electric Machines
-            if (GregTech_API.sMachineWireFire && mMetaTileEntity.isElectric()) {
+            if (GregTechAPI.sMachineWireFire && mMetaTileEntity.isElectric()) {
                 try {
                     mReleaseEnergy = true;
                     IEnergyConnected.Util.emitEnergyToNetwork(V[5], Math.max(1, getStoredEU() / V[5]), this);
@@ -1403,7 +1403,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
             mReleaseEnergy = false;
             // Normal Explosion Code
             mMetaTileEntity.onExplosion();
-            if (GT_Mod.gregtechproxy.mExplosionItemDrop) {
+            if (GTMod.gregtechproxy.mExplosionItemDrop) {
                 for (int i = 0; i < this.getSizeInventory(); i++) {
                     final ItemStack tItem = this.getStackInSlot(i);
                     if ((tItem != null) && (tItem.stackSize > 0) && (this.isValidSlot(i))) {
@@ -1415,12 +1415,12 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
             if (mRecipeStuff != null) {
                 for (int i = 0; i < 9; i++) {
                     if (this.getRandomNumber(100) < 50) {
-                        dropItems(GT_Utility.loadItem(mRecipeStuff, "Ingredient." + i));
+                        dropItems(GTUtility.loadItem(mRecipeStuff, "Ingredient." + i));
                     }
                 }
             }
 
-            GT_Pollution.addPollution((TileEntity) this, GT_Mod.gregtechproxy.mPollutionOnExplosion);
+            Pollution.addPollution((TileEntity) this, GTMod.gregtechproxy.mPollutionOnExplosion);
             mMetaTileEntity.doExplosion(aAmount);
         }
     }
@@ -1453,7 +1453,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
 
     @Override
     public ArrayList<ItemStack> getDrops() {
-        final ItemStack rStack = new ItemStack(GregTech_API.sBlockMachines, 1, mID);
+        final ItemStack rStack = new ItemStack(GregTechAPI.sBlockMachines, 1, mID);
         final NBTTagCompound tNBT = new NBTTagCompound();
         if (mRecipeStuff != null && !mRecipeStuff.hasNoTags()) tNBT.setTag("GT.CraftingComponents", mRecipeStuff);
         if (mMuffler) tNBT.setBoolean("mMuffler", mMuffler);
@@ -1486,7 +1486,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
             // Configure Cover, sneak can also be: screwdriver, wrench, side cutter, soldering iron
             if (aPlayer.isSneaking()) {
                 final ForgeDirection tSide = (getCoverIDAtSide(side) == 0)
-                    ? GT_Utility.determineWrenchingSide(side, aX, aY, aZ)
+                    ? GTUtility.determineWrenchingSide(side, aX, aY, aZ)
                     : side;
                 return (getCoverBehaviorAtSideNew(tSide).hasCoverGUI());
             } else if (getCoverBehaviorAtSideNew(side).onCoverRightclickClient(side, this, aPlayer, aX, aY, aZ)) {
@@ -1502,17 +1502,17 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                 final ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
                 if (tCurrentItem != null) {
                     if (getColorization() >= 0
-                        && GT_Utility.areStacksEqual(new ItemStack(Items.water_bucket, 1), tCurrentItem)) {
+                        && GTUtility.areStacksEqual(new ItemStack(Items.water_bucket, 1), tCurrentItem)) {
                         tCurrentItem.func_150996_a(Items.bucket);
                         setColorization((byte) (getColorization() >= 16 ? -2 : -1));
                         return true;
                     }
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWrenchList)) {
-                        if (aPlayer.isSneaking() && mMetaTileEntity instanceof GT_MetaTileEntity_BasicMachine
-                            && ((GT_MetaTileEntity_BasicMachine) mMetaTileEntity)
-                                .setMainFacing(GT_Utility.determineWrenchingSide(side, aX, aY, aZ))) {
-                            GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer);
-                            GT_Utility.sendSoundToPlayers(
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWrenchList)) {
+                        if (aPlayer.isSneaking() && mMetaTileEntity instanceof MTEBasicMachine
+                            && ((MTEBasicMachine) mMetaTileEntity)
+                                .setMainFacing(GTUtility.determineWrenchingSide(side, aX, aY, aZ))) {
+                            GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer);
+                            GTUtility.sendSoundToPlayers(
                                 worldObj,
                                 SoundResource.IC2_TOOLS_WRENCH,
                                 1.0F,
@@ -1523,14 +1523,14 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                             cableUpdateDelay = 10;
                         } else if (mMetaTileEntity.onWrenchRightClick(
                             side,
-                            GT_Utility.determineWrenchingSide(side, aX, aY, aZ),
+                            GTUtility.determineWrenchingSide(side, aX, aY, aZ),
                             aPlayer,
                             aX,
                             aY,
                             aZ,
                             tCurrentItem)) {
-                                GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer);
-                                GT_Utility.sendSoundToPlayers(
+                                GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer);
+                                GTUtility.sendSoundToPlayers(
                                     worldObj,
                                     SoundResource.IC2_TOOLS_WRENCH,
                                     1.0F,
@@ -1543,8 +1543,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                         return true;
                     }
 
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sScrewdriverList)) {
-                        if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 200, aPlayer)) {
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sScrewdriverList)) {
+                        if (GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 200, aPlayer)) {
                             setCoverDataAtSide(
                                 side,
                                 getCoverBehaviorAtSideNew(side).onCoverScrewdriverClick(
@@ -1557,7 +1557,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                                     aY,
                                     aZ));
                             mMetaTileEntity.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ, tCurrentItem);
-                            GT_Utility.sendSoundToPlayers(
+                            GTUtility.sendSoundToPlayers(
                                 worldObj,
                                 SoundResource.IC2_TOOLS_WRENCH,
                                 1.0F,
@@ -1569,18 +1569,18 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                         return true;
                     }
 
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sHardHammerList)) {
-                        if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sHardHammerList)) {
+                        if (GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
                             mInputDisabled = !mInputDisabled;
                             if (mInputDisabled) mOutputDisabled = !mOutputDisabled;
-                            GT_Utility.sendChatToPlayer(
+                            GTUtility.sendChatToPlayer(
                                 aPlayer,
-                                GT_Utility.trans("086", "Auto-Input: ") + (mInputDisabled
-                                    ? GT_Utility.trans("087", "Disabled")
-                                    : GT_Utility.trans("088", "Enabled") + GT_Utility.trans("089", "  Auto-Output: ")
-                                        + (mOutputDisabled ? GT_Utility.trans("087", "Disabled")
-                                            : GT_Utility.trans("088", "Enabled"))));
-                            GT_Utility.sendSoundToPlayers(
+                                GTUtility.trans("086", "Auto-Input: ")
+                                    + (mInputDisabled ? GTUtility.trans("087", "Disabled")
+                                        : GTUtility.trans("088", "Enabled") + GTUtility.trans("089", "  Auto-Output: ")
+                                            + (mOutputDisabled ? GTUtility.trans("087", "Disabled")
+                                                : GTUtility.trans("088", "Enabled"))));
+                            GTUtility.sendSoundToPlayers(
                                 worldObj,
                                 SoundResource.RANDOM_ANVIL_USE,
                                 1.0F,
@@ -1592,19 +1592,19 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                         return true;
                     }
 
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSoftHammerList)) {
-                        if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSoftHammerList)) {
+                        if (GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
                             if (mWorks) disableWorking();
                             else enableWorking();
                             {
-                                String tChat = GT_Utility.trans("090", "Machine Processing: ")
-                                    + (isAllowedToWork() ? GT_Utility.trans("088", "Enabled")
-                                        : GT_Utility.trans("087", "Disabled"));
+                                String tChat = GTUtility.trans("090", "Machine Processing: ")
+                                    + (isAllowedToWork() ? GTUtility.trans("088", "Enabled")
+                                        : GTUtility.trans("087", "Disabled"));
                                 if (getMetaTileEntity() != null && getMetaTileEntity().hasAlternativeModeText())
                                     tChat = getMetaTileEntity().getAlternativeModeText();
-                                GT_Utility.sendChatToPlayer(aPlayer, tChat);
+                                GTUtility.sendChatToPlayer(aPlayer, tChat);
                             }
-                            GT_Utility.sendSoundToPlayers(
+                            GTUtility.sendSoundToPlayers(
                                 worldObj,
                                 SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE,
                                 1.0F,
@@ -1616,11 +1616,11 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                         return true;
                     }
 
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList)) {
-                        final ForgeDirection tSide = GT_Utility.determineWrenchingSide(side, aX, aY, aZ);
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSolderingToolList)) {
+                        final ForgeDirection tSide = GTUtility.determineWrenchingSide(side, aX, aY, aZ);
                         if (mMetaTileEntity.onSolderingToolRightClick(side, tSide, aPlayer, aX, aY, aZ, tCurrentItem)) {
                             // logic handled internally
-                            GT_Utility.sendSoundToPlayers(
+                            GTUtility.sendSoundToPlayers(
                                 worldObj,
                                 SoundResource.IC2_TOOLS_BATTERY_USE,
                                 1.0F,
@@ -1628,15 +1628,15 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                                 xCoord,
                                 yCoord,
                                 zCoord);
-                        } else if (GT_ModHandler.useSolderingIron(tCurrentItem, aPlayer)) {
+                        } else if (GTModHandler.useSolderingIron(tCurrentItem, aPlayer)) {
                             mStrongRedstone ^= tSide.flag;
-                            GT_Utility.sendChatToPlayer(
+                            GTUtility.sendChatToPlayer(
                                 aPlayer,
-                                GT_Utility.trans("091", "Redstone Output at Side ") + tSide
-                                    + GT_Utility.trans("092", " set to: ")
-                                    + ((mStrongRedstone & tSide.flag) != 0 ? GT_Utility.trans("093", "Strong")
-                                        : GT_Utility.trans("094", "Weak")));
-                            GT_Utility.sendSoundToPlayers(
+                                GTUtility.trans("091", "Redstone Output at Side ") + tSide
+                                    + GTUtility.trans("092", " set to: ")
+                                    + ((mStrongRedstone & tSide.flag) != 0 ? GTUtility.trans("093", "Strong")
+                                        : GTUtility.trans("094", "Weak")));
+                            GTUtility.sendSoundToPlayers(
                                 worldObj,
                                 SoundResource.IC2_TOOLS_BATTERY_USE,
                                 3.0F,
@@ -1651,11 +1651,11 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                         return true;
                     }
 
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWireCutterList)) {
-                        final ForgeDirection tSide = GT_Utility.determineWrenchingSide(side, aX, aY, aZ);
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWireCutterList)) {
+                        final ForgeDirection tSide = GTUtility.determineWrenchingSide(side, aX, aY, aZ);
                         if (mMetaTileEntity.onWireCutterRightClick(side, tSide, aPlayer, aX, aY, aZ, tCurrentItem)) {
                             // logic handled internally
-                            GT_Utility.sendSoundToPlayers(
+                            GTUtility.sendSoundToPlayers(
                                 worldObj,
                                 SoundResource.IC2_TOOLS_WRENCH,
                                 1.0F,
@@ -1670,20 +1670,19 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                     }
 
                     ForgeDirection coverSide = side;
-                    if (getCoverIDAtSide(side) == 0) coverSide = GT_Utility.determineWrenchingSide(side, aX, aY, aZ);
+                    if (getCoverIDAtSide(side) == 0) coverSide = GTUtility.determineWrenchingSide(side, aX, aY, aZ);
 
                     if (getCoverIDAtSide(coverSide) == 0) {
-                        if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCovers.keySet())) {
-                            final GT_CoverBehaviorBase<?> coverBehavior = GregTech_API
-                                .getCoverBehaviorNew(tCurrentItem);
+                        if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sCovers.keySet())) {
+                            final CoverBehaviorBase<?> coverBehavior = GregTechAPI.getCoverBehaviorNew(tCurrentItem);
                             if (coverBehavior.isCoverPlaceable(coverSide, tCurrentItem, this)
-                                && mMetaTileEntity.allowCoverOnSide(coverSide, new GT_ItemStack(tCurrentItem))) {
+                                && mMetaTileEntity.allowCoverOnSide(coverSide, new GTItemStack(tCurrentItem))) {
 
                                 setCoverItemAtSide(coverSide, tCurrentItem);
                                 coverBehavior.onPlayerAttach(aPlayer, tCurrentItem, this, coverSide);
 
                                 if (!aPlayer.capabilities.isCreativeMode) tCurrentItem.stackSize--;
-                                GT_Utility.sendSoundToPlayers(
+                                GTUtility.sendSoundToPlayers(
                                     worldObj,
                                     SoundResource.IC2_TOOLS_WRENCH,
                                     1.0F,
@@ -1696,9 +1695,9 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                             return true;
                         }
                     } else {
-                        if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCrowbarList)) {
-                            if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
-                                GT_Utility.sendSoundToPlayers(
+                        if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sCrowbarList)) {
+                            if (GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
+                                GTUtility.sendSoundToPlayers(
                                     worldObj,
                                     SoundResource.RANDOM_BREAK,
                                     1.0F,
@@ -1709,15 +1708,15 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                                 dropCover(coverSide, side, false);
                             }
                             return true;
-                        } else if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sJackhammerList)) {
+                        } else if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sJackhammerList)) {
                             // Configuration of delicate electronics calls for a tool with precision and subtlety.
-                            if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
+                            if (GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
                                 final CoverInfo info = getCoverInfoAtSide(coverSide);
                                 if (info != CoverInfo.EMPTY_INFO) {
-                                    final GT_CoverBehaviorBase<?> behavior = info.getCoverBehavior();
+                                    final CoverBehaviorBase<?> behavior = info.getCoverBehavior();
                                     if (behavior.allowsTickRateAddition()) {
                                         info.onCoverJackhammer(aPlayer);
-                                        GT_Utility.sendSoundToPlayers(
+                                        GTUtility.sendSoundToPlayers(
                                             worldObj,
                                             SoundResource.IC2_TOOLS_DRILL_DRILL_SOFT,
                                             1.0F,
@@ -1727,7 +1726,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                                             zCoord);
 
                                     } else {
-                                        GT_Utility.sendChatToPlayer(
+                                        GTUtility.sendChatToPlayer(
                                             aPlayer,
                                             StatCollector.translateToLocal("gt.cover.info.chat.tick_rate_not_allowed"));
                                     }
@@ -1738,7 +1737,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                     }
                     // End item != null
                 } else if (aPlayer.isSneaking()) { // Sneak click, no tool -> open cover config if possible.
-                    side = (getCoverIDAtSide(side) == 0) ? GT_Utility.determineWrenchingSide(side, aX, aY, aZ) : side;
+                    side = (getCoverIDAtSide(side) == 0) ? GTUtility.determineWrenchingSide(side, aX, aY, aZ) : side;
                     return getCoverIDAtSide(side) > 0 && getCoverBehaviorAtSideNew(side).onCoverShiftRightClick(
                         side,
                         getCoverIDAtSide(side),
@@ -1762,7 +1761,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                 if (isUpgradable() && tCurrentItem != null) {
                     if (ItemList.Upgrade_Muffler.isStackEqual(aPlayer.inventory.getCurrentItem())) {
                         if (addMufflerUpgrade()) {
-                            GT_Utility.sendSoundToPlayers(
+                            GTUtility.sendSoundToPlayers(
                                 worldObj,
                                 SoundResource.RANDOM_CLICK,
                                 1.0F,
@@ -1779,7 +1778,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
                             mLockUpgrade = true;
                             setOwnerName(aPlayer.getDisplayName());
                             setOwnerUuid(aPlayer.getUniqueID());
-                            GT_Utility.sendSoundToPlayers(
+                            GTUtility.sendSoundToPlayers(
                                 worldObj,
                                 SoundResource.RANDOM_CLICK,
                                 1.0F,
@@ -1799,9 +1798,9 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
             if (!aPlayer.isSneaking() && hasValidMetaTileEntity())
                 return mMetaTileEntity.onRightclick(this, aPlayer, side, aX, aY, aZ);
         } catch (Throwable e) {
-            GT_Log.err.println(
+            GTLog.err.println(
                 "Encountered Exception while rightclicking TileEntity, the Game should've crashed now, but I prevented that. Please report immediately to GregTech Intergalactical!!!");
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
             e.printStackTrace();
         }
 
@@ -1813,9 +1812,9 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
         try {
             if (aPlayer != null && hasValidMetaTileEntity()) mMetaTileEntity.onLeftclick(this, aPlayer);
         } catch (Throwable e) {
-            GT_Log.err.println(
+            GTLog.err.println(
                 "Encountered Exception while leftclicking TileEntity, the Game should've crashed now, but I prevented that. Please report immediately to GregTech Intergalactical!!!");
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
     }
 
@@ -1859,7 +1858,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
         final CoverInfo coverInfo = getCoverInfoAtSide(ForgeDirection.getOrientation(ordinalSide));
         if (canAccessData() && (coverInfo.letsItemsOut(-1) || coverInfo.letsItemsIn(-1)))
             return mMetaTileEntity.getAccessibleSlotsFromSide(ordinalSide);
-        return GT_Values.emptyIntArray;
+        return GTValues.emptyIntArray;
     }
 
     /**
@@ -1998,13 +1997,13 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
 
     @Override
     public String getOwnerName() {
-        if (GT_Utility.isStringInvalid(mOwnerName)) return "Player";
+        if (GTUtility.isStringInvalid(mOwnerName)) return "Player";
         return mOwnerName;
     }
 
     @Override
     public String setOwnerName(String aName) {
-        if (GT_Utility.isStringInvalid(aName)) return mOwnerName = "Player";
+        if (GTUtility.isStringInvalid(aName)) return mOwnerName = "Player";
         return mOwnerName = aName;
     }
 
@@ -2041,7 +2040,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
             || getStoredEU() >= getEUCapacity()
             || mMetaTileEntity.maxAmperesIn() <= mAcceptedAmperes) return 0;
         if (aVoltage > getInputVoltage()) {
-            GT_Log.exp
+            GTLog.exp
                 .println("Energy Explosion, injected " + aVoltage + "EU/t in a " + getInputVoltage() + "EU/t Machine!");
             doExplosion(aVoltage);
             return 0;
@@ -2245,15 +2244,15 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
 
     @Override
     public boolean addStackToSlot(int slotIndex, ItemStack stack) {
-        if (GT_Utility.isStackInvalid(stack)) return true;
+        if (GTUtility.isStackInvalid(stack)) return true;
         if (slotIndex < 0 || slotIndex >= getSizeInventory()) return false;
         final ItemStack toStack = getStackInSlot(slotIndex);
-        if (GT_Utility.isStackInvalid(toStack)) {
+        if (GTUtility.isStackInvalid(toStack)) {
             setInventorySlotContents(slotIndex, stack);
             return true;
         }
-        final ItemStack fromStack = GT_OreDictUnificator.get(stack);
-        if (GT_Utility.areStacksEqual(toStack, fromStack) && toStack.stackSize + fromStack.stackSize
+        final ItemStack fromStack = GTOreDictUnificator.get(stack);
+        if (GTUtility.areStacksEqual(toStack, fromStack) && toStack.stackSize + fromStack.stackSize
             <= Math.min(fromStack.getMaxStackSize(), getInventoryStackLimit())) {
             toStack.stackSize += fromStack.stackSize;
             markDirty();
@@ -2264,7 +2263,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
 
     @Override
     public boolean addStackToSlot(int aIndex, ItemStack aStack, int aAmount) {
-        return addStackToSlot(aIndex, GT_Utility.copyAmount(aAmount, aStack));
+        return addStackToSlot(aIndex, GTUtility.copyAmount(aAmount, aStack));
     }
 
     @Override
@@ -2343,13 +2342,13 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
         final int newInputSize;
         final int oldOutputSize;
         final int newOutputSize;
-        final int chemistryUpdateVersion = GT_Mod.calculateTotalGTVersion(509, 31);
-        final int configCircuitAdditionVersion = GT_Mod.calculateTotalGTVersion(509, 40);
-        final int wireAdditionVersion = GT_Mod.calculateTotalGTVersion(509, 41);
-        final int disassemblerRemoveVersion = GT_Mod.calculateTotalGTVersion(509, 42, 44);
+        final int chemistryUpdateVersion = GTMod.calculateTotalGTVersion(509, 31);
+        final int configCircuitAdditionVersion = GTMod.calculateTotalGTVersion(509, 40);
+        final int wireAdditionVersion = GTMod.calculateTotalGTVersion(509, 41);
+        final int disassemblerRemoveVersion = GTMod.calculateTotalGTVersion(509, 42, 44);
         if (nbtVersion < 1000000) nbtVersion *= 1000;
         // 4 is old GT_MetaTileEntity_BasicMachine.OTHER_SLOT_COUNT
-        if (nbtVersion < configCircuitAdditionVersion && getMetaTileEntity() instanceof GT_MetaTileEntity_BasicMachine
+        if (nbtVersion < configCircuitAdditionVersion && getMetaTileEntity() instanceof MTEBasicMachine
             && slotIndex >= 4) slotIndex += 1;
         if (mID >= 211 && mID <= 218) { // Assembler
             if (nbtVersion < chemistryUpdateVersion) {
@@ -2415,10 +2414,10 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
         }
 
         int indexShift = 0;
-        if (slotIndex >= GT_MetaTileEntity_BasicMachine.OTHER_SLOT_COUNT + oldInputSize) {
+        if (slotIndex >= MTEBasicMachine.OTHER_SLOT_COUNT + oldInputSize) {
             indexShift += newInputSize - oldInputSize;
         }
-        if (slotIndex >= GT_MetaTileEntity_BasicMachine.OTHER_SLOT_COUNT + oldInputSize + oldOutputSize) {
+        if (slotIndex >= MTEBasicMachine.OTHER_SLOT_COUNT + oldInputSize + oldOutputSize) {
             indexShift += newOutputSize - oldOutputSize;
         }
         return slotIndex + indexShift;
diff --git a/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java
index c2cef8628d..7b18565165 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity;
 
-import static gregtech.api.enums.GT_Values.NW;
+import static gregtech.api.enums.GTValues.NW;
 
 import java.util.Arrays;
 import java.util.List;
@@ -47,10 +47,10 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Dyes;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.enums.GTValues;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.GUITextureSet;
 import gregtech.api.interfaces.IConfigurationCircuitSupport;
 import gregtech.api.interfaces.modularui.IAddGregtechLogo;
@@ -60,11 +60,11 @@ import gregtech.api.interfaces.tileentity.IGTEnet;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
 import gregtech.api.interfaces.tileentity.IIC2Enet;
-import gregtech.api.net.GT_Packet_Block_Event;
-import gregtech.api.net.GT_Packet_SetConfigurationCircuit;
+import gregtech.api.net.GTPacketBlockEvent;
+import gregtech.api.net.GTPacketSetConfigurationCircuit;
+import gregtech.api.util.GTUtil;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.GT_TooltipDataCache;
-import gregtech.api.util.GT_Util;
-import gregtech.api.util.GT_Utility;
 import gregtech.common.gui.modularui.uifactory.SelectItemUIFactory;
 import ic2.api.energy.event.EnergyTileLoadEvent;
 import ic2.api.energy.event.EnergyTileUnloadEvent;
@@ -103,7 +103,7 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     public static ForgeDirection getSideForPlayerPlacing(Entity player, ForgeDirection defaultFacing,
         boolean[] aAllowedFacings) {
 
-        final ForgeDirection facingFromPlayer = GT_Utility.getSideFromPlayerFacing(player);
+        final ForgeDirection facingFromPlayer = GTUtility.getSideFromPlayerFacing(player);
         if (facingFromPlayer != ForgeDirection.UNKNOWN && aAllowedFacings[facingFromPlayer.ordinal()])
             return facingFromPlayer;
 
@@ -424,13 +424,13 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     @Override
     public final boolean getOpacity(int x, int y, int z) {
         if (ignoreUnloadedChunks && crossedChunkBorder(x, z) && !worldObj.blockExists(x, y, z)) return false;
-        return GT_Utility.isOpaqueBlock(worldObj, x, y, z);
+        return GTUtility.isOpaqueBlock(worldObj, x, y, z);
     }
 
     @Override
     public final boolean getAir(int x, int y, int z) {
         if (ignoreUnloadedChunks && crossedChunkBorder(x, z) && !worldObj.blockExists(x, y, z)) return true;
-        return GT_Utility.isBlockAir(worldObj, x, y, z);
+        return GTUtility.isBlockAir(worldObj, x, y, z);
     }
 
     @Override
@@ -540,7 +540,7 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     public final void sendBlockEvent(byte aID, byte aValue) {
         NW.sendPacketToAllPlayersInRange(
             worldObj,
-            new GT_Packet_Block_Event(xCoord, (short) yCoord, zCoord, aID, aValue),
+            new GTPacketBlockEvent(xCoord, (short) yCoord, zCoord, aID, aValue),
             xCoord,
             zCoord);
     }
@@ -554,7 +554,7 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     }
 
     public final void setOnFire() {
-        GT_Utility.setCoordsOnFire(worldObj, xCoord, yCoord, zCoord, false);
+        GTUtility.setCoordsOnFire(worldObj, xCoord, yCoord, zCoord, false);
     }
 
     public final void setToFire() {
@@ -666,7 +666,7 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     }
 
     protected void addTitleToUI(ModularWindow.Builder builder, String title) {
-        if (GT_Mod.gregtechproxy.mTitleTabStyle == 2) {
+        if (GTMod.gregtechproxy.mTitleTabStyle == 2) {
             addTitleItemIconStyle(builder, title);
         } else {
             addTitleTextStyle(builder, title);
@@ -691,7 +691,7 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
         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);
@@ -852,9 +852,9 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
                     }
                 } else {
                     final List<ItemStack> tCircuits = ccs.getConfigurationCircuits();
-                    final int index = GT_Utility.findMatchingStackInList(tCircuits, cursorStack);
+                    final int index = GTUtility.findMatchingStackInList(tCircuits, cursorStack);
                     if (index < 0) {
-                        int curIndex = GT_Utility
+                        int curIndex = GTUtility
                             .findMatchingStackInList(tCircuits, inv.getStackInSlot(ccs.getCircuitSlot())) + 1;
                         if (clickData.mouseButton == 0) {
                             curIndex += 1;
@@ -894,7 +894,7 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
         })
             .disableShiftInsert()
             .setHandlePhantomActionClient(true)
-            .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_INT_CIRCUIT)
+            .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_INT_CIRCUIT)
             .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.select_circuit.tooltip"))
             .setTooltipShowUpDelay(TOOLTIP_DELAY)
             .setPos(ccs.getCircuitSlotX() - 1, ccs.getCircuitSlotY() - 1));
@@ -913,7 +913,7 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
                 getStackForm(0),
                 this::onCircuitSelected,
                 circuits,
-                GT_Utility.findMatchingStackInList(circuits, inv.getStackInSlot(ccs.getCircuitSlot())))
+                GTUtility.findMatchingStackInList(circuits, inv.getStackInSlot(ccs.getCircuitSlot())))
                     .setAnotherWindow(true, dialogOpened)
                     .setGuiTint(getGUIColorization())
                     .setCurrentGetter(() -> inv.getStackInSlot(ccs.getCircuitSlot()))
@@ -926,7 +926,7 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
 
         if (!(this instanceof IInventory inv)) return;
 
-        GT_Values.NW.sendToServer(new GT_Packet_SetConfigurationCircuit(this, selected));
+        GTValues.NW.sendToServer(new GTPacketSetConfigurationCircuit(this, selected));
         // we will not do any validation on client side
         // it doesn't get to actually decide what inventory contains anyway
         inv.setInventorySlotContents(ccs.getCircuitSlot(), selected);
@@ -943,7 +943,7 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     protected Supplier<Integer> COLOR_TEXT_RED = () -> getTextColorOrDefault("text_red", 0xff0000);
 
     public int getGUIColorization() {
-        return GT_Util.getRGBaInt(Dyes.dyeWhite.getRGBA());
+        return GTUtil.getRGBaInt(Dyes.dyeWhite.getRGBA());
     }
 
     public ItemStack getStackForm(long aAmount) {
diff --git a/src/main/java/gregtech/api/metatileentity/CommonMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/CommonMetaTileEntity.java
index c3528d44d7..3b0c9cc89f 100644
--- a/src/main/java/gregtech/api/metatileentity/CommonMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/CommonMetaTileEntity.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -16,8 +16,8 @@ import appeng.api.crafting.ICraftingIconProvider;
 import appeng.api.implementations.tiles.ISoundP2PHandler;
 import appeng.me.cache.helpers.TunnelCollection;
 import appeng.parts.p2p.PartP2PSound;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.gui.modularui.GUITextureSet;
 import gregtech.api.interfaces.IConfigurationCircuitSupport;
@@ -27,9 +27,9 @@ import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.modularui.IBindPlayerInventoryUI;
 import gregtech.api.interfaces.modularui.IGetTitleColor;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 
 public abstract class CommonMetaTileEntity extends CoverableTileEntity
     implements IGregTechTileEntity, ICraftingIconProvider, ISoundP2PHandler {
@@ -37,11 +37,11 @@ public abstract class CommonMetaTileEntity extends CoverableTileEntity
     protected boolean mNeedsBlockUpdate = true, mNeedsUpdate = true, mSendClientData = false, mInventoryChanged = false;
 
     protected boolean createNewMetatileEntity(short aID) {
-        if (aID <= 0 || aID >= GregTech_API.METATILEENTITIES.length || GregTech_API.METATILEENTITIES[aID] == null) {
-            GT_Log.err.println("MetaID " + aID + " not loadable => locking TileEntity!");
+        if (aID <= 0 || aID >= GregTechAPI.METATILEENTITIES.length || GregTechAPI.METATILEENTITIES[aID] == null) {
+            GTLog.err.println("MetaID " + aID + " not loadable => locking TileEntity!");
         } else {
             if (hasValidMetaTileEntity()) getMetaTileEntity().setBaseMetaTileEntity(null);
-            GregTech_API.METATILEENTITIES[aID].newMetaEntity(this)
+            GregTechAPI.METATILEENTITIES[aID].newMetaEntity(this)
                 .setBaseMetaTileEntity(this);
             mTickTimer = 0;
             mID = aID;
@@ -53,7 +53,7 @@ public abstract class CommonMetaTileEntity extends CoverableTileEntity
     protected void saveMetaTileNBT(NBTTagCompound aNBT) {
         try {
             if (hasValidMetaTileEntity()) {
-                aNBT.setInteger("nbtVersion", GT_Mod.NBT_VERSION);
+                aNBT.setInteger("nbtVersion", GTMod.NBT_VERSION);
                 final NBTTagList tItemList = new NBTTagList();
                 for (int i = 0; i < getMetaTileEntity().getRealInventory().length; i++) {
                     final ItemStack tStack = getMetaTileEntity().getRealInventory()[i];
@@ -70,12 +70,12 @@ public abstract class CommonMetaTileEntity extends CoverableTileEntity
                     getMetaTileEntity().saveNBTData(aNBT);
                 } catch (Throwable e) {
                     GT_FML_LOGGER.error("Encountered CRITICAL ERROR while saving MetaTileEntity.");
-                    GT_Mod.logStackTrace(e);
+                    GTMod.logStackTrace(e);
                 }
             }
         } catch (Throwable e) {
             GT_FML_LOGGER.error("Encountered CRITICAL ERROR while saving MetaTileEntity.");
-            GT_Mod.logStackTrace(e);
+            GTMod.logStackTrace(e);
         }
     }
 
@@ -87,7 +87,7 @@ public abstract class CommonMetaTileEntity extends CoverableTileEntity
                 final NBTTagCompound tTag = tItemList.getCompoundTagAt(i);
                 final int tSlot = migrateInventoryIndex(tTag.getInteger("IntSlot"), nbtVersion);
                 if (tSlot >= 0 && tSlot < getMetaTileEntity().getRealInventory().length) {
-                    ItemStack loadedStack = GT_Utility.loadItem(tTag);
+                    ItemStack loadedStack = GTUtility.loadItem(tTag);
                     // We move away from fluid display item in TEs
                     if (loadedStack != null && loadedStack.getItem() == ItemList.Display_Fluid.getItem()) {
                         loadedStack = null;
@@ -100,7 +100,7 @@ public abstract class CommonMetaTileEntity extends CoverableTileEntity
                 getMetaTileEntity().loadNBTData(aNBT);
             } catch (Throwable e) {
                 GT_FML_LOGGER.error("Encountered Exception while loading MetaTileEntity.");
-                GT_Mod.logStackTrace(e);
+                GTMod.logStackTrace(e);
             }
         }
     }
@@ -175,7 +175,7 @@ public abstract class CommonMetaTileEntity extends CoverableTileEntity
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID) {
         return hasValidMetaTileEntity() && getMetaTileEntity().allowCoverOnSide(side, aCoverID);
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java
index 429e0fc04c..bf62a1ce74 100644
--- a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java
@@ -1,9 +1,9 @@
 package gregtech.api.metatileentity;
 
-import static gregtech.api.enums.GT_Values.E;
-import static gregtech.api.enums.GT_Values.NW;
-import static gregtech.api.util.GT_LanguageManager.FACES;
-import static gregtech.api.util.GT_LanguageManager.getTranslation;
+import static gregtech.api.enums.GTValues.E;
+import static gregtech.api.enums.GTValues.NW;
+import static gregtech.api.util.GTLanguageManager.FACES;
+import static gregtech.api.util.GTLanguageManager.getTranslation;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -48,23 +48,23 @@ import com.gtnewhorizons.modularui.common.widget.MultiChildWidget;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-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.Textures;
 import gregtech.api.gui.modularui.GUITextureSet;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregtechWailaProvider;
-import gregtech.api.net.GT_Packet_RequestCoverData;
-import gregtech.api.net.GT_Packet_SendCoverData;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_CoverBehaviorBase;
+import gregtech.api.net.GTPacketRequestCoverData;
+import gregtech.api.net.GTPacketSendCoverData;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.CoverBehaviorBase;
 import gregtech.api.util.ISerializableObject;
-import gregtech.common.GT_Client;
+import gregtech.common.GTClient;
+import gregtech.common.covers.CoverFluidfilter;
 import gregtech.common.covers.CoverInfo;
-import gregtech.common.covers.GT_Cover_Fluidfilter;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import mcp.mobius.waila.api.IWailaConfigHandler;
@@ -105,7 +105,7 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
                     .saveDataToNBT());
         }
         if (tList.tagCount() > 0) {
-            aNBT.setTag(GT_Values.NBT.COVERS, tList);
+            aNBT.setTag(GTValues.NBT.COVERS, tList);
             // Backwards compat, in case of a revert... for now
             aNBT.setIntArray("mCoverSides", coverSides);
         }
@@ -124,7 +124,7 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
             : new byte[] { 15, 15, 15, 15, 15, 15 };
         mStrongRedstone = aNBT.getByte("mStrongRedstone");
 
-        if (aNBT.hasKey(GT_Values.NBT.COVERS)) {
+        if (aNBT.hasKey(GTValues.NBT.COVERS)) {
             readCoverInfoNBT(aNBT);
         } else if (aNBT.hasKey("mCoverSides")) {
             readLegacyCoverInfoNBT(aNBT);
@@ -132,7 +132,7 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
     }
 
     public void readCoverInfoNBT(NBTTagCompound aNBT) {
-        final NBTTagList tList = aNBT.getTagList(GT_Values.NBT.COVERS, 10);
+        final NBTTagList tList = aNBT.getTagList(GTValues.NBT.COVERS, 10);
         for (byte i = 0; i < tList.tagCount(); i++) {
             final NBTTagCompound tNBT = tList.getCompoundTagAt(i);
             final CoverInfo coverInfo = new CoverInfo(this, tNBT);
@@ -152,12 +152,12 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
             if (coverIDs[ordinalSide] == 0) continue;
 
             final CoverInfo coverInfo = new CoverInfo(side, coverIDs[ordinalSide], this, null);
-            final GT_CoverBehaviorBase<?> coverBehavior = coverInfo.getCoverBehavior();
-            if (coverBehavior == GregTech_API.sNoBehavior) continue;
+            final CoverBehaviorBase<?> coverBehavior = coverInfo.getCoverBehavior();
+            if (coverBehavior == GregTechAPI.sNoBehavior) continue;
 
             ISerializableObject coverData = null;
             if (hasOldCoverData) {
-                if (coverBehavior instanceof GT_Cover_Fluidfilter) {
+                if (coverBehavior instanceof CoverFluidfilter) {
                     final String filterKey = String.format("fluidFilter%d", ordinalSide);
                     if (aNBT.hasKey(filterKey)) {
                         coverData = coverInfo.getCoverBehavior()
@@ -229,12 +229,12 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
         return true;
     }
 
-    public abstract boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID);
+    public abstract boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID);
 
     protected void checkDropCover() {
         for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
             final int coverId = getCoverIDAtSide(side);
-            if (coverId != 0 && !allowCoverOnSide(side, new GT_ItemStack(coverId))) dropCover(side, side, true);
+            if (coverId != 0 && !allowCoverOnSide(side, new GTItemStack(coverId))) dropCover(side, side, true);
         }
     }
 
@@ -256,20 +256,20 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
     public final ITexture getCoverTexture(ForgeDirection side) {
         final CoverInfo coverInfo = getCoverInfoAtSide(side);
         if (!coverInfo.isValid()) return null;
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x1) != 0) {
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x1) != 0) {
             return Textures.BlockIcons.HIDDEN_TEXTURE[0]; // See through
         }
         final ITexture coverTexture = (!(this instanceof BaseMetaPipeEntity)) ? coverInfo.getSpecialCoverFGTexture()
             : coverInfo.getSpecialCoverTexture();
 
-        return coverTexture != null ? coverTexture : GregTech_API.sCovers.get(new GT_ItemStack(getCoverIDAtSide(side)));
+        return coverTexture != null ? coverTexture : GregTechAPI.sCovers.get(new GTItemStack(getCoverIDAtSide(side)));
     }
 
     protected void requestCoverDataIfNeeded() {
         if (worldObj == null || !worldObj.isRemote) return;
         for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
             final CoverInfo coverInfo = getCoverInfoAtSide(side);
-            if (coverInfo.isDataNeededOnClient()) NW.sendToServer(new GT_Packet_RequestCoverData(coverInfo, this));
+            if (coverInfo.isDataNeededOnClient()) NW.sendToServer(new GTPacketRequestCoverData(coverInfo, this));
         }
     }
 
@@ -318,15 +318,15 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
 
     @Override
     @Deprecated
-    public GT_CoverBehavior getCoverBehaviorAtSide(ForgeDirection side) {
-        final GT_CoverBehaviorBase<?> behavior = getCoverInfoAtSide(side).getCoverBehavior();
-        if (behavior instanceof GT_CoverBehavior) return (GT_CoverBehavior) behavior;
-        return GregTech_API.sNoBehavior;
+    public CoverBehavior getCoverBehaviorAtSide(ForgeDirection side) {
+        final CoverBehaviorBase<?> behavior = getCoverInfoAtSide(side).getCoverBehavior();
+        if (behavior instanceof CoverBehavior) return (CoverBehavior) behavior;
+        return GregTechAPI.sNoBehavior;
     }
 
     @Override
     public void setCoverItemAtSide(ForgeDirection side, ItemStack aCover) {
-        GregTech_API.getCoverBehaviorNew(aCover)
+        GregTechAPI.getCoverBehaviorNew(aCover)
             .placeCover(side, aCover, this);
     }
 
@@ -366,7 +366,7 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
     }
 
     @Override
-    public GT_CoverBehaviorBase<?> getCoverBehaviorAtSideNew(ForgeDirection side) {
+    public CoverBehaviorBase<?> getCoverBehaviorAtSideNew(ForgeDirection side) {
         return getCoverInfoAtSide(side).getCoverBehavior();
     }
 
@@ -546,11 +546,7 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
         for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
             final CoverInfo coverInfo = getCoverInfoAtSide(side);
             if (coverInfo.needsUpdate()) {
-                NW.sendPacketToAllPlayersInRange(
-                    worldObj,
-                    new GT_Packet_SendCoverData(coverInfo, this),
-                    xCoord,
-                    zCoord);
+                NW.sendPacketToAllPlayersInRange(worldObj, new GTPacketSendCoverData(coverInfo, this), xCoord, zCoord);
                 coverInfo.setNeedsUpdate(false);
             }
         }
@@ -562,11 +558,11 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
         final NBTTagCompound tag = accessor.getNBTData();
         final ForgeDirection currentFacing = accessor.getSide();
 
-        final NBTTagList tList = tag.getTagList(GT_Values.NBT.COVERS, 10);
+        final NBTTagList tList = tag.getTagList(GTValues.NBT.COVERS, 10);
         for (byte i = 0; i < tList.tagCount(); i++) {
             final NBTTagCompound tNBT = tList.getCompoundTagAt(i);
             final CoverInfo coverInfo = new CoverInfo(this, tNBT);
-            if (!coverInfo.isValid() || coverInfo.getCoverBehavior() == GregTech_API.sNoBehavior) continue;
+            if (!coverInfo.isValid() || coverInfo.getCoverBehavior() == GregTechAPI.sNoBehavior) continue;
 
             final ItemStack coverStack = coverInfo.getDisplayStack();
             if (coverStack != null) {
@@ -608,12 +604,12 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
      */
     public static void addInstalledCoversInformation(NBTTagCompound aNBT, List<String> aList) {
         if (aNBT == null || aList == null) return;
-        final NBTTagList tList = aNBT.getTagList(GT_Values.NBT.COVERS, 10);
+        final NBTTagList tList = aNBT.getTagList(GTValues.NBT.COVERS, 10);
 
         for (byte i = 0; i < tList.tagCount(); i++) {
             final NBTTagCompound tNBT = tList.getCompoundTagAt(i);
             final CoverInfo coverInfo = new CoverInfo(null, tNBT);
-            if (!coverInfo.isValid() || coverInfo.getCoverBehavior() == GregTech_API.sNoBehavior) continue;
+            if (!coverInfo.isValid() || coverInfo.getCoverBehavior() == GregTechAPI.sNoBehavior) continue;
 
             final ItemStack coverStack = coverInfo.getDisplayStack();
             if (coverStack != null) {
@@ -634,8 +630,8 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
                     final int i = tSide.ordinal();
                     final int coverId = mCoverSides[i];
                     if (coverId == 0) continue;
-                    final GT_CoverBehaviorBase<?> behavior = GregTech_API.getCoverBehaviorNew(coverId);
-                    if (behavior == null || behavior == GregTech_API.sNoBehavior) continue;
+                    final CoverBehaviorBase<?> behavior = GregTechAPI.getCoverBehaviorNew(coverId);
+                    if (behavior == null || behavior == GregTechAPI.sNoBehavior) continue;
                     if (!aNBT.hasKey(CoverableTileEntity.COVER_DATA_NBT_KEYS[i])) continue;
                     final ISerializableObject dataObject = behavior
                         .createDataObject(aNBT.getTag(CoverableTileEntity.COVER_DATA_NBT_KEYS[i]));
@@ -676,12 +672,12 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
     public void addCoverTabs(ModularWindow.Builder builder, UIBuildContext buildContext) {
         final int COVER_TAB_LEFT = -16, COVER_TAB_TOP = 1, COVER_TAB_HEIGHT = 20, COVER_TAB_WIDTH = 18,
             COVER_TAB_SPACING = 2, ICON_SIZE = 16;
-        final boolean flipHorizontally = GT_Mod.gregtechproxy.mCoverTabsFlipped;
+        final boolean flipHorizontally = GTMod.gregtechproxy.mCoverTabsFlipped;
 
         final Column columnWidget = new Column();
         builder.widget(columnWidget);
         final int xPos = flipHorizontally ? (getGUIWidth() - COVER_TAB_LEFT - COVER_TAB_WIDTH) : COVER_TAB_LEFT;
-        if (GT_Mod.gregtechproxy.mCoverTabsVisible) {
+        if (GTMod.gregtechproxy.mCoverTabsVisible) {
             columnWidget.setPos(xPos, COVER_TAB_TOP)
                 .setEnabled(
                     widget -> ((Column) widget).getChildren()
diff --git a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
index 8971db2d92..194aef8547 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity;
 
-import static gregtech.api.enums.GT_Values.GT;
+import static gregtech.api.enums.GTValues.GT;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -30,9 +30,9 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gnu.trove.list.TIntList;
 import gnu.trove.list.array.TIntArrayList;
-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.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IConnectable;
@@ -40,15 +40,15 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IColoredTileEntity;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Util;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtil;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.api.util.WorldSpawnedEventBuilder;
-import gregtech.common.GT_Client;
+import gregtech.common.GTClient;
 import gregtech.common.covers.CoverInfo;
 
 /**
@@ -107,10 +107,10 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
     }
 
     public MetaPipeEntity(int aID, String aBasicName, String aRegionalName, int aInvSlotCount, boolean aAddInfo) {
-        if (GregTech_API.sPostloadStarted || !GregTech_API.sPreloadStarted)
+        if (GregTechAPI.sPostloadStarted || !GregTechAPI.sPreloadStarted)
             throw new IllegalAccessError("This Constructor has to be called in the load Phase");
-        if (GregTech_API.METATILEENTITIES[aID] == null) {
-            GregTech_API.METATILEENTITIES[aID] = this;
+        if (GregTechAPI.METATILEENTITIES[aID] == null) {
+            GregTechAPI.METATILEENTITIES[aID] = this;
         } else {
             throw new IllegalArgumentException("MetaMachine-Slot Nr. " + aID + " is already occupied!");
         }
@@ -118,7 +118,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
             .toLowerCase(Locale.ENGLISH);
         setBaseMetaTileEntity(new BaseMetaPipeEntity());
         getBaseMetaTileEntity().setMetaTileID((short) aID);
-        GT_LanguageManager.addStringLocalization("gt.blockmachines." + mName + ".name", aRegionalName);
+        GTLanguageManager.addStringLocalization("gt.blockmachines." + mName + ".name", aRegionalName);
         mInventory = new ItemStack[aInvSlotCount];
 
         if (aAddInfo && GT.isClientSide()) {
@@ -129,7 +129,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
     protected final void addInfo(int aID) {
         if (!GT.isClientSide()) return;
 
-        ItemStack tStack = new ItemStack(GregTech_API.sBlockMachines, 1, aID);
+        ItemStack tStack = new ItemStack(GregTechAPI.sBlockMachines, 1, aID);
         Objects.requireNonNull(tStack.getItem())
             .addInformation(tStack, null, new ArrayList<>(), true);
     }
@@ -187,7 +187,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
 
     @Override
     public ItemStack getStackForm(long aAmount) {
-        return new ItemStack(GregTech_API.sBlockMachines, (int) aAmount, getBaseMetaTileEntity().getMetaTileID());
+        return new ItemStack(GregTechAPI.sBlockMachines, (int) aAmount, getBaseMetaTileEntity().getMetaTileID());
     }
 
     public boolean isCoverOnSide(BaseMetaPipeEntity aPipe, EntityLivingBase aEntity) {
@@ -254,7 +254,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID) {
         return true;
     }
 
@@ -322,7 +322,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
 
     @Override
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-        if (aBaseMetaTileEntity.isClientSide() && GT_Client.changeDetected == 4) {
+        if (aBaseMetaTileEntity.isClientSide() && 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 detection related
@@ -598,8 +598,8 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
 
     @Override
     public String getInventoryName() {
-        if (GregTech_API.METATILEENTITIES[getBaseMetaTileEntity().getMetaTileID()] != null)
-            return GregTech_API.METATILEENTITIES[getBaseMetaTileEntity().getMetaTileID()].getMetaName();
+        if (GregTechAPI.METATILEENTITIES[getBaseMetaTileEntity().getMetaTileID()] != null)
+            return GregTechAPI.METATILEENTITIES[getBaseMetaTileEntity().getMetaTileID()].getMetaName();
         return "";
     }
 
@@ -615,7 +615,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
 
     @Override
     public ItemStack decrStackSize(int aIndex, int aAmount) {
-        ItemStack tStack = getStackInSlot(aIndex), rStack = GT_Utility.copyOrNull(tStack);
+        ItemStack tStack = getStackInSlot(aIndex), rStack = GTUtility.copyOrNull(tStack);
         if (tStack != null) {
             if (tStack.stackSize <= aAmount) {
                 if (setStackToZeroInsteadOfNull(aIndex)) tStack.stackSize = 0;
@@ -647,7 +647,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
     public boolean canInsertItem(int slotIndex, ItemStack itemStack, int ordinalSide) {
         return isValidSlot(slotIndex) && itemStack != null
             && slotIndex < mInventory.length
-            && (mInventory[slotIndex] == null || GT_Utility.areStacksEqual(itemStack, mInventory[slotIndex]))
+            && (mInventory[slotIndex] == null || GTUtility.areStacksEqual(itemStack, mInventory[slotIndex]))
             && allowPutStack(getBaseMetaTileEntity(), slotIndex, ForgeDirection.getOrientation(ordinalSide), itemStack);
     }
 
@@ -796,12 +796,12 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
 
     @Override
     public void doExplosion(long aExplosionPower) {
-        float tStrength = GT_Values.getExplosionPowerForVoltage(aExplosionPower);
+        float tStrength = GTValues.getExplosionPowerForVoltage(aExplosionPower);
         int tX = getBaseMetaTileEntity().getXCoord(), tY = getBaseMetaTileEntity().getYCoord(),
             tZ = getBaseMetaTileEntity().getZCoord();
         World tWorld = getBaseMetaTileEntity().getWorld();
         tWorld.setBlock(tX, tY, tZ, Blocks.air);
-        if (GregTech_API.sMachineExplosions) {
+        if (GregTechAPI.sMachineExplosions) {
             new WorldSpawnedEventBuilder.ExplosionEffectEventBuilder().setStrength(tStrength)
                 .setSmoking(true)
                 .setPosition(tX + 0.5, tY + 0.5, tZ + 0.5)
@@ -949,7 +949,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
         return (mConnections & sideDirection.flag) != 0;
     }
 
-    public boolean letsIn(GT_CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
+    public boolean letsIn(CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity) {
         return false;
     }
@@ -958,7 +958,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
         return false;
     }
 
-    public boolean letsOut(GT_CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
+    public boolean letsOut(CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity) {
         return false;
     }
@@ -967,12 +967,12 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
         return false;
     }
 
-    public boolean letsIn(GT_CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
+    public boolean letsIn(CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
         ISerializableObject aCoverVariable, ICoverable aTileEntity) {
         return false;
     }
 
-    public boolean letsOut(GT_CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
+    public boolean letsOut(CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
         ISerializableObject aCoverVariable, ICoverable aTileEntity) {
         return false;
     }
@@ -1000,13 +1000,13 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
     @Override
     public int getGUIColorization() {
         Dyes dye = Dyes.dyeWhite;
-        if (GregTech_API.sColoredGUI) {
-            if (GregTech_API.sMachineMetalGUI) {
+        if (GregTechAPI.sColoredGUI) {
+            if (GregTechAPI.sMachineMetalGUI) {
                 dye = Dyes.MACHINE_METAL;
             } else if (getBaseMetaTileEntity() != null) {
                 dye = Dyes.getDyeFromIndex(getBaseMetaTileEntity().getColorization());
             }
         }
-        return GT_Util.getRGBInt(dye.getRGBA());
+        return GTUtil.getRGBInt(dye.getRGBA());
     }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
index d4f8aa6ba4..1008a64507 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -38,27 +38,27 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gnu.trove.list.TIntList;
 import gnu.trove.list.array.TIntArrayList;
-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.SoundResource;
 import gregtech.api.enums.SteamVariant;
-import gregtech.api.gui.GT_GUIColorOverride;
+import gregtech.api.gui.GUIColorOverride;
 import gregtech.api.gui.modularui.GUITextureSet;
 import gregtech.api.interfaces.ICleanroom;
 import gregtech.api.interfaces.ICleanroomReceiver;
 import gregtech.api.interfaces.IConfigurationCircuitSupport;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.metatileentity.implementations.MTECable;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtil;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.GT_TooltipDataCache;
-import gregtech.api.util.GT_Util;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Client;
+import gregtech.common.GTClient;
 import gregtech.common.covers.CoverInfo;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
@@ -90,7 +90,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
      */
     public final ItemStackHandler inventoryHandler;
 
-    protected GT_GUIColorOverride colorOverride;
+    protected GUIColorOverride colorOverride;
     protected GT_TooltipDataCache mTooltipCache = new GT_TooltipDataCache();
 
     @Override
@@ -128,18 +128,18 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
      * @param aID the machine ID
      */
     public MetaTileEntity(int aID, String aBasicName, String aRegionalName, int aInvSlotCount) {
-        if (GregTech_API.sPostloadStarted || !GregTech_API.sPreloadStarted)
+        if (GregTechAPI.sPostloadStarted || !GregTechAPI.sPreloadStarted)
             throw new IllegalAccessError("This Constructor has to be called in the load Phase");
-        if (GregTech_API.METATILEENTITIES[aID] == null) {
-            GregTech_API.METATILEENTITIES[aID] = this;
+        if (GregTechAPI.METATILEENTITIES[aID] == null) {
+            GregTechAPI.METATILEENTITIES[aID] = this;
         } else {
             throw new IllegalArgumentException("MetaMachine-Slot Nr. " + aID + " is already occupied!");
         }
         mName = aBasicName.replace(" ", "_")
             .toLowerCase(Locale.ENGLISH);
-        setBaseMetaTileEntity(GregTech_API.constructBaseMetaTileEntity());
+        setBaseMetaTileEntity(GregTechAPI.constructBaseMetaTileEntity());
         getBaseMetaTileEntity().setMetaTileID((short) aID);
-        GT_LanguageManager.addStringLocalization("gt.blockmachines." + mName + ".name", aRegionalName);
+        GTLanguageManager.addStringLocalization("gt.blockmachines." + mName + ".name", aRegionalName);
         mInventory = new ItemStack[aInvSlotCount];
         inventoryHandler = new ItemStackHandler(mInventory);
     }
@@ -151,7 +151,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
         mInventory = new ItemStack[aInvSlotCount];
         mName = aName;
         inventoryHandler = new ItemStackHandler(mInventory);
-        colorOverride = GT_GUIColorOverride.get(getGUITextureSet().getMainBackground().location);
+        colorOverride = GUIColorOverride.get(getGUITextureSet().getMainBackground().location);
     }
 
     @Override
@@ -179,12 +179,12 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
 
     @Override
     public ItemStack getStackForm(long aAmount) {
-        return new ItemStack(GregTech_API.sBlockMachines, (int) aAmount, getBaseMetaTileEntity().getMetaTileID());
+        return new ItemStack(GregTechAPI.sBlockMachines, (int) aAmount, getBaseMetaTileEntity().getMetaTileID());
     }
 
     @Override
     public String getLocalName() {
-        return GT_LanguageManager.getTranslation("gt.blockmachines." + mName + ".name");
+        return GTLanguageManager.getTranslation("gt.blockmachines." + mName + ".name");
     }
 
     @Override
@@ -219,7 +219,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) {
         return true;
     }
 
@@ -254,8 +254,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
         if (!aPlayer.isSneaking()) return false;
         final ForgeDirection oppositeSide = wrenchingSide.getOpposite();
         final TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityAtSide(wrenchingSide);
-        if ((tTileEntity instanceof IGregTechTileEntity gtTE)
-            && (gtTE.getMetaTileEntity() instanceof GT_MetaPipeEntity_Cable)) {
+        if ((tTileEntity instanceof IGregTechTileEntity gtTE) && (gtTE.getMetaTileEntity() instanceof MTECable)) {
 
             // The tile entity we're facing is a cable, let's try to connect to it
             return gtTE.getMetaTileEntity()
@@ -276,8 +275,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
         if (!aPlayer.isSneaking()) return false;
         final ForgeDirection oppositeSide = wrenchingSide.getOpposite();
         TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityAtSide(wrenchingSide);
-        if ((tTileEntity instanceof IGregTechTileEntity gtTE)
-            && (gtTE.getMetaTileEntity() instanceof GT_MetaPipeEntity_Cable)) {
+        if ((tTileEntity instanceof IGregTechTileEntity gtTE) && (gtTE.getMetaTileEntity() instanceof MTECable)) {
 
             // The tile entity we're facing is a cable, let's try to connect to it
             return gtTE.getMetaTileEntity()
@@ -311,7 +309,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
 
     @Override
     public void onExplosion() {
-        GT_Log.exp.println(
+        GTLog.exp.println(
             "Machine at " + this.getBaseMetaTileEntity()
                 .getXCoord()
                 + " | "
@@ -338,7 +336,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
 
     @Override
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-        if (aBaseMetaTileEntity.isClientSide() && GT_Client.changeDetected == 4) {
+        if (aBaseMetaTileEntity.isClientSide() && 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 detection related
@@ -633,14 +631,14 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
      * Determines the Tier of the Machine, used for de-charging Tools.
      */
     public long getInputTier() {
-        return GT_Utility.getTier(getBaseMetaTileEntity().getInputVoltage());
+        return GTUtility.getTier(getBaseMetaTileEntity().getInputVoltage());
     }
 
     /**
      * Determines the Tier of the Machine, used for charging Tools.
      */
     public long getOutputTier() {
-        return GT_Utility.getTier(getBaseMetaTileEntity().getOutputVoltage());
+        return GTUtility.getTier(getBaseMetaTileEntity().getOutputVoltage());
     }
 
     /**
@@ -888,7 +886,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
         markDirty();
         if (this instanceof IConfigurationCircuitSupport ccs) {
             if (ccs.allowSelectCircuit() && aIndex == ccs.getCircuitSlot() && aStack != null) {
-                mInventory[aIndex] = GT_Utility.copyAmount(0, aStack);
+                mInventory[aIndex] = GTUtility.copyAmount(0, aStack);
                 return;
             }
         }
@@ -897,8 +895,8 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
 
     @Override
     public String getInventoryName() {
-        if (GregTech_API.METATILEENTITIES[getBaseMetaTileEntity().getMetaTileID()] != null)
-            return GregTech_API.METATILEENTITIES[getBaseMetaTileEntity().getMetaTileID()].getMetaName();
+        if (GregTechAPI.METATILEENTITIES[getBaseMetaTileEntity().getMetaTileID()] != null)
+            return GregTechAPI.METATILEENTITIES[getBaseMetaTileEntity().getMetaTileID()].getMetaName();
         return "";
     }
 
@@ -914,7 +912,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
 
     @Override
     public ItemStack decrStackSize(int aIndex, int aAmount) {
-        ItemStack tStack = getStackInSlot(aIndex), rStack = GT_Utility.copyOrNull(tStack);
+        ItemStack tStack = getStackInSlot(aIndex), rStack = GTUtility.copyOrNull(tStack);
         if (tStack != null) {
             if (tStack.stackSize <= aAmount) {
                 if (setStackToZeroInsteadOfNull(aIndex)) {
@@ -949,7 +947,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
     public boolean canInsertItem(int aIndex, ItemStack aStack, int ordinalSide) {
         return isValidSlot(aIndex) && aStack != null
             && aIndex < mInventory.length
-            && (mInventory[aIndex] == null || GT_Utility.areStacksEqual(aStack, mInventory[aIndex]))
+            && (mInventory[aIndex] == null || GTUtility.areStacksEqual(aStack, mInventory[aIndex]))
             && allowPutStack(getBaseMetaTileEntity(), aIndex, ForgeDirection.getOrientation(ordinalSide), aStack);
     }
 
@@ -986,7 +984,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
 
     @Override
     public int fill(ForgeDirection side, FluidStack aFluid, boolean doFill) {
-        if (getBaseMetaTileEntity().hasSteamEngineUpgrade() && GT_ModHandler.isSteam(aFluid) && aFluid.amount > 1) {
+        if (getBaseMetaTileEntity().hasSteamEngineUpgrade() && GTModHandler.isSteam(aFluid) && aFluid.amount > 1) {
             int tSteam = (int) Math.min(
                 Integer.MAX_VALUE,
                 Math.min(
@@ -1114,15 +1112,14 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
 
     @Override
     public void doExplosion(long aExplosionPower) {
-        float tStrength = GT_Values.getExplosionPowerForVoltage(aExplosionPower);
+        float tStrength = GTValues.getExplosionPowerForVoltage(aExplosionPower);
         final int tX = getBaseMetaTileEntity().getXCoord();
         final int tY = getBaseMetaTileEntity().getYCoord();
         final int tZ = getBaseMetaTileEntity().getZCoord();
         final World tWorld = getBaseMetaTileEntity().getWorld();
-        GT_Utility.sendSoundToPlayers(tWorld, SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1, tX, tY, tZ);
+        GTUtility.sendSoundToPlayers(tWorld, SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1, tX, tY, tZ);
         tWorld.setBlock(tX, tY, tZ, Blocks.air);
-        if (GregTech_API.sMachineExplosions)
-            tWorld.createExplosion(null, tX + 0.5, tY + 0.5, tZ + 0.5, tStrength, true);
+        if (GregTechAPI.sMachineExplosions) tWorld.createExplosion(null, tX + 0.5, tY + 0.5, tZ + 0.5, tStrength, true);
     }
 
     @Override
@@ -1266,16 +1263,16 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
         if (this.colorOverride.sLoaded()) {
             if (this.colorOverride.sGuiTintingEnabled() && getBaseMetaTileEntity() != null) {
                 dye = Dyes.getDyeFromIndex(getBaseMetaTileEntity().getColorization());
-                return this.colorOverride.getGuiTintOrDefault(dye.mName, GT_Util.getRGBInt(dye.getRGBA()));
+                return this.colorOverride.getGuiTintOrDefault(dye.mName, GTUtil.getRGBInt(dye.getRGBA()));
             }
-        } else if (GregTech_API.sColoredGUI) {
-            if (GregTech_API.sMachineMetalGUI) {
+        } else if (GregTechAPI.sColoredGUI) {
+            if (GregTechAPI.sMachineMetalGUI) {
                 dye = Dyes.MACHINE_METAL;
             } else if (getBaseMetaTileEntity() != null) {
                 dye = Dyes.getDyeFromIndex(getBaseMetaTileEntity().getColorization());
             }
         }
-        return GT_Util.getRGBInt(dye.getRGBA());
+        return GTUtil.getRGBInt(dye.getRGBA());
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/TileIC2EnergySink.java b/src/main/java/gregtech/api/metatileentity/TileIC2EnergySink.java
index 6fecb840b4..a793dbbe34 100644
--- a/src/main/java/gregtech/api/metatileentity/TileIC2EnergySink.java
+++ b/src/main/java/gregtech/api/metatileentity/TileIC2EnergySink.java
@@ -9,21 +9,21 @@ import gregtech.api.interfaces.metatileentity.IConnectable;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntityCable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTECable;
+import gregtech.api.util.GTUtility;
 import ic2.api.energy.tile.IEnergySink;
 
 public class TileIC2EnergySink extends TileEntity implements IEnergySink {
 
     private final IGregTechTileEntity myMeta;
-    private GT_MetaPipeEntity_Cable cableMeta = null;
+    private MTECable cableMeta = null;
 
     public TileIC2EnergySink(IGregTechTileEntity meta) {
         if (meta == null) throw new NullPointerException("no null metas");
         myMeta = meta;
         final IMetaTileEntity metaTile = myMeta.getMetaTileEntity();
         if (metaTile instanceof IMetaTileEntityCable) {
-            cableMeta = (GT_MetaPipeEntity_Cable) metaTile;
+            cableMeta = (MTECable) metaTile;
         }
         setWorldObj(meta.getWorld());
         xCoord = meta.getXCoord();
@@ -62,7 +62,7 @@ public class TileIC2EnergySink extends TileEntity implements IEnergySink {
      */
     @Override
     public int getSinkTier() {
-        return GT_Utility.getTier(cableMeta != null ? cableMeta.mVoltage : myMeta.getInputVoltage());
+        return GTUtility.getTier(cableMeta != null ? cableMeta.mVoltage : myMeta.getInputVoltage());
     }
 
     /**
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicBatteryBuffer.java
index cff63caeb5..7ca8cce273 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicBatteryBuffer.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import java.util.List;
 
@@ -20,14 +20,14 @@ import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot;
 import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import ic2.api.item.IElectricItem;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
@@ -38,8 +38,7 @@ import mcp.mobius.waila.api.IWailaDataAccessor;
  * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
  * Machine
  */
-public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_TieredMachineBlock
-    implements IAddUIWidgets {
+public class MTEBasicBatteryBuffer extends MTETieredMachineBlock implements IAddUIWidgets {
 
     public boolean mCharge = false, mDecharge = false;
     public int mBatteryCount = 0, mChargeableCount = 0;
@@ -47,18 +46,18 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
     private long mStored = 0;
     private long mMax = 0;
 
-    public GT_MetaTileEntity_BasicBatteryBuffer(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription, int aSlotCount) {
+    public MTEBasicBatteryBuffer(int aID, String aName, String aNameRegional, int aTier, String aDescription,
+        int aSlotCount) {
         super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
     }
 
-    public GT_MetaTileEntity_BasicBatteryBuffer(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
+    public MTEBasicBatteryBuffer(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
         int aSlotCount) {
         super(aName, aTier, aSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicBatteryBuffer(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures, int aSlotCount) {
+    public MTEBasicBatteryBuffer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
+        int aSlotCount) {
         super(aName, aTier, aSlotCount, aDescription, aTextures);
     }
 
@@ -91,7 +90,7 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_BasicBatteryBuffer(mName, mTier, mDescriptionArray, mTextures, mInventory.length);
+        return new MTEBasicBatteryBuffer(mName, mTier, mDescriptionArray, mTextures, mInventory.length);
     }
 
     @Override
@@ -216,7 +215,7 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -227,8 +226,8 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
             mDecharge = aBaseMetaTileEntity.getStoredEU() < aBaseMetaTileEntity.getEUCapacity() / 3;
             mBatteryCount = 0;
             mChargeableCount = 0;
-            for (ItemStack tStack : mInventory) if (GT_ModHandler.isElectricItem(tStack, mTier)) {
-                if (GT_ModHandler.isChargerItem(tStack)) mBatteryCount++;
+            for (ItemStack tStack : mInventory) if (GTModHandler.isElectricItem(tStack, mTier)) {
+                if (GTModHandler.isChargerItem(tStack)) mBatteryCount++;
                 mChargeableCount++;
             }
         }
@@ -238,7 +237,7 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
     @Override
     public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
-        if (GT_ModHandler.isElectricItem(aStack) && aStack.getUnlocalizedName()
+        if (GTModHandler.isElectricItem(aStack) && aStack.getUnlocalizedName()
             .startsWith("gt.metaitem.01.")) {
             String name = aStack.getUnlocalizedName();
             if (name.equals("gt.metaitem.01.32510") || name.equals("gt.metaitem.01.32511")
@@ -255,10 +254,10 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
     @Override
     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
-        if (!GT_Utility.isStackValid(aStack)) {
+        if (!GTUtility.isStackValid(aStack)) {
             return false;
         }
-        return mInventory[aIndex] == null && GT_ModHandler.isElectricItem(aStack, this.mTier);
+        return mInventory[aIndex] == null && GTModHandler.isElectricItem(aStack, this.mTier);
     }
 
     @Override
@@ -274,16 +273,16 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
         long tStep = 0;
         if (mInventory != null) {
             for (ItemStack aStack : mInventory) {
-                if (GT_ModHandler.isElectricItem(aStack)) {
+                if (GTModHandler.isElectricItem(aStack)) {
 
-                    if (aStack.getItem() instanceof GT_MetaBase_Item) {
-                        Long[] stats = ((GT_MetaBase_Item) aStack.getItem()).getElectricStats(aStack);
+                    if (aStack.getItem() instanceof MetaBaseItem) {
+                        Long[] stats = ((MetaBaseItem) aStack.getItem()).getElectricStats(aStack);
                         if (stats != null) {
                             if (stats[0] > Long.MAX_VALUE / 2) {
                                 scaleOverflow = true;
                             }
                             tScale = tScale + stats[0];
-                            tStep = ((GT_MetaBase_Item) aStack.getItem()).getRealCharge(aStack);
+                            tStep = ((MetaBaseItem) aStack.getItem()).getRealCharge(aStack);
                             if (tStep > Long.MAX_VALUE / 2) {
                                 storedOverflow = true;
                             }
@@ -310,15 +309,15 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
         updateStorageInfo();
 
         return new String[] { EnumChatFormatting.BLUE + getLocalName() + EnumChatFormatting.RESET, "Stored Items:",
-            EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mStored)
+            EnumChatFormatting.GREEN + GTUtility.formatNumbers(mStored)
                 + EnumChatFormatting.RESET
                 + " EU / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(mMax)
+                + GTUtility.formatNumbers(mMax)
                 + EnumChatFormatting.RESET
                 + " EU",
-            "Average input:", GT_Utility.formatNumbers(getBaseMetaTileEntity().getAverageElectricInput()) + " EU/t",
-            "Average output:", GT_Utility.formatNumbers(getBaseMetaTileEntity().getAverageElectricOutput()) + " EU/t" };
+            "Average input:", GTUtility.formatNumbers(getBaseMetaTileEntity().getAverageElectricInput()) + " EU/t",
+            "Average output:", GTUtility.formatNumbers(getBaseMetaTileEntity().getAverageElectricOutput()) + " EU/t" };
     }
 
     private void updateStorageInfo() {
@@ -337,22 +336,22 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
         currenttip.add(
             StatCollector.translateToLocalFormatted(
                 "GT5U.waila.energy.stored",
-                GT_Utility.formatNumbers(tag.getLong("mStored")),
-                GT_Utility.formatNumbers(tag.getLong("mMax"))));
+                GTUtility.formatNumbers(tag.getLong("mStored")),
+                GTUtility.formatNumbers(tag.getLong("mMax"))));
         long avgIn = tag.getLong("AvgIn");
         long avgOut = tag.getLong("AvgOut");
         currenttip.add(
             StatCollector.translateToLocalFormatted(
                 "GT5U.waila.energy.avg_in_with_amperage",
-                GT_Utility.formatNumbers(avgIn),
-                GT_Utility.getAmperageForTier(avgIn, (byte) getInputTier()),
-                GT_Utility.getColoredTierNameFromTier((byte) getInputTier())));
+                GTUtility.formatNumbers(avgIn),
+                GTUtility.getAmperageForTier(avgIn, (byte) getInputTier()),
+                GTUtility.getColoredTierNameFromTier((byte) getInputTier())));
         currenttip.add(
             StatCollector.translateToLocalFormatted(
                 "GT5U.waila.energy.avg_out_with_amperage",
-                GT_Utility.formatNumbers(avgOut),
-                GT_Utility.getAmperageForTier(avgOut, (byte) getOutputTier()),
-                GT_Utility.getColoredTierNameFromTier((byte) getOutputTier())));
+                GTUtility.formatNumbers(avgOut),
+                GTUtility.getAmperageForTier(avgOut, (byte) getOutputTier()),
+                GTUtility.getColoredTierNameFromTier((byte) getOutputTier())));
         super.getWailaBody(itemStack, currenttip, accessor, config);
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicGenerator.java
index 7a968afc4b..ac923bc699 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicGenerator.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -12,36 +12,35 @@ import net.minecraftforge.fluids.IFluidHandler;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.RecipeMapWorkable;
 import gregtech.api.objects.ItemData;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.maps.FuelBackend;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Pollution;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.common.Pollution;
 
-public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity_BasicTank
-    implements RecipeMapWorkable {
+public abstract class MTEBasicGenerator extends MTEBasicTank implements RecipeMapWorkable {
 
-    public GT_MetaTileEntity_BasicGenerator(int aID, String aName, String aNameRegional, int aTier, String aDescription,
+    public MTEBasicGenerator(int aID, String aName, String aNameRegional, int aTier, String aDescription,
         ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicGenerator(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription, ITexture... aTextures) {
+    public MTEBasicGenerator(int aID, String aName, String aNameRegional, int aTier, String[] aDescription,
+        ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEBasicGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEBasicGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
@@ -81,7 +80,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -219,7 +218,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
                     if (tFluidAmountToUse > 0
                         && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)) {
                         // divided by two because this is called every 10 ticks, not 20
-                        GT_Pollution.addPollution(getBaseMetaTileEntity(), getPollution() / 2);
+                        Pollution.addPollution(getBaseMetaTileEntity(), getPollution() / 2);
                         mFluid.amount -= tFluidAmountToUse * tConsumed;
                     }
                 }
@@ -227,7 +226,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
 
             if (mInventory[getInputSlot()] != null
                 && aBaseMetaTileEntity.getUniversalEnergyStored() < (maxEUOutput() * 20 + getMinimumStoredEU())
-                && ((GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true) != null)
+                && ((GTUtility.getFluidForFilledItem(mInventory[getInputSlot()], true) != null)
                     || solidFuelOverride(mInventory[getInputSlot()]))) {
                 long tFuelValue = getFuelValue(mInventory[getInputSlot()]);
                 if (tFuelValue <= 0) tFuelValue = getFuelValue(mInventory[getInputSlot()], true);
@@ -238,7 +237,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
                         aBaseMetaTileEntity.increaseStoredEnergyUnits(tFuelValue, true);
                         aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
                         // divided by two because this is called every 10 ticks, not 20
-                        GT_Pollution.addPollution(getBaseMetaTileEntity(), getPollution() / 2);
+                        Pollution.addPollution(getBaseMetaTileEntity(), getPollution() / 2);
                     }
                 }
             }
@@ -255,11 +254,11 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
      */
     public boolean solidFuelOverride(ItemStack stack) {
         // this could be used for a coal generator for example aswell...
-        ItemData association = GT_OreDictUnificator.getAssociation(stack);
+        ItemData association = GTOreDictUnificator.getAssociation(stack);
         // if it is a gregtech Item, make sure its not a VOLUMETRIC_FLASK or any type of cell, else do vanilla checks
         if (association != null) {
             return !OrePrefixes.CELL_TYPES.contains(association.mPrefix)
-                && !GT_Utility.areStacksEqual(ItemList.VOLUMETRIC_FLASK.get(1L), stack, true);
+                && !GTUtility.areStacksEqual(ItemList.VOLUMETRIC_FLASK.get(1L), stack, true);
         } else {
             return stack != null && // when the stack is null its not a solid
                 stack.getItem() != null && // when the item in the stack is null its not a solid
@@ -293,7 +292,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
     public long getFuelValue(FluidStack aLiquid, boolean aLong) {
         RecipeMap<?> tRecipes = getRecipeMap();
         if (aLiquid == null || !(tRecipes.getBackend() instanceof FuelBackend tFuels)) return 0;
-        GT_Recipe tFuel = tFuels.findFuel(aLiquid);
+        GTRecipe tFuel = tFuels.findFuel(aLiquid);
         if (tFuel == null) return 0;
 
         return (long) tFuel.mSpecialValue * getEfficiency() * consumedFluidPerOperation(aLiquid) / 100;
@@ -305,8 +304,8 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
     }
 
     public long getFuelValue(ItemStack aStack, boolean aLong) {
-        if (GT_Utility.isStackInvalid(aStack) || getRecipeMap() == null) return 0;
-        GT_Recipe tFuel = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
+        if (GTUtility.isStackInvalid(aStack) || getRecipeMap() == null) return 0;
+        GTRecipe tFuel = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
         if (tFuel == null) return 0;
 
         long liters = 10L; // 1000mb/100
@@ -314,17 +313,17 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
     }
 
     public ItemStack getEmptyContainer(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack) || getRecipeMap() == null) return null;
-        GT_Recipe tFuel = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
-        if (tFuel != null) return GT_Utility.copyOrNull(tFuel.getOutput(0));
-        return GT_Utility.getContainerItem(aStack, true);
+        if (GTUtility.isStackInvalid(aStack) || getRecipeMap() == null) return null;
+        GTRecipe tFuel = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
+        if (tFuel != null) return GTUtility.copyOrNull(tFuel.getOutput(0));
+        return GTUtility.getContainerItem(aStack, true);
     }
 
     @Override
     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
         return super.allowPutStack(aBaseMetaTileEntity, aIndex, side, aStack) && (getFuelValue(aStack, true) > 0
-            || getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true), true) > 0);
+            || getFuelValue(GTUtility.getFluidForFilledItem(aStack, true), true) > 0);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicHull.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicHull.java
index e5766eee39..35b6003c24 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicHull.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicHull.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -11,31 +11,29 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
-public class GT_MetaTileEntity_BasicHull extends GT_MetaTileEntity_BasicTank {
+public class MTEBasicHull extends MTEBasicTank {
 
-    public GT_MetaTileEntity_BasicHull(int aID, String aName, String aNameRegional, int aTier, String aDescription,
+    public MTEBasicHull(int aID, String aName, String aNameRegional, int aTier, String aDescription,
         ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, 1, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicHull(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
-        String aDescription, ITexture... aTextures) {
+    public MTEBasicHull(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription,
+        ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicHull(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicHull(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicHull(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicHull(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_BasicHull(mName, mTier, mInventory.length, mDescriptionArray, mTextures);
+        return new MTEBasicHull(mName, mTier, mInventory.length, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicHull_NonElectric.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicHullNonElectric.java
index b6584b50ab..ec01af0408 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicHull_NonElectric.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicHullNonElectric.java
@@ -5,20 +5,17 @@ import net.minecraftforge.common.util.ForgeDirection;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
-public abstract class GT_MetaTileEntity_BasicHull_NonElectric extends GT_MetaTileEntity_BasicHull {
+public abstract class MTEBasicHullNonElectric extends MTEBasicHull {
 
-    public GT_MetaTileEntity_BasicHull_NonElectric(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription) {
+    public MTEBasicHullNonElectric(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
         super(aID, aName, aNameRegional, aTier, aDescription);
     }
 
-    public GT_MetaTileEntity_BasicHull_NonElectric(String aName, int aTier, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicHullNonElectric(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicHull_NonElectric(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicHullNonElectric(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures);
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java
index 377646f85a..25dfb9b58b 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java
@@ -1,7 +1,7 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.enums.GT_Values.debugCleanroom;
+import static gregtech.api.enums.GTValues.V;
+import static gregtech.api.enums.GTValues.debugCleanroom;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_PIPE_OUT;
 import static gregtech.api.metatileentity.BaseTileEntity.FLUID_TRANSFER_TOOLTIP;
@@ -14,9 +14,9 @@ import static gregtech.api.metatileentity.BaseTileEntity.STALLED_STUTTERING_TOOL
 import static gregtech.api.metatileentity.BaseTileEntity.STALLED_VENT_TOOLTIP;
 import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
 import static gregtech.api.metatileentity.BaseTileEntity.UNUSED_SLOT_TOOLTIP;
-import static gregtech.api.util.GT_RecipeConstants.EXPLODE;
-import static gregtech.api.util.GT_RecipeConstants.ON_FIRE;
-import static gregtech.api.util.GT_Utility.moveMultipleItemStacks;
+import static gregtech.api.util.GTRecipeConstants.EXPLODE;
+import static gregtech.api.util.GTRecipeConstants.ON_FIRE;
+import static gregtech.api.util.GTUtility.moveMultipleItemStacks;
 import static net.minecraftforge.common.util.ForgeDirection.DOWN;
 import static net.minecraftforge.common.util.ForgeDirection.UNKNOWN;
 import static net.minecraftforge.common.util.ForgeDirection.UP;
@@ -56,11 +56,11 @@ import com.gtnewhorizons.modularui.common.widget.FluidSlotWidget;
 import com.gtnewhorizons.modularui.common.widget.ProgressBar;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.SoundResource;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.SteamTexture;
 import gregtech.api.interfaces.ICleanroom;
 import gregtech.api.interfaces.IConfigurationCircuitSupport;
@@ -70,21 +70,21 @@ import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IOverclockDescriptionProvider;
 import gregtech.api.interfaces.tileentity.RecipeMapWorkable;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.objects.overclockdescriber.EUOverclockDescriber;
 import gregtech.api.objects.overclockdescriber.OverclockDescriber;
 import gregtech.api.recipe.BasicUIProperties;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ClientPreference;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTClientPreference;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.GTWaila;
 import gregtech.api.util.GT_TooltipDataCache;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.GT_Waila;
+import gregtech.api.util.OverclockCalculator;
 import gregtech.common.gui.modularui.UIHelper;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
@@ -95,8 +95,8 @@ import mcp.mobius.waila.api.IWailaDataAccessor;
  * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
  * Machine
  */
-public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_BasicTank implements RecipeMapWorkable,
-    IConfigurationCircuitSupport, IOverclockDescriptionProvider, IAddGregtechLogo, IAddUIWidgets {
+public abstract class MTEBasicMachine extends MTEBasicTank implements RecipeMapWorkable, IConfigurationCircuitSupport,
+    IOverclockDescriptionProvider, IAddGregtechLogo, IAddUIWidgets {
 
     /**
      * return values for checkRecipe()
@@ -120,7 +120,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
      * Contains the Recipe which has been previously used, or null if there was no previous Recipe, which could have
      * been buffered
      */
-    protected GT_Recipe mLastRecipe = null;
+    protected GTRecipe mLastRecipe = null;
 
     private FluidStack mFluidOut;
     protected final FluidStackTank fluidOutputTank = new FluidStackTank(
@@ -138,8 +138,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
      *                  TopFacingPipeActive 11 = TopFacingPipeInactive 12 = SideFacingPipeActive 13 =
      *                  SideFacingPipeInactive
      */
-    public GT_MetaTileEntity_BasicMachine(int aID, String aName, String aNameRegional, int aTier, int aAmperage,
-        String aDescription, int aInputSlotCount, int aOutputSlotCount, ITexture... aOverlays) {
+    public MTEBasicMachine(int aID, String aName, String aNameRegional, int aTier, int aAmperage, String aDescription,
+        int aInputSlotCount, int aOutputSlotCount, ITexture... aOverlays) {
         super(
             aID,
             aName,
@@ -157,8 +157,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     /**
      * Registers machine with multi-line descriptions.
      */
-    public GT_MetaTileEntity_BasicMachine(int aID, String aName, String aNameRegional, int aTier, int aAmperage,
-        String[] aDescription, int aInputSlotCount, int aOutputSlotCount, ITexture... aOverlays) {
+    public MTEBasicMachine(int aID, String aName, String aNameRegional, int aTier, int aAmperage, String[] aDescription,
+        int aInputSlotCount, int aOutputSlotCount, ITexture... aOverlays) {
         super(
             aID,
             aName,
@@ -176,8 +176,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     /**
      * For {@link #newMetaEntity}.
      */
-    public GT_MetaTileEntity_BasicMachine(String aName, int aTier, int aAmperage, String[] aDescription,
-        ITexture[][][] aTextures, int aInputSlotCount, int aOutputSlotCount) {
+    public MTEBasicMachine(String aName, int aTier, int aAmperage, String[] aDescription, ITexture[][][] aTextures,
+        int aInputSlotCount, int aOutputSlotCount) {
         super(aName, aTier, OTHER_SLOT_COUNT + aInputSlotCount + aOutputSlotCount + 1, aDescription, aTextures);
         mInputSlotCount = Math.max(0, aInputSlotCount);
         mOutputItems = new ItemStack[Math.max(0, aOutputSlotCount)];
@@ -494,17 +494,17 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
         if (aBaseMetaTileEntity.isClientSide()) return true;
-        if (!GT_Mod.gregtechproxy.mForceFreeFace) {
-            GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        if (!GTMod.gregtechproxy.mForceFreeFace) {
+            GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
             return true;
         }
         for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
             if (aBaseMetaTileEntity.getAirAtSide(side)) {
-                GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+                GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
                 return true;
             }
         }
-        GT_Utility.sendChatToPlayer(aPlayer, "No free Side!");
+        GTUtility.sendChatToPlayer(aPlayer, "No free Side!");
         return true;
     }
 
@@ -512,7 +512,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     public void initDefaultModes(NBTTagCompound aNBT) {
         mMainFacing = ForgeDirection.UNKNOWN;
         if (!getBaseMetaTileEntity().getWorld().isRemote) {
-            final GT_ClientPreference tPreference = GT_Mod.gregtechproxy
+            final GTClientPreference tPreference = GTMod.gregtechproxy
                 .getClientPreference(getBaseMetaTileEntity().getOwnerUuid());
             if (tPreference != null) {
                 mDisableFilter = !tPreference.isSingleBlockInitialFilterEnabled();
@@ -538,7 +538,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         if (mFluidOut != null) aNBT.setTag("mFluidOut", mFluidOut.writeToNBT(new NBTTagCompound()));
 
         for (int i = 0; i < mOutputItems.length; i++)
-            if (mOutputItems[i] != null) GT_Utility.saveItem(aNBT, "mOutputItem" + i, mOutputItems[i]);
+            if (mOutputItems[i] != null) GTUtility.saveItem(aNBT, "mOutputItem" + i, mOutputItems[i]);
     }
 
     @Override
@@ -557,7 +557,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         mOutputFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mOutputFluid"));
         mFluidOut = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluidOut"));
 
-        for (int i = 0; i < mOutputItems.length; i++) mOutputItems[i] = GT_Utility.loadItem(aNBT, "mOutputItem" + i);
+        for (int i = 0; i < mOutputItems.length; i++) mOutputItems[i] = GTUtility.loadItem(aNBT, "mOutputItem" + i);
     }
 
     @Override
@@ -663,14 +663,14 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
                         for (int i = getInputSlot(), j = i + mInputSlotCount; i < j; i++)
                             if (mInventory[i] != null && mInventory[i].stackSize <= 0) mInventory[i] = null;
                         for (int i = 0; i < mOutputItems.length; i++) {
-                            mOutputItems[i] = GT_Utility.copyOrNull(mOutputItems[i]);
+                            mOutputItems[i] = GTUtility.copyOrNull(mOutputItems[i]);
                             if (mOutputItems[i] != null && mOutputItems[i].stackSize > 64)
                                 mOutputItems[i].stackSize = 64;
-                            mOutputItems[i] = GT_OreDictUnificator.get(true, mOutputItems[i]);
+                            mOutputItems[i] = GTOreDictUnificator.get(true, mOutputItems[i]);
                         }
                         if (mFluid != null && mFluid.amount <= 0) mFluid = null;
                         mMaxProgresstime = Math.max(1, mMaxProgresstime);
-                        if (GT_Utility.isDebugItem(mInventory[dechargerSlotStartIndex()])) {
+                        if (GTUtility.isDebugItem(mInventory[dechargerSlotStartIndex()])) {
                             mEUt = mMaxProgresstime = 1;
                         }
                         startProcess();
@@ -717,9 +717,9 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     /**
      * Calculates overclock based on {@link #overclockDescriber}.
      */
-    protected void calculateCustomOverclock(GT_Recipe recipe) {
-        GT_OverclockCalculator calculator = overclockDescriber.createCalculator(
-            new GT_OverclockCalculator().setRecipeEUt(recipe.mEUt)
+    protected void calculateCustomOverclock(GTRecipe recipe) {
+        OverclockCalculator calculator = overclockDescriber.createCalculator(
+            new OverclockCalculator().setRecipeEUt(recipe.mEUt)
                 .setDuration(recipe.mDuration)
                 .setOneTickDiscount(true),
             recipe);
@@ -732,7 +732,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
      * Helper method for calculating simple overclock.
      */
     protected void calculateOverclockedNess(int eut, int duration) {
-        GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(eut)
+        OverclockCalculator calculator = new OverclockCalculator().setRecipeEUt(eut)
             .setEUt(V[mTier] * mAmperage)
             .setDuration(duration)
             .setOneTickDiscount(true)
@@ -755,7 +755,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         return rOutputs;
     }
 
-    protected boolean canOutput(GT_Recipe aRecipe) {
+    protected boolean canOutput(GTRecipe aRecipe) {
         return aRecipe != null && (aRecipe.mNeedsEmptyOutput ? isOutputEmpty() && getDrainableStack() == null
             : canOutput(aRecipe.getFluidOutput(0)) && canOutput(aRecipe.mOutputs));
     }
@@ -765,7 +765,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         ItemStack[] tOutputSlots = getAllOutputs();
         for (int i = 0; i < tOutputSlots.length && i < aOutputs.length; i++)
             if (tOutputSlots[i] != null && aOutputs[i] != null
-                && (!GT_Utility.areStacksEqual(tOutputSlots[i], aOutputs[i], false)
+                && (!GTUtility.areStacksEqual(tOutputSlots[i], aOutputs[i], false)
                     || tOutputSlots[i].stackSize + aOutputs[i].stackSize > tOutputSlots[i].getMaxStackSize())) {
                         mOutputBlocked++;
                         return false;
@@ -814,7 +814,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     @Override
     public void doSound(byte aIndex, double aX, double aY, double aZ) {
         super.doSound(aIndex, aX, aY, aZ);
-        if (aIndex == 8) GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_INTERRUPT_ONE, 100, 1.0F, aX, aY, aZ);
+        if (aIndex == 8) GTUtility.doSoundAtClient(SoundResource.IC2_MACHINES_INTERRUPT_ONE, 100, 1.0F, aX, aY, aZ);
     }
 
     public boolean doesAutoOutput() {
@@ -875,27 +875,27 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     @Override
     public String[] getInfoData() {
         return new String[] { "Progress:",
-            EnumChatFormatting.GREEN + GT_Utility.formatNumbers((mProgresstime / 20))
+            EnumChatFormatting.GREEN + GTUtility.formatNumbers((mProgresstime / 20))
                 + EnumChatFormatting.RESET
                 + " s / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(mMaxProgresstime / 20)
+                + GTUtility.formatNumbers(mMaxProgresstime / 20)
                 + EnumChatFormatting.RESET
                 + " s",
             "Stored Energy:",
-            EnumChatFormatting.GREEN + GT_Utility.formatNumbers(getBaseMetaTileEntity().getStoredEU())
+            EnumChatFormatting.GREEN + GTUtility.formatNumbers(getBaseMetaTileEntity().getStoredEU())
                 + EnumChatFormatting.RESET
                 + " EU / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(getBaseMetaTileEntity().getEUCapacity())
+                + GTUtility.formatNumbers(getBaseMetaTileEntity().getEUCapacity())
                 + EnumChatFormatting.RESET
                 + " EU",
             "Probably uses: " + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(mEUt)
+                + GTUtility.formatNumbers(mEUt)
                 + EnumChatFormatting.RESET
                 + " EU/t at "
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(mEUt == 0 ? 0 : mAmperage)
+                + GTUtility.formatNumbers(mEUt == 0 ? 0 : mAmperage)
                 + EnumChatFormatting.RESET
                 + " A" };
     }
@@ -910,15 +910,15 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         if (side == getBaseMetaTileEntity().getFrontFacing() || side == mMainFacing) {
             if (aPlayer.isSneaking()) {
                 mDisableFilter = !mDisableFilter;
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aPlayer,
                     StatCollector.translateToLocal("GT5U.hatch.disableFilter." + mDisableFilter));
             } else {
                 mAllowInputFromOutputSide = !mAllowInputFromOutputSide;
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aPlayer,
-                    mAllowInputFromOutputSide ? GT_Utility.trans("095", "Input from Output Side allowed")
-                        : GT_Utility.trans("096", "Input from Output Side forbidden"));
+                    mAllowInputFromOutputSide ? GTUtility.trans("095", "Input from Output Side allowed")
+                        : GTUtility.trans("096", "Input from Output Side forbidden"));
             }
         }
     }
@@ -931,19 +931,19 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         if (click) return true;
         if (wrenchingSide != mMainFacing) return false;
         mDisableMultiStack = !mDisableMultiStack;
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             entityPlayer,
             StatCollector.translateToLocal("GT5U.hatch.disableMultiStack." + mDisableMultiStack));
         return true;
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID) {
         if (side != mMainFacing) return true;
-        GT_CoverBehaviorBase<?> tBehavior = GregTech_API.getCoverBehaviorNew(aCoverID.toStack());
+        CoverBehaviorBase<?> tBehavior = GregTechAPI.getCoverBehaviorNew(aCoverID.toStack());
         return tBehavior.isGUIClickable(
             side,
-            GT_Utility.stackToInt(aCoverID.toStack()),
+            GTUtility.stackToInt(aCoverID.toStack()),
             tBehavior.createDataObject(),
             getBaseMetaTileEntity());
     }
@@ -961,7 +961,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
             || aIndex >= getInputSlot() + mInputSlotCount
             || (!mAllowInputFromOutputSide && side == aBaseMetaTileEntity.getFrontFacing())) return false;
         for (int i = getInputSlot(), j = i + mInputSlotCount; i < j; i++)
-            if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(aStack), mInventory[i]) && mDisableMultiStack)
+            if (GTUtility.areStacksEqual(GTOreDictUnificator.get(aStack), mInventory[i]) && mDisableMultiStack)
                 return i == aIndex;
         return mDisableFilter || allowPutStackValidated(aBaseMetaTileEntity, aIndex, side, aStack);
     }
@@ -1005,7 +1005,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
 
     @Override
     public List<ItemStack> getConfigurationCircuits() {
-        return GregTech_API.getConfigurationCircuitList(mTier);
+        return GregTechAPI.getConfigurationCircuitList(mTier);
     }
 
     @Override
@@ -1027,7 +1027,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         return checkRecipe(false);
     }
 
-    public static boolean isValidForLowGravity(GT_Recipe tRecipe, int dimId) {
+    public static boolean isValidForLowGravity(GTRecipe tRecipe, int dimId) {
         return // TODO check or get a better solution
         DimensionManager.getProvider(dimId)
             .getClass()
@@ -1060,7 +1060,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     public int checkRecipe(boolean skipOC) {
         RecipeMap<?> tMap = getRecipeMap();
         if (tMap == null) return DID_NOT_FIND_RECIPE;
-        GT_Recipe tRecipe = tMap.findRecipeQuery()
+        GTRecipe tRecipe = tMap.findRecipeQuery()
             .items(getAllInputs())
             .fluids(getFillableStack())
             .specialSlot(getSpecialSlot())
@@ -1079,7 +1079,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
             return DID_NOT_FIND_RECIPE;
         }
 
-        if (GT_Mod.gregtechproxy.mLowGravProcessing && (tRecipe.mSpecialValue == -100 || tRecipe.mSpecialValue == -300)
+        if (GTMod.gregtechproxy.mLowGravProcessing && (tRecipe.mSpecialValue == -100 || tRecipe.mSpecialValue == -300)
             && !isValidForLowGravity(tRecipe, getBaseMetaTileEntity().getWorld().provider.dimensionId))
             return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
         if (tRecipe.mCanBeBuffered) mLastRecipe = tRecipe;
@@ -1103,7 +1103,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
             for (int i = 0; i < mOutputItems.length; i++) if (mOutputItems[i] != null
                 && getBaseMetaTileEntity().getRandomNumber(10000) > cleanroom.getCleanness()) {
                     if (debugCleanroom) {
-                        GT_Log.out.println(
+                        GTLog.out.println(
                             "BasicMachine: Voiding output due to cleanness failure. Cleanness = "
                                 + cleanroom.getCleanness());
                     }
@@ -1192,35 +1192,35 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
                         currenttip.add(
                             StatCollector.translateToLocalFormatted(
                                 "GT5U.waila.energy.use_with_amperage",
-                                GT_Utility.formatNumbers(mEUt),
-                                GT_Utility.getAmperageForTier(mEUt, (byte) getInputTier()),
-                                GT_Utility.getColoredTierNameFromTier((byte) getInputTier())));
+                                GTUtility.formatNumbers(mEUt),
+                                GTUtility.getAmperageForTier(mEUt, (byte) getInputTier()),
+                                GTUtility.getColoredTierNameFromTier((byte) getInputTier())));
                     } else if (mEUt < 0) {
                         currenttip.add(
                             StatCollector.translateToLocalFormatted(
                                 "GT5U.waila.energy.produce_with_amperage",
-                                GT_Utility.formatNumbers(-mEUt),
-                                GT_Utility.getAmperageForTier(-mEUt, (byte) getOutputTier()),
-                                GT_Utility.getColoredTierNameFromTier((byte) getOutputTier())));
+                                GTUtility.formatNumbers(-mEUt),
+                                GTUtility.getAmperageForTier(-mEUt, (byte) getOutputTier()),
+                                GTUtility.getColoredTierNameFromTier((byte) getOutputTier())));
                     }
                 } else {
                     if (mEUt > 0) {
                         currenttip.add(
                             StatCollector.translateToLocalFormatted(
                                 "GT5U.waila.energy.use",
-                                GT_Utility.formatNumbers(mEUt),
-                                GT_Utility.getColoredTierNameFromVoltage(mEUt)));
+                                GTUtility.formatNumbers(mEUt),
+                                GTUtility.getColoredTierNameFromVoltage(mEUt)));
                     } else if (mEUt < 0) {
                         currenttip.add(
                             StatCollector.translateToLocalFormatted(
                                 "GT5U.waila.energy.produce",
-                                GT_Utility.formatNumbers(-mEUt),
-                                GT_Utility.getColoredTierNameFromVoltage(-mEUt)));
+                                GTUtility.formatNumbers(-mEUt),
+                                GTUtility.getColoredTierNameFromVoltage(-mEUt)));
                     }
                 }
             }
             currenttip.add(
-                GT_Waila.getMachineProgressString(
+                GTWaila.getMachineProgressString(
                     isActive,
                     tag.getInteger("maxProgressSingleBlock"),
                     tag.getInteger("progressSingleBlock")));
@@ -1308,7 +1308,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         builder.widget(
             createErrorStatusArea(
                 builder,
-                isSteampowered() ? GT_UITextures.PICTURE_STALLED_STEAM : GT_UITextures.PICTURE_STALLED_ELECTRICITY));
+                isSteampowered() ? GTUITextures.PICTURE_STALLED_STEAM : GTUITextures.PICTURE_STALLED_ELECTRICITY));
     }
 
     /**
@@ -1442,8 +1442,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
 
     protected CycleButtonWidget createItemAutoOutputButton() {
         return (CycleButtonWidget) new CycleButtonWidget().setToggle(() -> mItemTransfer, val -> mItemTransfer = val)
-            .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_ITEM)
-            .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+            .setStaticTexture(GTUITextures.OVERLAY_BUTTON_AUTOOUTPUT_ITEM)
+            .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
             .setGTTooltip(() -> mTooltipCache.getData(ITEM_TRANSFER_TOOLTIP))
             .setTooltipShowUpDelay(TOOLTIP_DELAY)
             .setPos(25, 62)
@@ -1452,8 +1452,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
 
     protected CycleButtonWidget createFluidAutoOutputButton() {
         return (CycleButtonWidget) new CycleButtonWidget().setToggle(() -> mFluidTransfer, val -> mFluidTransfer = val)
-            .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID)
-            .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+            .setStaticTexture(GTUITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID)
+            .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
             .setGTTooltip(() -> mTooltipCache.getData(FLUID_TRANSFER_TOOLTIP))
             .setTooltipShowUpDelay(TOOLTIP_DELAY)
             .setPos(7, 62)
@@ -1461,7 +1461,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     }
 
     protected Widget setNEITransferRect(Widget widget, String transferRectID) {
-        if (GT_Utility.isStringInvalid(transferRectID)) {
+        if (GTUtility.isStringInvalid(transferRectID)) {
             return widget;
         }
         final String transferRectTooltip;
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineBronze.java
index 5eb648d560..507a807a76 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineBronze.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.D1;
+import static gregtech.api.enums.GTValues.D1;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP;
@@ -25,7 +25,7 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.FluidSlotWidget;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.ParticleFX;
 import gregtech.api.enums.SoundResource;
@@ -34,13 +34,13 @@ import gregtech.api.enums.TierEU;
 import gregtech.api.gui.modularui.GUITextureSet;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.objects.overclockdescriber.OverclockDescriber;
 import gregtech.api.objects.overclockdescriber.SteamOverclockDescriber;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
 
 /**
@@ -49,19 +49,19 @@ import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
  * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
  * Machine
  */
-public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileEntity_BasicMachine {
+public abstract class MTEBasicMachineBronze extends MTEBasicMachine {
 
     private static final String TT_machineType = "GT5U.MBTT.MachineType";
     private static final int NEEDS_STEAM_VENTING = 64;
     public boolean mNeedsSteamVenting = false;
 
-    public GT_MetaTileEntity_BasicMachine_Bronze(int aID, String aName, String aNameRegional, String aDescription,
-        int aInputSlotCount, int aOutputSlotCount, boolean aHighPressure) {
+    public MTEBasicMachineBronze(int aID, String aName, String aNameRegional, String aDescription, int aInputSlotCount,
+        int aOutputSlotCount, boolean aHighPressure) {
         super(aID, aName, aNameRegional, aHighPressure ? 2 : 1, 0, aDescription, aInputSlotCount, aOutputSlotCount);
     }
 
-    public GT_MetaTileEntity_BasicMachine_Bronze(String aName, String[] aDescription, ITexture[][][] aTextures,
-        int aInputSlotCount, int aOutputSlotCount, boolean aHighPressure) {
+    public MTEBasicMachineBronze(String aName, String[] aDescription, ITexture[][][] aTextures, int aInputSlotCount,
+        int aOutputSlotCount, boolean aHighPressure) {
         super(aName, aHighPressure ? 2 : 1, 0, aDescription, aTextures, aInputSlotCount, aOutputSlotCount);
     }
 
@@ -160,7 +160,7 @@ public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileE
     public boolean allowToCheckRecipe() {
         if (mNeedsSteamVenting
             && getBaseMetaTileEntity().getCoverIDAtSide(getBaseMetaTileEntity().getFrontFacing()) == 0
-            && !GT_Utility.hasBlockHitBox(
+            && !GTUtility.hasBlockHitBox(
                 getBaseMetaTileEntity().getWorld(),
                 getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 1),
                 getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 1),
@@ -178,10 +178,10 @@ public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileE
                             getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 1) + 1,
                             getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 1) + 1,
                             getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 1) + 1))) {
-                    GT_Utility.applyHeatDamage(tLiving, getSteamDamage());
+                    GTUtility.applyHeatDamage(tLiving, getSteamDamage());
                 }
             } catch (Throwable e) {
-                if (D1) e.printStackTrace(GT_Log.err);
+                if (D1) e.printStackTrace(GTLog.err);
             }
         }
         return !mNeedsSteamVenting;
@@ -189,7 +189,7 @@ public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileE
 
     @Override
     public int checkRecipe() {
-        GT_Recipe tRecipe = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, TierEU.LV, null, getAllInputs());
+        GTRecipe tRecipe = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, TierEU.LV, null, getAllInputs());
         if ((tRecipe != null) && (canOutput(tRecipe.mOutputs))
             && (tRecipe.isRecipeInputEqual(true, null, getAllInputs()))) {
             this.mOutputItems[0] = tRecipe.getOutput(0);
@@ -215,7 +215,7 @@ public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileE
     public void doSound(byte aIndex, double aX, double aY, double aZ) {
         super.doSound(aIndex, aX, aY, aZ);
         if (aIndex == 9) {
-            GT_Utility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 5, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 5, 1.0F, aX, aY, aZ);
 
             new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD)
                 .setWorld(getBaseMetaTileEntity().getWorld())
@@ -240,8 +240,8 @@ public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileE
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) {
-        return GregTech_API.getCoverBehaviorNew(aCoverID.toStack())
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID) {
+        return GregTechAPI.getCoverBehaviorNew(aCoverID.toStack())
             .isSimpleCover() && super.allowCoverOnSide(side, aCoverID);
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Steel.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineSteel.java
index d6ae385430..8d6f5568d5 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Steel.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineSteel.java
@@ -22,16 +22,15 @@ import gregtech.api.render.TextureFactory;
  * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
  * Machine
  */
-public abstract class GT_MetaTileEntity_BasicMachine_Steel extends GT_MetaTileEntity_BasicMachine_Bronze
-    implements IGetTitleColor {
+public abstract class MTEBasicMachineSteel extends MTEBasicMachineBronze implements IGetTitleColor {
 
-    public GT_MetaTileEntity_BasicMachine_Steel(int aID, String aName, String aNameRegional, String aDescription,
-        int aInputSlotCount, int aOutputSlotCount, boolean aHighPressure) {
+    public MTEBasicMachineSteel(int aID, String aName, String aNameRegional, String aDescription, int aInputSlotCount,
+        int aOutputSlotCount, boolean aHighPressure) {
         super(aID, aName, aNameRegional, aDescription, aInputSlotCount, aOutputSlotCount, aHighPressure);
     }
 
-    public GT_MetaTileEntity_BasicMachine_Steel(String aName, String[] aDescription, ITexture[][][] aTextures,
-        int aInputSlotCount, int aOutputSlotCount, boolean aHighPressure) {
+    public MTEBasicMachineSteel(String aName, String[] aDescription, ITexture[][][] aTextures, int aInputSlotCount,
+        int aOutputSlotCount, boolean aHighPressure) {
         super(aName, aDescription, aTextures, aInputSlotCount, aOutputSlotCount, aHighPressure);
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineWithRecipe.java
index a10e735843..b5bd3d77e1 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineWithRecipe.java
@@ -1,9 +1,9 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.enums.GT_Values.VN;
-import static gregtech.api.enums.GT_Values.W;
-import static gregtech.api.enums.GT_Values.ticksBetweenSounds;
+import static gregtech.api.enums.GTValues.V;
+import static gregtech.api.enums.GTValues.VN;
+import static gregtech.api.enums.GTValues.W;
+import static gregtech.api.enums.GTValues.ticksBetweenSounds;
 import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
 import static net.minecraftforge.common.util.ForgeDirection.UP;
 
@@ -29,7 +29,7 @@ import gregtech.api.enums.ParticleFX;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures.BlockIcons.CustomIcon;
 import gregtech.api.enums.Tier;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -38,8 +38,8 @@ import gregtech.api.recipe.BasicUIProperties;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.ExternalMaterials;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
 
 /**
@@ -48,7 +48,7 @@ import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
  * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
  * Machine
  */
-public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_BasicMachine {
+public class MTEBasicMachineWithRecipe extends MTEBasicMachine {
 
     private final RecipeMap<?> mRecipes;
     private final int mTankCapacity;
@@ -60,9 +60,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
     /**
      * Registers machine with single-line description, specific tank capacity, and sound specified by ResourceLocation.
      */
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription, RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity,
-        ResourceLocation aSound, SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
+    public MTEBasicMachineWithRecipe(int aID, String aName, String aNameRegional, int aTier, String aDescription,
+        RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, ResourceLocation aSound,
+        SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
         this(
             aID,
             aName,
@@ -82,9 +82,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
     /**
      * Registers machine with multi-line descriptions, specific tank capacity, and sound specified by ResourceLocation.
      */
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription, RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity,
-        ResourceLocation aSound, SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
+    public MTEBasicMachineWithRecipe(int aID, String aName, String aNameRegional, int aTier, String[] aDescription,
+        RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, ResourceLocation aSound,
+        SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
         super(
             aID,
             aName,
@@ -422,11 +422,11 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
                 // spotless:on
             }
 
-            if (!GT_ModHandler.addCraftingRecipe(
+            if (!GTModHandler.addCraftingRecipe(
                 getStackForm(1),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.BUFFERED
-                    | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                    | GT_ModHandler.RecipeBits.REVERSIBLE,
+                GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.BUFFERED
+                    | GTModHandler.RecipeBits.NOT_REMOVABLE
+                    | GTModHandler.RecipeBits.REVERSIBLE,
                 aRecipe)) {
                 throw new IllegalArgumentException("INVALID CRAFTING RECIPE FOR: " + getStackForm(1).getDisplayName());
             }
@@ -436,9 +436,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
     /**
      * Registers machine with single-line description, auto-scaled fluid tank, and sound specified by SoundResource.
      */
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription, RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, boolean usesFluids,
-        SoundResource aSound, SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
+    public MTEBasicMachineWithRecipe(int aID, String aName, String aNameRegional, int aTier, String aDescription,
+        RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, boolean usesFluids, SoundResource aSound,
+        SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
         this(
             aID,
             aName,
@@ -458,9 +458,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
     /**
      * Registers machine with multi-line descriptions, auto-scaled fluid tank, and sound specified by SoundResource.
      */
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription, RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, boolean usesFluids,
-        SoundResource aSound, SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
+    public MTEBasicMachineWithRecipe(int aID, String aName, String aNameRegional, int aTier, String[] aDescription,
+        RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, boolean usesFluids, SoundResource aSound,
+        SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
         this(
             aID,
             aName,
@@ -480,9 +480,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
     /**
      * Registers machine with single-line description, specific tank capacity, and sound specified by SoundResource.
      */
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription, RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity,
-        SoundResource aSound, SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
+    public MTEBasicMachineWithRecipe(int aID, String aName, String aNameRegional, int aTier, String aDescription,
+        RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, SoundResource aSound,
+        SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
         this(
             aID,
             aName,
@@ -502,9 +502,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
     /**
      * Registers machine with multi-line descriptions, specific tank capacity, and sound specified by SoundResource.
      */
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription, RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity,
-        SoundResource aSound, SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
+    public MTEBasicMachineWithRecipe(int aID, String aName, String aNameRegional, int aTier, String[] aDescription,
+        RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, SoundResource aSound,
+        SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
         this(
             aID,
             aName,
@@ -524,9 +524,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
     /**
      * For {@link #newMetaEntity}.
      */
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe(String aName, int aTier, String[] aDescription,
-        RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, int aAmperage,
-        ITexture[][][] aTextures, ResourceLocation aSound, SpecialEffects aSpecialEffect) {
+    public MTEBasicMachineWithRecipe(String aName, int aTier, String[] aDescription, RecipeMap<?> aRecipes,
+        int aInputSlots, int aOutputSlots, int aTankCapacity, int aAmperage, ITexture[][][] aTextures,
+        ResourceLocation aSound, SpecialEffects aSpecialEffect) {
         super(aName, aTier, aAmperage, aDescription, aTextures, aInputSlots, aOutputSlots);
         this.mTankCapacity = aTankCapacity;
         this.mSpecialEffect = aSpecialEffect;
@@ -536,7 +536,7 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+        return new MTEBasicMachineWithRecipe(
             this.mName,
             this.mTier,
             this.mDescriptionArray,
@@ -551,17 +551,17 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
                 .setRecipeCatalystPriority(this.recipeCatalystPriority);
     }
 
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe setProgressBarTexture(FallbackableUITexture progressBarTexture) {
+    public MTEBasicMachineWithRecipe setProgressBarTexture(FallbackableUITexture progressBarTexture) {
         this.progressBarTexture = progressBarTexture;
         return this;
     }
 
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe setProgressBarTextureName(String name, UITexture fallback) {
-        return setProgressBarTexture(GT_UITextures.fallbackableProgressbar(name, fallback));
+    public MTEBasicMachineWithRecipe setProgressBarTextureName(String name, UITexture fallback) {
+        return setProgressBarTexture(GTUITextures.fallbackableProgressbar(name, fallback));
     }
 
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe setProgressBarTextureName(String name) {
-        return setProgressBarTextureName(name, GT_UITextures.PROGRESSBAR_ARROW);
+    public MTEBasicMachineWithRecipe setProgressBarTextureName(String name) {
+        return setProgressBarTextureName(name, GTUITextures.PROGRESSBAR_ARROW);
     }
 
     @Override
@@ -617,7 +617,7 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
                     // uv;
                     // assemblers
                     // luv-uev
-                    if (GT_Utility.isStackValid(aStack)) for (int oreID : OreDictionary.getOreIDs(aStack)) {
+                    if (GTUtility.isStackValid(aStack)) for (int oreID : OreDictionary.getOreIDs(aStack)) {
                         if (OreDictionary.getOreName(oreID)
                             .startsWith("circuit")) return true;
                     }
@@ -734,7 +734,7 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
         return recipeCatalystPriority;
     }
 
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe setRecipeCatalystPriority(int recipeCatalystPriority) {
+    public MTEBasicMachineWithRecipe setRecipeCatalystPriority(int recipeCatalystPriority) {
         this.recipeCatalystPriority = recipeCatalystPriority;
         return this;
     }
@@ -748,9 +748,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 1 && this.mSoundResourceLocation != null
-            && GT_Utility.isStringValid(this.mSoundResourceLocation.getResourceDomain())
-            && GT_Utility.isStringValid(this.mSoundResourceLocation.getResourcePath()))
-            GT_Utility.doSoundAtClient(this.mSoundResourceLocation, 100, 1.0F, aX, aY, aZ);
+            && GTUtility.isStringValid(this.mSoundResourceLocation.getResourceDomain())
+            && GTUtility.isStringValid(this.mSoundResourceLocation.getResourcePath()))
+            GTUtility.doSoundAtClient(this.mSoundResourceLocation, 100, 1.0F, aX, aY, aZ);
     }
 
     @Override
@@ -759,9 +759,8 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
         // Added to throttle sounds. To reduce lag, this is on the server side so BlockUpdate packets aren't sent.
         if (myMetaTileEntity.mTickTimer > (myMetaTileEntity.mLastSoundTick + ticksBetweenSounds)) {
             if (this.mSoundResourceLocation != null
-                && GT_Utility.isStringValid(this.mSoundResourceLocation.getResourceDomain())
-                && GT_Utility.isStringValid(this.mSoundResourceLocation.getResourcePath()))
-                this.sendLoopStart((byte) 1);
+                && GTUtility.isStringValid(this.mSoundResourceLocation.getResourceDomain())
+                && GTUtility.isStringValid(this.mSoundResourceLocation.getResourcePath())) this.sendLoopStart((byte) 1);
             // Does not have overflow protection, but they are longs.
             myMetaTileEntity.mLastSoundTick = myMetaTileEntity.mTickTimer;
         }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicTank.java
index 25fc7e7855..003b8c893e 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicTank.java
@@ -15,19 +15,18 @@ import com.gtnewhorizons.modularui.common.widget.FluidSlotWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 /**
  * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
  * <p>
  * This is the main construct for my generic Tanks. Filling and emptying behavior have to be implemented manually
  */
-public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_TieredMachineBlock
-    implements IAddUIWidgets {
+public abstract class MTEBasicTank extends MTETieredMachineBlock implements IAddUIWidgets {
 
     public FluidStack mFluid;
     // Due to class initializing order, getCapacity might not work properly at this time.
@@ -40,23 +39,21 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier
     /**
      * @param aInvSlotCount should be 3
      */
-    public GT_MetaTileEntity_BasicTank(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
-        String aDescription, ITexture... aTextures) {
+    public MTEBasicTank(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription,
+        ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicTank(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTEBasicTank(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String[] aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicTank(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicTank(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicTank(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicTank(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
@@ -151,13 +148,13 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier
             final int inputSlot = getInputSlot();
 
             if (doesEmptyContainers()) {
-                FluidStack tFluid = GT_Utility.getFluidForFilledItem(mInventory[inputSlot], true);
+                FluidStack tFluid = GTUtility.getFluidForFilledItem(mInventory[inputSlot], true);
                 if (tFluid != null && isFluidInputAllowed(tFluid)) {
                     if (getFillableStack() == null) {
                         if (isFluidInputAllowed(tFluid) && tFluid.amount <= getCapacity()) {
                             if (aBaseMetaTileEntity.addStackToSlot(
                                 getOutputSlot(),
-                                GT_Utility.getContainerForFilledItem(mInventory[inputSlot], true),
+                                GTUtility.getContainerForFilledItem(mInventory[inputSlot], true),
                                 1)) {
                                 setFillableStack(tFluid.copy());
                                 this.onEmptyingContainerWhenEmpty();
@@ -169,7 +166,7 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier
                             && ((long) tFluid.amount + getFillableStack().amount) <= (long) getCapacity()) {
                             if (aBaseMetaTileEntity.addStackToSlot(
                                 getOutputSlot(),
-                                GT_Utility.getContainerForFilledItem(mInventory[inputSlot], true),
+                                GTUtility.getContainerForFilledItem(mInventory[inputSlot], true),
                                 1)) {
                                 getFillableStack().amount += tFluid.amount;
                                 aBaseMetaTileEntity.decrStackSize(inputSlot, 1);
@@ -180,10 +177,10 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier
             }
 
             if (doesFillContainers()) {
-                ItemStack tOutput = GT_Utility
+                ItemStack tOutput = GTUtility
                     .fillFluidContainer(getDrainableStack(), mInventory[inputSlot], false, true);
                 if (tOutput != null && aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tOutput, 1)) {
-                    FluidStack tFluid = GT_Utility.getFluidForFilledItem(tOutput, true);
+                    FluidStack tFluid = GTUtility.getFluidForFilledItem(tOutput, true);
                     aBaseMetaTileEntity.decrStackSize(inputSlot, 1);
                     if (tFluid != null) getDrainableStack().amount -= tFluid.amount;
                     if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) setDrainableStack(null);
@@ -298,23 +295,23 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier
     @Override
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK)
                 .setPos(7, 16)
                 .setSize(71, 45))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_GAUGE)
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_GAUGE)
                     .setPos(79, 34)
                     .setSize(18, 18))
             .widget(
                 new SlotWidget(inventoryHandler, getInputSlot())
-                    .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN)
+                    .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_IN)
                     .setPos(79, 16))
             .widget(
                 new SlotWidget(inventoryHandler, getOutputSlot()).setAccess(true, false)
-                    .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT)
+                    .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_OUT)
                     .setPos(79, 52))
             .widget(
-                createFluidSlot().setBackground(GT_UITextures.TRANSPARENT)
+                createFluidSlot().setBackground(GTUITextures.TRANSPARENT)
                     .setPos(58, 41))
             .widget(
                 new TextWidget("Liquid Amount").setDefaultColor(COLOR_TEXT_WHITE.get())
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBuffer.java
index ef64d99db8..c8b4e6bfca 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBuffer.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Textures.BlockIcons.ARROW_DOWN;
 import static gregtech.api.enums.Textures.BlockIcons.ARROW_DOWN_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.ARROW_LEFT;
@@ -35,16 +35,16 @@ import com.gtnewhorizons.modularui.api.widget.Widget;
 import com.gtnewhorizons.modularui.common.widget.CycleButtonWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.render.TextureFactory;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.GT_TooltipDataCache;
-import gregtech.api.util.GT_Utility;
 
-public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredMachineBlock implements IAddUIWidgets {
+public abstract class MTEBuffer extends MTETieredMachineBlock implements IAddUIWidgets {
 
     private static final int OUTPUT_INDEX = 0;
     private static final int ARROW_RIGHT_INDEX = 1;
@@ -67,23 +67,19 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
     public int mSuccess = 0, mTargetStackSize = 0;
     private int uiButtonCount = 0;
 
-    public GT_MetaTileEntity_Buffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
-        String aDescription) {
+    public MTEBuffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
     }
 
-    public GT_MetaTileEntity_Buffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
-        String[] aDescription) {
+    public MTEBuffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String[] aDescription) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
     }
 
-    public GT_MetaTileEntity_Buffer(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBuffer(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Buffer(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBuffer(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
@@ -275,7 +271,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -314,11 +310,11 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
                 mTargetStackSize = mMaxStackSize;
             }
             if (mTargetStackSize == 0) {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("098", "Do not regulate Item Stack Size"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("098", "Do not regulate Item Stack Size"));
             } else {
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aPlayer,
-                    GT_Utility.trans("099", "Regulate Item Stack Size to: ") + mTargetStackSize);
+                    GTUtility.trans("099", "Regulate Item Stack Size to: ") + mTargetStackSize);
             }
         }
     }
@@ -374,7 +370,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
 
     protected void moveItems(IGregTechTileEntity aBaseMetaTileEntity, long ignoredTimer, int stacks) {
         int tCost;
-        if (bStockingMode) tCost = GT_Utility.moveMultipleItemStacks(
+        if (bStockingMode) tCost = GTUtility.moveMultipleItemStacks(
             aBaseMetaTileEntity,
             aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()),
             aBaseMetaTileEntity.getBackFacing(),
@@ -386,7 +382,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
             (byte) 64,
             (byte) 1,
             stacks);
-        else tCost = GT_Utility.moveMultipleItemStacks(
+        else tCost = GTUtility.moveMultipleItemStacks(
             aBaseMetaTileEntity,
             aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()),
             aBaseMetaTileEntity.getBackFacing(),
@@ -428,23 +424,23 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
     }
 
     protected void fillStacksIntoFirstSlots() {
-        HashMap<GT_Utility.ItemId, Integer> slots = new HashMap<>(mInventory.length);
-        HashMap<GT_Utility.ItemId, ItemStack> stacks = new HashMap<>(mInventory.length);
-        List<GT_Utility.ItemId> order = new ArrayList<>(mInventory.length);
+        HashMap<GTUtility.ItemId, Integer> slots = new HashMap<>(mInventory.length);
+        HashMap<GTUtility.ItemId, ItemStack> stacks = new HashMap<>(mInventory.length);
+        List<GTUtility.ItemId> order = new ArrayList<>(mInventory.length);
         List<Integer> validSlots = new ArrayList<>(mInventory.length);
         for (int i = 0; i < mInventory.length - 1; i++) {
             if (!isValidSlot(i)) continue;
             validSlots.add(i);
             ItemStack s = mInventory[i];
             if (s == null) continue;
-            GT_Utility.ItemId sID = GT_Utility.ItemId.createNoCopy(s);
+            GTUtility.ItemId sID = GTUtility.ItemId.createNoCopy(s);
             slots.merge(sID, s.stackSize, Integer::sum);
             if (!stacks.containsKey(sID)) stacks.put(sID, s);
             order.add(sID);
             mInventory[i] = null;
         }
         int slotindex = 0;
-        for (GT_Utility.ItemId sID : order) {
+        for (GTUtility.ItemId sID : order) {
             int toSet = slots.get(sID);
             if (toSet == 0) continue;
             int slot = validSlots.get(slotindex);
@@ -463,10 +459,10 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
         if (entityPlayer.isSneaking()) {
             // I was so proud of all this but I literally just copied code from OutputBus
             bSortStacks = !bSortStacks;
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 entityPlayer,
-                GT_Utility.trans("200", "Sort mode: ")
-                    + (bSortStacks ? GT_Utility.trans("088", "Enabled") : GT_Utility.trans("087", "Disabled")));
+                GTUtility.trans("200", "Sort mode: ")
+                    + (bSortStacks ? GTUtility.trans("088", "Enabled") : GTUtility.trans("087", "Disabled")));
             return true;
         }
         return super.onSolderingToolRightClick(side, wrenchingSide, entityPlayer, aX, aY, aZ);
@@ -477,16 +473,16 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
             createToggleButton(
                 () -> bOutput,
                 val -> bOutput = val,
-                GT_UITextures.OVERLAY_BUTTON_EMIT_ENERGY,
+                GTUITextures.OVERLAY_BUTTON_EMIT_ENERGY,
                 this::getEmitEnergyButtonTooltip));
     }
 
     private GT_TooltipDataCache.TooltipData getEmitEnergyButtonTooltip() {
         return mTooltipCache.getData(
             EMIT_ENERGY_TOOLTIP,
-            EnumChatFormatting.GREEN + GT_Utility.formatNumbers(V[mTier])
+            EnumChatFormatting.GREEN + GTUtility.formatNumbers(V[mTier])
                 + " ("
-                + GT_Utility.getColoredTierNameFromTier(mTier)
+                + GTUtility.getColoredTierNameFromTier(mTier)
                 + EnumChatFormatting.GREEN
                 + ")"
                 + EnumChatFormatting.GRAY,
@@ -498,7 +494,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
             createToggleButton(
                 () -> bRedstoneIfFull,
                 val -> bRedstoneIfFull = val,
-                GT_UITextures.OVERLAY_BUTTON_EMIT_REDSTONE,
+                GTUITextures.OVERLAY_BUTTON_EMIT_REDSTONE,
                 this::getEmitRedstoneIfFullButtonTooltip).setUpdateTooltipEveryTick(true));
     }
 
@@ -514,7 +510,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
             createToggleButton(
                 () -> bInvert,
                 val -> bInvert = val,
-                GT_UITextures.OVERLAY_BUTTON_INVERT_REDSTONE,
+                GTUITextures.OVERLAY_BUTTON_INVERT_REDSTONE,
                 () -> mTooltipCache.getData(INVERT_REDSTONE_TOOLTIP)));
     }
 
@@ -523,7 +519,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
             createToggleButton(
                 () -> bStockingMode,
                 val -> bStockingMode = val,
-                GT_UITextures.OVERLAY_BUTTON_STOCKING_MODE,
+                GTUITextures.OVERLAY_BUTTON_STOCKING_MODE,
                 () -> mTooltipCache.getData(STOCKING_MODE_TOOLTIP)));
     }
 
@@ -532,7 +528,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
             createToggleButton(
                 () -> bSortStacks,
                 val -> bSortStacks = val,
-                GT_UITextures.OVERLAY_BUTTON_SORTING_MODE,
+                GTUITextures.OVERLAY_BUTTON_SORTING_MODE,
                 () -> mTooltipCache.getData(SORTING_MODE_TOOLTIP)));
     }
 
@@ -546,7 +542,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
         Supplier<GT_TooltipDataCache.TooltipData> tooltipDataSupplier) {
         return new CycleButtonWidget().setToggle(getter, setter)
             .setStaticTexture(picture)
-            .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+            .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
             .setTooltipShowUpDelay(TOOLTIP_DELAY)
             .setPos(7 + (uiButtonCount++ * BUTTON_SIZE), 62)
             .setSize(BUTTON_SIZE, BUTTON_SIZE)
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/MTECable.java
index e44860963f..b56769c59b 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTECable.java
@@ -25,8 +25,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import cofh.api.energy.IEnergyReceiver;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TextureSet;
@@ -47,17 +47,17 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.interfaces.PowerLogicHost;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
-import gregtech.api.objects.GT_Cover_None;
+import gregtech.api.objects.GTCoverNone;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_GC_Compat;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTGCCompat;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
-import gregtech.common.GT_Client;
+import gregtech.common.GTClient;
 import gregtech.common.covers.CoverInfo;
-import gregtech.common.covers.GT_Cover_SolarPanel;
+import gregtech.common.covers.CoverSolarPanel;
 import ic2.api.energy.EnergyNet;
 import ic2.api.energy.tile.IEnergyEmitter;
 import ic2.api.energy.tile.IEnergySink;
@@ -67,7 +67,7 @@ import ic2.api.reactor.IReactorChamber;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTileEntityCable {
+public class MTECable extends MetaPipeEntity implements IMetaTileEntityCable {
 
     public final float mThickNess;
     public final Materials mMaterial;
@@ -76,7 +76,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
 
     public int mTransferredAmperage = 0;
 
-    public GT_MetaPipeEntity_Cable(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial,
+    public MTECable(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial,
         long aCableLossPerMeter, long aAmperage, long aVoltage, boolean aInsulated, boolean aCanShock) {
         super(aID, aName, aNameRegional, 0);
         mThickNess = aThickNess;
@@ -88,8 +88,8 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
         mCableLossPerMeter = aCableLossPerMeter;
     }
 
-    public GT_MetaPipeEntity_Cable(String aName, float aThickNess, Materials aMaterial, long aCableLossPerMeter,
-        long aAmperage, long aVoltage, boolean aInsulated, boolean aCanShock) {
+    public MTECable(String aName, float aThickNess, Materials aMaterial, long aCableLossPerMeter, long aAmperage,
+        long aVoltage, boolean aInsulated, boolean aCanShock) {
         super(aName, 0);
         mThickNess = aThickNess;
         mMaterial = aMaterial;
@@ -107,7 +107,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaPipeEntity_Cable(
+        return new MTECable(
             mName,
             mThickNess,
             mMaterial,
@@ -185,7 +185,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
 
         if (amperage == 0L) return;
 
-        GT_Utility.applyElectricityDamage(livingEntity, voltage, amperage);
+        GTUtility.applyElectricityDamage(livingEntity, voltage, amperage);
     }
 
     @Override
@@ -259,7 +259,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         super.onPostTick(aBaseMetaTileEntity, aTick);
         if (aTick % 20 == 0 && aBaseMetaTileEntity.isServerSide()
-            && (!GT_Mod.gregtechproxy.gt6Cable || mCheckConnections)) {
+            && (!GTMod.gregtechproxy.gt6Cable || mCheckConnections)) {
             checkConnections();
         }
     }
@@ -267,14 +267,14 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     @Override
     public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer,
         float aX, float aY, float aZ) {
-        if (GT_Mod.gregtechproxy.gt6Cable
-            && GT_ModHandler.damageOrDechargeItem(aPlayer.inventory.getCurrentItem(), 1, 500, aPlayer)) {
+        if (GTMod.gregtechproxy.gt6Cable
+            && GTModHandler.damageOrDechargeItem(aPlayer.inventory.getCurrentItem(), 1, 500, aPlayer)) {
             if (isConnectedAtSide(wrenchingSide)) {
                 disconnect(wrenchingSide);
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("215", "Disconnected"));
-            } else if (!GT_Mod.gregtechproxy.costlyCableConnection) {
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("215", "Disconnected"));
+            } else if (!GTMod.gregtechproxy.costlyCableConnection) {
                 if (connect(wrenchingSide) > 0)
-                    GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("214", "Connected"));
+                    GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("214", "Connected"));
             }
             return true;
         }
@@ -284,14 +284,14 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     @Override
     public boolean onSolderingToolRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer,
         float aX, float aY, float aZ) {
-        if (GT_Mod.gregtechproxy.gt6Cable
-            && GT_ModHandler.damageOrDechargeItem(aPlayer.inventory.getCurrentItem(), 1, 500, aPlayer)) {
+        if (GTMod.gregtechproxy.gt6Cable
+            && GTModHandler.damageOrDechargeItem(aPlayer.inventory.getCurrentItem(), 1, 500, aPlayer)) {
             if (isConnectedAtSide(wrenchingSide)) {
                 disconnect(wrenchingSide);
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("215", "Disconnected"));
-            } else if (!GT_Mod.gregtechproxy.costlyCableConnection || GT_ModHandler.consumeSolderingMaterial(aPlayer)) {
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("215", "Disconnected"));
+            } else if (!GTMod.gregtechproxy.costlyCableConnection || GTModHandler.consumeSolderingMaterial(aPlayer)) {
                 if (connect(wrenchingSide) > 0)
-                    GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("214", "Connected"));
+                    GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("214", "Connected"));
             }
             return true;
         }
@@ -299,25 +299,25 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     }
 
     @Override
-    public boolean letsIn(GT_CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
+    public boolean letsIn(CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity) {
         return coverBehavior.letsEnergyIn(side, aCoverID, aCoverVariable, aTileEntity);
     }
 
     @Override
-    public boolean letsOut(GT_CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
+    public boolean letsOut(CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity) {
         return coverBehavior.letsEnergyOut(side, aCoverID, aCoverVariable, aTileEntity);
     }
 
     @Override
-    public boolean letsIn(GT_CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
+    public boolean letsIn(CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
         ISerializableObject aCoverVariable, ICoverable aTileEntity) {
         return coverBehavior.letsEnergyIn(side, aCoverID, aCoverVariable, aTileEntity);
     }
 
     @Override
-    public boolean letsOut(GT_CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
+    public boolean letsOut(CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
         ISerializableObject aCoverVariable, ICoverable aTileEntity) {
         return coverBehavior.letsEnergyOut(side, aCoverID, aCoverVariable, aTileEntity);
     }
@@ -335,7 +335,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     @Override
     public boolean canConnect(ForgeDirection side, TileEntity tileEntity) {
         final IGregTechTileEntity baseMetaTile = getBaseMetaTileEntity();
-        final GT_CoverBehaviorBase<?> coverBehavior = baseMetaTile.getCoverBehaviorAtSideNew(side);
+        final CoverBehaviorBase<?> coverBehavior = baseMetaTile.getCoverBehaviorAtSideNew(side);
         final ForgeDirection oppositeSide = side.getOpposite();
 
         // GT Machine handling
@@ -346,11 +346,11 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
             return true;
 
         // Solar Panel Compat
-        if (coverBehavior instanceof GT_Cover_SolarPanel) return true;
+        if (coverBehavior instanceof CoverSolarPanel) return true;
 
         // ((tIsGregTechTileEntity && tIsTileEntityCable) && (tAlwaysLookConnected || tLetEnergyIn || tLetEnergyOut) )
         // --> Not needed
-        if (GalacticraftCore.isModLoaded() && GT_GC_Compat.canConnect(tileEntity, oppositeSide)) return true;
+        if (GalacticraftCore.isModLoaded() && GTGCCompat.canConnect(tileEntity, oppositeSide)) return true;
 
         // AE2-p2p Compat
         if (tileEntity instanceof appeng.tile.powersink.IC2 ic2sink
@@ -372,25 +372,25 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
                 && ((IEnergySink) ic2Energy).acceptsEnergyFrom((TileEntity) baseMetaTile, oppositeSide)) return true;
 
             // IC2 Source Compat
-            if (GT_Mod.gregtechproxy.ic2EnergySourceCompat && (ic2Energy instanceof IEnergySource)) {
+            if (GTMod.gregtechproxy.ic2EnergySourceCompat && (ic2Energy instanceof IEnergySource)) {
                 if (((IEnergySource) ic2Energy).emitsEnergyTo((TileEntity) baseMetaTile, oppositeSide)) {
                     return true;
                 }
             }
         }
         // RF Output Compat
-        if (GregTech_API.mOutputRF && tileEntity instanceof IEnergyReceiver
+        if (GregTechAPI.mOutputRF && tileEntity instanceof IEnergyReceiver
             && ((IEnergyReceiver) tileEntity).canConnectEnergy(oppositeSide)) return true;
 
         // RF Input Compat
-        return GregTech_API.mInputRF && (tileEntity instanceof IEnergyEmitter
+        return GregTechAPI.mInputRF && (tileEntity instanceof IEnergyEmitter
             && ((IEnergyEmitter) tileEntity).emitsEnergyTo((TileEntity) baseMetaTile, oppositeSide));
     }
 
     @Override
     public boolean getGT6StyleConnection() {
         // Yes if GT6 Cables are enabled
-        return GT_Mod.gregtechproxy.gt6Cable;
+        return GTMod.gregtechproxy.gt6Cable;
     }
 
     @Override
@@ -410,19 +410,19 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
         return new String[] {
             StatCollector.translateToLocal("GT5U.item.cable.max_voltage") + ": %%%"
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(mVoltage)
+                + GTUtility.formatNumbers(mVoltage)
                 + " ("
-                + GT_Utility.getColoredTierNameFromVoltage(mVoltage)
+                + GTUtility.getColoredTierNameFromVoltage(mVoltage)
                 + EnumChatFormatting.GREEN
                 + ")"
                 + EnumChatFormatting.GRAY,
             StatCollector.translateToLocal("GT5U.item.cable.max_amperage") + ": %%%"
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(mAmperage)
+                + GTUtility.formatNumbers(mAmperage)
                 + EnumChatFormatting.GRAY,
             StatCollector.translateToLocal("GT5U.item.cable.loss") + ": %%%"
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(mCableLossPerMeter)
+                + GTUtility.formatNumbers(mCableLossPerMeter)
                 + EnumChatFormatting.GRAY
                 + "%%% "
                 + StatCollector.translateToLocal("GT5U.item.cable.eu_volt") };
@@ -430,18 +430,18 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
 
     @Override
     public float getThickNess() {
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x1) != 0) return 0.0625F;
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x1) != 0) return 0.0625F;
         return mThickNess;
     }
 
     @Override
     public void saveNBTData(NBTTagCompound aNBT) {
-        if (GT_Mod.gregtechproxy.gt6Cable) aNBT.setByte("mConnections", mConnections);
+        if (GTMod.gregtechproxy.gt6Cable) aNBT.setByte("mConnections", mConnections);
     }
 
     @Override
     public void loadNBTData(NBTTagCompound aNBT) {
-        if (GT_Mod.gregtechproxy.gt6Cable) {
+        if (GTMod.gregtechproxy.gt6Cable) {
             mConnections = aNBT.getByte("mConnections");
         }
     }
@@ -469,34 +469,34 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
 
         return new String[] {
             "Amperage: " + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(currAmp)
+                + GTUtility.formatNumbers(currAmp)
                 + EnumChatFormatting.RESET
                 + " / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(mAmperage)
+                + GTUtility.formatNumbers(mAmperage)
                 + EnumChatFormatting.RESET
                 + " A",
             "Voltage Out: " + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(currVoltage)
+                + GTUtility.formatNumbers(currVoltage)
                 + EnumChatFormatting.RESET
                 + " / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(maxVoltageOut)
+                + GTUtility.formatNumbers(maxVoltageOut)
                 + EnumChatFormatting.RESET
                 + " EU/t",
             "Avg Amperage (20t): " + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(avgAmp)
+                + GTUtility.formatNumbers(avgAmp)
                 + EnumChatFormatting.RESET
                 + " A",
             "Avg Output (20t): " + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(avgVoltage)
+                + GTUtility.formatNumbers(avgVoltage)
                 + EnumChatFormatting.RESET
                 + " EU/t" };
     }
 
     @Override
     public AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) {
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x2) != 0)
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x2) != 0)
             return AxisAlignedBB.getBoundingBox(aX, aY, aZ, aX + 1, aY + 1, aZ + 1);
         else return getActualCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
     }
@@ -556,7 +556,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     public void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB,
         List<AxisAlignedBB> outputAABB, Entity collider) {
         super.addCollisionBoxesToList(aWorld, aX, aY, aZ, inputAABB, outputAABB, collider);
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x2) != 0) {
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x2) != 0) {
             final AxisAlignedBB aabb = getActualCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
             if (inputAABB.intersectsWith(aabb)) outputAABB.add(aabb);
         }
@@ -564,7 +564,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
 
     @Override
     public boolean shouldJoinIc2Enet() {
-        if (!GT_Mod.gregtechproxy.ic2EnergySourceCompat) return false;
+        if (!GTMod.gregtechproxy.ic2EnergySourceCompat) return false;
 
         if (mConnections != 0) {
             final IGregTechTileEntity baseMeta = getBaseMetaTileEntity();
@@ -594,7 +594,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
             for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
                 if (isConnectedAtSide(side)) {
                     final CoverInfo coverInfo = pipe.getCoverInfoAtSide(side);
-                    if (coverInfo.getCoverBehavior() instanceof GT_Cover_None) continue;
+                    if (coverInfo.getCoverBehavior() instanceof GTCoverNone) continue;
                     if (!letsIn(coverInfo) || !letsOut(coverInfo)) {
                         pipe.addToLock(pipe, side);
                     } else {
@@ -607,7 +607,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
             for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
                 if (isConnectedAtSide(side)) {
                     final CoverInfo coverInfo = pipe.getCoverInfoAtSide(side);
-                    if (coverInfo.getCoverBehavior() instanceof GT_Cover_None) continue;
+                    if (coverInfo.getCoverBehavior() instanceof GTCoverNone) continue;
 
                     if (!letsIn(coverInfo) || !letsOut(coverInfo)) {
                         dontAllow = true;
@@ -629,19 +629,19 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
         currenttip.add(
             StatCollector.translateToLocal("GT5U.item.cable.max_voltage") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(mVoltage)
+                + GTUtility.formatNumbers(mVoltage)
                 + " ("
-                + GT_Utility.getColoredTierNameFromVoltage(mVoltage)
+                + GTUtility.getColoredTierNameFromVoltage(mVoltage)
                 + EnumChatFormatting.GREEN
                 + ")");
         currenttip.add(
             StatCollector.translateToLocal("GT5U.item.cable.max_amperage") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(mAmperage));
+                + GTUtility.formatNumbers(mAmperage));
         currenttip.add(
             StatCollector.translateToLocal("GT5U.item.cable.loss") + ": "
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(mCableLossPerMeter)
+                + GTUtility.formatNumbers(mCableLossPerMeter)
                 + EnumChatFormatting.RESET
                 + " "
                 + StatCollector.translateToLocal("GT5U.item.cable.eu_volt"));
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTECubicMultiBlockBase.java
index efb91e3a26..c8b0c8ce3f 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTECubicMultiBlockBase.java
@@ -4,13 +4,13 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
 
 import java.util.List;
 
@@ -25,7 +25,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_StructureUtility;
+import gregtech.api.util.GTStructureUtility;
 
 /**
  * A simple 3x3x3 hollow cubic multiblock, that can be arbitrarily rotated, made of a single type of machine casing and
@@ -41,15 +41,15 @@ import gregtech.api.util.GT_StructureUtility;
  *
  * @param <T>
  */
-public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTileEntity_CubicMultiBlockBase<T>>
-    extends GT_MetaTileEntity_EnhancedMultiBlockBase<T> implements ISurvivalConstructable {
+public abstract class MTECubicMultiBlockBase<T extends MTECubicMultiBlockBase<T>> extends MTEEnhancedMultiBlockBase<T>
+    implements ISurvivalConstructable {
 
     protected static final String STRUCTURE_PIECE_MAIN = "main";
-    protected static final ClassValue<IStructureDefinition<GT_MetaTileEntity_CubicMultiBlockBase<?>>> STRUCTURE_DEFINITION = new ClassValue<>() {
+    protected static final ClassValue<IStructureDefinition<MTECubicMultiBlockBase<?>>> STRUCTURE_DEFINITION = new ClassValue<>() {
 
         @Override
-        protected IStructureDefinition<GT_MetaTileEntity_CubicMultiBlockBase<?>> computeValue(Class<?> type) {
-            return StructureDefinition.<GT_MetaTileEntity_CubicMultiBlockBase<?>>builder()
+        protected IStructureDefinition<MTECubicMultiBlockBase<?>> computeValue(Class<?> type) {
+            return StructureDefinition.<MTECubicMultiBlockBase<?>>builder()
                 .addShape(
                     STRUCTURE_PIECE_MAIN,
                     transpose(
@@ -58,24 +58,24 @@ public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTil
                     'h',
                     ofChain(
                         lazy(
-                            t -> GT_StructureUtility.<GT_MetaTileEntity_CubicMultiBlockBase<?>>buildHatchAdder()
+                            t -> GTStructureUtility.<MTECubicMultiBlockBase<?>>buildHatchAdder()
                                 .atLeastList(t.getAllowedHatches())
                                 .casingIndex(t.getHatchTextureIndex())
                                 .dot(1)
                                 .build()),
                         onElementPass(
-                            GT_MetaTileEntity_CubicMultiBlockBase::onCorrectCasingAdded,
-                            lazy(GT_MetaTileEntity_CubicMultiBlockBase::getCasingElement))))
+                            MTECubicMultiBlockBase::onCorrectCasingAdded,
+                            lazy(MTECubicMultiBlockBase::getCasingElement))))
                 .build();
         }
     };
     private int mCasingAmount = 0;
 
-    protected GT_MetaTileEntity_CubicMultiBlockBase(int aID, String aName, String aNameRegional) {
+    protected MTECubicMultiBlockBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    protected GT_MetaTileEntity_CubicMultiBlockBase(String aName) {
+    protected MTECubicMultiBlockBase(String aName) {
         super(aName);
     }
 
@@ -122,9 +122,9 @@ public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTil
         return mMaintenanceHatches.size() == 1;
     }
 
-    protected abstract IStructureElement<GT_MetaTileEntity_CubicMultiBlockBase<?>> getCasingElement();
+    protected abstract IStructureElement<MTECubicMultiBlockBase<?>> getCasingElement();
 
-    protected List<IHatchElement<? super GT_MetaTileEntity_CubicMultiBlockBase<?>>> getAllowedHatches() {
+    protected List<IHatchElement<? super MTECubicMultiBlockBase<?>>> getAllowedHatches() {
         return ImmutableList.of(InputHatch, OutputHatch, InputBus, OutputBus, Muffler, Maintenance, Energy);
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java
index 15ce78fae3..2cf4398e87 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java
@@ -19,30 +19,30 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 
 import cpw.mods.fml.common.network.NetworkRegistry;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 
 /**
- * Enhanced multiblock base class, featuring following improvement over {@link GT_MetaTileEntity_MultiBlockBase}
+ * Enhanced multiblock base class, featuring following improvement over {@link MTEMultiBlockBase}
  * <p>
  * 1. TecTech style declarative structure check utilizing StructureLib. 2. Arbitrarily rotating the whole structure, if
  * allowed to.
  *
  * @param <T> type of this
  */
-public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_MetaTileEntity_EnhancedMultiBlockBase<T>>
-    extends GT_MetaTileEntity_TooltipMultiBlockBase implements IAlignment, IConstructable {
+public abstract class MTEEnhancedMultiBlockBase<T extends MTEEnhancedMultiBlockBase<T>> extends MTETooltipMultiBlockBase
+    implements IAlignment, IConstructable {
 
     private ExtendedFacing mExtendedFacing = ExtendedFacing.DEFAULT;
     private IAlignmentLimits mLimits = getInitialAlignmentLimits();
 
-    protected GT_MetaTileEntity_EnhancedMultiBlockBase(int aID, String aName, String aNameRegional) {
+    protected MTEEnhancedMultiBlockBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    protected GT_MetaTileEntity_EnhancedMultiBlockBase(String aName) {
+    protected MTEEnhancedMultiBlockBase(String aName) {
         super(aName);
     }
 
@@ -61,7 +61,7 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
             mUpdated = false;
             mUpdate = 50;
             if (getBaseMetaTileEntity().isServerSide()
-                && !GregTech_API.isDummyWorld(getBaseMetaTileEntity().getWorld())) {
+                && !GregTechAPI.isDummyWorld(getBaseMetaTileEntity().getWorld())) {
                 StructureLibAPI.sendAlignment(
                     (IAlignmentProvider) base,
                     new NetworkRegistry.TargetPoint(
@@ -123,7 +123,7 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
      */
     public abstract IStructureDefinition<T> getStructureDefinition();
 
-    protected abstract GT_Multiblock_Tooltip_Builder createTooltip();
+    protected abstract MultiblockTooltipBuilder createTooltip();
 
     @Override
     public String[] getStructureDescription(ItemStack stackSize) {
@@ -184,8 +184,8 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
     }
 
     @SuppressWarnings("unchecked")
-    private IStructureDefinition<GT_MetaTileEntity_EnhancedMultiBlockBase<T>> getCastedStructureDefinition() {
-        return (IStructureDefinition<GT_MetaTileEntity_EnhancedMultiBlockBase<T>>) getStructureDefinition();
+    private IStructureDefinition<MTEEnhancedMultiBlockBase<T>> getCastedStructureDefinition() {
+        return (IStructureDefinition<MTEEnhancedMultiBlockBase<T>>) getStructureDefinition();
     }
 
     /**
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEExtendedPowerMultiBlockBase.java
index f430114319..64bade97e8 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEExtendedPowerMultiBlockBase.java
@@ -1,7 +1,7 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.VN;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.enums.GTValues.VN;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,25 +21,25 @@ import org.jetbrains.annotations.NotNull;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.check.CheckRecipeResult;
-import gregtech.api.util.GT_ExoticEnergyInputHelper;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.ExoticEnergyInputHelper;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.OverclockCalculator;
 import gregtech.api.util.shutdown.ShutDownReason;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 
 /**
  * Multiblock base class that allows machine to use power over int.
  */
-public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT_MetaTileEntity_EnhancedMultiBlockBase<T>>
-    extends GT_MetaTileEntity_EnhancedMultiBlockBase<T> {
+public abstract class MTEExtendedPowerMultiBlockBase<T extends MTEEnhancedMultiBlockBase<T>>
+    extends MTEEnhancedMultiBlockBase<T> {
 
     public long lEUt;
 
-    protected GT_MetaTileEntity_ExtendedPowerMultiBlockBase(int aID, String aName, String aNameRegional) {
+    protected MTEExtendedPowerMultiBlockBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    protected GT_MetaTileEntity_ExtendedPowerMultiBlockBase(String aName) {
+    protected MTEExtendedPowerMultiBlockBase(String aName) {
         super(aName);
     }
 
@@ -59,7 +59,7 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT
     @Override
     protected void calculateOverclockedNessMultiInternal(long aEUt, int aDuration, int mAmperage, long maxInputVoltage,
         boolean perfectOC) {
-        GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(aEUt)
+        OverclockCalculator calculator = new OverclockCalculator().setRecipeEUt(aEUt)
             .setEUt(maxInputVoltage * mAmperage)
             .setDuration(aDuration)
             .setDurationDecreasePerOC(perfectOC ? 4.0 : 2.0)
@@ -94,8 +94,8 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT
         return (-this.lEUt * 10000) / Math.max(1000, mEfficiency);
     }
 
-    public List<GT_MetaTileEntity_Hatch> getExoticAndNormalEnergyHatchList() {
-        List<GT_MetaTileEntity_Hatch> tHatches = new ArrayList<>();
+    public List<MTEHatch> getExoticAndNormalEnergyHatchList() {
+        List<MTEHatch> tHatches = new ArrayList<>();
         tHatches.addAll(filterValidMTEs(mExoticEnergyHatches));
         tHatches.addAll(filterValidMTEs(mEnergyHatches));
         return tHatches;
@@ -103,7 +103,7 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT
 
     @Override
     public boolean drainEnergyInput(long aEU) {
-        return GT_ExoticEnergyInputHelper.drainEnergy(aEU, getExoticAndNormalEnergyHatchList());
+        return ExoticEnergyInputHelper.drainEnergy(aEU, getExoticAndNormalEnergyHatchList());
     }
 
     @Override
@@ -145,13 +145,13 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT
     @Override
     public String[] getInfoData() {
         int mPollutionReduction = 0;
-        for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) {
+        for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
             mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction);
         }
 
         long storedEnergy = 0;
         long maxEnergy = 0;
-        for (GT_MetaTileEntity_Hatch tHatch : getExoticAndNormalEnergyHatchList()) {
+        for (MTEHatch tHatch : getExoticAndNormalEnergyHatchList()) {
             storedEnergy += tHatch.getBaseMetaTileEntity()
                 .getStoredEU();
             maxEnergy += tHatch.getBaseMetaTileEntity()
@@ -163,30 +163,30 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT
         return new String[] {
             /* 1 */ StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(mProgresstime / 20)
+                + GTUtility.formatNumbers(mProgresstime / 20)
                 + EnumChatFormatting.RESET
                 + " s / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(mMaxProgresstime / 20)
+                + GTUtility.formatNumbers(mMaxProgresstime / 20)
                 + EnumChatFormatting.RESET
                 + " s",
             /* 2 */ StatCollector.translateToLocal("GT5U.multiblock.energy") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(storedEnergy)
+                + GTUtility.formatNumbers(storedEnergy)
                 + EnumChatFormatting.RESET
                 + " EU / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(maxEnergy)
+                + GTUtility.formatNumbers(maxEnergy)
                 + EnumChatFormatting.RESET
                 + " EU",
             /* 3 */ StatCollector.translateToLocal("GT5U.multiblock.usage") + ": "
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(getActualEnergyUsage())
+                + GTUtility.formatNumbers(getActualEnergyUsage())
                 + EnumChatFormatting.RESET
                 + " EU/t",
             /* 4 */ StatCollector.translateToLocal("GT5U.multiblock.mei") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(voltage)
+                + GTUtility.formatNumbers(voltage)
                 + EnumChatFormatting.RESET
                 + " EU/t(*"
                 + amps
@@ -194,7 +194,7 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT
                 + StatCollector.translateToLocal("GT5U.machines.tier")
                 + ": "
                 + EnumChatFormatting.YELLOW
-                + VN[GT_Utility.getTier(voltage)]
+                + VN[GTUtility.getTier(voltage)]
                 + EnumChatFormatting.RESET,
             /* 5 */ StatCollector.translateToLocal("GT5U.multiblock.problems") + ": "
                 + EnumChatFormatting.RED
@@ -216,22 +216,22 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT
 
     @Override
     public long getMaxInputVoltage() {
-        return GT_ExoticEnergyInputHelper.getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList());
+        return ExoticEnergyInputHelper.getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList());
     }
 
     @Override
     public long getAverageInputVoltage() {
-        return GT_ExoticEnergyInputHelper.getAverageInputVoltageMulti(getExoticAndNormalEnergyHatchList());
+        return ExoticEnergyInputHelper.getAverageInputVoltageMulti(getExoticAndNormalEnergyHatchList());
     }
 
     @Override
     public long getMaxInputAmps() {
-        return GT_ExoticEnergyInputHelper.getMaxWorkingInputAmpsMulti(getExoticAndNormalEnergyHatchList());
+        return ExoticEnergyInputHelper.getMaxWorkingInputAmpsMulti(getExoticAndNormalEnergyHatchList());
     }
 
     @Override
     public long getMaxInputEu() {
-        return GT_ExoticEnergyInputHelper.getTotalEuMulti(getExoticAndNormalEnergyHatchList());
+        return ExoticEnergyInputHelper.getTotalEuMulti(getExoticAndNormalEnergyHatchList());
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_FilterBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEFilterBase.java
index 896cb223f3..32e224e50f 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_FilterBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEFilterBase.java
@@ -5,11 +5,11 @@ import net.minecraft.nbt.NBTTagCompound;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.util.GT_TooltipDataCache;
 
-public abstract class GT_MetaTileEntity_FilterBase extends GT_MetaTileEntity_Buffer {
+public abstract class MTEFilterBase extends MTEBuffer {
 
     private static final String INVERT_FILTER_TOOLTIP = "GT5U.machines.invert_filter.tooltip";
     protected static final int FILTER_SLOT_INDEX = 9;
@@ -17,23 +17,21 @@ public abstract class GT_MetaTileEntity_FilterBase extends GT_MetaTileEntity_Buf
     private static final String EMIT_REDSTONE_GRADUALLY_TOOLTIP = "GT5U" + ".machines.emit_redstone_gradually.tooltip";
     protected boolean invertFilter = false;
 
-    public GT_MetaTileEntity_FilterBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTEFilterBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String aDescription) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
     }
 
-    public GT_MetaTileEntity_FilterBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTEFilterBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String[] aDescription) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
     }
 
-    public GT_MetaTileEntity_FilterBase(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEFilterBase(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_FilterBase(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEFilterBase(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
@@ -86,7 +84,7 @@ public abstract class GT_MetaTileEntity_FilterBase extends GT_MetaTileEntity_Buf
             createToggleButton(
                 () -> bRedstoneIfFull,
                 val -> bRedstoneIfFull = val,
-                GT_UITextures.OVERLAY_BUTTON_EMIT_REDSTONE,
+                GTUITextures.OVERLAY_BUTTON_EMIT_REDSTONE,
                 this::getEmitRedstoneGraduallyButtonTooltip).setUpdateTooltipEveryTick(true));
     }
 
@@ -100,7 +98,7 @@ public abstract class GT_MetaTileEntity_FilterBase extends GT_MetaTileEntity_Buf
             createToggleButton(
                 () -> invertFilter,
                 val -> invertFilter = val,
-                GT_UITextures.OVERLAY_BUTTON_INVERT_FILTER,
+                GTUITextures.OVERLAY_BUTTON_INVERT_FILTER,
                 () -> mTooltipCache.getData(INVERT_FILTER_TOOLTIP)));
     }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java
index cafd1c9cb7..ddc0e28723 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java
@@ -1,13 +1,13 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES;
-import static gregtech.api.enums.GT_Values.D1;
+import static gregtech.api.enums.GTValues.ALL_VALID_SIDES;
+import static gregtech.api.enums.GTValues.D1;
 import static gregtech.api.enums.Mods.TinkerConstruct;
 import static gregtech.api.enums.Mods.Translocator;
-import static gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid.Border.BOTTOM;
-import static gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid.Border.LEFT;
-import static gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid.Border.RIGHT;
-import static gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid.Border.TOP;
+import static gregtech.api.metatileentity.implementations.MTEFluid.Border.BOTTOM;
+import static gregtech.api.metatileentity.implementations.MTEFluid.Border.LEFT;
+import static gregtech.api.metatileentity.implementations.MTEFluid.Border.RIGHT;
+import static gregtech.api.metatileentity.implementations.MTEFluid.Border.TOP;
 import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
 import static net.minecraftforge.common.util.ForgeDirection.DOWN;
 import static net.minecraftforge.common.util.ForgeDirection.EAST;
@@ -39,7 +39,7 @@ import net.minecraftforge.fluids.IFluidHandler;
 import org.apache.commons.lang3.tuple.MutableTriple;
 
 import cpw.mods.fml.common.Optional;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Mods;
@@ -53,23 +53,23 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
-import gregtech.common.GT_Client;
+import gregtech.common.GTClient;
 import gregtech.common.config.other.ConfigGeneral;
+import gregtech.common.covers.CoverDrain;
+import gregtech.common.covers.CoverFluidRegulator;
 import gregtech.common.covers.CoverInfo;
-import gregtech.common.covers.GT_Cover_Drain;
-import gregtech.common.covers.GT_Cover_FluidRegulator;
 
-public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
+public class MTEFluid extends MetaPipeEntity {
 
     protected static final EnumMap<ForgeDirection, EnumMap<Border, ForgeDirection>> FACE_BORDER_MAP = new EnumMap<>(
         ForgeDirection.class);
@@ -114,13 +114,13 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
      */
     public byte mDisableInput = 0;
 
-    public GT_MetaPipeEntity_Fluid(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial,
-        int aCapacity, int aHeatResistance, boolean aGasProof) {
+    public MTEFluid(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial, int aCapacity,
+        int aHeatResistance, boolean aGasProof) {
         this(aID, aName, aNameRegional, aThickNess, aMaterial, aCapacity, aHeatResistance, aGasProof, 1);
     }
 
-    public GT_MetaPipeEntity_Fluid(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial,
-        int aCapacity, int aHeatResistance, boolean aGasProof, int aFluidTypes) {
+    public MTEFluid(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial, int aCapacity,
+        int aHeatResistance, boolean aGasProof, int aFluidTypes) {
         super(aID, aName, aNameRegional, 0, false);
         mThickNess = aThickNess;
         mMaterial = aMaterial;
@@ -132,8 +132,8 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
         addInfo(aID);
     }
 
-    public GT_MetaPipeEntity_Fluid(String aName, float aThickNess, Materials aMaterial, int aCapacity,
-        int aHeatResistance, boolean aGasProof, int aFluidTypes) {
+    public MTEFluid(String aName, float aThickNess, Materials aMaterial, int aCapacity, int aHeatResistance,
+        boolean aGasProof, int aFluidTypes) {
         super(aName, 0);
         mThickNess = aThickNess;
         mMaterial = aMaterial;
@@ -151,14 +151,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaPipeEntity_Fluid(
-            mName,
-            mThickNess,
-            mMaterial,
-            mCapacity,
-            mHeatResistance,
-            mGasProof,
-            mPipeAmount);
+        return new MTEFluid(mName, mThickNess, mMaterial, mCapacity, mHeatResistance, mGasProof, mPipeAmount);
     }
 
     @Override
@@ -260,7 +253,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
         for (int i = 0; i < mPipeAmount; i++) if (mFluids[i] != null)
             aNBT.setTag("mFluid" + (i == 0 ? "" : i), mFluids[i].writeToNBT(new NBTTagCompound()));
         aNBT.setByte("mLastReceivedFrom", mLastReceivedFrom);
-        if (GT_Mod.gregtechproxy.gt6Pipe) {
+        if (GTMod.gregtechproxy.gt6Pipe) {
             aNBT.setByte("mConnections", mConnections);
             aNBT.setByte("mDisableInput", mDisableInput);
         }
@@ -271,7 +264,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
         for (int i = 0; i < mPipeAmount; i++)
             mFluids[i] = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid" + (i == 0 ? "" : i)));
         mLastReceivedFrom = aNBT.getByte("mLastReceivedFrom");
-        if (GT_Mod.gregtechproxy.gt6Pipe) {
+        if (GTMod.gregtechproxy.gt6Pipe) {
             mConnections = aNBT.getByte("mConnections");
             mDisableInput = aNBT.getByte("mDisableInput");
         }
@@ -287,11 +280,11 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
                         .getTemperature(tFluid);
                     if (tTemperature > 320
                         && !isCoverOnSide((BaseMetaPipeEntity) getBaseMetaTileEntity(), (EntityLivingBase) aEntity)) {
-                        GT_Utility.applyHeatDamage((EntityLivingBase) aEntity, (tTemperature - 300) / 50.0F);
+                        GTUtility.applyHeatDamage((EntityLivingBase) aEntity, (tTemperature - 300) / 50.0F);
                         break;
                     } else if (tTemperature < 260
                         && !isCoverOnSide((BaseMetaPipeEntity) getBaseMetaTileEntity(), (EntityLivingBase) aEntity)) {
-                            GT_Utility.applyFrostDamage((EntityLivingBase) aEntity, (270 - tTemperature) / 25.0F);
+                            GTUtility.applyFrostDamage((EntityLivingBase) aEntity, (270 - tTemperature) / 25.0F);
                             break;
                         }
                 }
@@ -308,7 +301,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
                 mLastReceivedFrom = 0;
             }
 
-            if (!GT_Mod.gregtechproxy.gt6Pipe || mCheckConnections) checkConnections();
+            if (!GTMod.gregtechproxy.gt6Pipe || mCheckConnections) checkConnections();
 
             final boolean shouldDistribute = (oLastReceivedFrom == mLastReceivedFrom);
             for (int i = 0, j = aBaseMetaTileEntity.getRandomNumber(mPipeAmount); i < mPipeAmount; i++) {
@@ -338,7 +331,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
             if (tTemperature > mHeatResistance) {
                 if (aBaseMetaTileEntity.getRandomNumber(100) == 0) {
                     // Poof
-                    GT_Log.exp.println(
+                    GTLog.exp.println(
                         "Set Pipe to Fire due to to low heat resistance at " + aBaseMetaTileEntity.getXCoord()
                             + " | "
                             + aBaseMetaTileEntity.getYCoord()
@@ -351,7 +344,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
                 }
                 // Mmhmm, Fire
                 aBaseMetaTileEntity.setOnFire();
-                GT_Log.exp.println(
+                GTLog.exp.println(
                     "Set Blocks around Pipe to Fire due to to low heat resistance at " + aBaseMetaTileEntity.getXCoord()
                         + " | "
                         + aBaseMetaTileEntity.getYCoord()
@@ -376,10 +369,10 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
                                     getBaseMetaTileEntity().getXCoord() + 3,
                                     getBaseMetaTileEntity().getYCoord() + 3,
                                     getBaseMetaTileEntity().getZCoord() + 3))) {
-                            GT_Utility.applyHeatDamage(tLiving, (tTemperature - 300) / 25.0F);
+                            GTUtility.applyHeatDamage(tLiving, (tTemperature - 300) / 25.0F);
                         }
                     } catch (Throwable e) {
-                        if (D1) e.printStackTrace(GT_Log.err);
+                        if (D1) e.printStackTrace(GTLog.err);
                     }
                 } else if (tTemperature < 260) {
                     try {
@@ -393,10 +386,10 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
                                     getBaseMetaTileEntity().getXCoord() + 3,
                                     getBaseMetaTileEntity().getYCoord() + 3,
                                     getBaseMetaTileEntity().getZCoord() + 3))) {
-                            GT_Utility.applyFrostDamage(tLiving, (270 - tTemperature) / 12.5F);
+                            GTUtility.applyFrostDamage(tLiving, (270 - tTemperature) / 12.5F);
                         }
                     } catch (Throwable e) {
-                        if (D1) e.printStackTrace(GT_Log.err);
+                        if (D1) e.printStackTrace(GTLog.err);
                     }
                 }
             }
@@ -468,21 +461,21 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
 
     public void connectPipeOnSide(ForgeDirection side, EntityPlayer entityPlayer) {
         if (!isConnectedAtSide(side)) {
-            if (connect(side) > 0) GT_Utility.sendChatToPlayer(entityPlayer, GT_Utility.trans("214", "Connected"));
+            if (connect(side) > 0) GTUtility.sendChatToPlayer(entityPlayer, GTUtility.trans("214", "Connected"));
         } else {
             disconnect(side);
-            GT_Utility.sendChatToPlayer(entityPlayer, GT_Utility.trans("215", "Disconnected"));
+            GTUtility.sendChatToPlayer(entityPlayer, GTUtility.trans("215", "Disconnected"));
         }
     }
 
     public void blockPipeOnSide(ForgeDirection side, EntityPlayer entityPlayer, byte mask) {
         if (isInputDisabledAtSide(side)) {
             mDisableInput &= ~mask;
-            GT_Utility.sendChatToPlayer(entityPlayer, GT_Utility.trans("212", "Input enabled"));
+            GTUtility.sendChatToPlayer(entityPlayer, GTUtility.trans("212", "Input enabled"));
             if (!isConnectedAtSide(side)) connect(side);
         } else {
             mDisableInput |= mask;
-            GT_Utility.sendChatToPlayer(entityPlayer, GT_Utility.trans("213", "Input disabled"));
+            GTUtility.sendChatToPlayer(entityPlayer, GTUtility.trans("213", "Input disabled"));
         }
     }
 
@@ -490,11 +483,11 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
     public boolean onWrenchRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer entityPlayer,
         float aX, float aY, float aZ, ItemStack aTool) {
 
-        if (GT_Mod.gregtechproxy.gt6Pipe) {
-            final int mode = GT_MetaGenerated_Tool.getToolMode(aTool);
+        if (GTMod.gregtechproxy.gt6Pipe) {
+            final int mode = MetaGeneratedTool.getToolMode(aTool);
             IGregTechTileEntity currentPipeBase = getBaseMetaTileEntity();
-            GT_MetaPipeEntity_Fluid currentPipe = (GT_MetaPipeEntity_Fluid) currentPipeBase.getMetaTileEntity();
-            final ForgeDirection tSide = GT_Utility.determineWrenchingSide(side, aX, aY, aZ);
+            MTEFluid currentPipe = (MTEFluid) currentPipeBase.getMetaTileEntity();
+            final ForgeDirection tSide = GTUtility.determineWrenchingSide(side, aX, aY, aZ);
             final byte tMask = (byte) (tSide.flag);
 
             if (mode == ToolModes.REGULAR.get()) {
@@ -526,10 +519,9 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
                         return wasActionPerformed;
                     }
 
-                    GT_MetaPipeEntity_Fluid nextPipe = nextPipeBase
-                        .getMetaTileEntity() instanceof GT_MetaPipeEntity_Fluid
-                            ? (GT_MetaPipeEntity_Fluid) nextPipeBase.getMetaTileEntity()
-                            : null;
+                    MTEFluid nextPipe = nextPipeBase.getMetaTileEntity() instanceof MTEFluid
+                        ? (MTEFluid) nextPipeBase.getMetaTileEntity()
+                        : null;
 
                     // if next tile entity is not a pipe
                     if (nextPipe == null) {
@@ -580,25 +572,25 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
     }
 
     @Override
-    public boolean letsIn(GT_CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
+    public boolean letsIn(CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity) {
         return coverBehavior.letsFluidIn(side, aCoverID, aCoverVariable, null, aTileEntity);
     }
 
     @Override
-    public boolean letsOut(GT_CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
+    public boolean letsOut(CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity) {
         return coverBehavior.letsFluidOut(side, aCoverID, aCoverVariable, null, aTileEntity);
     }
 
     @Override
-    public boolean letsIn(GT_CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
+    public boolean letsIn(CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
         ISerializableObject aCoverVariable, ICoverable aTileEntity) {
         return coverBehavior.letsFluidIn(side, aCoverID, aCoverVariable, null, aTileEntity);
     }
 
     @Override
-    public boolean letsOut(GT_CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
+    public boolean letsOut(CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
         ISerializableObject aCoverVariable, ICoverable aTileEntity) {
         return coverBehavior.letsFluidOut(side, aCoverID, aCoverVariable, null, aTileEntity);
     }
@@ -621,13 +613,13 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
         final IGregTechTileEntity baseMetaTile = getBaseMetaTileEntity();
         if (baseMetaTile == null) return false;
 
-        final GT_CoverBehaviorBase<?> coverBehavior = baseMetaTile.getCoverBehaviorAtSideNew(side);
+        final CoverBehaviorBase<?> coverBehavior = baseMetaTile.getCoverBehaviorAtSideNew(side);
         final IGregTechTileEntity gTileEntity = (tileEntity instanceof IGregTechTileEntity)
             ? (IGregTechTileEntity) tileEntity
             : null;
 
-        if (coverBehavior instanceof GT_Cover_Drain
-            || (TinkerConstruct.isModLoaded() && isTConstructFaucet(tileEntity))) return true;
+        if (coverBehavior instanceof CoverDrain || (TinkerConstruct.isModLoaded() && isTConstructFaucet(tileEntity)))
+            return true;
 
         final IFluidHandler fTileEntity = (tileEntity instanceof IFluidHandler) ? (IFluidHandler) tileEntity : null;
 
@@ -636,7 +628,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
             if (tInfo != null) {
                 return tInfo.length > 0 || (Translocator.isModLoaded() && isTranslocator(tileEntity))
                     || gTileEntity != null
-                        && gTileEntity.getCoverBehaviorAtSideNew(tSide) instanceof GT_Cover_FluidRegulator;
+                        && gTileEntity.getCoverBehaviorAtSideNew(tSide) instanceof CoverFluidRegulator;
             }
         }
         return false;
@@ -657,14 +649,14 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
     @Override
     public boolean getGT6StyleConnection() {
         // Yes if GT6 pipes are enabled
-        return GT_Mod.gregtechproxy.gt6Pipe;
+        return GTMod.gregtechproxy.gt6Pipe;
     }
 
     @Override
     public void doSound(byte aIndex, double aX, double aY, double aZ) {
         super.doSound(aIndex, aX, aY, aZ);
         if (aIndex == 9) {
-            GT_Utility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 5, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 5, 1.0F, aX, aY, aZ);
 
             new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD)
                 .setWorld(getBaseMetaTileEntity().getWorld())
@@ -837,12 +829,12 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
         List<String> descriptions = new ArrayList<>();
         descriptions.add(
             EnumChatFormatting.BLUE + "Fluid Capacity: %%%"
-                + GT_Utility.formatNumbers(mCapacity * 20L)
+                + GTUtility.formatNumbers(mCapacity * 20L)
                 + "%%% L/sec"
                 + EnumChatFormatting.GRAY);
         descriptions.add(
             EnumChatFormatting.RED + "Heat Limit: %%%"
-                + GT_Utility.formatNumbers(mHeatResistance)
+                + GTUtility.formatNumbers(mHeatResistance)
                 + "%%% K"
                 + EnumChatFormatting.GRAY);
         if (!mGasProof) {
@@ -856,7 +848,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
 
     @Override
     public float getThickNess() {
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x1) != 0) return 0.0625F;
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x1) != 0) return 0.0625F;
         return mThickNess;
     }
 
@@ -876,7 +868,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
 
     @Override
     public AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) {
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x2) != 0)
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x2) != 0)
             return AxisAlignedBB.getBoundingBox(aX, aY, aZ, aX + 1, aY + 1, aZ + 1);
         else return getActualCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
     }
@@ -931,7 +923,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
     public void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB,
         List<AxisAlignedBB> outputAABB, Entity collider) {
         super.addCollisionBoxesToList(aWorld, aX, aY, aZ, inputAABB, outputAABB, collider);
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x2) != 0) {
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x2) != 0) {
             final AxisAlignedBB aabb = getActualCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
             if (inputAABB.intersectsWith(aabb)) outputAABB.add(aabb);
         }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEFrame.java
index 7cb2b3a9bd..ec000b6e9c 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEFrame.java
@@ -12,22 +12,22 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_MetaPipeEntity_Frame extends MetaPipeEntity {
+public class MTEFrame extends MetaPipeEntity {
 
-    private static final String localizedDescFormat = GT_LanguageManager
+    private static final String localizedDescFormat = GTLanguageManager
         .addStringLocalization("gt.blockmachines.gt_frame.desc.format", "Just something you can put covers on.");
     public final Materials mMaterial;
 
-    public GT_MetaPipeEntity_Frame(int aID, String aName, String aNameRegional, Materials aMaterial) {
+    public MTEFrame(int aID, String aName, String aNameRegional, Materials aMaterial) {
         super(aID, aName, aNameRegional, 0);
         mMaterial = aMaterial;
         // Hide TileEntity frame in NEI, since we have the block version now that should always be used
         codechicken.nei.api.API.hideItem(this.getStackForm(1));
     }
 
-    public GT_MetaPipeEntity_Frame(String aName, Materials aMaterial) {
+    public MTEFrame(String aName, Materials aMaterial) {
         super(aName, 0);
         mMaterial = aMaterial;
     }
@@ -39,7 +39,7 @@ public class GT_MetaPipeEntity_Frame extends MetaPipeEntity {
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaPipeEntity_Frame(mName, mMaterial);
+        return new MTEFrame(mName, mMaterial);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatch.java
index 1e974f5e9d..bd0b3b6f61 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatch.java
@@ -5,7 +5,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import appeng.api.crafting.ICraftingIconProvider;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -13,7 +13,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 /**
  * Handles texture changes internally. No special calls are necessary other than updateTexture in add***ToMachineList.
  */
-public abstract class GT_MetaTileEntity_Hatch extends GT_MetaTileEntity_BasicTank implements ICraftingIconProvider {
+public abstract class MTEHatch extends MTEBasicTank implements ICraftingIconProvider {
 
     public enum ConnectionType {
         CABLE,
@@ -32,23 +32,21 @@ public abstract class GT_MetaTileEntity_Hatch extends GT_MetaTileEntity_BasicTan
 
     private ItemStack ae2CraftingIcon;
 
-    public GT_MetaTileEntity_Hatch(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
-        String aDescription, ITexture... aTextures) {
+    public MTEHatch(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription,
+        ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
-        String[] aDescription, ITexture... aTextures) {
+    public MTEHatch(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String[] aDescription,
+        ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatch(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatch(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
@@ -105,9 +103,9 @@ public abstract class GT_MetaTileEntity_Hatch extends GT_MetaTileEntity_BasicTan
         actualTexture = aNBT.getByte("mMachineBlock");
         mTexturePage = aNBT.getByte("mTexturePage");
 
-        if (mTexturePage != 0 && GT_Values.GT.isServerSide()) actualTexture |= 0x80; // <- lets just hope no one needs
-                                                                                     // the correct value for that on
-                                                                                     // server
+        if (mTexturePage != 0 && GTValues.GT.isServerSide()) actualTexture |= 0x80; // <- lets just hope no one needs
+                                                                                    // the correct value for that on
+                                                                                    // server
         mMachineBlock = actualTexture;
     }
 
@@ -137,7 +135,7 @@ public abstract class GT_MetaTileEntity_Hatch extends GT_MetaTileEntity_BasicTan
     /**
      * Some multiblocks restrict hatches by tier. This method allows hatches to specify custom tier used for
      * structure check, while keeping {@link #mTier} for other uses.
-     * 
+     *
      * @return Tier used for multiblock structure
      */
     public byte getTierForStructure() {
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchDataAccess.java
index 18344082ea..38c3102ff2 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchDataAccess.java
@@ -14,20 +14,20 @@ import net.minecraftforge.common.util.ForgeDirection;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_AssemblyLineUtils;
+import gregtech.api.util.AssemblyLineUtils;
 
-public class GT_MetaTileEntity_Hatch_DataAccess extends GT_MetaTileEntity_Hatch implements IAddUIWidgets {
+public class MTEHatchDataAccess extends MTEHatch implements IAddUIWidgets {
 
     private int timeout = 4;
 
-    public GT_MetaTileEntity_Hatch_DataAccess(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchDataAccess(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -38,12 +38,11 @@ public class GT_MetaTileEntity_Hatch_DataAccess extends GT_MetaTileEntity_Hatch
                 "Adds " + (aTier == 4 ? 4 : 16) + " extra slots for Data Sticks" });
     }
 
-    public GT_MetaTileEntity_Hatch_DataAccess(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEHatchDataAccess(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aTier == 4 ? 4 : 16, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_DataAccess(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchDataAccess(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aTier == 4 ? 4 : 16, aDescription, aTextures);
     }
 
@@ -79,12 +78,12 @@ public class GT_MetaTileEntity_Hatch_DataAccess extends GT_MetaTileEntity_Hatch
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_DataAccess(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchDataAccess(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -125,7 +124,7 @@ public class GT_MetaTileEntity_Hatch_DataAccess extends GT_MetaTileEntity_Hatch
         super.loadNBTData(aNBT);
         if (aNBT.getByte("mSticksUpdated") != 1) {
             for (int i = 0; i < getSizeInventory(); i++) {
-                GT_AssemblyLineUtils.processDataStick(getStackInSlot(i));
+                AssemblyLineUtils.processDataStick(getStackInSlot(i));
             }
         }
     }
@@ -140,7 +139,7 @@ public class GT_MetaTileEntity_Hatch_DataAccess extends GT_MetaTileEntity_Hatch
     @Override
     public void setInventorySlotContents(int aIndex, ItemStack aStack) {
         super.setInventorySlotContents(aIndex, aStack);
-        GT_AssemblyLineUtils.processDataStick(aStack);
+        AssemblyLineUtils.processDataStick(aStack);
     }
 
     public List<ItemStack> getInventoryItems(Predicate<ItemStack> filter) {
@@ -161,10 +160,10 @@ public class GT_MetaTileEntity_Hatch_DataAccess extends GT_MetaTileEntity_Hatch
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         if (mTier == 4) {
             getBaseMetaTileEntity()
-                .add2by2Slots(builder, getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CIRCUIT);
+                .add2by2Slots(builder, getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_CIRCUIT);
         } else {
             getBaseMetaTileEntity()
-                .add4by4Slots(builder, getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CIRCUIT);
+                .add4by4Slots(builder, getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_CIRCUIT);
         }
     }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Dynamo.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchDynamo.java
index 8e621434db..00f46fe9eb 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Dynamo.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchDynamo.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -11,9 +11,9 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-public class GT_MetaTileEntity_Hatch_Dynamo extends GT_MetaTileEntity_Hatch {
+public class MTEHatchDynamo extends MTEHatch {
 
-    public GT_MetaTileEntity_Hatch_Dynamo(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchDynamo(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -23,16 +23,15 @@ public class GT_MetaTileEntity_Hatch_Dynamo extends GT_MetaTileEntity_Hatch {
             new String[] { "Generating electric Energy from Multiblocks", "Puts out up to 1 Amp" });
     }
 
-    public GT_MetaTileEntity_Hatch_Dynamo(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription) {
+    public MTEHatchDynamo(int aID, String aName, String aNameRegional, int aTier, String[] aDescription) {
         super(aID, aName, aNameRegional, aTier, 0, aDescription);
     }
 
-    public GT_MetaTileEntity_Hatch_Dynamo(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEHatchDynamo(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Dynamo(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchDynamo(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
@@ -93,7 +92,7 @@ public class GT_MetaTileEntity_Hatch_Dynamo extends GT_MetaTileEntity_Hatch {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Dynamo(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchDynamo(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchEnergy.java
index d9be12671d..12d22d3bc7 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchEnergy.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -11,14 +11,13 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-public class GT_MetaTileEntity_Hatch_Energy extends GT_MetaTileEntity_Hatch {
+public class MTEHatchEnergy extends MTEHatch {
 
-    public GT_MetaTileEntity_Hatch_Energy(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription) {
+    public MTEHatchEnergy(int aID, String aName, String aNameRegional, int aTier, String[] aDescription) {
         super(aID, aName, aNameRegional, aTier, 0, aDescription);
     }
 
-    public GT_MetaTileEntity_Hatch_Energy(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchEnergy(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -28,21 +27,20 @@ public class GT_MetaTileEntity_Hatch_Energy extends GT_MetaTileEntity_Hatch {
             new String[] { "Energy Injector for Multiblocks", "Accepts up to 2 Amps" });
     }
 
-    public GT_MetaTileEntity_Hatch_Energy(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTEHatchEnergy(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String[] aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Energy(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEHatchEnergy(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Energy(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchEnergy(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Energy(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchEnergy(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
@@ -108,7 +106,7 @@ public class GT_MetaTileEntity_Hatch_Energy extends GT_MetaTileEntity_Hatch {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Energy(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchEnergy(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchInput.java
index 705a3e6248..c660bcc8f8 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchInput.java
@@ -9,35 +9,34 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.GT_Mod;
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.GTMod;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch {
+public class MTEHatchInput extends MTEHatch {
 
     public RecipeMap<?> mRecipeMap = null;
 
-    public GT_MetaTileEntity_Hatch_Input(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchInput(int aID, String aName, String aNameRegional, int aTier) {
         this(
             aID,
             aName,
             aNameRegional,
             aTier,
             new String[] { "Fluid Input for Multiblocks",
-                "Capacity: " + GT_Utility.formatNumbers(8000L * (1L << aTier)) + "L" });
+                "Capacity: " + GTUtility.formatNumbers(8000L * (1L << aTier)) + "L" });
     }
 
-    public GT_MetaTileEntity_Hatch_Input(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription) {
+    public MTEHatchInput(int aID, String aName, String aNameRegional, int aTier, String[] aDescription) {
         this(aID, 3, aName, aNameRegional, aTier, aDescription);
     }
 
-    public GT_MetaTileEntity_Hatch_Input(int aID, int aSlot, String aName, String aNameRegional, int aTier) {
+    public MTEHatchInput(int aID, int aSlot, String aName, String aNameRegional, int aTier) {
         this(
             aID,
             aSlot,
@@ -45,16 +44,14 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch {
             aNameRegional,
             aTier,
             new String[] { "Fluid Input for Multiblocks", "", "Can hold " + aSlot + " types of fluid." });
-        mDescriptionArray[1] = "Capacity: " + GT_Utility.formatNumbers(getCapacityPerTank(aTier, aSlot)) + "L";
+        mDescriptionArray[1] = "Capacity: " + GTUtility.formatNumbers(getCapacityPerTank(aTier, aSlot)) + "L";
     }
 
-    public GT_MetaTileEntity_Hatch_Input(int aID, int aSlot, String aName, String aNameRegional, int aTier,
-        String[] aDescription) {
+    public MTEHatchInput(int aID, int aSlot, String aName, String aNameRegional, int aTier, String[] aDescription) {
         super(aID, aName, aNameRegional, aTier, aSlot, aDescription);
     }
 
-    public GT_MetaTileEntity_Hatch_Input(int aID, String aName, String aNameRegional, int aTier, int allSlotCount,
-        String[] strings) {
+    public MTEHatchInput(int aID, String aName, String aNameRegional, int aTier, int allSlotCount, String[] strings) {
         super(aID, aName, aNameRegional, aTier, allSlotCount, strings);
     }
 
@@ -62,29 +59,28 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch {
         return (int) (8000L * (1L << aTier) / aSlot);
     }
 
-    public GT_MetaTileEntity_Hatch_Input(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEHatchInput(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Input(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchInput(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Input(String aName, int aSlots, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchInput(String aName, int aSlots, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aSlots, aDescription, aTextures);
     }
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
+        return GTMod.gregtechproxy.mRenderIndicatorsOnHatch
             ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(FLUID_IN_SIGN) }
             : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
+        return GTMod.gregtechproxy.mRenderIndicatorsOnHatch
             ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(FLUID_IN_SIGN) }
             : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN) };
     }
@@ -106,7 +102,7 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Input(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchInput(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -125,7 +121,7 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch {
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -181,7 +177,7 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch {
         ItemStack aStack) {
         return side == aBaseMetaTileEntity.getFrontFacing() && aIndex == 0
             && (mRecipeMap == null || mRecipeMap.containsInput(aStack)
-                || mRecipeMap.containsInput(GT_Utility.getFluidForFilledItem(aStack, true)));
+                || mRecipeMap.containsInput(GTUtility.getFluidForFilledItem(aStack, true)));
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchInputBus.java
index 8c99e813e2..f4f04c38a3 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchInputBus.java
@@ -22,9 +22,9 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.api.widget.Widget;
 import com.gtnewhorizons.modularui.common.widget.CycleButtonWidget;
 
-import gregtech.GT_Mod;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.GTMod;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IConfigurationCircuitSupport;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
@@ -32,14 +32,13 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ClientPreference;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTClientPreference;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.GT_TooltipDataCache;
-import gregtech.api.util.GT_Utility;
 import gregtech.api.util.extensions.ArrayExt;
 
-public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
-    implements IConfigurationCircuitSupport, IAddUIWidgets {
+public class MTEHatchInputBus extends MTEHatch implements IConfigurationCircuitSupport, IAddUIWidgets {
 
     private static final String SORTING_MODE_TOOLTIP = "GT5U.machines.sorting_mode.tooltip";
     private static final String ONE_STACK_LIMIT_TOOLTIP = "GT5U.machines.one_stack_limit.tooltip";
@@ -51,16 +50,15 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
     public boolean disableLimited = true;
     private int uiButtonCount = 0;
 
-    public GT_MetaTileEntity_Hatch_InputBus(int id, String name, String nameRegional, int tier) {
+    public MTEHatchInputBus(int id, String name, String nameRegional, int tier) {
         this(id, name, nameRegional, tier, getSlots(tier) + 1);
     }
 
-    protected GT_MetaTileEntity_Hatch_InputBus(int id, String name, String nameRegional, int tier, int slots,
-        String[] description) {
+    protected MTEHatchInputBus(int id, String name, String nameRegional, int tier, int slots, String[] description) {
         super(id, name, nameRegional, tier, slots, description);
     }
 
-    public GT_MetaTileEntity_Hatch_InputBus(int id, String name, String nameRegional, int tier, int slots) {
+    public MTEHatchInputBus(int id, String name, String nameRegional, int tier, int slots) {
         super(
             id,
             name,
@@ -73,25 +71,24 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
                 "Capacity: " + getSlots(tier) + " stack" + (getSlots(tier) >= 2 ? "s" : "")));
     }
 
-    public GT_MetaTileEntity_Hatch_InputBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchInputBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         this(aName, aTier, getSlots(aTier) + 1, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_InputBus(String aName, int aTier, int aSlots, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchInputBus(String aName, int aTier, int aSlots, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aSlots, aDescription, aTextures);
     }
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
+        return GTMod.gregtechproxy.mRenderIndicatorsOnHatch
             ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(ITEM_IN_SIGN) }
             : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
+        return GTMod.gregtechproxy.mRenderIndicatorsOnHatch
             ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(ITEM_IN_SIGN) }
             : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN) };
     }
@@ -118,12 +115,12 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_InputBus(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchInputBus(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -140,7 +137,7 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
     @Override
     public void initDefaultModes(NBTTagCompound aNBT) {
         if (!getBaseMetaTileEntity().getWorld().isRemote) {
-            GT_ClientPreference tPreference = GT_Mod.gregtechproxy
+            GTClientPreference tPreference = GTMod.gregtechproxy
                 .getClientPreference(getBaseMetaTileEntity().getOwnerUuid());
             if (tPreference != null) disableFilter = !tPreference.isInputBusInitialFilterEnabled();
         }
@@ -161,23 +158,23 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
 
     protected void fillStacksIntoFirstSlots() {
         final int L = mInventory.length - 1;
-        HashMap<GT_Utility.ItemId, Integer> slots = new HashMap<>(L);
-        HashMap<GT_Utility.ItemId, ItemStack> stacks = new HashMap<>(L);
-        List<GT_Utility.ItemId> order = new ArrayList<>(L);
+        HashMap<GTUtility.ItemId, Integer> slots = new HashMap<>(L);
+        HashMap<GTUtility.ItemId, ItemStack> stacks = new HashMap<>(L);
+        List<GTUtility.ItemId> order = new ArrayList<>(L);
         List<Integer> validSlots = new ArrayList<>(L);
         for (int i = 0; i < L; i++) {
             if (!isValidSlot(i)) continue;
             validSlots.add(i);
             ItemStack s = mInventory[i];
             if (s == null) continue;
-            GT_Utility.ItemId sID = GT_Utility.ItemId.createNoCopy(s);
+            GTUtility.ItemId sID = GTUtility.ItemId.createNoCopy(s);
             slots.merge(sID, s.stackSize, Integer::sum);
             if (!stacks.containsKey(sID)) stacks.put(sID, s);
             order.add(sID);
             mInventory[i] = null;
         }
         int slotindex = 0;
-        for (GT_Utility.ItemId sID : order) {
+        for (GTUtility.ItemId sID : order) {
             int toSet = slots.get(sID);
             if (toSet == 0) continue;
             int slot = validSlots.get(slotindex);
@@ -227,13 +224,13 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
                     disableLimited = true;
                 }
             }
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
                 StatCollector.translateToLocal("GT5U.hatch.disableSort." + disableSort) + "   "
                     + StatCollector.translateToLocal("GT5U.hatch.disableLimited." + disableLimited));
         } else {
             disableFilter = !disableFilter;
-            GT_Utility
+            GTUtility
                 .sendChatToPlayer(aPlayer, StatCollector.translateToLocal("GT5U.hatch.disableFilter." + disableFilter));
         }
     }
@@ -255,7 +252,7 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
 
     protected boolean limitedAllowPutStack(int aIndex, ItemStack aStack) {
         for (int i = 0; i < getSizeInventory(); i++)
-            if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get_nocopy(aStack), mInventory[i])) return i == aIndex;
+            if (GTUtility.areStacksEqual(GTOreDictUnificator.get_nocopy(aStack), mInventory[i])) return i == aIndex;
         return mInventory[aIndex] == null;
     }
 
@@ -274,7 +271,7 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
             createToggleButton(
                 () -> !disableSort,
                 val -> disableSort = !val,
-                GT_UITextures.OVERLAY_BUTTON_SORTING_MODE,
+                GTUITextures.OVERLAY_BUTTON_SORTING_MODE,
                 () -> mTooltipCache.getData(SORTING_MODE_TOOLTIP)));
     }
 
@@ -282,7 +279,7 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
         builder.widget(createToggleButton(() -> !disableLimited, val -> {
             disableLimited = !val;
             updateSlots();
-        }, GT_UITextures.OVERLAY_BUTTON_ONE_STACK_LIMIT, () -> mTooltipCache.getData(ONE_STACK_LIMIT_TOOLTIP)));
+        }, GTUITextures.OVERLAY_BUTTON_ONE_STACK_LIMIT, () -> mTooltipCache.getData(ONE_STACK_LIMIT_TOOLTIP)));
     }
 
     @Override
@@ -309,7 +306,7 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
         Supplier<GT_TooltipDataCache.TooltipData> tooltipDataSupplier) {
         return new CycleButtonWidget().setToggle(getter, setter)
             .setStaticTexture(picture)
-            .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+            .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
             .setTooltipShowUpDelay(TOOLTIP_DELAY)
             .setPos(7 + (uiButtonCount++ * BUTTON_SIZE), 62)
             .setSize(BUTTON_SIZE, BUTTON_SIZE)
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MagHatch.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMagnet.java
index 8a462d12c6..660894d0df 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MagHatch.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMagnet.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.AuthorFourIsTheNumber;
+import static gregtech.api.enums.GTValues.AuthorFourIsTheNumber;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_EMS_HOUSING;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_EMS_HOUSING_GLOW;
 
@@ -13,20 +13,20 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_IndustrialElectromagneticSeparator;
+import gregtech.common.tileentities.machines.multi.MTEIndustrialElectromagneticSeparator;
 
-public class GT_MetaTileEntity_MagHatch extends GT_MetaTileEntity_Hatch {
+public class MTEHatchMagnet extends MTEHatch {
 
-    public GT_MetaTileEntity_MagHatch(int aID, String aName, String aNameRegional) {
+    public MTEHatchMagnet(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, 5, 1, "Holds electromagnet for the Magnetic Flux Exhibitor");
     }
 
-    public GT_MetaTileEntity_MagHatch(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchMagnet(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription[0], aTextures);
     }
 
@@ -48,8 +48,7 @@ public class GT_MetaTileEntity_MagHatch extends GT_MetaTileEntity_Hatch {
     @Override
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         builder.widget(
-            new SlotWidget(inventoryHandler, 0)
-                .setFilter(GT_MetaTileEntity_IndustrialElectromagneticSeparator::isValidElectromagnet)
+            new SlotWidget(inventoryHandler, 0).setFilter(MTEIndustrialElectromagneticSeparator::isValidElectromagnet)
                 .setAccess(true, true)
                 .setPos(79, 34));
     }
@@ -61,7 +60,7 @@ public class GT_MetaTileEntity_MagHatch extends GT_MetaTileEntity_Hatch {
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -98,6 +97,6 @@ public class GT_MetaTileEntity_MagHatch extends GT_MetaTileEntity_Hatch {
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_MagHatch(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchMagnet(mName, mTier, mDescriptionArray, mTextures);
     }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMaintenance.java
index 8a4d718244..3a715a541a 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMaintenance.java
@@ -31,25 +31,25 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
 import cpw.mods.fml.common.network.NetworkRegistry;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import ic2.core.IHasGui;
 import ic2.core.item.ItemToolbox;
 
-public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch implements IAddUIWidgets, IAlignment {
+public class MTEHatchMaintenance extends MTEHatch implements IAddUIWidgets, IAlignment {
 
     private Rotation rotation = Rotation.NORMAL;
 
@@ -57,23 +57,22 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
     public boolean mWrench = false, mScrewdriver = false, mSoftHammer = false, mHardHammer = false,
         mSolderingTool = false, mCrowbar = false, mAuto;
 
-    public GT_MetaTileEntity_Hatch_Maintenance(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchMaintenance(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 1, "For maintaining Multiblocks");
         mAuto = false;
     }
 
-    public GT_MetaTileEntity_Hatch_Maintenance(int aID, String aName, String aNameRegional, int aTier, boolean aAuto) {
+    public MTEHatchMaintenance(int aID, String aName, String aNameRegional, int aTier, boolean aAuto) {
         super(aID, aName, aNameRegional, aTier, 4, "For automatically maintaining Multiblocks");
         mAuto = aAuto;
     }
 
-    public GT_MetaTileEntity_Hatch_Maintenance(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
-        boolean aAuto) {
+    public MTEHatchMaintenance(String aName, int aTier, String aDescription, ITexture[][][] aTextures, boolean aAuto) {
         super(aName, aTier, aAuto ? 4 : 1, aDescription, aTextures);
         mAuto = aAuto;
     }
 
-    public GT_MetaTileEntity_Hatch_Maintenance(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
+    public MTEHatchMaintenance(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
         boolean aAuto) {
         super(aName, aTier, aAuto ? 4 : 1, aDescription, aTextures);
         mAuto = aAuto;
@@ -81,9 +80,9 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
 
     private static ItemStack[] getAutoMaintenanceInputs() {
         if (sAutoMaintenanceInputs == null) sAutoMaintenanceInputs = new ItemStack[] { ItemList.Duct_Tape.get(4),
-            GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 2),
-            GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
-            GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2) };
+            GTOreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 2),
+            GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
+            GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2) };
         return sAutoMaintenanceInputs;
     }
 
@@ -164,14 +163,14 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
 
     @Override
     public boolean isValidSlot(int aIndex) {
-        return mAuto && GT_Mod.gregtechproxy.mAMHInteraction;
+        return mAuto && GTMod.gregtechproxy.mAMHInteraction;
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
         if (aTileEntity.getMetaTileID() == 111)
-            return new GT_MetaTileEntity_Hatch_Maintenance(mName, mTier, mDescriptionArray, mTextures, true);
-        return new GT_MetaTileEntity_Hatch_Maintenance(mName, mTier, mDescriptionArray, mTextures, false);
+            return new MTEHatchMaintenance(mName, mTier, mDescriptionArray, mTextures, true);
+        return new MTEHatchMaintenance(mName, mTier, mDescriptionArray, mTextures, false);
     }
 
     @Override
@@ -193,9 +192,9 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
                     if (--tStack.stackSize == 0) {
                         aPlayer.inventory.mainInventory[aPlayer.inventory.currentItem] = null;
                     }
-                } else GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+                } else GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
             } else {
-                GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+                GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
             }
             return true;
         }
@@ -248,8 +247,8 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
                 amt = tStack.stackSize;
                 boolean temp = true;
                 for (ItemStack aStack : mInventory) {
-                    if ((GT_Utility.areUnificationsEqual(aStack, tStack, true)
-                        || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true))) {
+                    if ((GTUtility.areUnificationsEqual(aStack, tStack, true)
+                        || GTUtility.areUnificationsEqual(GTOreDictUnificator.get(false, aStack), tStack, true))) {
                         amt -= aStack.stackSize;
                         if (amt < 1) {
                             temp = false;
@@ -266,8 +265,8 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
                 if (tStack != null) {
                     amt = tStack.stackSize;
                     for (ItemStack aStack : mInventory) {
-                        if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility
-                            .areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true))) {
+                        if ((GTUtility.areUnificationsEqual(aStack, tStack, true)
+                            || GTUtility.areUnificationsEqual(GTOreDictUnificator.get(false, aStack), tStack, true))) {
                             if (aStack.stackSize < amt) {
                                 amt -= aStack.stackSize;
                                 aStack.stackSize = 0;
@@ -300,26 +299,25 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
             return;
         }
 
-        if (GT_Utility.isStackInList(aStack, GregTech_API.sWrenchList) && !mWrench
-            && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mWrench = true;
-        if (GT_Utility.isStackInList(aStack, GregTech_API.sScrewdriverList) && !mScrewdriver
-            && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mScrewdriver = true;
-        if (GT_Utility.isStackInList(aStack, GregTech_API.sSoftHammerList) && !mSoftHammer
-            && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mSoftHammer = true;
-        if (GT_Utility.isStackInList(aStack, GregTech_API.sHardHammerList) && !mHardHammer
-            && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mHardHammer = true;
-        if (GT_Utility.isStackInList(aStack, GregTech_API.sCrowbarList) && !mCrowbar
-            && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mCrowbar = true;
-        if (!mSolderingTool && GT_ModHandler.useSolderingIron(aStack, aPlayer, aToolboxInventory))
-            mSolderingTool = true;
-        if (GT_OreDictUnificator.isItemStackInstanceOf(aStack, "craftingDuctTape")) {
+        if (GTUtility.isStackInList(aStack, GregTechAPI.sWrenchList) && !mWrench
+            && GTModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mWrench = true;
+        if (GTUtility.isStackInList(aStack, GregTechAPI.sScrewdriverList) && !mScrewdriver
+            && GTModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mScrewdriver = true;
+        if (GTUtility.isStackInList(aStack, GregTechAPI.sSoftHammerList) && !mSoftHammer
+            && GTModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mSoftHammer = true;
+        if (GTUtility.isStackInList(aStack, GregTechAPI.sHardHammerList) && !mHardHammer
+            && GTModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mHardHammer = true;
+        if (GTUtility.isStackInList(aStack, GregTechAPI.sCrowbarList) && !mCrowbar
+            && GTModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mCrowbar = true;
+        if (!mSolderingTool && GTModHandler.useSolderingIron(aStack, aPlayer, aToolboxInventory)) mSolderingTool = true;
+        if (GTOreDictUnificator.isItemStackInstanceOf(aStack, "craftingDuctTape")) {
             mWrench = mScrewdriver = mSoftHammer = mHardHammer = mCrowbar = mSolderingTool = true;
             getBaseMetaTileEntity().setActive(false);
             aStack.stackSize--;
         }
         if (mSolderingTool && aPlayer instanceof EntityPlayerMP tPlayer) {
             try {
-                GT_Mod.achievements.issueAchievement(tPlayer, "maintainance");
+                GTMod.achievements.issueAchievement(tPlayer, "maintainance");
             } catch (Exception ignored) {}
         }
     }
@@ -343,20 +341,18 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
     @Override
     public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
-        return mAuto && GT_Mod.gregtechproxy.mAMHInteraction;
+        return mAuto && GTMod.gregtechproxy.mAMHInteraction;
     }
 
     @Override
     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
-        if (mAuto && GT_Mod.gregtechproxy.mAMHInteraction) {
-            for (int i = 0; i < getSizeInventory(); i++) if (GT_Utility.areStacksEqual(
-                GT_OreDictUnificator.get(false, aStack),
-                GT_OreDictUnificator.get(false, getStackInSlot(i)))) return i == aIndex;
-            for (ItemStack tInput : getAutoMaintenanceInputs())
-                if (GT_Utility.areUnificationsEqual(tInput, aStack, true)
-                    || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tInput, true))
-                    return true;
+        if (mAuto && GTMod.gregtechproxy.mAMHInteraction) {
+            for (int i = 0; i < getSizeInventory(); i++) if (GTUtility.areStacksEqual(
+                GTOreDictUnificator.get(false, aStack),
+                GTOreDictUnificator.get(false, getStackInSlot(i)))) return i == aIndex;
+            for (ItemStack tInput : getAutoMaintenanceInputs()) if (GTUtility.areUnificationsEqual(tInput, aStack, true)
+                || GTUtility.areUnificationsEqual(GTOreDictUnificator.get(false, aStack), tInput, true)) return true;
         }
         return false;
     }
@@ -367,7 +363,7 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
             getBaseMetaTileEntity().add2by2Slots(builder);
         } else {
             builder.widget(
-                new DrawableWidget().setDrawable(GT_UITextures.SLOT_MAINTENANCE)
+                new DrawableWidget().setDrawable(GTUITextures.SLOT_MAINTENANCE)
                     .setPos(78, 33)
                     .setSize(20, 20))
                 .widget(new SlotWidget(BaseSlot.empty()) {
@@ -389,7 +385,7 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
                         }
                     }
                 }.disableShiftInsert()
-                    .setBackground(GT_UITextures.TRANSPARENT)
+                    .setBackground(GTUITextures.TRANSPARENT)
                     .setPos(79, 34))
                 .widget(
                     new TextWidget("Click with Tool to repair.").setDefaultColor(COLOR_TEXT_GRAY.get())
@@ -427,7 +423,7 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
             changed = true;
         }
         if (changed) {
-            if (base.isServerSide() && !GregTech_API.isDummyWorld(base.getWorld())) {
+            if (base.isServerSide() && !GregTechAPI.isDummyWorld(base.getWorld())) {
                 StructureLibAPI.sendAlignment(
                     (IAlignmentProvider) base,
                     new NetworkRegistry.TargetPoint(
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMuffler.java
index 8707d0f804..179ba56254 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMuffler.java
@@ -10,20 +10,20 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.ParticleFX;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 import gregtech.api.util.WorldSpawnedEventBuilder;
-import gregtech.common.GT_Pollution;
+import gregtech.common.Pollution;
 
 @SuppressWarnings("unused") // Unused API is expected within scope
-public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch {
+public class MTEHatchMuffler extends MTEHatch {
 
-    private static final String localizedDescFormat = GT_LanguageManager.addStringLocalization(
+    private static final String localizedDescFormat = GTLanguageManager.addStringLocalization(
         "gt.blockmachines.hatch.muffler.desc.format",
         "Outputs the Pollution (Might cause ... things)%n" + "DO NOT OBSTRUCT THE OUTPUT!%n"
             + "Reduces Pollution to %d%%%n"
@@ -33,24 +33,24 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch {
     private final String[] description = String.format(localizedDescFormat, pollutionReduction, pollutionRecover)
         .split("\\R");
 
-    public GT_MetaTileEntity_Hatch_Muffler(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchMuffler(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "");
     }
 
-    public GT_MetaTileEntity_Hatch_Muffler(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTEHatchMuffler(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String[] aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Muffler(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEHatchMuffler(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         this(aName, aTier, new String[] { aDescription }, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Muffler(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchMuffler(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         this(aName, aTier, 0, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Muffler(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+    public MTEHatchMuffler(String aName, int aTier, int aInvSlotCount, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
@@ -94,7 +94,7 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Muffler(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchMuffler(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -124,7 +124,7 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch {
         boolean chk1, chk2, chk3;
         float ran1 = XSTR_INSTANCE.nextFloat(), ran2, ran3;
         chk1 = ran1 * 100 < calculatePollutionReduction(100);
-        if (GT_Pollution.getPollution(getBaseMetaTileEntity()) >= GT_Mod.gregtechproxy.mPollutionSmogLimit) {
+        if (Pollution.getPollution(getBaseMetaTileEntity()) >= GTMod.gregtechproxy.mPollutionSmogLimit) {
             ran2 = XSTR_INSTANCE.nextFloat();
             ran3 = XSTR_INSTANCE.nextFloat();
             chk2 = ran2 * 100 < calculatePollutionReduction(100);
@@ -200,7 +200,7 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch {
      */
     public boolean polluteEnvironment(MetaTileEntity mte) {
         if (getBaseMetaTileEntity().getAirAtSide(getBaseMetaTileEntity().getFrontFacing())) {
-            GT_Pollution.addPollution(getBaseMetaTileEntity(), calculatePollutionReduction(10000));
+            Pollution.addPollution(getBaseMetaTileEntity(), calculatePollutionReduction(10000));
             return true;
         }
         return false;
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMultiInput.java
index 267c2d0f1c..9bf061573b 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMultiInput.java
@@ -20,20 +20,20 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_Hatch_MultiInput extends GT_MetaTileEntity_Hatch_Input implements IAddUIWidgets {
+public class MTEHatchMultiInput extends MTEHatchInput implements IAddUIWidgets {
 
     private final FluidStack[] mStoredFluid;
     private final FluidStackTank[] fluidTanks;
     public final int mCapacityPer;
 
-    public GT_MetaTileEntity_Hatch_MultiInput(int aID, int aSlot, String aName, String aNameRegional, int aTier) {
+    public MTEHatchMultiInput(int aID, int aSlot, String aName, String aNameRegional, int aTier) {
         super(aID, aSlot, aName, aNameRegional, aTier);
         this.mStoredFluid = new FluidStack[aSlot];
         fluidTanks = new FluidStackTank[aSlot];
         mCapacityPer = getCapacityPerTank(aTier, aSlot);
     }
 
-    public GT_MetaTileEntity_Hatch_MultiInput(int aID, int aSlot, String aName, String aNameRegional, int aTier,
+    public MTEHatchMultiInput(int aID, int aSlot, String aName, String aNameRegional, int aTier,
         String[] aDescription) {
         super(aID, aSlot, aName, aNameRegional, aTier, aDescription);
         this.mStoredFluid = new FluidStack[aSlot];
@@ -41,8 +41,7 @@ public class GT_MetaTileEntity_Hatch_MultiInput extends GT_MetaTileEntity_Hatch_
         mCapacityPer = getCapacityPerTank(aTier, aSlot);
     }
 
-    public GT_MetaTileEntity_Hatch_MultiInput(String aName, int aSlot, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchMultiInput(String aName, int aSlot, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aSlot, aTier, aDescription, aTextures);
         this.mStoredFluid = new FluidStack[aSlot];
         fluidTanks = new FluidStackTank[aSlot];
@@ -58,7 +57,7 @@ public class GT_MetaTileEntity_Hatch_MultiInput extends GT_MetaTileEntity_Hatch_
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_MultiInput(mName, getMaxType(), mTier, mDescriptionArray, mTextures);
+        return new MTEHatchMultiInput(mName, getMaxType(), mTier, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutput.java
index 2aa2410bd1..3a9dd0dc96 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutput.java
@@ -26,9 +26,9 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.GT_Mod;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.GTMod;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.fluid.IFluidStore;
 import gregtech.api.interfaces.metatileentity.IFluidLockable;
@@ -36,18 +36,17 @@ import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gregtech.common.gui.modularui.widget.FluidLockWidget;
 
-public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
-    implements IFluidStore, IFluidLockable, IAddUIWidgets {
+public class MTEHatchOutput extends MTEHatch implements IFluidStore, IFluidLockable, IAddUIWidgets {
 
     private String lockedFluidName = null;
     private WeakReference<EntityPlayer> playerThatLockedfluid = null;
     public byte mMode = 0;
 
-    public GT_MetaTileEntity_Hatch_Output(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchOutput(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -55,40 +54,39 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
             aTier,
             4,
             new String[] { "Fluid Output for Multiblocks",
-                "Capacity: " + GT_Utility.formatNumbers(8000L * (1L << aTier)) + "L",
+                "Capacity: " + GTUtility.formatNumbers(8000L * (1L << aTier)) + "L",
                 "Right click with screwdriver to restrict output",
                 "Can be restricted to put out Items and/or Steam/No Steam/1 specific Fluid",
                 "Restricted Output Hatches are given priority for Multiblock Fluid output" });
     }
 
-    public GT_MetaTileEntity_Hatch_Output(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEHatchOutput(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 4, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Output(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchOutput(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 4, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Output(int aID, String aName, String aNameRegional, int aTier, String[] aDescription,
+    public MTEHatchOutput(int aID, String aName, String aNameRegional, int aTier, String[] aDescription,
         int inventorySize) {
         super(aID, aName, aNameRegional, aTier, inventorySize, aDescription);
     }
 
-    public GT_MetaTileEntity_Hatch_Output(String name, int tier, int slots, String[] description,
-        ITexture[][][] textures) {
+    public MTEHatchOutput(String name, int tier, int slots, String[] description, ITexture[][][] textures) {
         super(name, tier, slots, description, textures);
     }
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
+        return GTMod.gregtechproxy.mRenderIndicatorsOnHatch
             ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT), TextureFactory.of(FLUID_OUT_SIGN) }
             : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
+        return GTMod.gregtechproxy.mRenderIndicatorsOnHatch
             ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT), TextureFactory.of(FLUID_OUT_SIGN) }
             : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT) };
     }
@@ -115,12 +113,12 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Output(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchOutput(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -131,7 +129,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
             IFluidHandler tTileEntity = aBaseMetaTileEntity
                 .getITankContainerAtSide(aBaseMetaTileEntity.getFrontFacing());
             if (tTileEntity != null) {
-                GT_Utility.moveFluid(
+                GTUtility.moveFluid(
                     aBaseMetaTileEntity,
                     tTileEntity,
                     aBaseMetaTileEntity.getFrontFacing(),
@@ -157,7 +155,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
         if (isFluidLocked()) {
             lockedFluidName = aNBT.getString("lockedFluidName");
         }
-        lockedFluidName = GT_Utility.isStringInvalid(lockedFluidName) ? null : lockedFluidName;
+        lockedFluidName = GTUtility.isStringInvalid(lockedFluidName) ? null : lockedFluidName;
     }
 
     @Override
@@ -229,42 +227,42 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
         final String inBrackets;
         switch (mMode) {
             case 0 -> {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("108", "Outputs misc. Fluids, Steam and Items"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("108", "Outputs misc. Fluids, Steam and Items"));
                 this.setLockedFluidName(null);
             }
             case 1 -> {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("109", "Outputs Steam and Items"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("109", "Outputs Steam and Items"));
                 this.setLockedFluidName(null);
             }
             case 2 -> {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("110", "Outputs Steam and misc. Fluids"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("110", "Outputs Steam and misc. Fluids"));
                 this.setLockedFluidName(null);
             }
             case 3 -> {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("111", "Outputs Steam"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("111", "Outputs Steam"));
                 this.setLockedFluidName(null);
             }
             case 4 -> {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("112", "Outputs misc. Fluids and Items"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("112", "Outputs misc. Fluids and Items"));
                 this.setLockedFluidName(null);
             }
             case 5 -> {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("113", "Outputs only Items"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("113", "Outputs only Items"));
                 this.setLockedFluidName(null);
             }
             case 6 -> {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("114", "Outputs only misc. Fluids"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("114", "Outputs only misc. Fluids"));
                 this.setLockedFluidName(null);
             }
             case 7 -> {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("115", "Outputs nothing"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("115", "Outputs nothing"));
                 this.setLockedFluidName(null);
             }
             case 8 -> {
                 playerThatLockedfluid = new WeakReference<>(aPlayer);
                 if (mFluid == null) {
                     this.setLockedFluidName(null);
-                    inBrackets = GT_Utility.trans(
+                    inBrackets = GTUtility.trans(
                         "115.3",
                         "currently none, will be locked to the next that is put in (or use fluid cell to lock)");
                 } else {
@@ -275,18 +273,16 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
                     inBrackets = this.getDrainableStack()
                         .getLocalizedName();
                 }
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aPlayer,
-                    String.format(
-                        "%s (%s)",
-                        GT_Utility.trans("151.1", "Outputs items and 1 specific Fluid"),
-                        inBrackets));
+                    String
+                        .format("%s (%s)", GTUtility.trans("151.1", "Outputs items and 1 specific Fluid"), inBrackets));
             }
             case 9 -> {
                 playerThatLockedfluid = new WeakReference<>(aPlayer);
                 if (mFluid == null) {
                     this.setLockedFluidName(null);
-                    inBrackets = GT_Utility.trans(
+                    inBrackets = GTUtility.trans(
                         "115.3",
                         "currently none, will be locked to the next that is put in (or use fluid cell to lock)");
                 } else {
@@ -297,9 +293,9 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
                     inBrackets = this.getDrainableStack()
                         .getLocalizedName();
                 }
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aPlayer,
-                    String.format("%s (%s)", GT_Utility.trans("151.2", "Outputs 1 specific Fluid"), inBrackets));
+                    String.format("%s (%s)", GTUtility.trans("151.2", "Outputs 1 specific Fluid"), inBrackets));
             }
         }
     }
@@ -317,11 +313,11 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
             if (getLockedFluidName() != null && !getLockedFluidName().equals(
                 tFluid.getFluid()
                     .getName())) {
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aPlayer,
                     String.format(
                         "%s %s",
-                        GT_Utility.trans(
+                        GTUtility.trans(
                             "151.3",
                             "Hatch is locked to a different fluid. To change the locking, empty it and made it locked to the next fluid with a screwdriver. Currently locked to"),
                         StatCollector.translateToLocal(getLockedFluidName())));
@@ -329,17 +325,17 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
                 setLockedFluidName(
                     tFluid.getFluid()
                         .getName());
-                if (mMode == 8) GT_Utility.sendChatToPlayer(
+                if (mMode == 8) GTUtility.sendChatToPlayer(
                     aPlayer,
                     String.format(
                         "%s (%s)",
-                        GT_Utility.trans("151.1", "Outputs items and 1 specific Fluid"),
+                        GTUtility.trans("151.1", "Outputs items and 1 specific Fluid"),
                         tFluid.getLocalizedName()));
-                else GT_Utility.sendChatToPlayer(
+                else GTUtility.sendChatToPlayer(
                     aPlayer,
                     String.format(
                         "%s (%s)",
-                        GT_Utility.trans("151.2", "Outputs 1 specific Fluid"),
+                        GTUtility.trans("151.2", "Outputs 1 specific Fluid"),
                         tFluid.getLocalizedName()));
             }
             return true;
@@ -412,7 +408,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
 
     @Override
     public boolean canStoreFluid(@Nonnull FluidStack fluidStack) {
-        if (mFluid != null && !GT_Utility.areFluidsEqual(mFluid, fluidStack)) {
+        if (mFluid != null && !GTUtility.areFluidsEqual(mFluid, fluidStack)) {
             return false;
         }
         if (isFluidLocked()) {
@@ -423,7 +419,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
                 fluidStack.getFluid()
                     .getName());
         }
-        if (GT_ModHandler.isSteam(fluidStack)) {
+        if (GTModHandler.isSteam(fluidStack)) {
             return outputsSteam();
         }
         return outputsLiquids();
@@ -442,9 +438,9 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
                     .getName());
             final EntityPlayer player;
             if (playerThatLockedfluid == null || (player = playerThatLockedfluid.get()) == null) return;
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 player,
-                String.format(GT_Utility.trans("151.4", "Successfully locked Fluid to %s"), mFluid.getLocalizedName()));
+                String.format(GTUtility.trans("151.4", "Successfully locked Fluid to %s"), mFluid.getLocalizedName()));
             playerThatLockedfluid = null;
         }
     }
@@ -459,12 +455,12 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
         return new String[] { EnumChatFormatting.BLUE + "Output Hatch" + EnumChatFormatting.RESET, "Stored Fluid:",
             EnumChatFormatting.GOLD + (mFluid == null ? "No Fluid" : mFluid.getLocalizedName())
                 + EnumChatFormatting.RESET,
-            EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mFluid == null ? 0 : mFluid.amount)
+            EnumChatFormatting.GREEN + GTUtility.formatNumbers(mFluid == null ? 0 : mFluid.amount)
                 + " L"
                 + EnumChatFormatting.RESET
                 + " "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(getCapacity())
+                + GTUtility.formatNumbers(getCapacity())
                 + " L"
                 + EnumChatFormatting.RESET,
             (!isFluidLocked() || lockedFluidName == null) ? "Not Locked"
@@ -477,7 +473,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         super.addUIWidgets(builder, buildContext);
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK)
                 .setPos(98, 16)
                 .setSize(71, 45))
             .widget(new FluidLockWidget(this).setPos(149, 41))
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutputBus.java
index 0bfe55cac1..31973f935b 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutputBus.java
@@ -2,7 +2,7 @@ package gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.Textures.BlockIcons.ITEM_OUT_SIGN;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_PIPE_OUT;
-import static gregtech.api.util.GT_Utility.moveMultipleItemStacks;
+import static gregtech.api.util.GTUtility.moveMultipleItemStacks;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -18,10 +18,10 @@ import com.gtnewhorizons.modularui.api.forge.ItemHandlerHelper;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.ItemList;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.widgets.GT_PhantomItemButton;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.widgets.PhantomItemButton;
 import gregtech.api.interfaces.IDataCopyable;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IItemLockable;
@@ -29,22 +29,21 @@ import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.extensions.ArrayExt;
 
-public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch
-    implements IAddUIWidgets, IItemLockable, IDataCopyable {
+public class MTEHatchOutputBus extends MTEHatch implements IAddUIWidgets, IItemLockable, IDataCopyable {
 
     private static final String DATA_STICK_DATA_TYPE = "outputBusFilter";
     private static final String LOCKED_ITEM_NBT_KEY = "lockedItem";
 
     protected ItemStack lockedItem = null;
 
-    public GT_MetaTileEntity_Hatch_OutputBus(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchOutputBus(int aID, String aName, String aNameRegional, int aTier) {
         this(aID, aName, aNameRegional, aTier, getSlots(aTier));
     }
 
-    public GT_MetaTileEntity_Hatch_OutputBus(int id, String name, String nameRegional, int tier, int slots) {
+    public MTEHatchOutputBus(int id, String name, String nameRegional, int tier, int slots) {
         super(
             id,
             name,
@@ -58,35 +57,33 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch
                 "Right click with data stick to load filter config"));
     }
 
-    public GT_MetaTileEntity_Hatch_OutputBus(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription) {
+    public MTEHatchOutputBus(int aID, String aName, String aNameRegional, int aTier, String[] aDescription) {
         super(aID, aName, aNameRegional, aTier, getSlots(aTier), aDescription);
     }
 
-    public GT_MetaTileEntity_Hatch_OutputBus(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription, int inventorySize) {
+    public MTEHatchOutputBus(int aID, String aName, String aNameRegional, int aTier, String[] aDescription,
+        int inventorySize) {
         super(aID, aName, aNameRegional, aTier, inventorySize, aDescription);
     }
 
-    public GT_MetaTileEntity_Hatch_OutputBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchOutputBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, getSlots(aTier), aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_OutputBus(String name, int tier, int slots, String[] description,
-        ITexture[][][] textures) {
+    public MTEHatchOutputBus(String name, int tier, int slots, String[] description, ITexture[][][] textures) {
         super(name, tier, slots, description, textures);
     }
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
+        return GTMod.gregtechproxy.mRenderIndicatorsOnHatch
             ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT), TextureFactory.of(ITEM_OUT_SIGN) }
             : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
+        return GTMod.gregtechproxy.mRenderIndicatorsOnHatch
             ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT), TextureFactory.of(ITEM_OUT_SIGN) }
             : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT) };
     }
@@ -113,19 +110,19 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_OutputBus(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchOutputBus(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
         if (!acceptsItemLock() || !(aPlayer instanceof EntityPlayerMP)) {
-            GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+            GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
             return super.onRightclick(aBaseMetaTileEntity, aPlayer);
         }
 
         final ItemStack dataStick = aPlayer.inventory.getCurrentItem();
         if (!ItemList.Tool_DataStick.isStackEqual(dataStick, false, true)) {
-            GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+            GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
             return super.onRightclick(aBaseMetaTileEntity, aPlayer);
         }
 
@@ -197,7 +194,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch
 
         for (int i = 0, mInventoryLength = mInventory.length; i < mInventoryLength && aStack.stackSize > 0; i++) {
             ItemStack tSlot = mInventory[i];
-            if (GT_Utility.isStackInvalid(tSlot)) {
+            if (GTUtility.isStackInvalid(tSlot)) {
                 int tRealStackLimit = Math.min(getInventoryStackLimit(), aStack.getMaxStackSize());
                 if (aStack.stackSize <= tRealStackLimit) {
                     mInventory[i] = aStack;
@@ -286,8 +283,8 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch
 
         if (acceptsItemLock()) {
             builder.widget(
-                new GT_PhantomItemButton(this).setPos(getGUIWidth() - 25, 40)
-                    .setBackground(GT_PhantomItemButton.FILTER_BACKGROUND));
+                new PhantomItemButton(this).setPos(getGUIWidth() - 25, 40)
+                    .setBackground(PhantomItemButton.FILTER_BACKGROUND));
         }
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_QuadrupleHumongous.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchQuadrupleHumongous.java
index e0ab7acf95..b0040d0c6a 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_QuadrupleHumongous.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchQuadrupleHumongous.java
@@ -4,13 +4,13 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-public class GT_MetaTileEntity_Hatch_QuadrupleHumongous extends GT_MetaTileEntity_Hatch_MultiInput {
+public class MTEHatchQuadrupleHumongous extends MTEHatchMultiInput {
 
-    public GT_MetaTileEntity_Hatch_QuadrupleHumongous(int aID, int aSlot, String aName, String aNameRegional) {
+    public MTEHatchQuadrupleHumongous(int aID, int aSlot, String aName, String aNameRegional) {
         super(aID, aSlot, aName, aNameRegional, 13);
     }
 
-    public GT_MetaTileEntity_Hatch_QuadrupleHumongous(String aName, int aSlot, int aTier, String[] aDescription,
+    public MTEHatchQuadrupleHumongous(String aName, int aSlot, int aTier, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aSlot, aTier, aDescription, aTextures);
     }
@@ -22,6 +22,6 @@ public class GT_MetaTileEntity_Hatch_QuadrupleHumongous extends GT_MetaTileEntit
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_QuadrupleHumongous(mName, getMaxType(), mTier, mDescriptionArray, mTextures);
+        return new MTEHatchQuadrupleHumongous(mName, getMaxType(), mTier, mDescriptionArray, mTextures);
     }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEItem.java
index 660230660e..ba804e834e 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEItem.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES;
+import static gregtech.api.enums.GTValues.ALL_VALID_SIDES;
 import static gregtech.api.enums.Textures.BlockIcons.PIPE_RESTRICTOR;
 
 import java.util.ArrayList;
@@ -20,9 +20,9 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Dyes;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.ITexture;
@@ -33,14 +33,14 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
-import gregtech.common.GT_Client;
+import gregtech.common.GTClient;
 import gregtech.common.covers.CoverInfo;
 
-public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileEntityItemPipe {
+public class MTEItem extends MetaPipeEntity implements IMetaTileEntityItemPipe {
 
     public final float mThickNess;
     public final Materials mMaterial;
@@ -52,7 +52,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
     public boolean mIsRestrictive = false;
     private int[] cacheSides;
 
-    public GT_MetaPipeEntity_Item(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial,
+    public MTEItem(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial,
         int aInvSlotCount, int aStepSize, boolean aIsRestrictive, int aTickTime) {
         super(aID, aName, aNameRegional, aInvSlotCount, false);
         mIsRestrictive = aIsRestrictive;
@@ -63,12 +63,12 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
         addInfo(aID);
     }
 
-    public GT_MetaPipeEntity_Item(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial,
+    public MTEItem(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial,
         int aInvSlotCount, int aStepSize, boolean aIsRestrictive) {
         this(aID, aName, aNameRegional, aThickNess, aMaterial, aInvSlotCount, aStepSize, aIsRestrictive, 20);
     }
 
-    public GT_MetaPipeEntity_Item(String aName, float aThickNess, Materials aMaterial, int aInvSlotCount, int aStepSize,
+    public MTEItem(String aName, float aThickNess, Materials aMaterial, int aInvSlotCount, int aStepSize,
         boolean aIsRestrictive, int aTickTime) {
         super(aName, aInvSlotCount);
         mIsRestrictive = aIsRestrictive;
@@ -85,14 +85,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaPipeEntity_Item(
-            mName,
-            mThickNess,
-            mMaterial,
-            mInventory.length,
-            mStepSize,
-            mIsRestrictive,
-            mTickTime);
+        return new MTEItem(mName, mThickNess, mMaterial, mInventory.length, mStepSize, mIsRestrictive, mTickTime);
     }
 
     @Override
@@ -191,13 +184,13 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
     @Override
     public void saveNBTData(NBTTagCompound aNBT) {
         aNBT.setByte("mLastReceivedFrom", (byte) mLastReceivedFrom.ordinal());
-        if (GT_Mod.gregtechproxy.gt6Pipe) aNBT.setByte("mConnections", mConnections);
+        if (GTMod.gregtechproxy.gt6Pipe) aNBT.setByte("mConnections", mConnections);
     }
 
     @Override
     public void loadNBTData(NBTTagCompound aNBT) {
         mLastReceivedFrom = ForgeDirection.getOrientation(aNBT.getByte("mLastReceivedFrom"));
-        if (GT_Mod.gregtechproxy.gt6Pipe) {
+        if (GTMod.gregtechproxy.gt6Pipe) {
             mConnections = aNBT.getByte("mConnections");
         }
     }
@@ -211,7 +204,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
                 mCurrentTransferStartTick = 0;
             }
 
-            if (!GT_Mod.gregtechproxy.gt6Pipe || mCheckConnections) checkConnections();
+            if (!GTMod.gregtechproxy.gt6Pipe || mCheckConnections) checkConnections();
 
             if (oLastReceivedFrom == mLastReceivedFrom) {
                 doTickProfilingInThisTick = false;
@@ -221,7 +214,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
                 for (boolean temp = true; temp && !isInventoryEmpty() && pipeCapacityCheck();) {
                     temp = false;
                     tPipeList.clear();
-                    for (IMetaTileEntityItemPipe tTileEntity : GT_Utility
+                    for (IMetaTileEntityItemPipe tTileEntity : GTUtility
                         .sortMapByValuesAcending(
                             IMetaTileEntityItemPipe.Util.scanPipes(this, new HashMap<>(), 0, false, false))
                         .keySet()) {
@@ -242,13 +235,13 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
     @Override
     public boolean onWrenchRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer entityPlayer,
         float aX, float aY, float aZ) {
-        if (GT_Mod.gregtechproxy.gt6Pipe) {
-            final ForgeDirection tSide = GT_Utility.determineWrenchingSide(side, aX, aY, aZ);
+        if (GTMod.gregtechproxy.gt6Pipe) {
+            final ForgeDirection tSide = GTUtility.determineWrenchingSide(side, aX, aY, aZ);
             if (isConnectedAtSide(tSide)) {
                 disconnect(tSide);
-                GT_Utility.sendChatToPlayer(entityPlayer, GT_Utility.trans("215", "Disconnected"));
+                GTUtility.sendChatToPlayer(entityPlayer, GTUtility.trans("215", "Disconnected"));
             } else {
-                if (connect(tSide) > 0) GT_Utility.sendChatToPlayer(entityPlayer, GT_Utility.trans("214", "Connected"));
+                if (connect(tSide) > 0) GTUtility.sendChatToPlayer(entityPlayer, GTUtility.trans("214", "Connected"));
             }
             return true;
         }
@@ -256,25 +249,25 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
     }
 
     @Override
-    public boolean letsIn(GT_CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
+    public boolean letsIn(CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity) {
         return coverBehavior.letsItemsIn(side, aCoverID, aCoverVariable, -1, aTileEntity);
     }
 
     @Override
-    public boolean letsOut(GT_CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
+    public boolean letsOut(CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity) {
         return coverBehavior.letsItemsOut(side, aCoverID, aCoverVariable, -1, aTileEntity);
     }
 
     @Override
-    public boolean letsIn(GT_CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
+    public boolean letsIn(CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
         ISerializableObject aCoverVariable, ICoverable aTileEntity) {
         return coverBehavior.letsItemsIn(side, aCoverID, aCoverVariable, -1, aTileEntity);
     }
 
     @Override
-    public boolean letsOut(GT_CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
+    public boolean letsOut(CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
         ISerializableObject aCoverVariable, ICoverable aTileEntity) {
         return coverBehavior.letsItemsOut(side, aCoverID, aCoverVariable, -1, aTileEntity);
     }
@@ -294,7 +287,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
         if (tileEntity == null) return false;
 
         final ForgeDirection oppositeSide = side.getOpposite();
-        boolean connectable = GT_Utility.isConnectableNonInventoryPipe(tileEntity, oppositeSide);
+        boolean connectable = GTUtility.isConnectableNonInventoryPipe(tileEntity, oppositeSide);
 
         final IGregTechTileEntity gTileEntity = (tileEntity instanceof IGregTechTileEntity)
             ? (IGregTechTileEntity) tileEntity
@@ -322,7 +315,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
     @Override
     public boolean getGT6StyleConnection() {
         // Yes if GT6 pipes are enabled
-        return GT_Mod.gregtechproxy.gt6Pipe;
+        return GTMod.gregtechproxy.gt6Pipe;
     }
 
     @Override
@@ -356,7 +349,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
                 if ((!(tInventory instanceof TileEntityHopper) && !(tInventory instanceof TileEntityDispenser))
                     || getBaseMetaTileEntity().getMetaIDAtSide(side) != side.getOpposite()
                         .ordinal()) {
-                    return GT_Utility.moveMultipleItemStacks(
+                    return GTUtility.moveMultipleItemStacks(
                         aSender,
                         tInventory,
                         ForgeDirection.UNKNOWN,
@@ -419,7 +412,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
             if (cacheSides == null) cacheSides = super.getAccessibleSlotsFromSide(ordinalSide);
             return cacheSides;
         } else {
-            return GT_Values.emptyIntArray;
+            return GTValues.emptyIntArray;
         }
     }
 
@@ -440,13 +433,13 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
     @Override
     public String[] getDescription() {
         if (mTickTime == 20) return new String[] { "Item Capacity: %%%" + getMaxPipeCapacity() + "%%% Stacks/sec",
-            "Routing Value: %%%" + GT_Utility.formatNumbers(mStepSize) };
+            "Routing Value: %%%" + GTUtility.formatNumbers(mStepSize) };
         else if (mTickTime % 20 == 0) return new String[] {
             "Item Capacity: %%%" + getMaxPipeCapacity() + "%%% Stacks/%%%" + (mTickTime / 20) + "%%% sec",
-            "Routing Value: %%%" + GT_Utility.formatNumbers(mStepSize) };
+            "Routing Value: %%%" + GTUtility.formatNumbers(mStepSize) };
         else return new String[] {
             "Item Capacity: %%%" + getMaxPipeCapacity() + "%%% Stacks/%%%" + mTickTime + "%%% ticks",
-            "Routing Value: %%%" + GT_Utility.formatNumbers(mStepSize) };
+            "Routing Value: %%%" + GTUtility.formatNumbers(mStepSize) };
     }
 
     private boolean isInventoryEmpty() {
@@ -456,13 +449,13 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
 
     @Override
     public float getThickNess() {
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x1) != 0) return 0.0625F;
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x1) != 0) return 0.0625F;
         return mThickNess;
     }
 
     @Override
     public AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) {
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x2) != 0)
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x2) != 0)
             return AxisAlignedBB.getBoundingBox(aX, aY, aZ, aX + 1, aY + 1, aZ + 1);
         else return getActualCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
     }
@@ -522,7 +515,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
     public void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB,
         List<AxisAlignedBB> outputAABB, Entity collider) {
         super.addCollisionBoxesToList(aWorld, aX, aY, aZ, inputAABB, outputAABB, collider);
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x2) != 0) {
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x2) != 0) {
             final AxisAlignedBB aabb = getActualCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
             if (inputAABB.intersectsWith(aabb)) outputAABB.add(aabb);
         }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java
index 6c2df9b082..ab70cf25ae 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java
@@ -1,9 +1,9 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.enums.GT_Values.VN;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.enums.GTValues.V;
+import static gregtech.api.enums.GTValues.VN;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.formatNumbers;
 import static mcp.mobius.waila.api.SpecialChars.GREEN;
 import static mcp.mobius.waila.api.SpecialChars.RED;
 import static mcp.mobius.waila.api.SpecialChars.RESET;
@@ -59,63 +59,63 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.VoidingMode;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.fluid.IFluidStore;
 import gregtech.api.interfaces.metatileentity.IItemLockable;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures;
 import gregtech.api.interfaces.modularui.IAddGregtechLogo;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.modularui.IBindPlayerInventoryUI;
+import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SingleRecipeCheck;
-import gregtech.api.util.GT_ClientPreference;
-import gregtech.api.util.GT_ExoticEnergyInputHelper;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_ParallelHelper;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Util;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.GT_Waila;
+import gregtech.api.util.ExoticEnergyInputHelper;
+import gregtech.api.util.GTClientPreference;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtil;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.GTWaila;
 import gregtech.api.util.OutputHatchWrapper;
+import gregtech.api.util.OverclockCalculator;
+import gregtech.api.util.ParallelHelper;
 import gregtech.api.util.VoidProtectionHelper;
 import gregtech.api.util.shutdown.ShutDownReason;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
-import gregtech.client.GT_SoundLoop;
-import gregtech.common.GT_Pollution;
+import gregtech.client.GTSoundLoop;
+import gregtech.common.Pollution;
 import gregtech.common.config.machinestats.ConfigMachines;
 import gregtech.common.gui.modularui.widget.CheckRecipeResultSyncer;
 import gregtech.common.gui.modularui.widget.ShutDownReasonSyncer;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_CraftingInput_ME;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_InputBus_ME;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Input_ME;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_OutputBus_ME;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME;
+import gregtech.common.items.MetaGeneratedTool01;
 import gregtech.common.tileentities.machines.IDualInputHatch;
 import gregtech.common.tileentities.machines.IDualInputInventory;
 import gregtech.common.tileentities.machines.IRecipeProcessingAwareHatch;
 import gregtech.common.tileentities.machines.ISmartInputHatch;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine;
+import gregtech.common.tileentities.machines.MTEHatchCraftingInputME;
+import gregtech.common.tileentities.machines.MTEHatchInputBusME;
+import gregtech.common.tileentities.machines.MTEHatchInputME;
+import gregtech.common.tileentities.machines.MTEHatchOutputBusME;
+import gregtech.common.tileentities.machines.MTEHatchOutputME;
+import gregtech.common.tileentities.machines.multi.MTELargeTurbine;
 import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
-    implements ControllerWithOptionalFeatures, IAddGregtechLogo, IAddUIWidgets, IBindPlayerInventoryUI {
+public abstract class MTEMultiBlockBase extends MetaTileEntity
+    implements IControllerWithOptionalFeatures, IAddGregtechLogo, IAddUIWidgets, IBindPlayerInventoryUI {
 
     public static boolean disableMaintenance;
     public boolean hasMaintenanceChecks = getDefaultHasMaintenanceChecks();
@@ -146,20 +146,20 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     protected static final String BATCH_MODE_NBT_KEY = "batchMode";
     protected SingleRecipeCheck mSingleRecipeCheck = null;
 
-    public ArrayList<GT_MetaTileEntity_Hatch_Input> mInputHatches = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_Output> mOutputHatches = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_InputBus> mInputBusses = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_OutputBus> mOutputBusses = new ArrayList<>();
+    public ArrayList<MTEHatchInput> mInputHatches = new ArrayList<>();
+    public ArrayList<MTEHatchOutput> mOutputHatches = new ArrayList<>();
+    public ArrayList<MTEHatchInputBus> mInputBusses = new ArrayList<>();
+    public ArrayList<MTEHatchOutputBus> mOutputBusses = new ArrayList<>();
     public ArrayList<IDualInputHatch> mDualInputHatches = new ArrayList<>();
     public ArrayList<ISmartInputHatch> mSmartInputHatches = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_Dynamo> mDynamoHatches = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_Muffler> mMufflerHatches = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_Energy> mEnergyHatches = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_Maintenance> mMaintenanceHatches = new ArrayList<>();
-    protected List<GT_MetaTileEntity_Hatch> mExoticEnergyHatches = new ArrayList<>();
+    public ArrayList<MTEHatchDynamo> mDynamoHatches = new ArrayList<>();
+    public ArrayList<MTEHatchMuffler> mMufflerHatches = new ArrayList<>();
+    public ArrayList<MTEHatchEnergy> mEnergyHatches = new ArrayList<>();
+    public ArrayList<MTEHatchMaintenance> mMaintenanceHatches = new ArrayList<>();
+    protected List<MTEHatch> mExoticEnergyHatches = new ArrayList<>();
     protected final ProcessingLogic processingLogic;
     @SideOnly(Side.CLIENT)
-    protected GT_SoundLoop activitySoundLoop;
+    protected GTSoundLoop activitySoundLoop;
 
     protected long mLastWorkingTick = 0, mTotalRunTime = 0;
     private static final int CHECK_INTERVAL = 100; // How often should we check for a new recipe on an idle machine?
@@ -168,27 +168,27 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     protected static final byte INTERRUPT_SOUND_INDEX = 8;
     protected static final byte PROCESS_START_SOUND_INDEX = 1;
 
-    public GT_MetaTileEntity_MultiBlockBase(int aID, String aName, String aNameRegional) {
+    public MTEMultiBlockBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, 2);
         this.processingLogic = null;
-        GT_MetaTileEntity_MultiBlockBase.disableMaintenance = ConfigMachines.disableMaintenanceChecks;
+        MTEMultiBlockBase.disableMaintenance = ConfigMachines.disableMaintenanceChecks;
         this.damageFactorLow = ConfigMachines.damageFactorLow;
         this.damageFactorHigh = ConfigMachines.damageFactorHigh;
         this.mNEI = "";
         if (!shouldCheckMaintenance()) fixAllIssues();
     }
 
-    public GT_MetaTileEntity_MultiBlockBase(String aName) {
+    public MTEMultiBlockBase(String aName) {
         super(aName, 2);
         this.processingLogic = createProcessingLogic();
-        GT_MetaTileEntity_MultiBlockBase.disableMaintenance = ConfigMachines.disableMaintenanceChecks;
+        MTEMultiBlockBase.disableMaintenance = ConfigMachines.disableMaintenanceChecks;
         this.damageFactorLow = ConfigMachines.damageFactorLow;
         this.damageFactorHigh = ConfigMachines.damageFactorHigh;
         if (!shouldCheckMaintenance()) fixAllIssues();
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID) {
         return side != getBaseMetaTileEntity().getFrontFacing();
     }
 
@@ -197,11 +197,11 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (supportsSingleRecipeLocking()) {
             mLockedToSingleRecipe = !mLockedToSingleRecipe;
             if (mLockedToSingleRecipe) {
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aPlayer,
-                    GT_Utility.trans("223", "Single recipe locking enabled. Will lock to next recipe."));
+                    GTUtility.trans("223", "Single recipe locking enabled. Will lock to next recipe."));
             } else {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("220", "Single recipe locking disabled."));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("220", "Single recipe locking disabled."));
                 mSingleRecipeCheck = null;
             }
         }
@@ -273,7 +273,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (mOutputItems != null) {
             aNBT.setInteger("mOutputItemsLength", mOutputItems.length);
             for (int i = 0; i < mOutputItems.length; i++) if (mOutputItems[i] != null) {
-                GT_Utility.saveItem(aNBT, "mOutputItem" + i, mOutputItems[i]);
+                GTUtility.saveItem(aNBT, "mOutputItem" + i, mOutputItems[i]);
             }
         }
         if (mOutputFluids != null) {
@@ -342,15 +342,14 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         int aOutputItemsLength = aNBT.getInteger("mOutputItemsLength");
         if (aOutputItemsLength > 0) {
             mOutputItems = new ItemStack[aOutputItemsLength];
-            for (int i = 0; i < mOutputItems.length; i++)
-                mOutputItems[i] = GT_Utility.loadItem(aNBT, "mOutputItem" + i);
+            for (int i = 0; i < mOutputItems.length; i++) mOutputItems[i] = GTUtility.loadItem(aNBT, "mOutputItem" + i);
         }
 
         int aOutputFluidsLength = aNBT.getInteger("mOutputFluidsLength");
         if (aOutputFluidsLength > 0) {
             mOutputFluids = new FluidStack[aOutputFluidsLength];
             for (int i = 0; i < mOutputFluids.length; i++)
-                mOutputFluids[i] = GT_Utility.loadFluid(aNBT, "mOutputFluids" + i);
+                mOutputFluids[i] = GTUtility.loadFluid(aNBT, "mOutputFluids" + i);
         }
         if (shouldCheckMaintenance()) {
             mWrench = aNBT.getBoolean("mWrench");
@@ -376,7 +375,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     @Override
     public void onLeftclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        if (aBaseMetaTileEntity.isServerSide() && GT_Util.saveMultiblockInputConfiguration(this, aPlayer)) {
+        if (aBaseMetaTileEntity.isServerSide() && GTUtil.saveMultiblockInputConfiguration(this, aPlayer)) {
             aPlayer.addChatComponentMessage(new ChatComponentTranslation("GT5U.MULTI_MACHINE_CONFIG.SAVE"));
             return;
         }
@@ -385,9 +384,9 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        if (GT_Util.hasMultiblockInputConfiguration(aPlayer.getHeldItem())) {
+        if (GTUtil.hasMultiblockInputConfiguration(aPlayer.getHeldItem())) {
             if (aBaseMetaTileEntity.isServerSide()) {
-                if (GT_Util.loadMultiblockInputConfiguration(this, aPlayer)) {
+                if (GTUtil.loadMultiblockInputConfiguration(this, aPlayer)) {
                     aPlayer.addChatComponentMessage(new ChatComponentTranslation("GT5U.MULTI_MACHINE_CONFIG.LOAD"));
                 } else {
                     aPlayer
@@ -396,7 +395,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
             }
             return true;
         }
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -508,7 +507,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (!shouldCheckMaintenance()) return;
 
         if (getRepairStatus() != getIdealStatus()) {
-            for (GT_MetaTileEntity_Hatch_Maintenance tHatch : filterValidMTEs(mMaintenanceHatches)) {
+            for (MTEHatchMaintenance tHatch : filterValidMTEs(mMaintenanceHatches)) {
                 if (tHatch.mAuto) tHatch.autoMaintainance();
                 if (tHatch.mWrench) mWrench = true;
                 if (tHatch.mScrewdriver) mScrewdriver = true;
@@ -593,7 +592,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                         for (ItemStack tStack : mOutputItems) {
                             if (tStack != null) {
                                 try {
-                                    GT_Mod.achievements.issueAchivementHatch(
+                                    GTMod.achievements.issueAchivementHatch(
                                         aBaseMetaTileEntity.getWorld()
                                             .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()),
                                         tStack);
@@ -607,7 +606,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                         addFluidOutputs(mOutputFluids);
                         if (mOutputFluids.length > 1) {
                             try {
-                                GT_Mod.achievements.issueAchievement(
+                                GTMod.achievements.issueAchievement(
                                     aBaseMetaTileEntity.getWorld()
                                         .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()),
                                     "oilplant");
@@ -647,7 +646,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     public boolean polluteEnvironment(int aPollutionLevel) {
         mPollution += aPollutionLevel;
-        for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) {
+        for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
             if (mPollution >= 10000) {
                 if (tHatch.polluteEnvironment(this)) {
                     mPollution -= 10000;
@@ -671,9 +670,9 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         switch (aIndex) {
             case PROCESS_START_SOUND_INDEX -> {
                 if (getProcessStartSound() != null)
-                    GT_Utility.doSoundAtClient(getProcessStartSound(), getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ);
+                    GTUtility.doSoundAtClient(getProcessStartSound(), getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ);
             }
-            case INTERRUPT_SOUND_INDEX -> GT_Utility
+            case INTERRUPT_SOUND_INDEX -> GTUtility
                 .doSoundAtClient(SoundResource.IC2_MACHINES_INTERRUPT_ONE, 100, 1.0F, aX, aY, aZ);
         }
     }
@@ -683,7 +682,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == PROCESS_START_SOUND_INDEX) {
             if (getProcessStartSound() != null)
-                GT_Utility.doSoundAtClient(getProcessStartSound(), getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ);
+                GTUtility.doSoundAtClient(getProcessStartSound(), getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ);
         }
     }
 
@@ -691,7 +690,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     protected void doActivitySound(ResourceLocation activitySound) {
         if (getBaseMetaTileEntity().isActive() && activitySound != null) {
             if (activitySoundLoop == null) {
-                activitySoundLoop = new GT_SoundLoop(activitySound, getBaseMetaTileEntity(), false, true);
+                activitySoundLoop = new GTSoundLoop(activitySound, getBaseMetaTileEntity(), false, true);
                 Minecraft.getMinecraft()
                     .getSoundHandler()
                     .playSound(activitySoundLoop);
@@ -865,8 +864,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                     result = foundResult;
                 }
             } else {
-                for (GT_MetaTileEntity_Hatch_InputBus bus : mInputBusses) {
-                    if (bus instanceof GT_MetaTileEntity_Hatch_CraftingInput_ME) {
+                for (MTEHatchInputBus bus : mInputBusses) {
+                    if (bus instanceof MTEHatchCraftingInputME) {
                         continue;
                     }
                     List<ItemStack> inputItems = new ArrayList<>();
@@ -1047,9 +1046,9 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
             if (mInventory[1] != null && getBaseMetaTileEntity().getRandomNumber(2) == 0
                 && !mInventory[1].getUnlocalizedName()
                     .startsWith("gt.blockmachines.basicmachine.")) {
-                if (mInventory[1].getItem() instanceof GT_MetaGenerated_Tool_01) {
+                if (mInventory[1].getItem() instanceof MetaGeneratedTool01) {
                     NBTTagCompound tNBT = mInventory[1].getTagCompound();
-                    ((GT_MetaGenerated_Tool) mInventory[1].getItem()).doDamage(
+                    ((MetaGeneratedTool) mInventory[1].getItem()).doDamage(
                         mInventory[1],
                         (long) getDamageToComponent(mInventory[1])
                             * (long) Math.min(mEUt / this.damageFactorLow, Math.pow(mEUt, this.damageFactorHigh)));
@@ -1073,7 +1072,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     public void explodeMultiblock() {
 
-        GT_Log.exp.println(
+        GTLog.exp.println(
             "MultiBlockExplosion at: " + this.getBaseMetaTileEntity()
                 .getXCoord()
                 + " | "
@@ -1087,7 +1086,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                     .getWorld().provider.dimensionId
                 + ".");
 
-        GT_Pollution.addPollution(getBaseMetaTileEntity(), GT_Mod.gregtechproxy.mPollutionOnExplosion);
+        Pollution.addPollution(getBaseMetaTileEntity(), GTMod.gregtechproxy.mPollutionOnExplosion);
         mInventory[1] = null;
         // noinspection unchecked // In this case, the inspection only indicates that the array can be abused in runtime
         Iterable<MetaTileEntity> allHatches = Iterables.concat(
@@ -1123,7 +1122,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         long totalOutput = 0;
         long aFirstVoltageFound = -1;
         boolean aFoundMixedDynamos = false;
-        for (GT_MetaTileEntity_Hatch_Dynamo aDynamo : filterValidMTEs(mDynamoHatches)) {
+        for (MTEHatchDynamo aDynamo : filterValidMTEs(mDynamoHatches)) {
             long aVoltage = aDynamo.maxEUOutput();
             long aTotal = aDynamo.maxAmperesOut() * aVoltage;
             // Check against voltage to check when hatch mixing
@@ -1147,7 +1146,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         int aAmpsToInject;
         int aRemainder;
         int ampsOnCurrentHatch;
-        for (GT_MetaTileEntity_Hatch_Dynamo aDynamo : filterValidMTEs(mDynamoHatches)) {
+        for (MTEHatchDynamo aDynamo : filterValidMTEs(mDynamoHatches)) {
             leftToInject = aEU - injected;
             aVoltage = aDynamo.maxEUOutput();
             aAmpsToInject = (int) (leftToInject / aVoltage);
@@ -1172,22 +1171,21 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
      */
     public long getMaxInputVoltage() {
         long rVoltage = 0;
-        for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches))
-            rVoltage += tHatch.getBaseMetaTileEntity()
-                .getInputVoltage();
+        for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) rVoltage += tHatch.getBaseMetaTileEntity()
+            .getInputVoltage();
         return rVoltage;
     }
 
     public long getAverageInputVoltage() {
-        return GT_ExoticEnergyInputHelper.getAverageInputVoltageMulti(mEnergyHatches);
+        return ExoticEnergyInputHelper.getAverageInputVoltageMulti(mEnergyHatches);
     }
 
     public long getMaxInputAmps() {
-        return GT_ExoticEnergyInputHelper.getMaxWorkingInputAmpsMulti(mEnergyHatches);
+        return ExoticEnergyInputHelper.getMaxWorkingInputAmpsMulti(mEnergyHatches);
     }
 
     public long getMaxInputEu() {
-        return GT_ExoticEnergyInputHelper.getTotalEuMulti(mEnergyHatches);
+        return ExoticEnergyInputHelper.getTotalEuMulti(mEnergyHatches);
     }
 
     /**
@@ -1195,7 +1193,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
      */
     public long getMaxInputPower() {
         long eut = 0;
-        for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) {
+        for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) {
             IGregTechTileEntity baseTile = tHatch.getBaseMetaTileEntity();
             eut += baseTile.getInputVoltage() * baseTile.getInputAmperage();
         }
@@ -1230,8 +1228,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
      */
     protected void calculateOverclockedNessMultiInternal(long aEUt, int aDuration, int mAmperage, long maxInputVoltage,
         boolean perfectOC) {
-        byte tier = (byte) Math.max(0, GT_Utility.getTier(maxInputVoltage));
-        GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(aEUt)
+        byte tier = (byte) Math.max(0, GTUtility.getTier(maxInputVoltage));
+        OverclockCalculator calculator = new OverclockCalculator().setRecipeEUt(aEUt)
             .setEUt(V[tier] * mAmperage)
             .setDuration(aDuration)
             .setDurationDecreasePerOC(perfectOC ? 4.0 : 2.0)
@@ -1260,16 +1258,16 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     public boolean drainEnergyInput(long aEU) {
         if (aEU <= 0) return true;
-        for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) {
+        for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) {
             if (tHatch.getBaseMetaTileEntity()
                 .decreaseStoredEnergyUnits(aEU, false)) return true;
         }
         return false;
     }
 
-    protected static boolean dumpFluid(List<GT_MetaTileEntity_Hatch_Output> aOutputHatches, FluidStack copiedFluidStack,
+    protected static boolean dumpFluid(List<MTEHatchOutput> aOutputHatches, FluidStack copiedFluidStack,
         boolean restrictiveHatchesOnly) {
-        for (GT_MetaTileEntity_Hatch_Output tHatch : filterValidMTEs(aOutputHatches)) {
+        for (MTEHatchOutput tHatch : filterValidMTEs(aOutputHatches)) {
             if (restrictiveHatchesOnly && tHatch.mMode == 0) {
                 continue;
             }
@@ -1308,7 +1306,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     public boolean depleteInput(FluidStack aLiquid, boolean simulate) {
         if (aLiquid == null) return false;
-        for (GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) {
+        for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) {
             setHatchRecipeMap(tHatch);
             FluidStack tLiquid = tHatch.drain(ForgeDirection.UNKNOWN, aLiquid, false);
             if (tLiquid != null && tLiquid.amount >= aLiquid.amount) {
@@ -1323,10 +1321,10 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     }
 
     public boolean addOutput(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return false;
-        aStack = GT_Utility.copyOrNull(aStack);
+        if (GTUtility.isStackInvalid(aStack)) return false;
+        aStack = GTUtility.copyOrNull(aStack);
 
-        final List<GT_MetaTileEntity_Hatch_OutputBus> filteredBuses = filterValidMTEs(mOutputBusses);
+        final List<MTEHatchOutputBus> filteredBuses = filterValidMTEs(mOutputBusses);
         if (dumpItem(filteredBuses, aStack, true) || dumpItem(filteredBuses, aStack, false)) {
             return true;
         }
@@ -1336,7 +1334,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         while (outputSuccess && aStack.stackSize > 0) {
             outputSuccess = false;
             ItemStack single = aStack.splitStack(1);
-            for (GT_MetaTileEntity_Hatch_Output tHatch : filterValidMTEs(mOutputHatches)) {
+            for (MTEHatchOutput tHatch : filterValidMTEs(mOutputHatches)) {
                 if (!outputSuccess && tHatch.outputsItems()) {
                     if (tHatch.getBaseMetaTileEntity()
                         .addStackToSlot(1, single)) outputSuccess = true;
@@ -1346,9 +1344,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         return outputSuccess;
     }
 
-    private boolean dumpItem(List<GT_MetaTileEntity_Hatch_OutputBus> outputBuses, ItemStack itemStack,
-        boolean restrictiveBusesOnly) {
-        for (GT_MetaTileEntity_Hatch_OutputBus outputBus : outputBuses) {
+    private boolean dumpItem(List<MTEHatchOutputBus> outputBuses, ItemStack itemStack, boolean restrictiveBusesOnly) {
+        for (MTEHatchOutputBus outputBus : outputBuses) {
             if (restrictiveBusesOnly && !outputBus.isLocked()) {
                 continue;
             }
@@ -1362,12 +1359,12 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     }
 
     public boolean depleteInput(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return false;
-        FluidStack aLiquid = GT_Utility.getFluidForFilledItem(aStack, true);
+        if (GTUtility.isStackInvalid(aStack)) return false;
+        FluidStack aLiquid = GTUtility.getFluidForFilledItem(aStack, true);
         if (aLiquid != null) return depleteInput(aLiquid);
-        for (GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) {
+        for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) {
             setHatchRecipeMap(tHatch);
-            if (GT_Utility.areStacksEqual(
+            if (GTUtility.areStacksEqual(
                 aStack,
                 tHatch.getBaseMetaTileEntity()
                     .getStackInSlot(0))) {
@@ -1379,11 +1376,11 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                 }
             }
         }
-        for (GT_MetaTileEntity_Hatch_InputBus tHatch : filterValidMTEs(mInputBusses)) {
+        for (MTEHatchInputBus tHatch : filterValidMTEs(mInputBusses)) {
             tHatch.mRecipeMap = getRecipeMap();
             for (int i = tHatch.getBaseMetaTileEntity()
                 .getSizeInventory() - 1; i >= 0; i--) {
-                if (GT_Utility.areStacksEqual(
+                if (GTUtility.areStacksEqual(
                     aStack,
                     tHatch.getBaseMetaTileEntity()
                         .getStackInSlot(i))) {
@@ -1401,7 +1398,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     public ArrayList<ItemStack> getStoredOutputs() {
         ArrayList<ItemStack> rList = new ArrayList<>();
-        for (GT_MetaTileEntity_Hatch_OutputBus tHatch : filterValidMTEs(mOutputBusses)) {
+        for (MTEHatchOutputBus tHatch : filterValidMTEs(mOutputBusses)) {
             for (int i = tHatch.getBaseMetaTileEntity()
                 .getSizeInventory() - 1; i >= 0; i--) {
                 rList.add(
@@ -1415,15 +1412,15 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     public ArrayList<FluidStack> getStoredFluids() {
         ArrayList<FluidStack> rList = new ArrayList<>();
         Map<Fluid, FluidStack> inputsFromME = new HashMap<>();
-        for (GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) {
+        for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) {
             setHatchRecipeMap(tHatch);
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_MultiInput multiInputHatch) {
+            if (tHatch instanceof MTEHatchMultiInput multiInputHatch) {
                 for (FluidStack tFluid : multiInputHatch.getStoredFluid()) {
                     if (tFluid != null) {
                         rList.add(tFluid);
                     }
                 }
-            } else if (tHatch instanceof GT_MetaTileEntity_Hatch_Input_ME meHatch) {
+            } else if (tHatch instanceof MTEHatchInputME meHatch) {
                 for (FluidStack fluidStack : meHatch.getStoredFluids()) {
                     if (fluidStack != null) {
                         // Prevent the same fluid from different ME hatches from being recognized
@@ -1449,7 +1446,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
      * @param doDrain If false, fluid will not actually be consumed
      * @return Whether the hatch contains enough fluid to drain
      */
-    public boolean drain(GT_MetaTileEntity_Hatch hatch, FluidStack fluid, boolean doDrain) {
+    public boolean drain(MTEHatch hatch, FluidStack fluid, boolean doDrain) {
         if (fluid == null || hatch == null) return false;
         if (supportsCraftingMEBuffer() && hatch instanceof IDualInputHatch tHatch && tHatch.supportsFluids()) {
             Optional<IDualInputInventory> inventory = tHatch.getFirstNonEmptyInventory();
@@ -1465,8 +1462,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
             }
         }
 
-        if (hatch instanceof GT_MetaTileEntity_Hatch_Input tHatch && tHatch.isValid()) {
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_Input_ME meHatch) {
+        if (hatch instanceof MTEHatchInput tHatch && tHatch.isValid()) {
+            if (tHatch instanceof MTEHatchInputME meHatch) {
                 meHatch.startRecipeProcessing();
                 FluidStack tFluid = meHatch.drain(ForgeDirection.UNKNOWN, fluid, doDrain);
                 meHatch.endRecipeProcessing(this);
@@ -1482,20 +1479,20 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     public ArrayList<ItemStack> getStoredInputs() {
         ArrayList<ItemStack> rList = new ArrayList<>();
-        Map<GT_Utility.ItemId, ItemStack> inputsFromME = new HashMap<>();
-        for (GT_MetaTileEntity_Hatch_InputBus tHatch : filterValidMTEs(mInputBusses)) {
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_CraftingInput_ME) {
+        Map<GTUtility.ItemId, ItemStack> inputsFromME = new HashMap<>();
+        for (MTEHatchInputBus tHatch : filterValidMTEs(mInputBusses)) {
+            if (tHatch instanceof MTEHatchCraftingInputME) {
                 continue;
             }
             tHatch.mRecipeMap = getRecipeMap();
             IGregTechTileEntity tileEntity = tHatch.getBaseMetaTileEntity();
-            boolean isMEBus = tHatch instanceof GT_MetaTileEntity_Hatch_InputBus_ME;
+            boolean isMEBus = tHatch instanceof MTEHatchInputBusME;
             for (int i = tileEntity.getSizeInventory() - 1; i >= 0; i--) {
                 ItemStack itemStack = tileEntity.getStackInSlot(i);
                 if (itemStack != null) {
                     if (isMEBus) {
                         // Prevent the same item from different ME buses from being recognized
-                        inputsFromME.put(GT_Utility.ItemId.createNoCopy(itemStack), itemStack);
+                        inputsFromME.put(GTUtility.ItemId.createNoCopy(itemStack), itemStack);
                     } else {
                         rList.add(itemStack);
                     }
@@ -1537,20 +1534,20 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
             }
         }
 
-        Map<GT_Utility.ItemId, ItemStack> inputsFromME = new HashMap<>();
-        for (GT_MetaTileEntity_Hatch_InputBus tHatch : filterValidMTEs(mInputBusses)) {
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_CraftingInput_ME) {
+        Map<GTUtility.ItemId, ItemStack> inputsFromME = new HashMap<>();
+        for (MTEHatchInputBus tHatch : filterValidMTEs(mInputBusses)) {
+            if (tHatch instanceof MTEHatchCraftingInputME) {
                 continue;
             }
             tHatch.mRecipeMap = getRecipeMap();
             IGregTechTileEntity tileEntity = tHatch.getBaseMetaTileEntity();
-            boolean isMEBus = tHatch instanceof GT_MetaTileEntity_Hatch_InputBus_ME;
+            boolean isMEBus = tHatch instanceof MTEHatchInputBusME;
             for (int i = tileEntity.getSizeInventory() - 1; i >= 0; i--) {
                 ItemStack itemStack = tileEntity.getStackInSlot(i);
                 if (itemStack != null) {
                     if (isMEBus) {
                         // Prevent the same item from different ME buses from being recognized
-                        inputsFromME.put(GT_Utility.ItemId.createNoCopy(itemStack), itemStack);
+                        inputsFromME.put(GTUtility.ItemId.createNoCopy(itemStack), itemStack);
                     } else {
                         rList.add(itemStack);
                     }
@@ -1566,15 +1563,15 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         return rList;
     }
 
-    public Map<GT_Utility.ItemId, ItemStack> getStoredInputsFromME() {
-        Map<GT_Utility.ItemId, ItemStack> inputsFromME = new Object2ReferenceOpenHashMap<>();
-        for (GT_MetaTileEntity_Hatch_InputBus tHatch : filterValidMTEs(mInputBusses)) {
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_InputBus_ME meBus) {
+    public Map<GTUtility.ItemId, ItemStack> getStoredInputsFromME() {
+        Map<GTUtility.ItemId, ItemStack> inputsFromME = new Object2ReferenceOpenHashMap<>();
+        for (MTEHatchInputBus tHatch : filterValidMTEs(mInputBusses)) {
+            if (tHatch instanceof MTEHatchInputBusME meBus) {
                 for (int i = meBus.getSizeInventory() - 1; i >= 0; i--) {
                     ItemStack itemStack = meBus.getStackInSlot(i);
                     if (itemStack != null) {
                         // Prevent the same item from different ME buses from being recognized
-                        inputsFromME.put(GT_Utility.ItemId.createNoCopy(itemStack), itemStack);
+                        inputsFromME.put(GTUtility.ItemId.createNoCopy(itemStack), itemStack);
                     }
                 }
             }
@@ -1584,8 +1581,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     public Map<Fluid, FluidStack> getStoredFluidsFromME() {
         Map<Fluid, FluidStack> fluidsFromME = new Reference2ReferenceOpenHashMap<>();
-        for (GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) {
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_Input_ME meHatch) {
+        for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) {
+            if (tHatch instanceof MTEHatchInputME meHatch) {
                 for (FluidStack fluid : meHatch.getStoredFluids()) {
                     if (fluid != null) {
                         // Prevent the same fluid from different ME hatches from being recognized
@@ -1613,17 +1610,17 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     }
 
     public void updateSlots() {
-        for (GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) tHatch.updateSlots();
-        for (GT_MetaTileEntity_Hatch_InputBus tHatch : filterValidMTEs(mInputBusses)) tHatch.updateSlots();
+        for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) tHatch.updateSlots();
+        for (MTEHatchInputBus tHatch : filterValidMTEs(mInputBusses)) tHatch.updateSlots();
     }
 
     protected void startRecipeProcessing() {
-        for (GT_MetaTileEntity_Hatch_InputBus hatch : filterValidMTEs(mInputBusses)) {
+        for (MTEHatchInputBus hatch : filterValidMTEs(mInputBusses)) {
             if (hatch instanceof IRecipeProcessingAwareHatch aware) {
                 aware.startRecipeProcessing();
             }
         }
-        for (GT_MetaTileEntity_Hatch_Input hatch : filterValidMTEs(mInputHatches)) {
+        for (MTEHatchInput hatch : filterValidMTEs(mInputHatches)) {
             if (hatch instanceof IRecipeProcessingAwareHatch aware) {
                 aware.startRecipeProcessing();
             }
@@ -1637,12 +1634,12 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     }
 
     protected void endRecipeProcessing() {
-        for (GT_MetaTileEntity_Hatch_InputBus hatch : filterValidMTEs(mInputBusses)) {
+        for (MTEHatchInputBus hatch : filterValidMTEs(mInputBusses)) {
             if (hatch instanceof IRecipeProcessingAwareHatch aware) {
                 setResultIfFailure(aware.endRecipeProcessing(this));
             }
         }
-        for (GT_MetaTileEntity_Hatch_Input hatch : filterValidMTEs(mInputHatches)) {
+        for (MTEHatchInput hatch : filterValidMTEs(mInputHatches)) {
             if (hatch instanceof IRecipeProcessingAwareHatch aware) {
                 setResultIfFailure(aware.endRecipeProcessing(this));
             }
@@ -1653,7 +1650,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch hatch) {
+        if (aMetaTileEntity instanceof MTEHatch hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
         }
@@ -1667,26 +1664,21 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                 mSmartInputHatches.add(hatch);
             }
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
-            setHatchRecipeMap((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity);
-            return mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity);
-        }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) {
-            ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mRecipeMap = getRecipeMap();
-            return mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity);
-        }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output)
-            return mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus)
-            return mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy)
-            return mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo)
-            return mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance)
-            return mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler)
-            return mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity);
+        if (aMetaTileEntity instanceof MTEHatchInput) {
+            setHatchRecipeMap((MTEHatchInput) aMetaTileEntity);
+            return mInputHatches.add((MTEHatchInput) aMetaTileEntity);
+        }
+        if (aMetaTileEntity instanceof MTEHatchInputBus) {
+            ((MTEHatchInputBus) aMetaTileEntity).mRecipeMap = getRecipeMap();
+            return mInputBusses.add((MTEHatchInputBus) aMetaTileEntity);
+        }
+        if (aMetaTileEntity instanceof MTEHatchOutput) return mOutputHatches.add((MTEHatchOutput) aMetaTileEntity);
+        if (aMetaTileEntity instanceof MTEHatchOutputBus) return mOutputBusses.add((MTEHatchOutputBus) aMetaTileEntity);
+        if (aMetaTileEntity instanceof MTEHatchEnergy) return mEnergyHatches.add((MTEHatchEnergy) aMetaTileEntity);
+        if (aMetaTileEntity instanceof MTEHatchDynamo) return mDynamoHatches.add((MTEHatchDynamo) aMetaTileEntity);
+        if (aMetaTileEntity instanceof MTEHatchMaintenance)
+            return mMaintenanceHatches.add((MTEHatchMaintenance) aMetaTileEntity);
+        if (aMetaTileEntity instanceof MTEHatchMuffler) return mMufflerHatches.add((MTEHatchMuffler) aMetaTileEntity);
         return false;
     }
 
@@ -1694,7 +1686,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance hatch) {
+        if (aMetaTileEntity instanceof MTEHatchMaintenance hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             return mMaintenanceHatches.add(hatch);
@@ -1708,7 +1700,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         }
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy hatch) {
+        if (aMetaTileEntity instanceof MTEHatchEnergy hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             return mEnergyHatches.add(hatch);
@@ -1720,8 +1712,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch hatch
-            && GT_ExoticEnergyInputHelper.isExoticEnergyInput(aMetaTileEntity)) {
+        if (aMetaTileEntity instanceof MTEHatch hatch && ExoticEnergyInputHelper.isExoticEnergyInput(aMetaTileEntity)) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             return mExoticEnergyHatches.add(hatch);
@@ -1733,7 +1724,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo hatch) {
+        if (aMetaTileEntity instanceof MTEHatchDynamo hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             return mDynamoHatches.add(hatch);
@@ -1745,7 +1736,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler hatch) {
+        if (aMetaTileEntity instanceof MTEHatchMuffler hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             return mMufflerHatches.add(hatch);
@@ -1776,7 +1767,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aMetaTileEntity instanceof ISmartInputHatch hatch) {
             mSmartInputHatches.add(hatch);
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus hatch) {
+        if (aMetaTileEntity instanceof MTEHatchInputBus hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             hatch.mRecipeMap = getRecipeMap();
@@ -1789,7 +1780,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus hatch) {
+        if (aMetaTileEntity instanceof MTEHatchOutputBus hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             return mOutputBusses.add(hatch);
@@ -1804,7 +1795,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aMetaTileEntity instanceof ISmartInputHatch hatch) {
             mSmartInputHatches.add(hatch);
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input hatch) {
+        if (aMetaTileEntity instanceof MTEHatchInput hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             setHatchRecipeMap(hatch);
@@ -1817,7 +1808,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output hatch) {
+        if (aMetaTileEntity instanceof MTEHatchOutput hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             return mOutputHatches.add(hatch);
@@ -1825,7 +1816,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         return false;
     }
 
-    protected void setHatchRecipeMap(GT_MetaTileEntity_Hatch_Input hatch) {
+    protected void setHatchRecipeMap(MTEHatchInput hatch) {
         if (filtersFluid()) {
             hatch.mRecipeMap = getRecipeMap();
         }
@@ -1841,13 +1832,13 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     @Override
     public String[] getInfoData() {
         int mPollutionReduction = 0;
-        for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) {
+        for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
             mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction);
         }
 
         long storedEnergy = 0;
         long maxEnergy = 0;
-        for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) {
+        for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) {
             storedEnergy += tHatch.getBaseMetaTileEntity()
                 .getStoredEU();
             maxEnergy += tHatch.getBaseMetaTileEntity()
@@ -1886,7 +1877,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                 + StatCollector.translateToLocal("GT5U.machines.tier")
                 + ": "
                 + EnumChatFormatting.YELLOW
-                + VN[GT_Utility.getTier(getMaxInputVoltage())]
+                + VN[GTUtility.getTier(getMaxInputVoltage())]
                 + EnumChatFormatting.RESET,
             /* 5 */ StatCollector.translateToLocal("GT5U.multiblock.problems") + ": "
                 + EnumChatFormatting.RED
@@ -1929,7 +1920,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         int tInputList_sS = tInputList.size();
         for (int i = 0; i < tInputList_sS - 1; i++) {
             for (int j = i + 1; j < tInputList_sS; j++) {
-                if (!GT_Utility.areStacksEqual(tInputList.get(i), tInputList.get(j))) continue;
+                if (!GTUtility.areStacksEqual(tInputList.get(i), tInputList.get(j))) continue;
                 if (tInputList.get(i).stackSize >= tInputList.get(j).stackSize) {
                     tInputList.remove(j--);
                     tInputList_sS = tInputList.size();
@@ -1949,7 +1940,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         int tFluidList_sS = tFluidList.size();
         for (int i = 0; i < tFluidList_sS - 1; i++) {
             for (int j = i + 1; j < tFluidList_sS; j++) {
-                if (!GT_Utility.areFluidsEqual(tFluidList.get(i), tFluidList.get(j))) continue;
+                if (!GTUtility.areFluidsEqual(tFluidList.get(i), tFluidList.get(j))) continue;
 
                 if (tFluidList.get(i).amount >= tFluidList.get(j).amount) {
                     tFluidList.remove(j--);
@@ -1989,15 +1980,15 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                         StatCollector.translateToLocalFormatted(
                             "GT5U.waila.energy.use_with_amperage",
                             formatNumbers(actualEnergyUsage),
-                            GT_Utility.getAmperageForTier(actualEnergyUsage, (byte) energyTier),
-                            GT_Utility.getColoredTierNameFromTier((byte) energyTier)));
+                            GTUtility.getAmperageForTier(actualEnergyUsage, (byte) energyTier),
+                            GTUtility.getColoredTierNameFromTier((byte) energyTier)));
                 } else if (actualEnergyUsage < 0) {
                     currentTip.add(
                         StatCollector.translateToLocalFormatted(
                             "GT5U.waila.energy.produce_with_amperage",
                             formatNumbers(-actualEnergyUsage),
-                            GT_Utility.getAmperageForTier(-actualEnergyUsage, (byte) energyTier),
-                            GT_Utility.getColoredTierNameFromTier((byte) energyTier)));
+                            GTUtility.getAmperageForTier(-actualEnergyUsage, (byte) energyTier),
+                            GTUtility.getColoredTierNameFromTier((byte) energyTier)));
                 }
             } else {
                 if (actualEnergyUsage > 0) {
@@ -2005,20 +1996,20 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                         StatCollector.translateToLocalFormatted(
                             "GT5U.waila.energy.use",
                             formatNumbers(actualEnergyUsage),
-                            GT_Utility.getColoredTierNameFromVoltage(actualEnergyUsage)));
+                            GTUtility.getColoredTierNameFromVoltage(actualEnergyUsage)));
                 } else if (actualEnergyUsage < 0) {
                     currentTip.add(
                         StatCollector.translateToLocalFormatted(
                             "GT5U.waila.energy.produce",
                             formatNumbers(-actualEnergyUsage),
-                            GT_Utility.getColoredTierNameFromVoltage(-actualEnergyUsage)));
+                            GTUtility.getColoredTierNameFromVoltage(-actualEnergyUsage)));
                 }
             }
         }
-        currentTip.add(
-            GT_Waila.getMachineProgressString(isActive, tag.getInteger("maxProgress"), tag.getInteger("progress")));
+        currentTip
+            .add(GTWaila.getMachineProgressString(isActive, tag.getInteger("maxProgress"), tag.getInteger("progress")));
         // Show ns on the tooltip
-        if (GT_Mod.gregtechproxy.wailaAverageNS && tag.hasKey("averageNS")) {
+        if (GTMod.gregtechproxy.wailaAverageNS && tag.hasKey("averageNS")) {
             int tAverageTime = tag.getInteger("averageNS");
             currentTip.add("Average CPU load of ~" + formatNumbers(tAverageTime) + " ns");
         }
@@ -2051,7 +2042,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
             }
         }
 
-        final GT_ClientPreference preference = GT_Mod.gregtechproxy.getClientPreference(player.getUniqueID());
+        final GTClientPreference preference = GTMod.gregtechproxy.getClientPreference(player.getUniqueID());
         if (preference != null && preference.isWailaAverageNSEnabled()) {
             getBaseMetaTileEntity().startTimeStatistics();
             int tAverageTime = 0;
@@ -2073,7 +2064,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     }
 
     protected void setMufflers(boolean state) {
-        for (GT_MetaTileEntity_Hatch_Muffler aMuffler : mMufflerHatches) {
+        for (MTEHatchMuffler aMuffler : mMufflerHatches) {
             final IGregTechTileEntity iGTTileEntity = aMuffler.getBaseMetaTileEntity();
             if (iGTTileEntity != null && !iGTTileEntity.isDead()) {
                 iGTTileEntity.setActive(state);
@@ -2088,7 +2079,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         setMufflers(false);
     }
 
-    public List<GT_MetaTileEntity_Hatch> getExoticEnergyHatches() {
+    public List<MTEHatch> getExoticEnergyHatches() {
         return mExoticEnergyHatches;
     }
 
@@ -2118,10 +2109,10 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
      * If void protection is enabled, it also checks for {@link #protectsExcessItem()} and
      * {@link #protectsExcessFluid()}, so you don't need to call them along with this method.
      * <p>
-     * If you're using {@link GT_ParallelHelper}, it will handle void protection and return 0 parallel
+     * If you're using {@link ParallelHelper}, it will handle void protection and return 0 parallel
      * if all the output cannot be dumped into buses / hatches. In that case you won't use this method.
      */
-    protected boolean canOutputAll(@Nonnull GT_Recipe recipe) {
+    protected boolean canOutputAll(@Nonnull GTRecipe recipe) {
         return canOutputAll(recipe.mOutputs, recipe.mFluidOutputs);
     }
 
@@ -2231,8 +2222,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     @Override
     public List<ItemStack> getItemOutputSlots(ItemStack[] toOutput) {
         List<ItemStack> ret = new ArrayList<>();
-        for (final GT_MetaTileEntity_Hatch tBus : filterValidMTEs(mOutputBusses)) {
-            if (!(tBus instanceof GT_MetaTileEntity_Hatch_OutputBus_ME)) {
+        for (final MTEHatch tBus : filterValidMTEs(mOutputBusses)) {
+            if (!(tBus instanceof MTEHatchOutputBusME)) {
                 final IInventory tBusInv = tBus.getBaseMetaTileEntity();
                 for (int i = 0; i < tBusInv.getSizeInventory(); i++) {
                     final ItemStack stackInSlot = tBus.getStackInSlot(i);
@@ -2263,18 +2254,18 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     /**
      * Util method for DT-like structure to collect list of output hatches.
      */
-    protected <T extends GT_MetaTileEntity_Hatch_Output> List<? extends IFluidStore> getFluidOutputSlotsByLayer(
-        FluidStack[] toOutput, List<List<T>> hatchesByLayer) {
+    protected <T extends MTEHatchOutput> List<? extends IFluidStore> getFluidOutputSlotsByLayer(FluidStack[] toOutput,
+        List<List<T>> hatchesByLayer) {
         List<IFluidStore> ret = new ArrayList<>();
         for (int i = 0; i < toOutput.length; i++) {
             if (i >= hatchesByLayer.size()) {
                 break;
             }
             FluidStack fluidOutputForLayer = toOutput[i];
-            for (GT_MetaTileEntity_Hatch_Output hatch : hatchesByLayer.get(i)) {
+            for (MTEHatchOutput hatch : hatchesByLayer.get(i)) {
                 if (!hatch.isValid()) continue;
                 if (fluidOutputForLayer != null) {
-                    ret.add(new OutputHatchWrapper(hatch, f -> GT_Utility.areFluidsEqual(f, fluidOutputForLayer)));
+                    ret.add(new OutputHatchWrapper(hatch, f -> GTUtility.areFluidsEqual(f, fluidOutputForLayer)));
                 } else {
                     ret.add(hatch);
                 }
@@ -2285,9 +2276,9 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     @Override
     public boolean canDumpItemToME() {
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mOutputBusses)) {
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_OutputBus_ME) {
-                if ((((GT_MetaTileEntity_Hatch_OutputBus_ME) tHatch).canAcceptItem())) {
+        for (MTEHatch tHatch : filterValidMTEs(mOutputBusses)) {
+            if (tHatch instanceof MTEHatchOutputBusME) {
+                if ((((MTEHatchOutputBusME) tHatch).canAcceptItem())) {
                     return true;
                 }
             }
@@ -2298,8 +2289,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     @Override
     public boolean canDumpFluidToME() {
         for (IFluidStore tHatch : getFluidOutputSlots(new FluidStack[0])) {
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_Output_ME) {
-                if ((((GT_MetaTileEntity_Hatch_Output_ME) tHatch).canAcceptFluid())) {
+            if (tHatch instanceof MTEHatchOutputME) {
+                if ((((MTEHatchOutputME) tHatch).canAcceptFluid())) {
                     return true;
                 }
             }
@@ -2336,8 +2327,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
      * Creates the icon list for this machine. Override this and add the overlays to machineModeIcons in order.
      */
     public void setMachineModeIcons() {
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_DEFAULT);
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_DEFAULT);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_DEFAULT);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_DEFAULT);
     }
 
     /**
@@ -2447,13 +2438,13 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     @Override
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK)
                 .setPos(4, 4)
                 .setSize(190, 85));
         final SlotWidget inventorySlot = new SlotWidget(inventoryHandler, 1);
         builder.widget(
             inventorySlot.setPos(173, 167)
-                .setBackground(GT_UITextures.SLOT_DARK_GRAY));
+                .setBackground(GTUITextures.SLOT_DARK_GRAY));
 
         final DynamicPositionedColumn screenElements = new DynamicPositionedColumn();
         drawTexts(screenElements, inventorySlot);
@@ -2563,44 +2554,42 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (supportsMachineModeSwitch()) {
             screenElements.widget(
                 TextWidget.dynamicString(
-                    () -> EnumChatFormatting.WHITE + GT_Utility.trans("400", "Running mode: ")
+                    () -> EnumChatFormatting.WHITE + GTUtility.trans("400", "Running mode: ")
                         + EnumChatFormatting.GOLD
                         + getMachineModeName()));
         }
         screenElements
             .widget(
-                new TextWidget(GT_Utility.trans("132", "Pipe is loose.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+                new TextWidget(GTUtility.trans("132", "Pipe is loose.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> !mWrench))
             .widget(new FakeSyncWidget.BooleanSyncer(() -> mWrench, val -> mWrench = val));
         screenElements
             .widget(
-                new TextWidget(GT_Utility.trans("133", "Screws are loose.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+                new TextWidget(GTUtility.trans("133", "Screws are loose.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> !mScrewdriver))
             .widget(new FakeSyncWidget.BooleanSyncer(() -> mScrewdriver, val -> mScrewdriver = val));
         screenElements
             .widget(
-                new TextWidget(GT_Utility.trans("134", "Something is stuck.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+                new TextWidget(GTUtility.trans("134", "Something is stuck.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> !mSoftHammer))
             .widget(new FakeSyncWidget.BooleanSyncer(() -> mSoftHammer, val -> mSoftHammer = val));
         screenElements
             .widget(
-                new TextWidget(GT_Utility.trans("135", "Platings are dented.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+                new TextWidget(GTUtility.trans("135", "Platings are dented.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> !mHardHammer))
             .widget(new FakeSyncWidget.BooleanSyncer(() -> mHardHammer, val -> mHardHammer = val));
         screenElements
             .widget(
-                new TextWidget(GT_Utility.trans("136", "Circuitry burned out.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+                new TextWidget(GTUtility.trans("136", "Circuitry burned out.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> !mSolderingTool))
             .widget(new FakeSyncWidget.BooleanSyncer(() -> mSolderingTool, val -> mSolderingTool = val));
-        screenElements
-            .widget(
-                new TextWidget(GT_Utility.trans("137", "That doesn't belong there."))
-                    .setDefaultColor(COLOR_TEXT_WHITE.get())
-                    .setEnabled(widget -> !mCrowbar))
+        screenElements.widget(
+            new TextWidget(GTUtility.trans("137", "That doesn't belong there.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+                .setEnabled(widget -> !mCrowbar))
             .widget(new FakeSyncWidget.BooleanSyncer(() -> mCrowbar, val -> mCrowbar = val));
         screenElements
             .widget(
-                new TextWidget(GT_Utility.trans("138", "Incomplete Structure.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+                new TextWidget(GTUtility.trans("138", "Incomplete Structure.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> !mMachine))
             .widget(new FakeSyncWidget.BooleanSyncer(() -> mMachine, val -> mMachine = val));
         screenElements.widget(
@@ -2611,7 +2600,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                 .setEnabled(widget -> (getBaseMetaTileEntity().getErrorDisplayID() & 256) != 0));
 
         screenElements.widget(
-            new TextWidget(GT_Utility.trans("139", "Hit with Soft Mallet")).setDefaultColor(COLOR_TEXT_WHITE.get())
+            new TextWidget(GTUtility.trans("139", "Hit with Soft Mallet")).setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setEnabled(
                     widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0 && !getBaseMetaTileEntity().isActive()))
             .widget(
@@ -2623,15 +2612,15 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                     () -> getBaseMetaTileEntity().isActive(),
                     val -> getBaseMetaTileEntity().setActive(val)));
         screenElements.widget(
-            new TextWidget(GT_Utility.trans("140", "to (re-)start the Machine")).setDefaultColor(COLOR_TEXT_WHITE.get())
+            new TextWidget(GTUtility.trans("140", "to (re-)start the Machine")).setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setEnabled(
                     widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0 && !getBaseMetaTileEntity().isActive()));
         screenElements.widget(
-            new TextWidget(GT_Utility.trans("141", "if it doesn't start.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+            new TextWidget(GTUtility.trans("141", "if it doesn't start.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setEnabled(
                     widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0 && !getBaseMetaTileEntity().isActive()));
         screenElements.widget(
-            new TextWidget(GT_Utility.trans("142", "Running perfectly.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+            new TextWidget(GTUtility.trans("142", "Running perfectly.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setEnabled(
                     widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0 && getBaseMetaTileEntity().isActive()));
 
@@ -2656,7 +2645,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                 .setTextAlignment(Alignment.CenterLeft)
                 .setEnabled(
                     widget -> shouldDisplayShutDownReason() && !getBaseMetaTileEntity().isActive()
-                        && GT_Utility.isStringValid(
+                        && GTUtility.isStringValid(
                             getBaseMetaTileEntity().getLastShutDownReason()
                                 .getDisplayString())
                         && getBaseMetaTileEntity().wasShutdown()))
@@ -2675,7 +2664,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                 .setTextAlignment(Alignment.CenterLeft)
                 .setEnabled(
                     widget -> shouldDisplayCheckRecipeResult()
-                        && GT_Utility.isStringValid(checkRecipeResult.getDisplayString())
+                        && GTUtility.isStringValid(checkRecipeResult.getDisplayString())
                         && (isAllowedToWork() || getBaseMetaTileEntity().isActive()
                             || checkRecipeResult.persistsOnShutdown())))
             .widget(new CheckRecipeResultSyncer(() -> checkRecipeResult, (result) -> checkRecipeResult = result));
@@ -2706,15 +2695,14 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         }
 
         screenElements.widget(
-            new TextWidget(GT_Utility.trans("144", "Missing Turbine Rotor")).setDefaultColor(COLOR_TEXT_WHITE.get())
+            new TextWidget(GTUtility.trans("144", "Missing Turbine Rotor")).setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setEnabled(widget -> {
                     if (getBaseMetaTileEntity().isAllowedToWork()) return false;
-                    if (getBaseMetaTileEntity().getErrorDisplayID() == 0
-                        && this instanceof GT_MetaTileEntity_LargeTurbine) {
+                    if (getBaseMetaTileEntity().getErrorDisplayID() == 0 && this instanceof MTELargeTurbine) {
                         final ItemStack tItem = inventorySlot.getMcSlot()
                             .getStack();
                         return tItem == null
-                            || !(tItem.getItem() == GT_MetaGenerated_Tool_01.INSTANCE && tItem.getItemDamage() >= 170
+                            || !(tItem.getItem() == MetaGeneratedTool01.INSTANCE && tItem.getItemDamage() >= 170
                                 && tItem.getItemDamage() <= 177);
                     }
                     return false;
@@ -2726,12 +2714,12 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     }
 
     @TestOnly
-    protected void setEnergyHatches(ArrayList<GT_MetaTileEntity_Hatch_Energy> EnergyHatches) {
+    protected void setEnergyHatches(ArrayList<MTEHatchEnergy> EnergyHatches) {
         this.mEnergyHatches = EnergyHatches;
     }
 
     @TestOnly
-    protected void setExoticEnergyHatches(List<GT_MetaTileEntity_Hatch> ExoticEnergyHatches) {
+    protected void setExoticEnergyHatches(List<MTEHatch> ExoticEnergyHatches) {
         this.mExoticEnergyHatches = ExoticEnergyHatches;
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SpecialFilter.java b/src/main/java/gregtech/api/metatileentity/implementations/MTESpecialFilter.java
index 1a71f17ec8..c93b542805 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SpecialFilter.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTESpecialFilter.java
@@ -15,27 +15,25 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
-public abstract class GT_MetaTileEntity_SpecialFilter extends GT_MetaTileEntity_FilterBase {
+public abstract class MTESpecialFilter extends MTEFilterBase {
 
     private static final String ALLOW_NBT_TOOLTIP = "GT5U.machines.allow_nbt.tooltip";
     private boolean allowNbt = false;
 
-    public GT_MetaTileEntity_SpecialFilter(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription) {
+    public MTESpecialFilter(int aID, String aName, String aNameRegional, int aTier, String[] aDescription) {
         // 9 buffer slot, 1 representation slot, 1 holo slot. last seems not needed...
         super(aID, aName, aNameRegional, aTier, 11, aDescription);
     }
 
-    public GT_MetaTileEntity_SpecialFilter(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTESpecialFilter(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_SpecialFilter(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+    public MTESpecialFilter(String aName, int aTier, int aInvSlotCount, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
@@ -75,21 +73,21 @@ public abstract class GT_MetaTileEntity_SpecialFilter extends GT_MetaTileEntity_
         super.addUIWidgets(builder, buildContext);
         addAllowNbtButton(builder);
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_WHITE.apply(27, false))
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_24_WHITE.apply(27, false))
                 .setPos(6, 19)
                 .setSize(27, 24))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_BLUE.apply(42, true))
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_24_BLUE.apply(42, true))
                     .setPos(53, 19)
                     .setSize(42, 24))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_RED.apply(19, true))
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_24_RED.apply(19, true))
                     .setPos(152, 19)
                     .setSize(19, 24))
             .widget(
                 createFilterIconSlot(BaseSlot.phantom(inventoryHandler, 9)).disableShiftInsert()
                     .setPos(34, 22)
-                    .setBackground(GT_UITextures.BUTTON_STANDARD))
+                    .setBackground(GTUITextures.BUTTON_STANDARD))
             .widget(
                 SlotGroup.ofItemHandler(inventoryHandler, 3)
                     .endAtSlot(8)
@@ -102,7 +100,7 @@ public abstract class GT_MetaTileEntity_SpecialFilter extends GT_MetaTileEntity_
             createToggleButton(
                 () -> allowNbt,
                 val -> allowNbt = val,
-                GT_UITextures.OVERLAY_BUTTON_NBT,
+                GTUITextures.OVERLAY_BUTTON_NBT,
                 () -> mTooltipCache.getData(ALLOW_NBT_TOOLTIP)));
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java b/src/main/java/gregtech/api/metatileentity/implementations/MTETieredMachineBlock.java
index a08e49fd6c..8bffeaf17e 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTETieredMachineBlock.java
@@ -1,19 +1,19 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.GT;
+import static gregtech.api.enums.GTValues.GT;
 import static gregtech.api.metatileentity.BaseTileEntity.BATTERY_SLOT_TOOLTIP;
 import static gregtech.api.metatileentity.BaseTileEntity.BATTERY_SLOT_TOOLTIP_ALT;
 import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
 
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.api.enums.GT_Values;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.enums.GTValues;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntity {
+public abstract class MTETieredMachineBlock extends MetaTileEntity {
 
     /**
      * Value between [0 - 9] to describe the Tier of this Machine. PLZ [0-15] works - READ! GT_Values class.
@@ -30,8 +30,8 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
      */
     public final ITexture[][][] mTextures;
 
-    public GT_MetaTileEntity_TieredMachineBlock(int aID, String aName, String aNameRegional, int aTier,
-        int aInvSlotCount, String aDescription, ITexture... aTextures) {
+    public MTETieredMachineBlock(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+        String aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, aInvSlotCount);
         mTier = (byte) Math.max(0, Math.min(aTier, 14));
         mDescriptionArray = aDescription == null ? new String[0] : new String[] { aDescription };
@@ -40,8 +40,8 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
         else mTextures = null;
     }
 
-    public GT_MetaTileEntity_TieredMachineBlock(int aID, String aName, String aNameRegional, int aTier,
-        int aInvSlotCount, String[] aDescription, ITexture... aTextures) {
+    public MTETieredMachineBlock(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+        String[] aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, aInvSlotCount);
         mTier = (byte) Math.max(0, Math.min(aTier, 15));
         mDescriptionArray = aDescription == null ? new String[0] : aDescription;
@@ -51,7 +51,7 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
         else mTextures = null;
     }
 
-    public GT_MetaTileEntity_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String aDescription,
+    public MTETieredMachineBlock(String aName, int aTier, int aInvSlotCount, String aDescription,
         ITexture[][][] aTextures) {
         super(aName, aInvSlotCount);
         mTier = (byte) aTier;
@@ -59,7 +59,7 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
         mTextures = aTextures;
     }
 
-    public GT_MetaTileEntity_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+    public MTETieredMachineBlock(String aName, int aTier, int aInvSlotCount, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aInvSlotCount);
         mTier = (byte) aTier;
@@ -98,13 +98,13 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
     protected SlotWidget createChargerSlot(int x, int y) {
         final String batterySlotTooltipKey;
         final Object[] batterySlotTooltipArgs;
-        final String pTier1 = GT_Utility.getColoredTierNameFromTier(mTier);
-        if (mTier == GT_Values.VN.length - 1) {
+        final String pTier1 = GTUtility.getColoredTierNameFromTier(mTier);
+        if (mTier == GTValues.VN.length - 1) {
             batterySlotTooltipKey = BATTERY_SLOT_TOOLTIP_ALT;
             batterySlotTooltipArgs = new String[] { pTier1 };
         } else {
             batterySlotTooltipKey = BATTERY_SLOT_TOOLTIP;
-            batterySlotTooltipArgs = new String[] { pTier1, GT_Utility.getColoredTierNameFromTier((byte) (mTier + 1)) };
+            batterySlotTooltipArgs = new String[] { pTier1, GTUtility.getColoredTierNameFromTier((byte) (mTier + 1)) };
         }
         return createChargerSlot(x, y, batterySlotTooltipKey, batterySlotTooltipArgs);
     }
@@ -113,7 +113,7 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
         return (SlotWidget) new SlotWidget(inventoryHandler, rechargerSlotStartIndex()).disableShiftInsert()
             .setGTTooltip(() -> mTooltipCache.getData(tooltipKey, tooltipArgs))
             .setTooltipShowUpDelay(TOOLTIP_DELAY)
-            .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CHARGER)
+            .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_CHARGER)
             .setPos(x, y);
     }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TooltipMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTETooltipMultiBlockBase.java
index c12c7c1442..71fce08c7e 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TooltipMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTETooltipMultiBlockBase.java
@@ -4,30 +4,29 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 
 import org.lwjgl.input.Keyboard;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ISecondaryDescribable;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
 /**
- * A multiblock with tooltip {@link GT_Multiblock_Tooltip_Builder}
+ * A multiblock with tooltip {@link MultiblockTooltipBuilder}
  */
-public abstract class GT_MetaTileEntity_TooltipMultiBlockBase extends GT_MetaTileEntity_MultiBlockBase
-    implements ISecondaryDescribable {
+public abstract class MTETooltipMultiBlockBase extends MTEMultiBlockBase implements ISecondaryDescribable {
 
-    private static final AtomicReferenceArray<GT_Multiblock_Tooltip_Builder> tooltips = new AtomicReferenceArray<>(
-        GregTech_API.METATILEENTITIES.length);
+    private static final AtomicReferenceArray<MultiblockTooltipBuilder> tooltips = new AtomicReferenceArray<>(
+        GregTechAPI.METATILEENTITIES.length);
 
-    public GT_MetaTileEntity_TooltipMultiBlockBase(int aID, String aName, String aNameRegional) {
+    public MTETooltipMultiBlockBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_TooltipMultiBlockBase(String aName) {
+    public MTETooltipMultiBlockBase(String aName) {
         super(aName);
     }
 
-    protected GT_Multiblock_Tooltip_Builder getTooltip() {
+    protected MultiblockTooltipBuilder getTooltip() {
         int tId = getBaseMetaTileEntity().getMetaTileID();
-        GT_Multiblock_Tooltip_Builder tooltip = tooltips.get(tId);
+        MultiblockTooltipBuilder tooltip = tooltips.get(tId);
         if (tooltip == null) {
             tooltip = createTooltip();
             tooltips.set(tId, tooltip);
@@ -35,7 +34,7 @@ public abstract class GT_MetaTileEntity_TooltipMultiBlockBase extends GT_MetaTil
         return tooltip;
     }
 
-    protected abstract GT_Multiblock_Tooltip_Builder createTooltip();
+    protected abstract MultiblockTooltipBuilder createTooltip();
 
     @Override
     public String[] getDescription() {
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java b/src/main/java/gregtech/api/metatileentity/implementations/MTETransformer.java
index de7019b292..d2b88d26bc 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTETransformer.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Mods.EnderIO;
 import static mcp.mobius.waila.api.SpecialChars.BLUE;
 import static mcp.mobius.waila.api.SpecialChars.GOLD;
@@ -23,13 +23,13 @@ import cofh.api.energy.IEnergyStorage;
 import crazypants.enderio.machine.capbank.TileCapBank;
 import crazypants.enderio.machine.capbank.network.ICapBankNetwork;
 import crazypants.enderio.power.IPowerContainer;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
@@ -39,17 +39,17 @@ import mcp.mobius.waila.api.IWailaDataAccessor;
  * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
  * Machine
  */
-public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachineBlock {
+public class MTETransformer extends MTETieredMachineBlock {
 
-    public GT_MetaTileEntity_Transformer(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
+    public MTETransformer(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
         super(aID, aName, aNameRegional, aTier, 0, aDescription);
     }
 
-    public GT_MetaTileEntity_Transformer(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTETransformer(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Transformer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTETransformer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
@@ -94,7 +94,7 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Transformer(mName, mTier, mDescriptionArray, mTextures);
+        return new MTETransformer(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -175,7 +175,7 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
 
     @Override
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-        if (aBaseMetaTileEntity.isServerSide() && GregTech_API.mInputRF) {
+        if (aBaseMetaTileEntity.isServerSide() && GregTechAPI.mInputRF) {
             aBaseMetaTileEntity.setActive(aBaseMetaTileEntity.isAllowedToWork());
             for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
                 if (aBaseMetaTileEntity.getStoredEU() >= aBaseMetaTileEntity.getEUCapacity()) break;
@@ -185,20 +185,20 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
                     && energyProvider.extractEnergy(side.getOpposite(), 1, true) == 1) {
                     long tEU = ((IEnergyProvider) tTileEntity).extractEnergy(
                         side.getOpposite(),
-                        GT_Utility.safeInt(maxEUInput() * 100L / GregTech_API.mRFtoEU),
+                        GTUtility.safeInt(maxEUInput() * 100L / GregTechAPI.mRFtoEU),
                         false);
-                    tEU = tEU * GregTech_API.mRFtoEU / 100;
+                    tEU = tEU * GregTechAPI.mRFtoEU / 100;
                     aBaseMetaTileEntity.injectEnergyUnits(ForgeDirection.UNKNOWN, Math.min(tEU, maxEUInput()), 1);
                 } else if (tTileEntity instanceof IEnergyStorage energyStorage
                     && energyStorage.extractEnergy(1, true) == 1) {
                         long tEU = ((IEnergyStorage) tTileEntity)
-                            .extractEnergy(GT_Utility.safeInt(maxEUInput() * 100L / GregTech_API.mRFtoEU), false);
-                        tEU = tEU * GregTech_API.mRFtoEU / 100;
+                            .extractEnergy(GTUtility.safeInt(maxEUInput() * 100L / GregTechAPI.mRFtoEU), false);
+                        tEU = tEU * GregTechAPI.mRFtoEU / 100;
                         aBaseMetaTileEntity.injectEnergyUnits(ForgeDirection.UNKNOWN, Math.min(tEU, maxEUInput()), 1);
                     } else if (EnderIO.isModLoaded() && tTileEntity instanceof IPowerContainer powerContainer
                         && powerContainer.getEnergyStored() > 0) {
                             final int storedRF = powerContainer.getEnergyStored();
-                            final int extractRF = GT_Utility.safeInt(maxEUInput() * 100L / GregTech_API.mRFtoEU);
+                            final int extractRF = GTUtility.safeInt(maxEUInput() * 100L / GregTechAPI.mRFtoEU);
                             long tEU = 0;
                             if (tTileEntity instanceof TileCapBank capBank) {
                                 ICapBankNetwork network = capBank.getNetwork();
@@ -206,9 +206,9 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
                                     tEU = Math.min(
                                         (Math.min(
                                             Math.min(network.getEnergyStoredL(), storedRF - extractRF),
-                                            network.getMaxOutput())) * (long) GregTech_API.mRFtoEU / 100L,
+                                            network.getMaxOutput())) * (long) GregTechAPI.mRFtoEU / 100L,
                                         maxEUInput());
-                                    network.addEnergy(GT_Utility.safeInt(-(tEU * 100 / GregTech_API.mRFtoEU)));
+                                    network.addEnergy(GTUtility.safeInt(-(tEU * 100 / GregTechAPI.mRFtoEU)));
                                 }
                             } else {
                                 if (storedRF > extractRF) {
@@ -216,7 +216,7 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
                                     tEU = maxEUInput();
                                 } else {
                                     powerContainer.setEnergyStored(0);
-                                    tEU = storedRF * (long) GregTech_API.mRFtoEU / 100L;
+                                    tEU = storedRF * (long) GregTechAPI.mRFtoEU / 100L;
                                 }
                             }
                             aBaseMetaTileEntity
@@ -255,15 +255,15 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
 
     @Override
     public String getAlternativeModeText() {
-        return (getBaseMetaTileEntity().isAllowedToWork() ? GT_Utility.trans("145", "Step Down, In: ")
-            : GT_Utility.trans("146", "Step Up, In: ")) + maxEUInput()
-            + GT_Utility.trans("148", "V ")
+        return (getBaseMetaTileEntity().isAllowedToWork() ? GTUtility.trans("145", "Step Down, In: ")
+            : GTUtility.trans("146", "Step Up, In: ")) + maxEUInput()
+            + GTUtility.trans("148", "V ")
             + maxAmperesIn()
-            + GT_Utility.trans("147", "A, Out: ")
+            + GTUtility.trans("147", "A, Out: ")
             + maxEUOutput()
-            + GT_Utility.trans("148", "V ")
+            + GTUtility.trans("148", "V ")
             + maxAmperesOut()
-            + GT_Utility.trans("149", "A");
+            + GTUtility.trans("149", "A");
     }
 
     @Override
@@ -279,17 +279,17 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
         final ForgeDirection side = accessor.getSide();
         final boolean allowedToWork = tag.getBoolean("isAllowedToWork");
 
-        final byte inputTier = GT_Utility.getTier(tag.getLong("maxEUInput"));
-        final byte outputTier = GT_Utility.getTier(tag.getLong("maxEUOutput"));
+        final byte inputTier = GTUtility.getTier(tag.getLong("maxEUInput"));
+        final byte outputTier = GTUtility.getTier(tag.getLong("maxEUOutput"));
 
         currenttip.add(
             String.format(
                 "%s %s(%dA) -> %s(%dA)",
                 (allowedToWork ? (GREEN + "Step Down") : (RED + "Step Up")) + RESET,
-                GT_Mod.gregtechproxy.mWailaTransformerVoltageTier ? GT_Utility.getColoredTierNameFromTier(inputTier)
+                GTMod.gregtechproxy.mWailaTransformerVoltageTier ? GTUtility.getColoredTierNameFromTier(inputTier)
                     : tag.getLong("maxEUInput"),
                 tag.getLong("maxAmperesIn"),
-                GT_Mod.gregtechproxy.mWailaTransformerVoltageTier ? GT_Utility.getColoredTierNameFromTier(outputTier)
+                GTMod.gregtechproxy.mWailaTransformerVoltageTier ? GTUtility.getColoredTierNameFromTier(outputTier)
                     : tag.getLong("maxEUOutput"),
                 tag.getLong("maxAmperesOut")));
 
@@ -297,15 +297,14 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
             currenttip.add(
                 String.format(
                     GOLD + "Input:" + RESET + " %s(%dA)",
-                    GT_Mod.gregtechproxy.mWailaTransformerVoltageTier ? GT_Utility.getColoredTierNameFromTier(inputTier)
+                    GTMod.gregtechproxy.mWailaTransformerVoltageTier ? GTUtility.getColoredTierNameFromTier(inputTier)
                         : tag.getLong("maxEUInput"),
                     tag.getLong("maxAmperesIn")));
         } else {
             currenttip.add(
                 String.format(
                     BLUE + "Output:" + RESET + " %s(%dA)",
-                    GT_Mod.gregtechproxy.mWailaTransformerVoltageTier
-                        ? GT_Utility.getColoredTierNameFromTier(outputTier)
+                    GTMod.gregtechproxy.mWailaTransformerVoltageTier ? GTUtility.getColoredTierNameFromTier(outputTier)
                         : tag.getLong("maxEUOutput"),
                     tag.getLong("maxAmperesOut")));
         }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_WetTransformer.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEWetTransformer.java
index f865a5ea8a..e2c2437311 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_WetTransformer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEWetTransformer.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import net.minecraft.util.EnumChatFormatting;
 
@@ -11,20 +11,19 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
-public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_Transformer {
+public class MTEWetTransformer extends MTETransformer {
 
-    public GT_MetaTileEntity_WetTransformer(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription) {
+    public MTEWetTransformer(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
         super(aID, aName, aNameRegional, aTier, aDescription);
     }
 
-    public GT_MetaTileEntity_WetTransformer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEWetTransformer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_WetTransformer(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEWetTransformer(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEWirelessDynamo.java
index a04f5cd986..fc7bc3fae2 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEWirelessDynamo.java
@@ -1,7 +1,7 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.AuthorColen;
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.AuthorColen;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.common.misc.WirelessNetworkManager.addEUToGlobalEnergyMap;
 import static gregtech.common.misc.WirelessNetworkManager.strongCheckOrAddUser;
 
@@ -18,17 +18,15 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IWirelessEnergyHatchInformation;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-public class GT_MetaTileEntity_Wireless_Dynamo extends GT_MetaTileEntity_Hatch_Dynamo
-    implements IWirelessEnergyHatchInformation {
+public class MTEWirelessDynamo extends MTEHatchDynamo implements IWirelessEnergyHatchInformation {
 
     private UUID owner_uuid;
 
-    public GT_MetaTileEntity_Wireless_Dynamo(String aName, byte aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEWirelessDynamo(String aName, byte aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Wireless_Dynamo(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEWirelessDynamo(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, new String[] { "" });
     }
 
@@ -106,7 +104,7 @@ public class GT_MetaTileEntity_Wireless_Dynamo extends GT_MetaTileEntity_Hatch_D
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Wireless_Dynamo(mName, mTier, new String[] { "" }, mTextures);
+        return new MTEWirelessDynamo(mName, mTier, new String[] { "" }, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEWirelessEnergy.java
index bf624eadd7..e195b4ab08 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEWirelessEnergy.java
@@ -1,7 +1,7 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.AuthorColen;
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.AuthorColen;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.common.misc.WirelessNetworkManager.addEUToGlobalEnergyMap;
 import static java.lang.Long.min;
 
@@ -20,8 +20,7 @@ import gregtech.api.interfaces.tileentity.IWirelessEnergyHatchInformation;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.common.misc.spaceprojects.SpaceProjectManager;
 
-public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_Energy
-    implements IWirelessEnergyHatchInformation {
+public class MTEWirelessEnergy extends MTEHatchEnergy implements IWirelessEnergyHatchInformation {
 
     private final BigInteger eu_transferred_per_operation = BigInteger
         .valueOf(2 * V[mTier] * ticks_between_energy_addition);
@@ -29,11 +28,11 @@ public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_En
 
     private UUID owner_uuid;
 
-    public GT_MetaTileEntity_Wireless_Hatch(String aName, byte aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEWirelessEnergy(String aName, byte aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Wireless_Hatch(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEWirelessEnergy(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, new String[] { "" });
     }
 
@@ -111,7 +110,7 @@ public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_En
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Wireless_Hatch(mName, mTier, new String[] { "" }, mTextures);
+        return new MTEWirelessEnergy(mName, mTier, new String[] { "" }, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
index f5cf261be1..f1f4b8591a 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
@@ -1,11 +1,11 @@
 package gregtech.api.multitileentity;
 
-import static gregtech.api.enums.GT_Values.OFFX;
-import static gregtech.api.enums.GT_Values.OFFY;
-import static gregtech.api.enums.GT_Values.OFFZ;
-import static gregtech.api.util.GT_Util.LAST_BROKEN_TILEENTITY;
-import static gregtech.api.util.GT_Util.getTileEntity;
-import static gregtech.api.util.GT_Util.setTileEntity;
+import static gregtech.api.enums.GTValues.OFFX;
+import static gregtech.api.enums.GTValues.OFFY;
+import static gregtech.api.enums.GTValues.OFFZ;
+import static gregtech.api.util.GTUtil.LAST_BROKEN_TILEENTITY;
+import static gregtech.api.util.GTUtil.getTileEntity;
+import static gregtech.api.util.GTUtil.setTileEntity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,7 +44,7 @@ import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IDebugableBlock;
@@ -53,10 +53,10 @@ import gregtech.api.metatileentity.BaseTileEntity;
 import gregtech.api.metatileentity.CoverableTileEntity;
 import gregtech.api.multitileentity.interfaces.IMultiTileEntity;
 import gregtech.api.objects.XSTR;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Util;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtil;
 import gregtech.common.covers.CoverInfo;
-import gregtech.common.render.GT_MultiTile_Renderer;
+import gregtech.common.render.MultiTileRenderer;
 
 /*
  * MultiTileEntityBlock ported from GT6
@@ -85,7 +85,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
 
     public MultiTileEntityBlock(Material material) {
         super(material);
-        if (GregTech_API.sPreloadFinished)
+        if (GregTechAPI.sPreloadFinished)
             throw new IllegalStateException("Blocks can only be initialized within preInit!");
     }
 
@@ -121,7 +121,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
 
     public MultiTileEntityBlock register() {
         if (registered) throw new IllegalStateException("Block already registered " + internalName);
-        if (GregTech_API.sPreloadFinished)
+        if (GregTechAPI.sPreloadFinished)
             throw new IllegalStateException("Blocks can only be initialized within preInit!");
 
         registered = true;
@@ -141,7 +141,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
         // spotless:off
         // if (aTileEntity instanceof IMTE_HasMultiBlockMachineRelevantData
         //     && ((IMTE_HasMultiBlockMachineRelevantData) aTileEntity).hasMultiBlockMachineRelevantData())
-        //     GregTech_API.causeMachineUpdate(world, x, y, z);
+        //     GregTechAPI.causeMachineUpdate(world, x, y, z);
         // spotless:on
 
         world.removeTileEntity(x, y, z);
@@ -160,8 +160,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
 
     @Override
     public int getRenderType() {
-        return GT_MultiTile_Renderer.INSTANCE == null ? super.getRenderType()
-            : GT_MultiTile_Renderer.INSTANCE.getRenderId();
+        return MultiTileRenderer.INSTANCE == null ? super.getRenderType() : MultiTileRenderer.INSTANCE.getRenderId();
     }
 
     @Override
@@ -455,7 +454,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
 
     @Override
     public boolean removedByPlayer(World world, EntityPlayer aPlayer, int x, int y, int z, boolean aWillHarvest) {
-        final TileEntity tileEntity = GT_Util.getTileEntity(world, x, y, z, true);
+        final TileEntity tileEntity = GTUtil.getTileEntity(world, x, y, z, true);
         if (tileEntity != null) LAST_BROKEN_TILEENTITY.set(tileEntity);
         return super.removedByPlayer(world, aPlayer, x, y, z, aWillHarvest);
     }
@@ -467,7 +466,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
 
     @Override
     public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
-        return GregTech_API.sMachineFlammable && (world.getBlockMetadata(x, y, z) == 0) ? 100 : 0;
+        return GregTechAPI.sMachineFlammable && (world.getBlockMetadata(x, y, z) == 0) ? 100 : 0;
     }
 
     @Override
@@ -502,7 +501,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
         final TileEntity tileEntity = getTileEntity(world, x, y, z, true);
         if (tileEntity != null) LAST_BROKEN_TILEENTITY.set(tileEntity);
         if (tileEntity instanceof IMultiTileEntity mute) {
-            GT_Log.exp.printf(
+            GTLog.exp.printf(
                 "Explosion at : %d | %d | %d DIMID: %s due to near explosion!%n",
                 x,
                 y,
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java
index 325f583149..ca265e529e 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java
@@ -1,6 +1,6 @@
 package gregtech.api.multitileentity;
 
-import static gregtech.api.enums.GT_Values.NBT;
+import static gregtech.api.enums.GTValues.NBT;
 
 import java.lang.ref.WeakReference;
 
@@ -11,7 +11,7 @@ import gregtech.api.enums.Materials;
 import gregtech.api.multitileentity.base.MultiTileEntity;
 import gregtech.api.multitileentity.multiblock.casing.FunctionalCasing;
 import gregtech.api.multitileentity.multiblock.casing.UpgradeCasing;
-import gregtech.api.util.GT_Util;
+import gregtech.api.util.GTUtil;
 import gregtech.common.tileentities.casings.upgrade.Inventory;
 import gregtech.common.tileentities.casings.upgrade.Tank;
 
@@ -43,7 +43,7 @@ public class MultiTileEntityClassContainer {
 
         if (parameters.hasKey(NBT.MATERIAL) && !parameters.hasKey(NBT.COLOR)) parameters.setInteger(
             NBT.COLOR,
-            GT_Util.getRGBInt(
+            GTUtil.getRGBInt(
                 Materials.get(parameters.getString(NBT.MATERIAL))
                     .getRGBA()));
 
@@ -80,7 +80,7 @@ public class MultiTileEntityClassContainer {
     public MultiTileEntityClassContainer material(Materials material) {
         // Sets the material, and the color from the material, if not already set
         parameters.setString(NBT.MATERIAL, material.toString());
-        if (!parameters.hasKey(NBT.COLOR)) parameters.setInteger(NBT.COLOR, GT_Util.getRGBInt(material.getRGBA()));
+        if (!parameters.hasKey(NBT.COLOR)) parameters.setInteger(NBT.COLOR, GTUtil.getRGBInt(material.getRGBA()));
         return this;
     }
 
@@ -90,7 +90,7 @@ public class MultiTileEntityClassContainer {
     }
 
     public MultiTileEntityClassContainer color(short[] rgba) {
-        parameters.setInteger(NBT.COLOR, GT_Util.getRGBInt(rgba));
+        parameters.setInteger(NBT.COLOR, GTUtil.getRGBInt(rgba));
         return this;
     }
 
@@ -154,7 +154,7 @@ public class MultiTileEntityClassContainer {
          * Merge in arbitrary NBT tuples of (key, value). Useful for anything for which a custom method has not yet been
          * exposed
          */
-        parameters = GT_Util.fuseNBT(parameters, GT_Util.makeNBT(aTags));
+        parameters = GTUtil.fuseNBT(parameters, GTUtil.makeNBT(aTags));
         return this;
     }
 
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java
index e67ab61e96..bf7259626f 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java
@@ -1,7 +1,7 @@
 package gregtech.api.multitileentity;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
-import static gregtech.api.enums.GT_Values.SIDE_TOP;
+import static gregtech.GTMod.GT_FML_LOGGER;
+import static gregtech.api.enums.GTValues.SIDE_TOP;
 
 import java.util.List;
 
@@ -132,7 +132,7 @@ public class MultiTileEntityItem extends ItemBlock {
              *    Add back if needed
              */
             // try {
-            //     GregTech_API.causeMachineUpdate(world, x, y, z);
+            //     GregTechAPI.causeMachineUpdate(world, x, y, z);
             // } catch (Throwable e) {
             //     GT_FML_LOGGER.error("causeMachineUpdate", e);
             // }
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java
index 0b5afbb043..186110abb7 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java
@@ -1,6 +1,6 @@
 package gregtech.api.multitileentity;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -21,12 +21,12 @@ import com.gtnewhorizon.gtnhlib.util.map.ItemStackMap;
 import appeng.core.CreativeTab;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.LoaderState;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.multitileentity.base.MultiTileEntity;
 import gregtech.api.multitileentity.interfaces.IMultiTileEntity;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Util;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtil;
+import gregtech.api.util.GTUtility;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap;
 
@@ -61,7 +61,7 @@ public class MultiTileEntityRegistry {
         this.block = block;
         GT_FML_LOGGER.info(internalName + " " + Block.getIdFromBlock(block) + " This is the answer");
         this.block.setRegistry(this);
-        REGISTRIES.put(new ItemStack(Item.getItemById(Block.getIdFromBlock(block)), 1, GT_Values.W), this);
+        REGISTRIES.put(new ItemStack(Item.getItemById(Block.getIdFromBlock(block)), 1, GTValues.W), this);
         NAMED_REGISTRIES.put(internalName, this);
     }
 
@@ -84,7 +84,7 @@ public class MultiTileEntityRegistry {
     }
 
     public static MultiTileEntityRegistry getRegistry(int aRegistryID) {
-        return REGISTRIES.get(new ItemStack(Item.getItemById(aRegistryID), 1, GT_Values.W));
+        return REGISTRIES.get(new ItemStack(Item.getItemById(aRegistryID), 1, GTValues.W));
     }
 
     public static MultiTileEntityRegistry getRegistry(String aRegistryName) {
@@ -101,7 +101,7 @@ public class MultiTileEntityRegistry {
      */
     public ItemStack add(String aLocalised, MultiTileEntityClassContainer aClassContainer) {
         boolean tFailed = false;
-        if (GT_Utility.isStringInvalid(aLocalised)) {
+        if (GTUtility.isStringInvalid(aLocalised)) {
             GT_FML_LOGGER.error("MULTI-TILE REGISTRY ERROR: Localisation Missing!");
             tFailed = true;
         }
@@ -113,7 +113,7 @@ public class MultiTileEntityRegistry {
                 GT_FML_LOGGER.error("MULTI-TILE REGISTRY ERROR: Class inside Class Container is null!");
                 tFailed = true;
             }
-            if (aClassContainer.getMuteID() == GT_Values.W) {
+            if (aClassContainer.getMuteID() == GTValues.W) {
                 GT_FML_LOGGER.error("MULTI-TILE REGISTRY ERROR: Class Container uses Wildcard MetaData!");
                 tFailed = true;
             }
@@ -138,8 +138,7 @@ public class MultiTileEntityRegistry {
             return null;
         }
 
-        GT_LanguageManager
-            .addStringLocalization(internalName + "." + aClassContainer.getMuteID() + ".name", aLocalised);
+        GTLanguageManager.addStringLocalization(internalName + "." + aClassContainer.getMuteID() + ".name", aLocalised);
         registry.put(aClassContainer.getMuteID(), aClassContainer);
         mLastRegisteredID = aClassContainer.getMuteID();
         registrations.add(aClassContainer);
@@ -154,7 +153,7 @@ public class MultiTileEntityRegistry {
         return getItem(aClassContainer.getMuteID());
     }
 
-    public short mLastRegisteredID = GT_Values.W;
+    public short mLastRegisteredID = GTValues.W;
 
     public ItemStack getItem() {
         return getItem(mLastRegisteredID, 1, null);
@@ -206,14 +205,14 @@ public class MultiTileEntityRegistry {
     public TileEntity getNewTileEntity(World aWorld, int x, int y, int z, int metaID, NBTTagCompound nbt) {
         final MultiTileEntityClassContainer container = registry.get((short) metaID);
         if (container == null) return null;
-        final MultiTileEntity te = (MultiTileEntity) GT_Utility
+        final MultiTileEntity te = (MultiTileEntity) GTUtility
             .callConstructor(container.getMuteClass(), -1, null, true);
         te.setWorldObj(aWorld);
         te.xCoord = x;
         te.yCoord = y;
         te.zCoord = z;
         nbt = (nbt == null || nbt.hasNoTags()) ? container.getParameters()
-            : GT_Util.fuseNBT(nbt, container.getParameters());
+            : GTUtil.fuseNBT(nbt, container.getParameters());
         te.initFromNBT(nbt, (short) metaID, (short) Block.getIdFromBlock(block));
         return te;
     }
diff --git a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
index eeadfe7602..24163f9c20 100644
--- a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
+++ b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
@@ -1,7 +1,7 @@
 package gregtech.api.multitileentity.base;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
-import static gregtech.api.enums.GT_Values.VALID_SIDES;
+import static gregtech.GTMod.GT_FML_LOGGER;
+import static gregtech.api.enums.GTValues.VALID_SIDES;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -35,15 +35,15 @@ import net.minecraftforge.fluids.Fluid;
 import com.gtnewhorizons.modularui.common.internal.network.NetworkUtils;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.GT_Values.NBT;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
+import gregtech.api.enums.GTValues.NBT;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Mods;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.Textures.BlockIcons.CustomIcon;
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.metatileentity.CoverableTileEntity;
 import gregtech.api.metatileentity.GregTechTileClientEvents;
@@ -52,18 +52,18 @@ import gregtech.api.multitileentity.MultiTileEntityClassContainer;
 import gregtech.api.multitileentity.MultiTileEntityRegistry;
 import gregtech.api.multitileentity.interfaces.IMultiTileEntity;
 import gregtech.api.multitileentity.interfaces.SyncedMultiTileEntity;
-import gregtech.api.net.GT_Packet_MultiTileEntity;
-import gregtech.api.net.GT_Packet_New;
+import gregtech.api.net.GTPacketMultiTileEntity;
+import gregtech.api.net.GTPacketNew;
 import gregtech.api.net.data.CommonData;
 import gregtech.api.net.data.CoordinateData;
 import gregtech.api.net.data.MultiTileEntityData;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.objects.XSTR;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Util;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtil;
+import gregtech.api.util.GTUtility;
 import gregtech.common.render.MultiTileBasicRender;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
@@ -98,16 +98,16 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     protected ForgeDirection facing = ForgeDirection.WEST; // Default to WEST, so it renders facing Left in the
                                                            // inventory
     protected byte color;
-    protected int rgba = GT_Values.UNCOLORED;
-    private short mteID = GT_Values.W, mteRegistry = GT_Values.W;
+    protected int rgba = GTValues.UNCOLORED;
+    private short mteID = GTValues.W, mteRegistry = GTValues.W;
     private String customName = null;
     private String ownerName = "";
-    private UUID ownerUUID = GT_Utility.defaultUuid;
+    private UUID ownerUUID = GTUtility.defaultUuid;
     private boolean lockUpgrade = false;
 
-    private final GT_Packet_MultiTileEntity fullPacket = new GT_Packet_MultiTileEntity(false);
-    private final GT_Packet_MultiTileEntity timedPacket = new GT_Packet_MultiTileEntity(false);
-    private final GT_Packet_MultiTileEntity graphicPacket = new GT_Packet_MultiTileEntity(false);
+    private final GTPacketMultiTileEntity fullPacket = new GTPacketMultiTileEntity(false);
+    private final GTPacketMultiTileEntity timedPacket = new GTPacketMultiTileEntity(false);
+    private final GTPacketMultiTileEntity graphicPacket = new GTPacketMultiTileEntity(false);
 
     public MultiTileEntity(boolean isTicking) {
         this.isTicking = isTicking;
@@ -213,7 +213,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     @Override
     public void readFromNBT(NBTTagCompound nbt) {
         // Check if it is a World/Chunk-Loading Process calling readFromNBT
-        if (mteID == GT_Values.W || mteRegistry == GT_Values.W) {
+        if (mteID == GTValues.W || mteRegistry == GTValues.W) {
             // Read the ID Tags first
             mteID = nbt.getShort(NBT.MTE_ID);
             mteRegistry = nbt.getShort(NBT.MTE_REG);
@@ -224,7 +224,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
                 if (tClass != null) {
                     // Add the Default Parameters. Useful for things that differ between different tiers/types of the
                     // same machine
-                    nbt = GT_Util.fuseNBT(nbt, tClass.getParameters());
+                    nbt = GTUtil.fuseNBT(nbt, tClass.getParameters());
                 }
             }
         }
@@ -255,7 +255,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
             readMultiTileNBT(nbt);
 
             if (NetworkUtils.isDedicatedClient()) {
-                if (GregTech_API.sBlockIcons == null && nbt.hasKey(NBT.TEXTURE_FOLDER)) {
+                if (GregTechAPI.sBlockIcons == null && nbt.hasKey(NBT.TEXTURE_FOLDER)) {
                     loadTextures(nbt.getString(NBT.TEXTURE_FOLDER));
                 } else {
                     copyTextures();
@@ -284,7 +284,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
         nbt.setShort(NBT.MTE_ID, mteID);
         nbt.setShort(NBT.MTE_REG, mteRegistry);
         // write the Custom Name
-        if (GT_Utility.isStringValid(customName)) {
+        if (GTUtility.isStringValid(customName)) {
             final NBTTagCompound displayNBT;
             if (nbt.hasKey(NBT.DISPLAY)) {
                 displayNBT = nbt.getCompoundTag(NBT.DISPLAY);
@@ -349,7 +349,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     public TileEntity getTileEntity(int aX, int aY, int aZ) {
         if (worldObj == null
             || (ignoreUnloadedChunks && crossedChunkBorder(aX, aZ) && !worldObj.blockExists(aX, aY, aZ))) return null;
-        return GT_Util.getTileEntity(worldObj, aX, aY, aZ, true);
+        return GTUtil.getTileEntity(worldObj, aX, aY, aZ, true);
     }
 
     @Override
@@ -410,7 +410,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
 
     @Override
     public String getCustomName() {
-        return GT_Utility.isStringValid(customName) ? customName : null;
+        return GTUtility.isStringValid(customName) ? customName : null;
     }
 
     @Override
@@ -468,7 +468,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
 
         if (shouldTriggerBlockUpdate()) {
             // If we're triggering a block update this will call onMachineBlockUpdate()
-            GregTech_API.causeMachineUpdate(worldObj, xCoord, yCoord, zCoord);
+            GregTechAPI.causeMachineUpdate(worldObj, xCoord, yCoord, zCoord);
         } else {
             // If we're not trigger a cascading one, call the update here.
             onMachineBlockUpdate();
@@ -653,7 +653,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID) {
         return true;
     }
 
@@ -696,13 +696,13 @@ public abstract class MultiTileEntity extends CoverableTileEntity
 
     @Override
     public String getOwnerName() {
-        if (GT_Utility.isStringInvalid(ownerName)) return "Player";
+        if (GTUtility.isStringInvalid(ownerName)) return "Player";
         return ownerName;
     }
 
     @Override
     public String setOwnerName(String aName) {
-        if (GT_Utility.isStringInvalid(aName)) return ownerName = "Player";
+        if (GTUtility.isStringInvalid(aName)) return ownerName = "Player";
         return ownerName = aName;
     }
 
@@ -741,7 +741,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
             return allowRightclick(aPlayer) && onRightClick(aPlayer, side, aX, aY, aZ);
         } catch (Throwable e) {
             GT_FML_LOGGER.error("onBlockActivated Failed", e);
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
             return true;
         }
     }
@@ -752,7 +752,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
             // Configure Cover, sneak can also be: screwdriver, wrench, side cutter, soldering iron
             if (aPlayer.isSneaking()) {
                 final ForgeDirection tSide = (getCoverIDAtSide(side) == 0)
-                    ? GT_Utility.determineWrenchingSide(side, aX, aY, aZ)
+                    ? GTUtility.determineWrenchingSide(side, aX, aY, aZ)
                     : side;
                 return (getCoverBehaviorAtSideNew(tSide).hasCoverGUI());
             } else if (getCoverBehaviorAtSideNew(side).onCoverRightclickClient(side, this, aPlayer, aX, aY, aZ)) {
@@ -764,37 +764,37 @@ public abstract class MultiTileEntity extends CoverableTileEntity
             if (!privateAccess() || aPlayer.getDisplayName()
                 .equalsIgnoreCase(getOwnerName())) {
                 final ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
-                final ForgeDirection wrenchSide = GT_Utility.determineWrenchingSide(side, aX, aY, aZ);
+                final ForgeDirection wrenchSide = GTUtility.determineWrenchingSide(side, aX, aY, aZ);
 
                 if (tCurrentItem != null) {
                     if (getColorization() >= 0
-                        && GT_Utility.areStacksEqual(new ItemStack(Items.water_bucket, 1), tCurrentItem)) {
+                        && GTUtility.areStacksEqual(new ItemStack(Items.water_bucket, 1), tCurrentItem)) {
                         // TODO (Colorization)
                     }
 
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWrenchList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWrenchList))
                         return onWrenchRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sScrewdriverList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sScrewdriverList))
                         return onScrewdriverRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sHardHammerList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sHardHammerList))
                         return onHammerRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSoftHammerList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSoftHammerList))
                         return onMalletRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSolderingToolList))
                         return onSolderingRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWireCutterList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWireCutterList))
                         return onWireCutterRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
 
                     final ForgeDirection coverSide = getCoverIDAtSide(side) == 0 ? wrenchSide : side;
 
                     if (getCoverIDAtSide(coverSide) == 0) {
-                        if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCovers.keySet())) {
-                            if (GregTech_API.getCoverBehaviorNew(tCurrentItem)
+                        if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sCovers.keySet())) {
+                            if (GregTechAPI.getCoverBehaviorNew(tCurrentItem)
                                 .isCoverPlaceable(coverSide, tCurrentItem, this)
-                                && allowCoverOnSide(coverSide, new GT_ItemStack(tCurrentItem))) {
+                                && allowCoverOnSide(coverSide, new GTItemStack(tCurrentItem))) {
                                 setCoverItemAtSide(coverSide, tCurrentItem);
                                 if (!aPlayer.capabilities.isCreativeMode) tCurrentItem.stackSize--;
-                                GT_Utility.sendSoundToPlayers(
+                                GTUtility.sendSoundToPlayers(
                                     worldObj,
                                     SoundResource.IC2_TOOLS_WRENCH,
                                     1.0F,
@@ -808,9 +808,9 @@ public abstract class MultiTileEntity extends CoverableTileEntity
                             return true;
                         }
                     } else {
-                        if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCrowbarList)) {
-                            if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
-                                GT_Utility.sendSoundToPlayers(
+                        if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sCrowbarList)) {
+                            if (GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
+                                GTUtility.sendSoundToPlayers(
                                     worldObj,
                                     SoundResource.RANDOM_BREAK,
                                     1.0F,
@@ -825,7 +825,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
                         }
                     }
                 } else if (aPlayer.isSneaking()) { // Sneak click, no tool -> open cover config if possible.
-                    side = (getCoverIDAtSide(side) == 0) ? GT_Utility.determineWrenchingSide(side, aX, aY, aZ) : side;
+                    side = (getCoverIDAtSide(side) == 0) ? GTUtility.determineWrenchingSide(side, aX, aY, aZ) : side;
                     return getCoverIDAtSide(side) > 0 && getCoverBehaviorAtSideNew(side).onCoverShiftRightClick(
                         side,
                         getCoverIDAtSide(side),
@@ -867,7 +867,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
             return false;
         }
 
-        GT_UIInfos.openGTTileEntityUI(this, aPlayer);
+        GTUIInfos.openGTTileEntityUI(this, aPlayer);
         System.out.println("Trying to open a UI");
         return true;
     }
@@ -875,15 +875,15 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     public boolean onWrenchRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide, float aX,
         float aY, float aZ, ItemStack aTool) {
         if (setMainFacing(wrenchSide)) {
-            GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer);
-            GT_Utility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord);
+            GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer);
+            GTUtility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord);
         }
         return onWrenchRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
     }
 
     public boolean onScrewdriverRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide,
         float aX, float aY, float aZ, ItemStack aTool) {
-        if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 200, aPlayer)) {
+        if (GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 200, aPlayer)) {
             setCoverDataAtSide(
                 wrenchSide,
                 getCoverBehaviorAtSideNew(wrenchSide).onCoverScrewdriverClick(
@@ -896,7 +896,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
                     aY,
                     aZ));
             // TODO: Update connections!
-            GT_Utility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord);
+            GTUtility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord);
         }
         return onScrewdriverRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
     }
@@ -1033,20 +1033,20 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     /**
      * @return a Packet containing all Data which has to be synchronised to the Client - Override as needed
      */
-    public GT_Packet_MultiTileEntity getClientDataPacket() {
+    public GTPacketMultiTileEntity getClientDataPacket() {
 
-        final GT_Packet_MultiTileEntity packet = new GT_Packet_MultiTileEntity(false);
+        final GTPacketMultiTileEntity packet = new GTPacketMultiTileEntity(false);
         return packet;
     }
 
     @Override
     public void sendClientData(EntityPlayerMP aPlayer) {
         if (worldObj == null || worldObj.isRemote) return;
-        final GT_Packet_New tPacket = getClientDataPacket();
+        final GTPacketNew tPacket = getClientDataPacket();
         if (aPlayer == null) {
-            GT_Values.NW.sendPacketToAllPlayersInRange(worldObj, tPacket, getXCoord(), getZCoord());
+            GTValues.NW.sendPacketToAllPlayersInRange(worldObj, tPacket, getXCoord(), getZCoord());
         } else {
-            GT_Values.NW.sendToPlayer(tPacket, aPlayer);
+            GTValues.NW.sendToPlayer(tPacket, aPlayer);
         }
         sendCoverDataIfNeeded();
     }
@@ -1339,20 +1339,20 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     }
 
     @Override
-    public void getFullPacketData(GT_Packet_MultiTileEntity packet) {
+    public void getFullPacketData(GTPacketMultiTileEntity packet) {
         packet.addData(new CoordinateData(getCoords()));
         packet.addData(new CommonData(mStrongRedstone, color, (byte) 0));
         packet.addData(new MultiTileEntityData(mteRegistry, mteID));
     }
 
     @Override
-    public void getGraphicPacketData(GT_Packet_MultiTileEntity packet) {
+    public void getGraphicPacketData(GTPacketMultiTileEntity packet) {
         packet.addData(new CoordinateData(getCoords()));
         packet.addData(new MultiTileEntityData(mteRegistry, mteID));
     }
 
     @Override
-    public void getTimedPacketData(GT_Packet_MultiTileEntity packet) {
+    public void getTimedPacketData(GTPacketMultiTileEntity packet) {
         packet.addData(new CoordinateData(getCoords()));
         packet.addData(new MultiTileEntityData(mteRegistry, mteID));
     }
@@ -1361,21 +1361,21 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     public void sendFullPacket(@Nonnull EntityPlayerMP player) {
         fullPacket.clearData();
         getFullPacketData(fullPacket);
-        GT_Values.NW.sendToPlayer(fullPacket, player);
+        GTValues.NW.sendToPlayer(fullPacket, player);
     }
 
     @Override
     public void sendGraphicPacket() {
         graphicPacket.clearData();
         getGraphicPacketData(graphicPacket);
-        GT_Values.NW.sendPacketToAllPlayersInRange(worldObj, graphicPacket, getXCoord(), getZCoord());
+        GTValues.NW.sendPacketToAllPlayersInRange(worldObj, graphicPacket, getXCoord(), getZCoord());
     }
 
     @Override
     public void sendTimedPacket() {
         timedPacket.clearData();
         getTimedPacketData(timedPacket);
-        GT_Values.NW.sendPacketToAllPlayersInRange(worldObj, timedPacket, getXCoord(), getZCoord());
+        GTValues.NW.sendPacketToAllPlayersInRange(worldObj, timedPacket, getXCoord(), getZCoord());
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/multitileentity/base/NonTickableMultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/base/NonTickableMultiTileEntity.java
index 2837a88180..7866ad69dc 100644
--- a/src/main/java/gregtech/api/multitileentity/base/NonTickableMultiTileEntity.java
+++ b/src/main/java/gregtech/api/multitileentity/base/NonTickableMultiTileEntity.java
@@ -1,12 +1,12 @@
 package gregtech.api.multitileentity.base;
 
-import static gregtech.api.enums.GT_Values.NW;
+import static gregtech.api.enums.GTValues.NW;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.Packet;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.net.GT_Packet_SendCoverData;
+import gregtech.api.net.GTPacketSendCoverData;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.covers.CoverInfo;
 
@@ -45,7 +45,7 @@ public abstract class NonTickableMultiTileEntity extends MultiTileEntity {
         } else {
             // Otherwise, send the data right away
             final CoverInfo coverInfo = getCoverInfoAtSide(side);
-            NW.sendPacketToAllPlayersInRange(worldObj, new GT_Packet_SendCoverData(coverInfo, this), xCoord, zCoord);
+            NW.sendPacketToAllPlayersInRange(worldObj, new GTPacketSendCoverData(coverInfo, this), xCoord, zCoord);
 
             // Just in case
             coverInfo.setNeedsUpdate(false);
diff --git a/src/main/java/gregtech/api/multitileentity/base/TickableMultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/base/TickableMultiTileEntity.java
index 987a4c18b3..dfc600483b 100644
--- a/src/main/java/gregtech/api/multitileentity/base/TickableMultiTileEntity.java
+++ b/src/main/java/gregtech/api/multitileentity/base/TickableMultiTileEntity.java
@@ -1,6 +1,6 @@
 package gregtech.api.multitileentity.base;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -14,11 +14,11 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.task.TaskHost;
 import gregtech.api.task.TickableTask;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Util;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtil;
 
 public abstract class TickableMultiTileEntity extends MultiTileEntity implements TaskHost {
 
@@ -57,7 +57,7 @@ public abstract class TickableMultiTileEntity extends MultiTileEntity implements
         try {
             if (timer++ == 0) {
                 markDirty();
-                GT_Util.markChunkDirty(this);
+                GTUtil.markChunkDirty(this);
                 onFirstTick(isServerSide);
             }
             if (isDead()) {
@@ -80,7 +80,7 @@ public abstract class TickableMultiTileEntity extends MultiTileEntity implements
 
         } catch (Throwable e) {
             GT_FML_LOGGER.error("UpdateEntity Failed", e);
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
             try {
                 onTickFailed(timer, isServerSide);
             } catch (Throwable e2) {
@@ -133,8 +133,8 @@ public abstract class TickableMultiTileEntity extends MultiTileEntity implements
 
     @Override
     protected final void readTasksNBT(NBTTagCompound nbt) {
-        if (nbt.hasKey(GT_Values.NBT.TASKS)) {
-            NBTTagCompound tasksTag = nbt.getCompoundTag(GT_Values.NBT.TASKS);
+        if (nbt.hasKey(GTValues.NBT.TASKS)) {
+            NBTTagCompound tasksTag = nbt.getCompoundTag(GTValues.NBT.TASKS);
             for (TickableTask<?> task : tasks.values()) {
                 if (tasksTag.hasKey(task.getName())) {
                     task.readFromNBT(tasksTag.getCompoundTag(task.getName()));
@@ -151,7 +151,7 @@ public abstract class TickableMultiTileEntity extends MultiTileEntity implements
             task.writeToNBT(tag);
             tasksTag.setTag(task.getName(), tag);
         }
-        aNBT.setTag(GT_Values.NBT.TASKS, tasksTag);
+        aNBT.setTag(GTValues.NBT.TASKS, tasksTag);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileCasing.java b/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileCasing.java
index 73bd55738a..4efaff34d7 100644
--- a/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileCasing.java
+++ b/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileCasing.java
@@ -3,7 +3,7 @@ package gregtech.api.multitileentity.enums;
 import static gregtech.api.util.GT_StructureUtilityMuTE.createMuTEStructureCasing;
 import static gregtech.loaders.preload.GT_Loader_MultiTileEntities.CASING_REGISTRY_NAME;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.util.GT_StructureUtilityMuTE;
 
 public enum GT_MultiTileCasing {
@@ -19,7 +19,7 @@ public enum GT_MultiTileCasing {
     LaserEngraverUpgrade2(8),
     LaserEngraverUpgrade3(9),
     LaserEngraverUpgrade4(10),
-    NONE(GT_Values.W);
+    NONE(GTValues.W);
 
     private final int meta;
     private final GT_StructureUtilityMuTE.MuTEStructureCasing casing;
diff --git a/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileComponentCasing.java b/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileComponentCasing.java
index e062ecc705..431da32353 100644
--- a/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileComponentCasing.java
+++ b/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileComponentCasing.java
@@ -1,6 +1,6 @@
 package gregtech.api.multitileentity.enums;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 
 public enum GT_MultiTileComponentCasing {
 
@@ -116,7 +116,7 @@ public enum GT_MultiTileComponentCasing {
     UMV_FieldGenerator(109),
     UXV_FieldGenerator(110),
     MAX_FieldGenerator(111),
-    NONE(GT_Values.W);
+    NONE(GTValues.W);
 
     private final int meta;
 
diff --git a/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileMachine.java b/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileMachine.java
index 7cdde78986..6787ab00d7 100644
--- a/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileMachine.java
+++ b/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileMachine.java
@@ -1,11 +1,11 @@
 package gregtech.api.multitileentity.enums;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 
 public enum GT_MultiTileMachine {
 
     CokeOven(0),
-    NONE(GT_Values.W);
+    NONE(GTValues.W);
 
     private final int meta;
 
diff --git a/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileUpgradeCasing.java b/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileUpgradeCasing.java
index 296bae546d..5acdd5aeef 100644
--- a/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileUpgradeCasing.java
+++ b/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileUpgradeCasing.java
@@ -1,6 +1,6 @@
 package gregtech.api.multitileentity.enums;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 
 public enum GT_MultiTileUpgradeCasing {
 
@@ -57,7 +57,7 @@ public enum GT_MultiTileUpgradeCasing {
     Insulator_NextGen(107),
     Insulator_Omnipotent(108),
     Insulator_OmegaType(109),
-    NONE(GT_Values.W);
+    NONE(GTValues.W);
 
     private final int meta;
 
diff --git a/src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java
index 2045f28d67..0f959c6bce 100644
--- a/src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java
+++ b/src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java
@@ -4,7 +4,7 @@ import javax.annotation.Nonnull;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 
-import gregtech.api.net.GT_Packet_MultiTileEntity;
+import gregtech.api.net.GTPacketMultiTileEntity;
 
 public interface SyncedMultiTileEntity {
 
@@ -19,10 +19,10 @@ public interface SyncedMultiTileEntity {
     /**
      * Should always collect all the data that the controller or casing has and should send
      * Called by {@link #sendFullPacket()}
-     * 
+     *
      * @param packet The packet which will be sent
      */
-    void getFullPacketData(GT_Packet_MultiTileEntity packet);
+    void getFullPacketData(GTPacketMultiTileEntity packet);
 
     /**
      * Will send a packet at a certain period of time, defined by {@link #getTimedPacketPeriod()}, to all players around
@@ -35,10 +35,10 @@ public interface SyncedMultiTileEntity {
      * Collects all the data that should be sent out at a certain period of time defined by
      * {@link #getTimedPacketPeriod()}
      * Called by {@link #sendTimedPacket()}
-     * 
+     *
      * @param packet The packet which will be sent
      */
-    void getTimedPacketData(GT_Packet_MultiTileEntity packet);
+    void getTimedPacketData(GTPacketMultiTileEntity packet);
 
     /**
      * Defines the period of time at which a timed packet should be sent out. Default 20 ticks
@@ -56,8 +56,8 @@ public interface SyncedMultiTileEntity {
     /**
      * Collects all the data that is needed to be send every single tick
      * Called by {@link #sendGraphicPacket()}
-     * 
+     *
      * @param packet The packet which will be sent
      */
-    void getGraphicPacketData(GT_Packet_MultiTileEntity packet);
+    void getGraphicPacketData(GTPacketMultiTileEntity packet);
 }
diff --git a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
index 0953b4905c..32b87126ca 100644
--- a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
+++ b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
@@ -1,6 +1,6 @@
 package gregtech.api.multitileentity.machine;
 
-import static gregtech.api.enums.GT_Values.*;
+import static gregtech.api.enums.GTValues.*;
 import static gregtech.api.enums.TickTime.MINUTE;
 
 import java.io.IOException;
@@ -30,8 +30,8 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.GT_Values.NBT;
+import gregtech.api.enums.GTValues;
+import gregtech.api.enums.GTValues.NBT;
 import gregtech.api.enums.InventoryType;
 import gregtech.api.enums.Mods;
 import gregtech.api.enums.SoundResource;
@@ -55,8 +55,8 @@ import gregtech.api.multitileentity.base.TickableMultiTileEntity;
 import gregtech.api.multitileentity.interfaces.IMultiTileMachine;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.task.tasks.ProcessingTask;
-import gregtech.api.util.GT_Utility;
-import gregtech.client.GT_SoundLoop;
+import gregtech.api.util.GTUtility;
+import gregtech.client.GTSoundLoop;
 import gregtech.common.gui.MachineGUIProvider;
 
 public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> extends TickableMultiTileEntity
@@ -106,7 +106,7 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
     protected GUIProvider<?> guiProvider = createGUIProvider();
 
     @SideOnly(Side.CLIENT)
-    protected GT_SoundLoop activitySoundLoop;
+    protected GTSoundLoop activitySoundLoop;
 
     public MultiTileBasicMachine() {
         new ProcessingTask<>(this);
@@ -388,16 +388,16 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
         switch (aIndex) {
             case PROCESS_START_SOUND_INDEX -> {
                 if (getProcessStartSound() != null)
-                    GT_Utility.doSoundAtClient(getProcessStartSound(), getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ);
+                    GTUtility.doSoundAtClient(getProcessStartSound(), getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ);
             }
-            case INTERRUPT_SOUND_INDEX -> GT_Utility
+            case INTERRUPT_SOUND_INDEX -> GTUtility
                 .doSoundAtClient(SoundResource.IC2_MACHINES_INTERRUPT_ONE, 100, 1.0F, aX, aY, aZ);
         }
     }
 
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         if (aIndex == PROCESS_START_SOUND_INDEX && getProcessStartSound() != null) {
-            GT_Utility.doSoundAtClient(getProcessStartSound(), getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(getProcessStartSound(), getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ);
         }
     }
 
@@ -412,7 +412,7 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
     @SideOnly(Side.CLIENT)
     protected void doActivitySound(ResourceLocation activitySound) {
         if (isActive() && activitySound != null && activitySoundLoop == null) {
-            activitySoundLoop = new GT_SoundLoop(activitySound, this, false, true);
+            activitySoundLoop = new GTSoundLoop(activitySound, this, false, true);
             Minecraft.getMinecraft()
                 .getSoundHandler()
                 .playSound(activitySoundLoop);
@@ -549,7 +549,7 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
     @Override
     protected void addDebugInfo(EntityPlayer player, int logLevel, ArrayList<String> list) {
         list.add(
-            GT_Utility.trans("186", "Owned by: ") + EnumChatFormatting.BLUE
+            GTUtility.trans("186", "Owned by: ") + EnumChatFormatting.BLUE
                 + getOwnerName()
                 + EnumChatFormatting.RESET
                 + " ("
@@ -567,30 +567,30 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
             list.add(
                 StatCollector.translateToLocal("GT5U.multiblock.energy") + ": "
                     + EnumChatFormatting.GREEN
-                    + GT_Utility.formatNumbers(logic.getStoredEnergy())
+                    + GTUtility.formatNumbers(logic.getStoredEnergy())
                     + EnumChatFormatting.RESET
                     + " EU / "
                     + EnumChatFormatting.YELLOW
-                    + GT_Utility.formatNumbers(logic.getCapacity())
+                    + GTUtility.formatNumbers(logic.getCapacity())
                     + EnumChatFormatting.RESET
                     + " EU");
             list.add(
                 StatCollector.translateToLocal("GT5U.multiblock.usage") + ": "
                     + EnumChatFormatting.RED
-                    + GT_Utility.formatNumbers(getProcessingLogic().getCalculatedEut())
+                    + GTUtility.formatNumbers(getProcessingLogic().getCalculatedEut())
                     + EnumChatFormatting.RESET
                     + " EU/t");
             list.add(
                 StatCollector.translateToLocal("GT5U.multiblock.mei") + ": "
                     + EnumChatFormatting.YELLOW
-                    + GT_Utility.formatNumbers(logic.getVoltage())
+                    + GTUtility.formatNumbers(logic.getVoltage())
                     + EnumChatFormatting.RESET
                     // TODO: Put ampere getter here, once that's variable
                     + " EU/t(*2A) "
                     + StatCollector.translateToLocal("GT5U.machines.tier")
                     + ": "
                     + EnumChatFormatting.YELLOW
-                    + VN[GT_Utility.getTier(logic.getVoltage())]
+                    + VN[GTUtility.getTier(logic.getVoltage())]
                     + EnumChatFormatting.RESET);
         }
 
@@ -598,11 +598,11 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
 
         // TODO: Add CPU load calculator
         list.add(
-            "Average CPU load of ~" + GT_Utility.formatNumbers(0)
+            "Average CPU load of ~" + GTUtility.formatNumbers(0)
                 + "ns over "
-                + GT_Utility.formatNumbers(0)
+                + GTUtility.formatNumbers(0)
                 + " ticks with worst time of "
-                + GT_Utility.formatNumbers(0)
+                + GTUtility.formatNumbers(0)
                 + "ns.");
     }
 
@@ -613,11 +613,11 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
         list.add(
             StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(progressTime > 20 ? progressTime / 20 : progressTime)
+                + GTUtility.formatNumbers(progressTime > 20 ? progressTime / 20 : progressTime)
                 + EnumChatFormatting.RESET
                 + (progressTime > 20 ? " s / " : " ticks / ")
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(maxProgressTime > 20 ? maxProgressTime / 20 : maxProgressTime)
+                + GTUtility.formatNumbers(maxProgressTime > 20 ? maxProgressTime / 20 : maxProgressTime)
                 + EnumChatFormatting.RESET
                 + (maxProgressTime > 20 ? " s" : " ticks"));
     }
@@ -678,7 +678,7 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
 
         switch (soundEventValue) {
             case PROCESS_START_SOUND_INDEX -> {
-                if (getProcessStartSound() != null) GT_Utility.doSoundAtClient(
+                if (getProcessStartSound() != null) GTUtility.doSoundAtClient(
                     getProcessStartSound(),
                     getTimeBetweenProcessSounds(),
                     1.0F,
@@ -686,7 +686,7 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
                     getYCoord(),
                     getZCoord());
             }
-            case INTERRUPT_SOUND_INDEX -> GT_Utility.doSoundAtClient(
+            case INTERRUPT_SOUND_INDEX -> GTUtility.doSoundAtClient(
                 SoundResource.IC2_MACHINES_INTERRUPT_ONE,
                 100,
                 1.0F,
@@ -765,8 +765,8 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
     }
 
     protected void updatePowerLogic() {
-        power.setEnergyCapacity(GT_Values.V[tier] * power.getMaxAmperage() * 2 * MINUTE);
-        power.setMaxVoltage(GT_Values.V[tier]);
+        power.setEnergyCapacity(GTValues.V[tier] * power.getMaxAmperage() * 2 * MINUTE);
+        power.setMaxVoltage(GTValues.V[tier]);
         power.setMaxAmperage(1);
     }
 
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/ComplexParallelController.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/ComplexParallelController.java
index cdcb77d6e5..3abb69dd51 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/base/ComplexParallelController.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/ComplexParallelController.java
@@ -15,8 +15,8 @@ import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 import gregtech.api.logic.ComplexParallelProcessingLogic;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.GT_Waila;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.GTWaila;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
@@ -56,12 +56,12 @@ public abstract class ComplexParallelController<C extends ComplexParallelControl
                     + (i + 1)
                     + ": "
                     + EnumChatFormatting.GREEN
-                    + GT_Utility.formatNumbers(
+                    + GTUtility.formatNumbers(
                         processing.getProgress(i) > 20 ? processing.getProgress(i) / 20 : processing.getProgress(i))
                     + EnumChatFormatting.RESET
                     + (processing.getProgress(i) > 20 ? " s / " : " ticks / ")
                     + EnumChatFormatting.YELLOW
-                    + GT_Utility.formatNumbers(
+                    + GTUtility.formatNumbers(
                         processing.getDuration(i) > 20 ? processing.getDuration(i) / 20 : processing.getDuration(i))
                     + EnumChatFormatting.RESET
                     + (processing.getDuration(i) > 20 ? " s" : " ticks"));
@@ -92,7 +92,7 @@ public abstract class ComplexParallelController<C extends ComplexParallelControl
             currentTip.add(
                 "Process " + (i + 1)
                     + ": "
-                    + GT_Waila
+                    + GTWaila
                         .getMachineProgressString(maxProgress > 0 && maxProgress >= progress, maxProgress, progress));
         }
     }
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java
index 552cf6d94e..1eaae5997d 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java
@@ -1,6 +1,6 @@
 package gregtech.api.multitileentity.multiblock.base;
 
-import static gregtech.api.util.GT_Utility.moveMultipleItemStacks;
+import static gregtech.api.util.GTUtility.moveMultipleItemStacks;
 import static gregtech.common.misc.WirelessNetworkManager.strongCheckOrAddUser;
 import static mcp.mobius.waila.api.SpecialChars.*;
 
@@ -46,7 +46,7 @@ import com.gtnewhorizon.structurelib.util.Vec3Impl;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 
 import cpw.mods.fml.common.network.NetworkRegistry;
-import gregtech.api.enums.GT_Values.NBT;
+import gregtech.api.enums.GTValues.NBT;
 import gregtech.api.enums.InventoryType;
 import gregtech.api.enums.VoidingMode;
 import gregtech.api.interfaces.IDescribable;
@@ -64,11 +64,11 @@ import gregtech.api.multitileentity.interfaces.IMultiBlockPart;
 import gregtech.api.multitileentity.machine.MultiTileBasicMachine;
 import gregtech.api.multitileentity.multiblock.casing.FunctionalCasing;
 import gregtech.api.multitileentity.multiblock.casing.UpgradeCasing;
-import gregtech.api.net.GT_Packet_MultiTileEntity;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.GT_Waila;
+import gregtech.api.net.GTPacketMultiTileEntity;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.GTWaila;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
@@ -81,7 +81,7 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce
     public static final String ALL_INVENTORIES_NAME = "all";
     protected static final int AUTO_OUTPUT_FREQUENCY_TICK = 20;
 
-    private static final Map<Integer, GT_Multiblock_Tooltip_Builder> tooltip = new ConcurrentHashMap<>();
+    private static final Map<Integer, MultiblockTooltipBuilder> tooltip = new ConcurrentHashMap<>();
     private final List<WeakTargetRef<UpgradeCasing>> upgradeCasings = new ArrayList<>();
     private final List<WeakTargetRef<FunctionalCasing>> functionalCasings = new ArrayList<>();
     protected BuildState buildState = new BuildState();
@@ -131,7 +131,7 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce
     /**
      * Create the tooltip for this multi block controller.
      */
-    protected abstract GT_Multiblock_Tooltip_Builder createTooltip();
+    protected abstract MultiblockTooltipBuilder createTooltip();
 
     /**
      * @return The starting offset for the structure builder
@@ -269,8 +269,8 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce
         return getMultiTileEntityRegistryID() << 16 + getMultiTileEntityID();
     }
 
-    protected GT_Multiblock_Tooltip_Builder getTooltip() {
-        GT_Multiblock_Tooltip_Builder builder = tooltip.get(getToolTipID());
+    protected MultiblockTooltipBuilder getTooltip() {
+        MultiblockTooltipBuilder builder = tooltip.get(getToolTipID());
         if (builder == null) {
             builder = createTooltip();
             tooltip.put(getToolTipID(), builder);
@@ -423,7 +423,7 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce
         if (aPlayer.isSneaking()) {
             // we won't be allowing horizontal flips, as it can be perfectly emulated by rotating twice and flipping
             // horizontally allowing an extra round of flip make it hard to draw meaningful flip markers in
-            // GT_Proxy#drawGrid
+            // GTProxy#drawGrid
             toolSetFlip(getFlip().isHorizontallyFlipped() ? Flip.NONE : Flip.HORIZONTAL);
         } else {
             toolSetRotation(null);
@@ -615,7 +615,7 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID) {
         return side != facing;
     }
 
@@ -992,7 +992,7 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce
         if (isSimpleMachine) {
             boolean isActive = tag.getBoolean("isActive");
             currentTip.add(
-                GT_Waila.getMachineProgressString(isActive, tag.getInteger("maxProgress"), tag.getInteger("progress")));
+                GTWaila.getMachineProgressString(isActive, tag.getInteger("maxProgress"), tag.getInteger("progress")));
         }
         boolean isActive = tag.getBoolean("isActive");
         if (isActive) {
@@ -1002,23 +1002,23 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce
                 currentTip.add(
                     StatCollector.translateToLocalFormatted(
                         "GT5U.waila.energy.use_with_amperage",
-                        GT_Utility.formatNumbers(actualEnergyUsage),
-                        GT_Utility.getAmperageForTier(actualEnergyUsage, (byte) energyTier),
-                        GT_Utility.getColoredTierNameFromTier((byte) energyTier)));
+                        GTUtility.formatNumbers(actualEnergyUsage),
+                        GTUtility.getAmperageForTier(actualEnergyUsage, (byte) energyTier),
+                        GTUtility.getColoredTierNameFromTier((byte) energyTier)));
             } else if (actualEnergyUsage < 0) {
                 currentTip.add(
                     StatCollector.translateToLocalFormatted(
                         "GT5U.waila.energy.produce_with_amperage",
-                        GT_Utility.formatNumbers(-actualEnergyUsage),
-                        GT_Utility.getAmperageForTier(-actualEnergyUsage, (byte) energyTier),
-                        GT_Utility.getColoredTierNameFromTier((byte) energyTier)));
+                        GTUtility.formatNumbers(-actualEnergyUsage),
+                        GTUtility.getAmperageForTier(-actualEnergyUsage, (byte) energyTier),
+                        GTUtility.getColoredTierNameFromTier((byte) energyTier)));
             }
         }
     }
 
     @Override
-    public GT_Packet_MultiTileEntity getClientDataPacket() {
-        final GT_Packet_MultiTileEntity packet = super.getClientDataPacket();
+    public GTPacketMultiTileEntity getClientDataPacket() {
+        final GTPacketMultiTileEntity packet = super.getClientDataPacket();
 
         return packet;
 
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java
index 5a16ed4b38..2c3cafc67d 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java
@@ -1,7 +1,7 @@
 package gregtech.api.multitileentity.multiblock.base;
 
 import static com.google.common.math.LongMath.log2;
-import static gregtech.api.enums.GT_Values.B;
+import static gregtech.api.enums.GTValues.B;
 import static gregtech.api.enums.Textures.BlockIcons.FLUID_IN_SIGN;
 import static gregtech.api.enums.Textures.BlockIcons.FLUID_OUT_SIGN;
 import static gregtech.api.enums.Textures.BlockIcons.ITEM_IN_SIGN;
@@ -36,9 +36,9 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow.Builder;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 
-import gregtech.api.enums.GT_Values.NBT;
+import gregtech.api.enums.GTValues.NBT;
 import gregtech.api.enums.InventoryType;
-import gregtech.api.fluid.FluidTankGT;
+import gregtech.api.fluid.GTFluidTank;
 import gregtech.api.gui.GUIHost;
 import gregtech.api.gui.GUIProvider;
 import gregtech.api.interfaces.ITexture;
@@ -54,7 +54,7 @@ import gregtech.api.multitileentity.enums.MultiTileCasingPurpose;
 import gregtech.api.multitileentity.interfaces.IMultiBlockController;
 import gregtech.api.multitileentity.interfaces.IMultiBlockPart;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.common.covers.CoverInfo;
 import gregtech.common.gui.PartGUIProvider;
 import mcp.mobius.waila.api.IWailaConfigHandler;
@@ -80,7 +80,7 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity
 
     protected UUID lockedInventory;
     protected int mLockedInventoryIndex = 0;
-    protected FluidTankGT configurationTank = new FluidTankGT();
+    protected GTFluidTank configurationTank = new GTFluidTank();
 
     @Nonnull
     protected final GUIProvider<?> guiProvider = createGUIProvider();
@@ -436,7 +436,7 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity
         if (aPlayer.isSneaking()) {
             facing = wrenchSide;
         }
-        GT_Utility.sendChatToPlayer(aPlayer, "Mode set to `" + getModeName(mode) + "' (" + mode + ")");
+        GTUtility.sendChatToPlayer(aPlayer, "Mode set to `" + getModeName(mode) + "' (" + mode + ")");
         sendClientData((EntityPlayerMP) aPlayer);
         return true;
     }
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/casing/FunctionalCasing.java b/src/main/java/gregtech/api/multitileentity/multiblock/casing/FunctionalCasing.java
index bc3c857fd6..d48bbd03fd 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/casing/FunctionalCasing.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/casing/FunctionalCasing.java
@@ -2,7 +2,7 @@ package gregtech.api.multitileentity.multiblock.casing;
 
 import net.minecraft.nbt.NBTTagCompound;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.multitileentity.multiblock.base.MultiBlockPart;
 
 public abstract class FunctionalCasing extends MultiBlockPart {
@@ -19,7 +19,7 @@ public abstract class FunctionalCasing extends MultiBlockPart {
     @Override
     public void readMultiTileNBT(NBTTagCompound nbt) {
         super.readMultiTileNBT(nbt);
-        tier = nbt.getInteger(GT_Values.NBT.TIER);
+        tier = nbt.getInteger(GTValues.NBT.TIER);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/casing/UpgradeCasing.java b/src/main/java/gregtech/api/multitileentity/multiblock/casing/UpgradeCasing.java
index 566afcd770..ae5b36c1e0 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/casing/UpgradeCasing.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/casing/UpgradeCasing.java
@@ -2,7 +2,7 @@ package gregtech.api.multitileentity.multiblock.casing;
 
 import net.minecraft.nbt.NBTTagCompound;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.multitileentity.interfaces.IMultiBlockController;
 import gregtech.api.multitileentity.multiblock.base.MultiBlockPart;
 
@@ -27,7 +27,7 @@ public abstract class UpgradeCasing extends MultiBlockPart {
     @Override
     public void readMultiTileNBT(NBTTagCompound aNBT) {
         super.readMultiTileNBT(aNBT);
-        tier = aNBT.getInteger(GT_Values.NBT.TIER);
+        tier = aNBT.getInteger(GTValues.NBT.TIER);
     }
 
     protected abstract void customWork(IMultiBlockController aTarget);
diff --git a/src/main/java/gregtech/api/net/GT_Packet.java b/src/main/java/gregtech/api/net/GTPacket.java
index d06ea7d0d3..1d2de3303b 100644
--- a/src/main/java/gregtech/api/net/GT_Packet.java
+++ b/src/main/java/gregtech/api/net/GTPacket.java
@@ -8,12 +8,12 @@ import com.google.common.io.ByteArrayDataInput;
 import io.netty.buffer.ByteBuf;
 
 /**
- * @deprecated Use {@link GT_Packet_New} instead
+ * @deprecated Use {@link GTPacketNew} instead
  */
 @Deprecated
-public abstract class GT_Packet {
+public abstract class GTPacket {
 
-    public GT_Packet(boolean aIsReference) {
+    public GTPacket(boolean aIsReference) {
         //
     }
 
@@ -42,7 +42,7 @@ public abstract class GT_Packet {
     /**
      * @return encoded byte Stream
      */
-    public abstract GT_Packet decode(ByteArrayDataInput aData);
+    public abstract GTPacket decode(ByteArrayDataInput aData);
 
     /**
      * Process the packet
diff --git a/src/main/java/gregtech/api/net/GT_Packet_Block_Event.java b/src/main/java/gregtech/api/net/GTPacketBlockEvent.java
index 9adf583698..a2164f4f07 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_Block_Event.java
+++ b/src/main/java/gregtech/api/net/GTPacketBlockEvent.java
@@ -10,17 +10,17 @@ import io.netty.buffer.ByteBuf;
 /**
  * Used to transfer Block Events in a much better fashion
  */
-public class GT_Packet_Block_Event extends GT_Packet_New {
+public class GTPacketBlockEvent extends GTPacketNew {
 
     private int mX, mZ;
     private short mY;
     private byte mID, mValue;
 
-    public GT_Packet_Block_Event() {
+    public GTPacketBlockEvent() {
         super(true);
     }
 
-    public GT_Packet_Block_Event(int aX, short aY, int aZ, byte aID, byte aValue) {
+    public GTPacketBlockEvent(int aX, short aY, int aZ, byte aID, byte aValue) {
         super(false);
         mX = aX;
         mY = aY;
@@ -39,8 +39,8 @@ public class GT_Packet_Block_Event extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_Block_Event(
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketBlockEvent(
             aData.readInt(),
             aData.readShort(),
             aData.readInt(),
@@ -58,6 +58,6 @@ public class GT_Packet_Block_Event extends GT_Packet_New {
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.BLOCK_EVENT.id;
+        return GTPacketTypes.BLOCK_EVENT.id;
     }
 }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java b/src/main/java/gregtech/api/net/GTPacketClientPreference.java
index a5fd8a2e08..ea5d9ec476 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java
+++ b/src/main/java/gregtech/api/net/GTPacketClientPreference.java
@@ -7,27 +7,27 @@ import net.minecraft.world.IBlockAccess;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.GT_Mod;
-import gregtech.api.util.GT_ClientPreference;
+import gregtech.GTMod;
+import gregtech.api.util.GTClientPreference;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Packet_ClientPreference extends GT_Packet_New {
+public class GTPacketClientPreference extends GTPacketNew {
 
-    private GT_ClientPreference mPreference;
+    private GTClientPreference mPreference;
     private EntityPlayerMP mPlayer;
 
-    public GT_Packet_ClientPreference() {
+    public GTPacketClientPreference() {
         super(true);
     }
 
-    public GT_Packet_ClientPreference(GT_ClientPreference mPreference) {
+    public GTPacketClientPreference(GTClientPreference mPreference) {
         super(false);
         this.mPreference = mPreference;
     }
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.CLIENT_PREFERENCE.id;
+        return GTPacketTypes.CLIENT_PREFERENCE.id;
     }
 
     @Override
@@ -39,7 +39,7 @@ public class GT_Packet_ClientPreference extends GT_Packet_New {
 
     @Override
     public void process(IBlockAccess aWorld) {
-        if (mPlayer != null) GT_Mod.gregtechproxy.setClientPreference(mPlayer.getUniqueID(), mPreference);
+        if (mPlayer != null) GTMod.gregtechproxy.setClientPreference(mPlayer.getUniqueID(), mPreference);
     }
 
     @Override
@@ -51,12 +51,8 @@ public class GT_Packet_ClientPreference extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_ClientPreference(
-            new GT_ClientPreference(
-                aData.readBoolean(),
-                aData.readBoolean(),
-                aData.readBoolean(),
-                aData.readBoolean()));
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketClientPreference(
+            new GTClientPreference(aData.readBoolean(), aData.readBoolean(), aData.readBoolean(), aData.readBoolean()));
     }
 }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java b/src/main/java/gregtech/api/net/GTPacketMultiTileEntity.java
index 33cb4f2dcf..b151f8eb5f 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java
+++ b/src/main/java/gregtech/api/net/GTPacketMultiTileEntity.java
@@ -1,6 +1,6 @@
 package gregtech.api.net;
 
-import static gregtech.api.enums.GT_Values.B;
+import static gregtech.api.enums.GTValues.B;
 
 import java.util.HashSet;
 import java.util.Objects;
@@ -18,13 +18,13 @@ import gregtech.api.net.data.MultiTileEntityProcess;
 import gregtech.api.net.data.PacketData;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Packet_MultiTileEntity extends GT_Packet_New {
+public class GTPacketMultiTileEntity extends GTPacketNew {
 
     private final Set<PacketData<MultiTileEntityProcess>> data = new HashSet<>();
     public static final int COVERS = B[0], REDSTONE = B[1], MODES = B[2], CONTROLLER = B[3], INVENTORY_INDEX = B[4],
         INVENTORY_NAME_ID = B[5], BOOLEANS = B[6], SOUND = B[7];
 
-    public GT_Packet_MultiTileEntity(boolean reference) {
+    public GTPacketMultiTileEntity(boolean reference) {
         super(reference);
     }
 
@@ -97,11 +97,11 @@ public class GT_Packet_MultiTileEntity extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput in) {
+    public GTPacketNew decode(ByteArrayDataInput in) {
         Objects.requireNonNull(in);
         final int packetFeatures = in.readInt();
 
-        final GT_Packet_MultiTileEntity packet = new GT_Packet_MultiTileEntity(false);
+        final GTPacketMultiTileEntity packet = new GTPacketMultiTileEntity(false);
 
         if (containsBit(packetFeatures, CoordinateData.COORDINATE_DATA_ID)) {
             packet.addData(new CoordinateData());
@@ -225,7 +225,7 @@ public class GT_Packet_MultiTileEntity extends GT_Packet_New {
          * }
          * } catch (Exception e) {
          * e.printStackTrace();
-         * GT_Mod.GT_FML_LOGGER.error(
+         * GTMod.GT_FML_LOGGER.error(
          * "Exception setting tile entity data for tile entity {} at ({}, {}, {})",
          * tTileEntity,
          * mX,
@@ -237,7 +237,7 @@ public class GT_Packet_MultiTileEntity extends GT_Packet_New {
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.MULTI_TILE_ENTITY.id;
+        return GTPacketTypes.MULTI_TILE_ENTITY.id;
     }
 
     public void clearData() {
diff --git a/src/main/java/gregtech/api/net/GT_Packet_MusicSystemData.java b/src/main/java/gregtech/api/net/GTPacketMusicSystemData.java
index 13ebf49205..c650188594 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_MusicSystemData.java
+++ b/src/main/java/gregtech/api/net/GTPacketMusicSystemData.java
@@ -4,26 +4,26 @@ import net.minecraft.world.IBlockAccess;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.api.util.GT_MusicSystem;
+import gregtech.api.util.GTMusicSystem;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
-public class GT_Packet_MusicSystemData extends GT_Packet_New {
+public class GTPacketMusicSystemData extends GTPacketNew {
 
     ByteBuf storedData;
 
-    public GT_Packet_MusicSystemData() {
+    public GTPacketMusicSystemData() {
         super(true);
     }
 
-    public GT_Packet_MusicSystemData(ByteBuf data) {
+    public GTPacketMusicSystemData(ByteBuf data) {
         super(false);
         this.storedData = data;
     }
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.MUSIC_SYSTEM_DATA.id;
+        return GTPacketTypes.MUSIC_SYSTEM_DATA.id;
     }
 
     @Override
@@ -39,11 +39,11 @@ public class GT_Packet_MusicSystemData extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
+    public GTPacketNew decode(ByteArrayDataInput aData) {
         final int len = aData.readInt();
         final byte[] fullData = new byte[len];
         aData.readFully(fullData);
-        return new GT_Packet_MusicSystemData(Unpooled.wrappedBuffer(fullData));
+        return new GTPacketMusicSystemData(Unpooled.wrappedBuffer(fullData));
     }
 
     @Override
@@ -52,7 +52,7 @@ public class GT_Packet_MusicSystemData extends GT_Packet_New {
             return;
         }
         storedData.markReaderIndex();
-        GT_MusicSystem.ClientSystem.loadUpdatedSources(storedData);
+        GTMusicSystem.ClientSystem.loadUpdatedSources(storedData);
         storedData.resetReaderIndex();
     }
 }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_New.java b/src/main/java/gregtech/api/net/GTPacketNew.java
index 41eb1740b3..d3fee800c6 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_New.java
+++ b/src/main/java/gregtech/api/net/GTPacketNew.java
@@ -6,9 +6,9 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
 @SuppressWarnings("deprecation")
-public abstract class GT_Packet_New extends GT_Packet {
+public abstract class GTPacketNew extends GTPacket {
 
-    public GT_Packet_New(boolean aIsReference) {
+    public GTPacketNew(boolean aIsReference) {
         super(aIsReference);
     }
 
@@ -26,5 +26,5 @@ public abstract class GT_Packet_New extends GT_Packet {
     public abstract void encode(ByteBuf aOut);
 
     @Override
-    public abstract GT_Packet_New decode(ByteArrayDataInput aData);
+    public abstract GTPacketNew decode(ByteArrayDataInput aData);
 }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_Pollution.java b/src/main/java/gregtech/api/net/GTPacketPollution.java
index 9b4a367dc4..2f4805aad8 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_Pollution.java
+++ b/src/main/java/gregtech/api/net/GTPacketPollution.java
@@ -5,19 +5,19 @@ import net.minecraft.world.IBlockAccess;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.common.GT_Client;
+import gregtech.common.GTClient;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Packet_Pollution extends GT_Packet_New {
+public class GTPacketPollution extends GTPacketNew {
 
     private ChunkCoordIntPair chunk;
     private int pollution;
 
-    public GT_Packet_Pollution() {
+    public GTPacketPollution() {
         super(true);
     }
 
-    public GT_Packet_Pollution(ChunkCoordIntPair chunk, int pollution) {
+    public GTPacketPollution(ChunkCoordIntPair chunk, int pollution) {
         super(false);
         this.chunk = chunk;
         this.pollution = pollution;
@@ -31,17 +31,17 @@ public class GT_Packet_Pollution extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_Pollution(new ChunkCoordIntPair(aData.readInt(), aData.readInt()), aData.readInt());
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketPollution(new ChunkCoordIntPair(aData.readInt(), aData.readInt()), aData.readInt());
     }
 
     @Override
     public void process(IBlockAccess aWorld) {
-        GT_Client.recieveChunkPollutionPacket(chunk, pollution);
+        GTClient.recieveChunkPollutionPacket(chunk, pollution);
     }
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.POLLUTION.id;
+        return GTPacketTypes.POLLUTION.id;
     }
 }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java b/src/main/java/gregtech/api/net/GTPacketRequestCoverData.java
index bca97b69a5..4679643624 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java
+++ b/src/main/java/gregtech/api/net/GTPacketRequestCoverData.java
@@ -19,7 +19,7 @@ import io.netty.buffer.ByteBuf;
 /**
  * Client -> Server : ask for cover data
  */
-public class GT_Packet_RequestCoverData extends GT_Packet_New {
+public class GTPacketRequestCoverData extends GTPacketNew {
 
     protected int mX;
     protected short mY;
@@ -30,11 +30,11 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New {
 
     protected EntityPlayerMP mPlayer;
 
-    public GT_Packet_RequestCoverData() {
+    public GTPacketRequestCoverData() {
         super(true);
     }
 
-    public GT_Packet_RequestCoverData(CoverInfo info, ICoverable tile) {
+    public GTPacketRequestCoverData(CoverInfo info, ICoverable tile) {
         super(false);
         this.mX = tile.getXCoord();
         this.mY = tile.getYCoord();
@@ -44,7 +44,7 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New {
         this.coverID = info.getCoverID();
     }
 
-    public GT_Packet_RequestCoverData(int mX, short mY, int mZ, ForgeDirection coverSide, int coverID) {
+    public GTPacketRequestCoverData(int mX, short mY, int mZ, ForgeDirection coverSide, int coverID) {
         super(false);
         this.mX = mX;
         this.mY = mY;
@@ -54,7 +54,7 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New {
         this.coverID = coverID;
     }
 
-    public GT_Packet_RequestCoverData(ForgeDirection coverSide, int coverID, ICoverable tile) {
+    public GTPacketRequestCoverData(ForgeDirection coverSide, int coverID, ICoverable tile) {
         super(false);
         this.mX = tile.getXCoord();
         this.mY = tile.getYCoord();
@@ -66,7 +66,7 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New {
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.REQUEST_COVER_DATA.id;
+        return GTPacketTypes.REQUEST_COVER_DATA.id;
     }
 
     @Override
@@ -80,8 +80,8 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_RequestCoverData(
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketRequestCoverData(
             aData.readInt(),
             aData.readShort(),
             aData.readInt(),
diff --git a/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java b/src/main/java/gregtech/api/net/GTPacketSendCoverData.java
index 268aaab803..76adb75d31 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java
+++ b/src/main/java/gregtech/api/net/GTPacketSendCoverData.java
@@ -6,7 +6,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.metatileentity.CoverableTileEntity;
 import gregtech.api.util.ISerializableObject;
@@ -16,7 +16,7 @@ import io.netty.buffer.ByteBuf;
 /**
  * Server -> Client : Update cover data
  */
-public class GT_Packet_SendCoverData extends GT_Packet_New {
+public class GTPacketSendCoverData extends GTPacketNew {
 
     protected int mX;
     protected short mY;
@@ -26,11 +26,11 @@ public class GT_Packet_SendCoverData extends GT_Packet_New {
     protected int coverID;
     protected ISerializableObject coverData;
 
-    public GT_Packet_SendCoverData() {
+    public GTPacketSendCoverData() {
         super(true);
     }
 
-    public GT_Packet_SendCoverData(int mX, short mY, int mZ, ForgeDirection coverSide, int coverID,
+    public GTPacketSendCoverData(int mX, short mY, int mZ, ForgeDirection coverSide, int coverID,
         ISerializableObject coverData) {
         super(false);
         this.mX = mX;
@@ -42,7 +42,7 @@ public class GT_Packet_SendCoverData extends GT_Packet_New {
         this.coverData = coverData;
     }
 
-    public GT_Packet_SendCoverData(CoverInfo info, ICoverable tile) {
+    public GTPacketSendCoverData(CoverInfo info, ICoverable tile) {
         super(false);
         this.mX = tile.getXCoord();
         this.mY = tile.getYCoord();
@@ -53,7 +53,7 @@ public class GT_Packet_SendCoverData extends GT_Packet_New {
         this.coverData = info.getCoverData();
     }
 
-    public GT_Packet_SendCoverData(ForgeDirection coverSide, int coverID, ISerializableObject coverData,
+    public GTPacketSendCoverData(ForgeDirection coverSide, int coverID, ISerializableObject coverData,
         ICoverable tile) {
         super(false);
         this.mX = tile.getXCoord();
@@ -67,7 +67,7 @@ public class GT_Packet_SendCoverData extends GT_Packet_New {
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.SEND_COVER_DATA.id;
+        return GTPacketTypes.SEND_COVER_DATA.id;
     }
 
     @Override
@@ -82,15 +82,15 @@ public class GT_Packet_SendCoverData extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
+    public GTPacketNew decode(ByteArrayDataInput aData) {
         final int coverId;
-        return new GT_Packet_SendCoverData(
+        return new GTPacketSendCoverData(
             aData.readInt(),
             aData.readShort(),
             aData.readInt(),
             ForgeDirection.getOrientation(aData.readByte()),
             coverId = aData.readInt(),
-            GregTech_API.getCoverBehaviorNew(coverId)
+            GregTechAPI.getCoverBehaviorNew(coverId)
                 .createDataObject()
                 .readFromPacket(aData, null));
     }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_SendOregenPattern.java b/src/main/java/gregtech/api/net/GTPacketSendOregenPattern.java
index 8213ee9c71..9db0e9a471 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_SendOregenPattern.java
+++ b/src/main/java/gregtech/api/net/GTPacketSendOregenPattern.java
@@ -4,20 +4,20 @@ import net.minecraft.world.IBlockAccess;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.api.util.GT_Log;
-import gregtech.common.GT_Worldgenerator;
-import gregtech.common.GT_Worldgenerator.OregenPattern;
+import gregtech.api.util.GTLog;
+import gregtech.common.GTWorldgenerator;
+import gregtech.common.GTWorldgenerator.OregenPattern;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Packet_SendOregenPattern extends GT_Packet_New {
+public class GTPacketSendOregenPattern extends GTPacketNew {
 
     protected OregenPattern pattern = OregenPattern.AXISSYMMETRICAL;
 
-    public GT_Packet_SendOregenPattern() {
+    public GTPacketSendOregenPattern() {
         super(true);
     }
 
-    public GT_Packet_SendOregenPattern(OregenPattern pattern) {
+    public GTPacketSendOregenPattern(OregenPattern pattern) {
         super(false);
         this.pattern = pattern;
     }
@@ -28,29 +28,29 @@ public class GT_Packet_SendOregenPattern extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
+    public GTPacketNew decode(ByteArrayDataInput aData) {
         int ordinal = aData.readInt();
         // make sure we get valid data:
         if (ordinal >= 0 && ordinal < OregenPattern.values().length) {
-            return new GT_Packet_SendOregenPattern(OregenPattern.values()[ordinal]);
+            return new GTPacketSendOregenPattern(OregenPattern.values()[ordinal]);
         }
         // invalid data, default to AXISSYMMETRICAL:
-        GT_Log.err.println(
+        GTLog.err.println(
             String.format(
                 "Received invalid data! Received %d but value must be between 0 and %d! Default (0) will be used.",
                 ordinal,
                 OregenPattern.values().length - 1));
-        return new GT_Packet_SendOregenPattern();
+        return new GTPacketSendOregenPattern();
     }
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.SEND_OREGEN_PATTERN.id;
+        return GTPacketTypes.SEND_OREGEN_PATTERN.id;
     }
 
     @Override
     public void process(IBlockAccess aWorld) {
-        GT_Worldgenerator.oregenPattern = this.pattern;
+        GTWorldgenerator.oregenPattern = this.pattern;
     }
 
 }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java b/src/main/java/gregtech/api/net/GTPacketSetConfigurationCircuit.java
index 2bfdbca9d2..8984cea509 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java
+++ b/src/main/java/gregtech/api/net/GTPacketSetConfigurationCircuit.java
@@ -15,14 +15,14 @@ import gregtech.api.interfaces.IConfigurationCircuitSupport;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IHasInventory;
 import gregtech.api.metatileentity.BaseTileEntity;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import io.netty.buffer.ByteBuf;
 
 /**
  * Client -> Server: Update machine configuration data
  */
-public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New {
+public class GTPacketSetConfigurationCircuit extends GTPacketNew {
 
     protected int mX;
     protected short mY;
@@ -31,19 +31,19 @@ public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New {
 
     protected ItemStack circuit;
 
-    public GT_Packet_SetConfigurationCircuit() {
+    public GTPacketSetConfigurationCircuit() {
         super(true);
     }
 
-    public GT_Packet_SetConfigurationCircuit(IGregTechTileEntity tile, ItemStack circuit) {
+    public GTPacketSetConfigurationCircuit(IGregTechTileEntity tile, ItemStack circuit) {
         this(tile.getXCoord(), tile.getYCoord(), tile.getZCoord(), circuit);
     }
 
-    public GT_Packet_SetConfigurationCircuit(BaseTileEntity tile, ItemStack circuit) {
+    public GTPacketSetConfigurationCircuit(BaseTileEntity tile, ItemStack circuit) {
         this(tile.getXCoord(), tile.getYCoord(), tile.getZCoord(), circuit);
     }
 
-    public GT_Packet_SetConfigurationCircuit(int x, short y, int z, ItemStack circuit) {
+    public GTPacketSetConfigurationCircuit(int x, short y, int z, ItemStack circuit) {
         super(false);
 
         this.mX = x;
@@ -55,7 +55,7 @@ public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New {
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.SET_CONFIGURATION_CIRCUIT.id;
+        return GTPacketTypes.SET_CONFIGURATION_CIRCUIT.id;
     }
 
     @Override
@@ -82,8 +82,8 @@ public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_SetConfigurationCircuit(
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketSetConfigurationCircuit(
             aData.readInt(),
             aData.readShort(),
             aData.readInt(),
@@ -103,7 +103,7 @@ public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New {
         if (!machine.allowSelectCircuit()) return;
         machine.getConfigurationCircuits()
             .stream()
-            .filter(stack -> GT_Utility.areStacksEqual(stack, circuit))
+            .filter(stack -> GTUtility.areStacksEqual(stack, circuit))
             .findFirst()
             .ifPresent(stack -> ((IHasInventory) tile).setInventorySlotContents(machine.getCircuitSlot(), stack));
     }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_Sound.java b/src/main/java/gregtech/api/net/GTPacketSound.java
index 93bfdfd3aa..95f95e641d 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_Sound.java
+++ b/src/main/java/gregtech/api/net/GTPacketSound.java
@@ -7,23 +7,23 @@ import net.minecraft.world.IBlockAccess;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufOutputStream;
 
-public class GT_Packet_Sound extends GT_Packet_New {
+public class GTPacketSound extends GTPacketNew {
 
     private int mX, mZ;
     private short mY;
     private String mSoundName;
     private float mSoundStrength, mSoundPitch;
 
-    public GT_Packet_Sound() {
+    public GTPacketSound() {
         super(true);
     }
 
-    public GT_Packet_Sound(String aSoundName, float aSoundStrength, float aSoundPitch, int aX, short aY, int aZ) {
+    public GTPacketSound(String aSoundName, float aSoundStrength, float aSoundPitch, int aX, short aY, int aZ) {
         super(false);
         mX = aX;
         mY = aY;
@@ -44,13 +44,13 @@ public class GT_Packet_Sound extends GT_Packet_New {
             byteOutputStream.writeInt(mZ);
         } catch (IOException e) {
             // this really shouldn't happen, but whatever
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_Sound(
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketSound(
             aData.readUTF(),
             aData.readFloat(),
             aData.readFloat(),
@@ -62,12 +62,12 @@ public class GT_Packet_Sound extends GT_Packet_New {
     @Override
     public void process(IBlockAccess aWorld) {
         if (mSoundName != null) {
-            GT_Utility.doSoundAtClient(new ResourceLocation(mSoundName), 1, mSoundStrength, mSoundPitch, mX, mY, mZ);
+            GTUtility.doSoundAtClient(new ResourceLocation(mSoundName), 1, mSoundStrength, mSoundPitch, mX, mY, mZ);
         }
     }
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.SOUND.id;
+        return GTPacketTypes.SOUND.id;
     }
 }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java b/src/main/java/gregtech/api/net/GTPacketTileEntity.java
index b07277dc00..eecb16d6da 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java
+++ b/src/main/java/gregtech/api/net/GTPacketTileEntity.java
@@ -6,23 +6,23 @@ import net.minecraft.world.IBlockAccess;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Packet_TileEntity extends GT_Packet_New {
+public class GTPacketTileEntity extends GTPacketNew {
 
     private int mX, mZ, mC0, mC1, mC2, mC3, mC4, mC5;
     private short mY, mID, mRID;
     private byte mTexture, mTexturePage, mUpdate, mRedstone, mColor;
 
-    public GT_Packet_TileEntity() {
+    public GTPacketTileEntity() {
         super(true);
     }
 
     // For multi tiles
-    public GT_Packet_TileEntity(int aX, short aY, int aZ, short aRID, short aID, int aC0, int aC1, int aC2, int aC3,
+    public GTPacketTileEntity(int aX, short aY, int aZ, short aRID, short aID, int aC0, int aC1, int aC2, int aC3,
         int aC4, int aC5, byte aTexture, byte aTexturePage, byte aUpdate, byte aRedstone, byte aColor) {
         super(false);
         mX = aX;
@@ -44,8 +44,8 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
     }
 
     // For meta tiles
-    public GT_Packet_TileEntity(int aX, short aY, int aZ, short aID, int aC0, int aC1, int aC2, int aC3, int aC4,
-        int aC5, byte aTexture, byte aTexturePage, byte aUpdate, byte aRedstone, byte aColor) {
+    public GTPacketTileEntity(int aX, short aY, int aZ, short aID, int aC0, int aC1, int aC2, int aC3, int aC4, int aC5,
+        byte aTexture, byte aTexturePage, byte aUpdate, byte aRedstone, byte aColor) {
         this(
             aX,
             aY,
@@ -66,8 +66,8 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
     }
 
     // For pipes
-    public GT_Packet_TileEntity(int aX, short aY, int aZ, short aID, int aC0, int aC1, int aC2, int aC3, int aC4,
-        int aC5, byte aTexture, byte aUpdate, byte aRedstone, byte aColor) {
+    public GTPacketTileEntity(int aX, short aY, int aZ, short aID, int aC0, int aC1, int aC2, int aC3, int aC4, int aC5,
+        byte aTexture, byte aUpdate, byte aRedstone, byte aColor) {
         this(aX, aY, aZ, (short) 0, aID, aC0, aC1, aC2, aC3, aC4, aC5, aTexture, (byte) 0, aUpdate, aRedstone, aColor);
     }
 
@@ -95,8 +95,8 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_TileEntity(
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketTileEntity(
             // Coords
             aData.readInt(),
             aData.readShort(),
@@ -141,7 +141,7 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
             else if (tTileEntity instanceof BaseMetaPipeEntity) ((BaseMetaPipeEntity) tTileEntity)
                 .receiveMetaTileEntityData(mID, mC0, mC1, mC2, mC3, mC4, mC5, mTexture, mUpdate, mRedstone, mColor);
         } catch (Exception e) {
-            GT_Mod.GT_FML_LOGGER.error(
+            GTMod.GT_FML_LOGGER.error(
                 "Exception setting tile entity data for tile entity {} at ({}, {}, {})",
                 tTileEntity,
                 mX,
@@ -152,6 +152,6 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.TILE_ENTITY.id;
+        return GTPacketTypes.TILE_ENTITY.id;
     }
 }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_ToolSwitchMode.java b/src/main/java/gregtech/api/net/GTPacketToolSwitchMode.java
index c7984d7434..57cabcf2bf 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_ToolSwitchMode.java
+++ b/src/main/java/gregtech/api/net/GTPacketToolSwitchMode.java
@@ -8,20 +8,20 @@ import net.minecraft.world.IBlockAccess;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Packet_ToolSwitchMode extends GT_Packet_New {
+public class GTPacketToolSwitchMode extends GTPacketNew {
 
     private EntityPlayerMP player;
 
-    public GT_Packet_ToolSwitchMode() {
+    public GTPacketToolSwitchMode() {
         super(true);
     }
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.TOOL_SWITCH_MODE.id;
+        return GTPacketTypes.TOOL_SWITCH_MODE.id;
     }
 
     @Override
@@ -30,8 +30,8 @@ public class GT_Packet_ToolSwitchMode extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_ToolSwitchMode();
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketToolSwitchMode();
     }
 
     @Override
@@ -42,11 +42,11 @@ public class GT_Packet_ToolSwitchMode extends GT_Packet_New {
     @Override
     public void process(IBlockAccess aWorld) {
         ItemStack currentItem = player.inventory.getCurrentItem();
-        if (currentItem == null || (!(currentItem.getItem() instanceof GT_MetaGenerated_Tool item))) return;
+        if (currentItem == null || (!(currentItem.getItem() instanceof MetaGeneratedTool item))) return;
         byte maxMode = item.getToolMaxMode(currentItem);
         if (maxMode <= 1) return;
-        byte newMode = (byte) ((GT_MetaGenerated_Tool.getToolMode(currentItem) + 1) % maxMode);
-        GT_MetaGenerated_Tool.setToolMode(currentItem, newMode);
+        byte newMode = (byte) ((MetaGeneratedTool.getToolMode(currentItem) + 1) % maxMode);
+        MetaGeneratedTool.setToolMode(currentItem, newMode);
         player.sendSlotContents(player.inventoryContainer, player.inventory.currentItem, currentItem);
     }
 }
diff --git a/src/main/java/gregtech/api/net/GTPacketTypes.java b/src/main/java/gregtech/api/net/GTPacketTypes.java
new file mode 100644
index 0000000000..d635706e68
--- /dev/null
+++ b/src/main/java/gregtech/api/net/GTPacketTypes.java
@@ -0,0 +1,64 @@
+package gregtech.api.net;
+
+import java.util.Arrays;
+
+import gregtech.common.blocks.PacketOres;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+
+/**
+ * Centralized place to keep all the GT packet ID constants
+ */
+public enum GTPacketTypes {
+
+    TILE_ENTITY(0, new GTPacketTileEntity()),
+    SOUND(1, new GTPacketSound()),
+    BLOCK_EVENT(2, new GTPacketBlockEvent()),
+    ORES(3, new PacketOres()),
+    POLLUTION(4, new GTPacketPollution()),
+    CLIENT_PREFERENCE(9, new GTPacketClientPreference()),
+    SET_CONFIGURATION_CIRCUIT(12, new GTPacketSetConfigurationCircuit()),
+    UPDATE_ITEM(13, new GTPacketUpdateItem()),
+    SEND_COVER_DATA(16, new GTPacketSendCoverData()),
+    REQUEST_COVER_DATA(17, new GTPacketRequestCoverData()),
+    MULTI_TILE_ENTITY(18, new GTPacketMultiTileEntity(true)),
+    SEND_OREGEN_PATTERN(19, new GTPacketSendOregenPattern()),
+    TOOL_SWITCH_MODE(20, new GTPacketToolSwitchMode()),
+    MUSIC_SYSTEM_DATA(21, new GTPacketMusicSystemData()),
+    // merge conflict prevention comment, keep a trailing comma above
+    ;
+
+    static {
+        // Validate no duplicate IDs
+        final GTPacketTypes[] types = values();
+        final Int2ObjectOpenHashMap<GTPacketNew> foundIds = new Int2ObjectOpenHashMap<>(types.length);
+        for (GTPacketTypes type : types) {
+            final GTPacketNew previous = foundIds.get(type.id);
+            if (previous != null) {
+                throw new IllegalStateException(
+                    "Duplicate packet IDs defined: " + type.id
+                        + " for "
+                        + type.getClass()
+                        + " and "
+                        + previous.getClass());
+            }
+            foundIds.put(type.id, type.referencePacket);
+        }
+    }
+
+    public final byte id;
+    public final GTPacketNew referencePacket;
+
+    GTPacketTypes(int id, GTPacketNew referencePacket) {
+        if (((int) (byte) id) != id) {
+            throw new IllegalArgumentException("Value outside of byte normal range: " + id);
+        }
+        this.id = (byte) id;
+        this.referencePacket = referencePacket;
+    }
+
+    public static GTPacketNew[] referencePackets() {
+        return Arrays.stream(values())
+            .map(p -> p.referencePacket)
+            .toArray(GTPacketNew[]::new);
+    }
+}
diff --git a/src/main/java/gregtech/api/net/GT_Packet_UpdateItem.java b/src/main/java/gregtech/api/net/GTPacketUpdateItem.java
index 1b8a453234..54846cdcc9 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_UpdateItem.java
+++ b/src/main/java/gregtech/api/net/GTPacketUpdateItem.java
@@ -17,23 +17,23 @@ import io.netty.buffer.ByteBuf;
 /**
  * Client -> Server: send arbitrary data to server and update the currently held item.
  */
-public class GT_Packet_UpdateItem extends GT_Packet_New {
+public class GTPacketUpdateItem extends GTPacketNew {
 
     private NBTTagCompound tag;
     private EntityPlayerMP mPlayer;
 
-    public GT_Packet_UpdateItem() {
+    public GTPacketUpdateItem() {
         super(true);
     }
 
-    public GT_Packet_UpdateItem(NBTTagCompound tag) {
+    public GTPacketUpdateItem(NBTTagCompound tag) {
         super(false);
         this.tag = tag;
     }
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.UPDATE_ITEM.id;
+        return GTPacketTypes.UPDATE_ITEM.id;
     }
 
     @Override
@@ -49,8 +49,8 @@ public class GT_Packet_UpdateItem extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_UpdateItem(ISerializableObject.readCompoundTagFromGreggyByteBuf(aData));
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketUpdateItem(ISerializableObject.readCompoundTagFromGreggyByteBuf(aData));
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/net/GT_PacketTypes.java b/src/main/java/gregtech/api/net/GT_PacketTypes.java
deleted file mode 100644
index 5907b2176b..0000000000
--- a/src/main/java/gregtech/api/net/GT_PacketTypes.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package gregtech.api.net;
-
-import java.util.Arrays;
-
-import gregtech.common.blocks.GT_Packet_Ores;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-
-/**
- * Centralized place to keep all the GT packet ID constants
- */
-public enum GT_PacketTypes {
-
-    TILE_ENTITY(0, new GT_Packet_TileEntity()),
-    SOUND(1, new GT_Packet_Sound()),
-    BLOCK_EVENT(2, new GT_Packet_Block_Event()),
-    ORES(3, new GT_Packet_Ores()),
-    POLLUTION(4, new GT_Packet_Pollution()),
-    CLIENT_PREFERENCE(9, new GT_Packet_ClientPreference()),
-    SET_CONFIGURATION_CIRCUIT(12, new GT_Packet_SetConfigurationCircuit()),
-    UPDATE_ITEM(13, new GT_Packet_UpdateItem()),
-    SEND_COVER_DATA(16, new GT_Packet_SendCoverData()),
-    REQUEST_COVER_DATA(17, new GT_Packet_RequestCoverData()),
-    MULTI_TILE_ENTITY(18, new GT_Packet_MultiTileEntity(true)),
-    SEND_OREGEN_PATTERN(19, new GT_Packet_SendOregenPattern()),
-    TOOL_SWITCH_MODE(20, new GT_Packet_ToolSwitchMode()),
-    MUSIC_SYSTEM_DATA(21, new GT_Packet_MusicSystemData()),
-    // merge conflict prevention comment, keep a trailing comma above
-    ;
-
-    static {
-        // Validate no duplicate IDs
-        final GT_PacketTypes[] types = values();
-        final Int2ObjectOpenHashMap<GT_Packet_New> foundIds = new Int2ObjectOpenHashMap<>(types.length);
-        for (GT_PacketTypes type : types) {
-            final GT_Packet_New previous = foundIds.get(type.id);
-            if (previous != null) {
-                throw new IllegalStateException(
-                    "Duplicate packet IDs defined: " + type.id
-                        + " for "
-                        + type.getClass()
-                        + " and "
-                        + previous.getClass());
-            }
-            foundIds.put(type.id, type.referencePacket);
-        }
-    }
-
-    public final byte id;
-    public final GT_Packet_New referencePacket;
-
-    GT_PacketTypes(int id, GT_Packet_New referencePacket) {
-        if (((int) (byte) id) != id) {
-            throw new IllegalArgumentException("Value outside of byte normal range: " + id);
-        }
-        this.id = (byte) id;
-        this.referencePacket = referencePacket;
-    }
-
-    public static GT_Packet_New[] referencePackets() {
-        return Arrays.stream(values())
-            .map(p -> p.referencePacket)
-            .toArray(GT_Packet_New[]::new);
-    }
-}
diff --git a/src/main/java/gregtech/api/net/IGT_NetworkHandler.java b/src/main/java/gregtech/api/net/IGT_NetworkHandler.java
index 8436a89e9b..3569317b01 100644
--- a/src/main/java/gregtech/api/net/IGT_NetworkHandler.java
+++ b/src/main/java/gregtech/api/net/IGT_NetworkHandler.java
@@ -8,15 +8,15 @@ import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 @SuppressWarnings("deprecation")
 public interface IGT_NetworkHandler {
 
-    void sendToPlayer(GT_Packet aPacket, EntityPlayerMP aPlayer);
+    void sendToPlayer(GTPacket aPacket, EntityPlayerMP aPlayer);
 
-    void sendToAllAround(GT_Packet aPacket, TargetPoint aPosition);
+    void sendToAllAround(GTPacket aPacket, TargetPoint aPosition);
 
-    default void sendToAll(GT_Packet aPacket) {
+    default void sendToAll(GTPacket aPacket) {
         throw new UnsupportedOperationException("sendToAll not implemented");
     }
 
-    void sendToServer(GT_Packet aPacket);
+    void sendToServer(GTPacket aPacket);
 
-    void sendPacketToAllPlayersInRange(World aWorld, GT_Packet aPacket, int aX, int aZ);
+    void sendPacketToAllPlayersInRange(World aWorld, GTPacket aPacket, int aX, int aZ);
 }
diff --git a/src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java b/src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java
index c2e0556de9..3ede25f5ea 100644
--- a/src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java
+++ b/src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java
@@ -4,7 +4,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalChestBase;
+import gregtech.common.tileentities.storage.MTEDigitalChestBase;
 
 public class AE2DigitalChestHandler implements appeng.api.storage.IExternalStorageHandler {
 
@@ -12,14 +12,14 @@ public class AE2DigitalChestHandler implements appeng.api.storage.IExternalStora
     public boolean canHandle(final TileEntity te, final ForgeDirection d, final appeng.api.storage.StorageChannel chan,
         final appeng.api.networking.security.BaseActionSource mySrc) {
         return chan == appeng.api.storage.StorageChannel.ITEMS && te instanceof BaseMetaTileEntity
-            && ((BaseMetaTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase;
+            && ((BaseMetaTileEntity) te).getMetaTileEntity() instanceof MTEDigitalChestBase;
     }
 
     @Override
     public appeng.api.storage.IMEInventory<?> getInventory(final TileEntity te, final ForgeDirection d,
         final appeng.api.storage.StorageChannel chan, final appeng.api.networking.security.BaseActionSource src) {
         if (chan == appeng.api.storage.StorageChannel.ITEMS) {
-            return ((GT_MetaTileEntity_DigitalChestBase) (((BaseMetaTileEntity) te).getMetaTileEntity()));
+            return ((MTEDigitalChestBase) (((BaseMetaTileEntity) te).getMetaTileEntity()));
         }
         return null;
     }
diff --git a/src/main/java/gregtech/api/objects/GT_ArrayList.java b/src/main/java/gregtech/api/objects/GTArrayList.java
index 9124ef8616..33fbb18571 100644
--- a/src/main/java/gregtech/api/objects/GT_ArrayList.java
+++ b/src/main/java/gregtech/api/objects/GTArrayList.java
@@ -7,20 +7,20 @@ import java.util.Objects;
 
 import com.google.common.collect.Collections2;
 
-public class GT_ArrayList<E> extends ArrayList<E> {
+public class GTArrayList<E> extends ArrayList<E> {
 
     private static final long serialVersionUID = 1L;
     private int size_sS;
 
     private final boolean mAllowNulls;
 
-    public GT_ArrayList(boolean aAllowNulls, int aCapacity) {
+    public GTArrayList(boolean aAllowNulls, int aCapacity) {
         super(aCapacity);
         mAllowNulls = aAllowNulls;
     }
 
     @SafeVarargs
-    public GT_ArrayList(boolean aAllowNulls, E... aArray) {
+    public GTArrayList(boolean aAllowNulls, E... aArray) {
         super(Arrays.asList(aArray));
         mAllowNulls = aAllowNulls;
         if (!mAllowNulls) {
@@ -32,7 +32,7 @@ public class GT_ArrayList<E> extends ArrayList<E> {
         }
     }
 
-    public GT_ArrayList(boolean aAllowNulls, Collection<? extends E> aList) {
+    public GTArrayList(boolean aAllowNulls, Collection<? extends E> aList) {
         super(aList);
         mAllowNulls = aAllowNulls;
         if (!mAllowNulls) {
diff --git a/src/main/java/gregtech/api/objects/GT_ChunkManager.java b/src/main/java/gregtech/api/objects/GTChunkManager.java
index 14baaddd3d..59bc90aa1c 100644
--- a/src/main/java/gregtech/api/objects/GT_ChunkManager.java
+++ b/src/main/java/gregtech/api/objects/GTChunkManager.java
@@ -15,23 +15,23 @@ import net.minecraftforge.common.ForgeChunkManager.Ticket;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
 
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.enums.GTValues;
 import gregtech.api.interfaces.IChunkLoader;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Log;
+import gregtech.api.util.GTLog;
 
 /**
  * Handles re-initialization of chunks after a server restart.
  */
-public class GT_ChunkManager
+public class GTChunkManager
     implements ForgeChunkManager.OrderedLoadingCallback, ForgeChunkManager.PlayerOrderedLoadingCallback {
 
     private final Map<TileEntity, Ticket> registeredTickets = new HashMap<>();
-    public static GT_ChunkManager instance = new GT_ChunkManager();
+    public static GTChunkManager instance = new GTChunkManager();
 
     public static void init() {
-        ForgeChunkManager.setForcedChunkLoadingCallback(GT_Mod.instance, instance);
+        ForgeChunkManager.setForcedChunkLoadingCallback(GTMod.instance, instance);
     }
 
     @Override
@@ -54,7 +54,7 @@ public class GT_ChunkManager
     @Override
     public List<Ticket> ticketsLoaded(List<Ticket> tickets, World world, int maxTicketCount) {
         List<Ticket> validTickets = new ArrayList<>();
-        if (GT_Values.alwaysReloadChunkloaders) {
+        if (GTValues.alwaysReloadChunkloaders) {
             for (Ticket ticket : tickets) {
                 int x = ticket.getModData()
                     .getInteger("OwnerX");
@@ -108,24 +108,24 @@ public class GT_ChunkManager
      * @return if the chunk was loaded successfully
      */
     public static boolean requestPlayerChunkLoad(TileEntity owner, ChunkCoordIntPair chunkXZ, String player) {
-        if (!GT_Values.enableChunkloaders) return false;
-        if (!GT_Values.alwaysReloadChunkloaders && chunkXZ == null) return false;
-        if (GT_Values.debugChunkloaders && chunkXZ != null) GT_Log.out
-            .println("GT_ChunkManager: Chunk request: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")");
+        if (!GTValues.enableChunkloaders) return false;
+        if (!GTValues.alwaysReloadChunkloaders && chunkXZ == null) return false;
+        if (GTValues.debugChunkloaders && chunkXZ != null)
+            GTLog.out.println("GT_ChunkManager: Chunk request: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")");
         if (instance.registeredTickets.containsKey(owner)) {
             ForgeChunkManager.forceChunk(instance.registeredTickets.get(owner), chunkXZ);
         } else {
             Ticket ticket;
             if (player.equals("")) ticket = ForgeChunkManager
-                .requestTicket(GT_Mod.instance, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL);
+                .requestTicket(GTMod.instance, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL);
             else ticket = ForgeChunkManager
-                .requestPlayerTicket(GT_Mod.instance, player, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL);
+                .requestPlayerTicket(GTMod.instance, player, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL);
             if (ticket == null) {
-                if (GT_Values.debugChunkloaders)
-                    GT_Log.out.println("GT_ChunkManager: ForgeChunkManager.requestTicket failed");
+                if (GTValues.debugChunkloaders)
+                    GTLog.out.println("GT_ChunkManager: ForgeChunkManager.requestTicket failed");
                 return false;
             }
-            if (GT_Values.debugChunkloaders) GT_Log.out.println(
+            if (GTValues.debugChunkloaders) GTLog.out.println(
                 "GT_ChunkManager: ticket issued for machine at: (" + owner.xCoord
                     + ", "
                     + owner.yCoord
@@ -137,7 +137,7 @@ public class GT_ChunkManager
             tag.setInteger("OwnerY", owner.yCoord);
             tag.setInteger("OwnerZ", owner.zCoord);
             ForgeChunkManager.forceChunk(ticket, chunkXZ);
-            if (GT_Values.alwaysReloadChunkloaders)
+            if (GTValues.alwaysReloadChunkloaders)
                 ForgeChunkManager.forceChunk(ticket, new ChunkCoordIntPair(owner.xCoord >> 4, owner.zCoord >> 4));
             instance.registeredTickets.put(owner, ticket);
         }
@@ -150,28 +150,28 @@ public class GT_ChunkManager
     }
 
     public static void releaseChunk(TileEntity owner, ChunkCoordIntPair chunkXZ) {
-        if (!GT_Values.enableChunkloaders) return;
+        if (!GTValues.enableChunkloaders) return;
         Ticket ticket = instance.registeredTickets.get(owner);
         if (ticket != null) {
-            if (GT_Values.debugChunkloaders) GT_Log.out
+            if (GTValues.debugChunkloaders) GTLog.out
                 .println("GT_ChunkManager: Chunk release: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")");
             ForgeChunkManager.unforceChunk(ticket, chunkXZ);
         }
     }
 
     public static void releaseTicket(TileEntity owner) {
-        if (!GT_Values.enableChunkloaders) return;
+        if (!GTValues.enableChunkloaders) return;
         Ticket ticket = instance.registeredTickets.get(owner);
         if (ticket != null) {
-            if (GT_Values.debugChunkloaders) {
-                GT_Log.out.println(
+            if (GTValues.debugChunkloaders) {
+                GTLog.out.println(
                     "GT_ChunkManager: ticket released by machine at: (" + owner.xCoord
                         + ", "
                         + owner.yCoord
                         + ", "
                         + owner.zCoord
                         + ")");
-                for (ChunkCoordIntPair chunk : ticket.getChunkList()) GT_Log.out
+                for (ChunkCoordIntPair chunk : ticket.getChunkList()) GTLog.out
                     .println("GT_ChunkManager: Chunk release: (" + chunk.chunkXPos + ", " + chunk.chunkZPos + ")");
             }
             ForgeChunkManager.releaseTicket(ticket);
@@ -180,25 +180,25 @@ public class GT_ChunkManager
     }
 
     public static void printTickets() {
-        GT_Log.out.println("GT_ChunkManager: Start forced chunks dump:");
+        GTLog.out.println("GT_ChunkManager: Start forced chunks dump:");
         instance.registeredTickets.forEach((machine, ticket) -> {
-            GT_Log.out.print(
+            GTLog.out.print(
                 "GT_ChunkManager: Chunks forced by the machine at (" + machine.xCoord
                     + ", "
                     + machine.yCoord
                     + ", "
                     + machine.zCoord
                     + ")");
-            if (ticket.isPlayerTicket()) GT_Log.out.print(" Owner: " + ticket.getPlayerName());
-            GT_Log.out.print(" :");
+            if (ticket.isPlayerTicket()) GTLog.out.print(" Owner: " + ticket.getPlayerName());
+            GTLog.out.print(" :");
             for (ChunkCoordIntPair c : ticket.getChunkList()) {
-                GT_Log.out.print("(");
-                GT_Log.out.print(c.chunkXPos);
-                GT_Log.out.print(", ");
-                GT_Log.out.print(c.chunkZPos);
-                GT_Log.out.print("), ");
+                GTLog.out.print("(");
+                GTLog.out.print(c.chunkXPos);
+                GTLog.out.print(", ");
+                GTLog.out.print(c.chunkZPos);
+                GTLog.out.print("), ");
             }
         });
-        GT_Log.out.println("GT_ChunkManager: End forced chunks dump:");
+        GTLog.out.println("GT_ChunkManager: End forced chunks dump:");
     }
 }
diff --git a/src/main/java/gregtech/api/objects/GT_CopiedBlockTexture.java b/src/main/java/gregtech/api/objects/GTCopiedBlockTexture.java
index c5307b4803..79be90c3b6 100644
--- a/src/main/java/gregtech/api/objects/GT_CopiedBlockTexture.java
+++ b/src/main/java/gregtech/api/objects/GTCopiedBlockTexture.java
@@ -4,27 +4,28 @@ import net.minecraft.block.Block;
 
 import gregtech.api.enums.Dyes;
 import gregtech.api.interfaces.ITexture;
+import gregtech.common.render.GTCopiedBlockTextureRender;
 
 /**
  * @deprecated Replaced by the {@link gregtech.api.render.TextureFactory} API.
  */
 @Deprecated
-public class GT_CopiedBlockTexture extends gregtech.common.render.GT_CopiedBlockTexture implements ITexture {
+public class GTCopiedBlockTexture extends GTCopiedBlockTextureRender implements ITexture {
 
     // Backwards Compat
     @Deprecated
     public short[] mRGBa;
 
-    public GT_CopiedBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean aAllowAlpha) {
+    public GTCopiedBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean aAllowAlpha) {
         super(aBlock, ordinalSide, aMeta, aRGBa, aAllowAlpha);
-        GT_CopiedBlockTexture.this.mRGBa = aRGBa;
+        GTCopiedBlockTexture.this.mRGBa = aRGBa;
     }
 
-    public GT_CopiedBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa) {
+    public GTCopiedBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa) {
         this(aBlock, ordinalSide, aMeta, aRGBa, true);
     }
 
-    public GT_CopiedBlockTexture(Block aBlock, int ordinalSide, int aMeta) {
+    public GTCopiedBlockTexture(Block aBlock, int ordinalSide, int aMeta) {
         this(aBlock, ordinalSide, aMeta, Dyes._NULL.mRGBa);
     }
 
diff --git a/src/main/java/gregtech/api/objects/GT_Cover_Default.java b/src/main/java/gregtech/api/objects/GTCoverDefault.java
index cc5f96eef3..6e9664c355 100644
--- a/src/main/java/gregtech/api/objects/GT_Cover_Default.java
+++ b/src/main/java/gregtech/api/objects/GTCoverDefault.java
@@ -5,15 +5,15 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 
 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;
 
-public class GT_Cover_Default extends GT_CoverBehavior {
+public class GTCoverDefault extends CoverBehavior {
 
     /**
      * This is the Dummy, if there is a generic Cover without behavior
      */
-    public GT_Cover_Default() {
+    public GTCoverDefault() {
         super();
     }
 
@@ -26,12 +26,12 @@ public class GT_Cover_Default extends GT_CoverBehavior {
     public int onCoverScrewdriverclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
         aCoverVariable = ((aCoverVariable + 1) & 15);
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
-            ((aCoverVariable & 1) != 0 ? GT_Utility.trans("128.1", "Redstone ") : "")
-                + ((aCoverVariable & 2) != 0 ? GT_Utility.trans("129.1", "Energy ") : "")
-                + ((aCoverVariable & 4) != 0 ? GT_Utility.trans("130.1", "Fluids ") : "")
-                + ((aCoverVariable & 8) != 0 ? GT_Utility.trans("131.1", "Items ") : ""));
+            ((aCoverVariable & 1) != 0 ? GTUtility.trans("128.1", "Redstone ") : "")
+                + ((aCoverVariable & 2) != 0 ? GTUtility.trans("129.1", "Energy ") : "")
+                + ((aCoverVariable & 4) != 0 ? GTUtility.trans("130.1", "Fluids ") : "")
+                + ((aCoverVariable & 8) != 0 ? GTUtility.trans("131.1", "Items ") : ""));
         return aCoverVariable;
     }
 
diff --git a/src/main/java/gregtech/api/objects/GT_Cover_None.java b/src/main/java/gregtech/api/objects/GTCoverNone.java
index 279efe63d8..2c07538186 100644
--- a/src/main/java/gregtech/api/objects/GT_Cover_None.java
+++ b/src/main/java/gregtech/api/objects/GTCoverNone.java
@@ -1,6 +1,6 @@
 package gregtech.api.objects;
 
-import static gregtech.api.enums.GT_Values.E;
+import static gregtech.api.enums.GTValues.E;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -8,15 +8,15 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 
 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_None extends GT_CoverBehavior {
+public class GTCoverNone extends CoverBehavior {
 
     /**
      * This is the Dummy, if there is no Cover
      */
-    public GT_Cover_None() {}
+    public GTCoverNone() {}
 
     @Override
     public float getBlastProofLevel(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
diff --git a/src/main/java/gregtech/api/objects/GT_Fluid.java b/src/main/java/gregtech/api/objects/GTFluid.java
index 10824d6327..9ffeac5b8f 100644
--- a/src/main/java/gregtech/api/objects/GT_Fluid.java
+++ b/src/main/java/gregtech/api/objects/GTFluid.java
@@ -4,23 +4,23 @@ import static gregtech.api.enums.Mods.GregTech;
 
 import net.minecraftforge.fluids.Fluid;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.fluid.GT_FluidFactory;
+import gregtech.api.GregTechAPI;
+import gregtech.api.fluid.GTFluidFactory;
 
 /**
- * @deprecated use {@link GT_FluidFactory#builder}
+ * @deprecated use {@link GTFluidFactory#builder}
  */
 @Deprecated
-public class GT_Fluid extends Fluid implements Runnable {
+public class GTFluid extends Fluid implements Runnable {
 
     public final String mTextureName;
     private final short[] mRGBa;
 
-    public GT_Fluid(String aName, String aTextureName, short[] aRGBa) {
+    public GTFluid(String aName, String aTextureName, short[] aRGBa) {
         super(aName);
         mRGBa = aRGBa;
         mTextureName = aTextureName;
-        GregTech_API.sGTBlockIconload.add(this);
+        GregTechAPI.sGTBlockIconload.add(this);
     }
 
     @Override
@@ -31,6 +31,6 @@ public class GT_Fluid extends Fluid implements Runnable {
 
     @Override
     public void run() {
-        setIcons(GregTech_API.sBlockIcons.registerIcon(GregTech.getResourcePath("fluids", "fluid." + mTextureName)));
+        setIcons(GregTechAPI.sBlockIcons.registerIcon(GregTech.getResourcePath("fluids", "fluid." + mTextureName)));
     }
 }
diff --git a/src/main/java/gregtech/api/objects/GT_HashSet.java b/src/main/java/gregtech/api/objects/GTHashSet.java
index d42f194e5d..df012c05f7 100644
--- a/src/main/java/gregtech/api/objects/GT_HashSet.java
+++ b/src/main/java/gregtech/api/objects/GTHashSet.java
@@ -9,41 +9,41 @@ import java.util.Map;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTUtility;
 
-public class GT_HashSet<E extends GT_ItemStack> extends AbstractSet<E> {
+public class GTHashSet<E extends GTItemStack> extends AbstractSet<E> {
 
     private static final Object OBJECT = new Object();
-    private final transient HashMap<GT_ItemStack, Object> map;
+    private final transient HashMap<GTItemStack, Object> map;
 
-    public GT_HashSet() {
+    public GTHashSet() {
         map = new HashMap<>();
-        GregTech_API.sItemStackMappings.add(map);
+        GregTechAPI.sItemStackMappings.add(map);
     }
 
-    public GT_HashSet(Collection<? extends E> c) {
+    public GTHashSet(Collection<? extends E> c) {
         map = new HashMap<>(Math.max((int) (c.size() / .75f) + 1, 16));
         addAll(c);
-        GregTech_API.sItemStackMappings.add(map);
+        GregTechAPI.sItemStackMappings.add(map);
     }
 
-    public GT_HashSet(int initialCapacity, float loadFactor) {
+    public GTHashSet(int initialCapacity, float loadFactor) {
         map = new HashMap<>(initialCapacity, loadFactor);
-        GregTech_API.sItemStackMappings.add(map);
+        GregTechAPI.sItemStackMappings.add(map);
     }
 
-    public GT_HashSet(int initialCapacity) {
+    public GTHashSet(int initialCapacity) {
         map = new HashMap<>(initialCapacity);
-        GregTech_API.sItemStackMappings.add(map);
+        GregTechAPI.sItemStackMappings.add(map);
     }
 
-    GT_HashSet(int initialCapacity, float loadFactor, boolean dummy) {
+    GTHashSet(int initialCapacity, float loadFactor, boolean dummy) {
         map = new LinkedHashMap<>(initialCapacity, loadFactor);
-        GregTech_API.sItemStackMappings.add(map);
+        GregTechAPI.sItemStackMappings.add(map);
     }
 
-    public Map<GT_ItemStack, Object> getMap() {
+    public Map<GTItemStack, Object> getMap() {
         return map;
     }
 
@@ -70,8 +70,8 @@ public class GT_HashSet<E extends GT_ItemStack> extends AbstractSet<E> {
     }
 
     public boolean add(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return false;
-        return map.put(new GT_ItemStack(aStack), OBJECT) == null;
+        if (GTUtility.isStackInvalid(aStack)) return false;
+        return map.put(new GTItemStack(aStack), OBJECT) == null;
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/objects/GT_ItemStack.java b/src/main/java/gregtech/api/objects/GTItemStack.java
index 492655740d..3ddfcd706a 100644
--- a/src/main/java/gregtech/api/objects/GT_ItemStack.java
+++ b/src/main/java/gregtech/api/objects/GTItemStack.java
@@ -4,8 +4,8 @@ import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.item.ItemHolder;
 import it.unimi.dsi.fastutil.Hash;
 
@@ -13,7 +13,7 @@ import it.unimi.dsi.fastutil.Hash;
  * An optimization of {@link ItemStack} to have a better {@code hashcode} and {@code equals} in order to improve
  * {@code HashMap} and {@code Set} performance
  */
-public class GT_ItemStack extends ItemHolder {
+public class GTItemStack extends ItemHolder {
 
     /**
      * A better {@link Hash.Strategy} for {@link ItemStack}. Implementation originally from {@code GT_ItemStack2}.
@@ -38,26 +38,26 @@ public class GT_ItemStack extends ItemHolder {
     public final byte mStackSize;
     public final short mMetaData;
 
-    public GT_ItemStack(Item aItem, long aStackSize, long aMetaData) {
+    public GTItemStack(Item aItem, long aStackSize, long aMetaData) {
         super(new ItemStack(aItem, 1, (int) aMetaData));
         mItem = aItem;
         mStackSize = (byte) aStackSize;
         mMetaData = (short) aMetaData;
     }
 
-    public GT_ItemStack(ItemStack aStack) {
+    public GTItemStack(ItemStack aStack) {
         this(aStack, false);
     }
 
-    public GT_ItemStack(ItemStack aStack, boolean wildcard) {
+    public GTItemStack(ItemStack aStack, boolean wildcard) {
         this(
             aStack == null ? null : aStack.getItem(),
             aStack == null ? 0 : aStack.stackSize,
-            aStack == null ? 0 : wildcard ? GT_Values.W : Items.feather.getDamage(aStack));
+            aStack == null ? 0 : wildcard ? GTValues.W : Items.feather.getDamage(aStack));
     }
 
-    public GT_ItemStack(int aHashCode) {
-        this(GT_Utility.intToStack(aHashCode));
+    public GTItemStack(int aHashCode) {
+        this(GTUtility.intToStack(aHashCode));
     }
 
     public final ItemStack toStack() {
@@ -66,25 +66,25 @@ public class GT_ItemStack extends ItemHolder {
     }
 
     public final boolean isStackEqual(ItemStack aStack) {
-        return GT_Utility.areStacksEqual(toStack(), aStack);
+        return GTUtility.areStacksEqual(toStack(), aStack);
     }
 
-    public final boolean isStackEqual(GT_ItemStack aStack) {
-        return GT_Utility.areStacksEqual(toStack(), aStack.toStack());
+    public final boolean isStackEqual(GTItemStack aStack) {
+        return GTUtility.areStacksEqual(toStack(), aStack.toStack());
     }
 
     @Override
     public boolean equals(Object aStack) {
         if (aStack == this) return true;
-        if (aStack instanceof GT_ItemStack) {
-            return ((GT_ItemStack) aStack).mItem == mItem && ((GT_ItemStack) aStack).mMetaData == mMetaData;
+        if (aStack instanceof GTItemStack) {
+            return ((GTItemStack) aStack).mItem == mItem && ((GTItemStack) aStack).mMetaData == mMetaData;
         }
         return false;
     }
 
     @Override
     public int hashCode() {
-        return GT_Utility.stackToInt(toStack());
+        return GTUtility.stackToInt(toStack());
     }
 
     /**
@@ -102,6 +102,6 @@ public class GT_ItemStack extends ItemHolder {
      * @return a copy of the stack with stack size 1 and no NBT
      */
     public static ItemStack internalCopyStack(ItemStack aStack, boolean wildcard) {
-        return new ItemStack(aStack.getItem(), 1, wildcard ? GT_Values.W : Items.feather.getDamage(aStack));
+        return new ItemStack(aStack.getItem(), 1, wildcard ? GTValues.W : Items.feather.getDamage(aStack));
     }
 }
diff --git a/src/main/java/gregtech/api/objects/GT_ItemStack2.java b/src/main/java/gregtech/api/objects/GTItemStack2.java
index aa93876830..798915d848 100644
--- a/src/main/java/gregtech/api/objects/GT_ItemStack2.java
+++ b/src/main/java/gregtech/api/objects/GTItemStack2.java
@@ -8,28 +8,28 @@ import net.minecraft.item.ItemStack;
  * structure with GT_ItemStack. It also shouldn't be used to construct search query into a hash based data structure
  * that contains GT_ItemStack.
  *
- * @deprecated See {@link GT_ItemStack#ITEMSTACK_HASH_STRATEGY2}
+ * @deprecated See {@link GTItemStack#ITEMSTACK_HASH_STRATEGY2}
  */
 @Deprecated
-public class GT_ItemStack2 extends GT_ItemStack {
+public class GTItemStack2 extends GTItemStack {
 
-    public GT_ItemStack2(Item aItem, long aStackSize, long aMetaData) {
+    public GTItemStack2(Item aItem, long aStackSize, long aMetaData) {
         super(aItem, aStackSize, aMetaData);
     }
 
-    public GT_ItemStack2(ItemStack aStack) {
+    public GTItemStack2(ItemStack aStack) {
         super(aStack);
     }
 
-    public GT_ItemStack2(ItemStack aStack, boolean wildcard) {
+    public GTItemStack2(ItemStack aStack, boolean wildcard) {
         super(aStack, wildcard);
     }
 
     @Override
     public boolean equals(Object aStack) {
         if (aStack == this) return true;
-        if (aStack instanceof GT_ItemStack) {
-            return ((GT_ItemStack) aStack).mItem == mItem && ((GT_ItemStack) aStack).mMetaData == mMetaData;
+        if (aStack instanceof GTItemStack) {
+            return ((GTItemStack) aStack).mItem == mItem && ((GTItemStack) aStack).mMetaData == mMetaData;
         }
         return false;
     }
diff --git a/src/main/java/gregtech/api/objects/GT_MultiTexture.java b/src/main/java/gregtech/api/objects/GTMultiTexture.java
index 9748ecb934..ecd2f55661 100644
--- a/src/main/java/gregtech/api/objects/GT_MultiTexture.java
+++ b/src/main/java/gregtech/api/objects/GTMultiTexture.java
@@ -1,6 +1,7 @@
 package gregtech.api.objects;
 
 import gregtech.api.interfaces.ITexture;
+import gregtech.common.render.GTMultiTextureRender;
 
 /**
  * <p>
@@ -9,13 +10,13 @@ import gregtech.api.interfaces.ITexture;
  * <p>
  * I should have done this much earlier...
  * </p>
- * 
+ *
  * @deprecated Replaced by the {@link gregtech.api.render.TextureFactory} API.
  */
 @Deprecated
-public class GT_MultiTexture extends gregtech.common.render.GT_MultiTexture implements ITexture {
+public class GTMultiTexture extends GTMultiTextureRender implements ITexture {
 
-    public GT_MultiTexture(ITexture... aTextures) {
+    public GTMultiTexture(ITexture... aTextures) {
         super(aTextures);
     }
 
diff --git a/src/main/java/gregtech/api/objects/GT_RenderedTexture.java b/src/main/java/gregtech/api/objects/GTRenderedTexture.java
index bbb22e7d36..a4d0a064ff 100644
--- a/src/main/java/gregtech/api/objects/GT_RenderedTexture.java
+++ b/src/main/java/gregtech/api/objects/GTRenderedTexture.java
@@ -6,23 +6,23 @@ import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 
 @Deprecated
-public class GT_RenderedTexture extends gregtech.common.render.GT_RenderedTexture
+public class GTRenderedTexture extends gregtech.common.render.GTRenderedTexture
     implements ITexture, IColorModulationContainer {
 
     @Deprecated
     public short[] mRGBa;
 
-    public GT_RenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) {
+    public GTRenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) {
         super(aIcon, aRGBa, aAllowAlpha, false, true, false);
         if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture");
         mRGBa = aRGBa;
     }
 
-    public GT_RenderedTexture(IIconContainer aIcon, short[] aRGBa) {
+    public GTRenderedTexture(IIconContainer aIcon, short[] aRGBa) {
         this(aIcon, aRGBa, true);
     }
 
-    public GT_RenderedTexture(IIconContainer aIcon) {
+    public GTRenderedTexture(IIconContainer aIcon) {
         this(aIcon, Dyes._NULL.mRGBa);
     }
 
diff --git a/src/main/java/gregtech/api/objects/GT_SidedTexture.java b/src/main/java/gregtech/api/objects/GTSidedTexture.java
index d042ebede9..d7b2291386 100644
--- a/src/main/java/gregtech/api/objects/GT_SidedTexture.java
+++ b/src/main/java/gregtech/api/objects/GTSidedTexture.java
@@ -4,40 +4,40 @@ import gregtech.api.enums.Dyes;
 import gregtech.api.interfaces.IColorModulationContainer;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
+import gregtech.common.render.GTSidedTextureRender;
 
 /**
  * @deprecated Replaced by the {@link gregtech.api.render.TextureFactory} API.
  */
 @Deprecated
-public class GT_SidedTexture extends gregtech.common.render.GT_SidedTexture
-    implements ITexture, IColorModulationContainer {
+public class GTSidedTexture extends GTSidedTextureRender implements ITexture, IColorModulationContainer {
 
     @Deprecated
     public short[] mRGBa;
 
-    public GT_SidedTexture(IIconContainer aIcon0, IIconContainer aIcon1, IIconContainer aIcon2, IIconContainer aIcon3,
+    public GTSidedTexture(IIconContainer aIcon0, IIconContainer aIcon1, IIconContainer aIcon2, IIconContainer aIcon3,
         IIconContainer aIcon4, IIconContainer aIcon5, short[] aRGBa, boolean aAllowAlpha) {
         super(aIcon0, aIcon1, aIcon2, aIcon3, aIcon4, aIcon5, aRGBa, aAllowAlpha);
 
         // Backwards Compat
-        GT_SidedTexture.this.mRGBa = aRGBa;
+        GTSidedTexture.this.mRGBa = aRGBa;
     }
 
-    public GT_SidedTexture(IIconContainer aIcon0, IIconContainer aIcon1, IIconContainer aIcon2, IIconContainer aIcon3,
+    public GTSidedTexture(IIconContainer aIcon0, IIconContainer aIcon1, IIconContainer aIcon2, IIconContainer aIcon3,
         IIconContainer aIcon4, IIconContainer aIcon5, short[] aRGBa) {
         this(aIcon0, aIcon1, aIcon2, aIcon3, aIcon4, aIcon5, aRGBa, true);
     }
 
-    public GT_SidedTexture(IIconContainer aIcon0, IIconContainer aIcon1, IIconContainer aIcon2, IIconContainer aIcon3,
+    public GTSidedTexture(IIconContainer aIcon0, IIconContainer aIcon1, IIconContainer aIcon2, IIconContainer aIcon3,
         IIconContainer aIcon4, IIconContainer aIcon5) {
         this(aIcon0, aIcon1, aIcon2, aIcon3, aIcon4, aIcon5, Dyes._NULL.mRGBa);
     }
 
-    public GT_SidedTexture(IIconContainer aBottom, IIconContainer aTop, IIconContainer aSides, short[] aRGBa) {
+    public GTSidedTexture(IIconContainer aBottom, IIconContainer aTop, IIconContainer aSides, short[] aRGBa) {
         this(aBottom, aTop, aSides, aSides, aSides, aSides, aRGBa);
     }
 
-    public GT_SidedTexture(IIconContainer aBottom, IIconContainer aTop, IIconContainer aSides) {
+    public GTSidedTexture(IIconContainer aBottom, IIconContainer aTop, IIconContainer aSides) {
         this(aBottom, aTop, aSides, Dyes._NULL.mRGBa);
     }
 
diff --git a/src/main/java/gregtech/api/objects/GT_StdRenderedTexture.java b/src/main/java/gregtech/api/objects/GTStdRenderedTexture.java
index d4b8d16da6..11a3a4818f 100644
--- a/src/main/java/gregtech/api/objects/GT_StdRenderedTexture.java
+++ b/src/main/java/gregtech/api/objects/GTStdRenderedTexture.java
@@ -16,19 +16,19 @@ import gregtech.api.util.LightingHelper;
  * @deprecated Replaced by the {@link gregtech.api.render.TextureFactory} API.
  */
 @Deprecated
-public class GT_StdRenderedTexture extends GT_RenderedTexture {
+public class GTStdRenderedTexture extends GTRenderedTexture {
 
     @SuppressWarnings("unused")
-    public GT_StdRenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) {
+    public GTStdRenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) {
         super(aIcon, aRGBa, aAllowAlpha);
     }
 
-    public GT_StdRenderedTexture(IIconContainer aIcon, short[] aRGBa) {
+    public GTStdRenderedTexture(IIconContainer aIcon, short[] aRGBa) {
         super(aIcon, aRGBa, true);
     }
 
     @SuppressWarnings("unused")
-    public GT_StdRenderedTexture(IIconContainer aIcon) {
+    public GTStdRenderedTexture(IIconContainer aIcon) {
         super(aIcon, Dyes._NULL.mRGBa);
     }
 
diff --git a/src/main/java/gregtech/api/objects/GT_UO_Dimension.java b/src/main/java/gregtech/api/objects/GTUODimension.java
index af82c35dab..2fe10196bd 100644
--- a/src/main/java/gregtech/api/objects/GT_UO_Dimension.java
+++ b/src/main/java/gregtech/api/objects/GTUODimension.java
@@ -7,13 +7,13 @@ import net.minecraftforge.common.config.ConfigCategory;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 
-public class GT_UO_Dimension {
+public class GTUODimension {
 
-    private final BiMap<String, GT_UO_Fluid> fFluids;
+    private final BiMap<String, GTUOFluid> fFluids;
     private int maxChance;
     public String Dimension = "null";
 
-    public GT_UO_Dimension(ConfigCategory aConfigCategory) { // TODO CONFIGURE
+    public GTUODimension(ConfigCategory aConfigCategory) { // TODO CONFIGURE
         fFluids = HashBiMap.create();
         if (aConfigCategory.containsKey("Dimension")) {
             aConfigCategory.get("Dimension").comment = "Dimension ID or Class Name";
@@ -24,7 +24,7 @@ public class GT_UO_Dimension {
         // GT_FML_LOGGER.info("GT UO "+aConfigCategory.getName()+" Dimension:"+Dimension);
         for (int i = 0; i < aConfigCategory.getChildren()
             .size(); i++) {
-            GT_UO_Fluid fluid = new GT_UO_Fluid(
+            GTUOFluid fluid = new GTUOFluid(
                 (ConfigCategory) aConfigCategory.getChildren()
                     .toArray()[i]);
             fFluids.put(fluid.Registry, fluid);
@@ -32,9 +32,9 @@ public class GT_UO_Dimension {
         }
     }
 
-    public GT_UO_Fluid getRandomFluid(Random aRandom) {
+    public GTUOFluid getRandomFluid(Random aRandom) {
         int random = aRandom.nextInt(1000);
-        for (BiMap.Entry<String, GT_UO_Fluid> fl : fFluids.entrySet()) {
+        for (BiMap.Entry<String, GTUOFluid> fl : fFluids.entrySet()) {
             int chance = fl.getValue().Chance * 1000 / maxChance;
             if (random <= chance) return fl.getValue();
             // GT_FML_LOGGER.info("GT UO "+fl.getValue().Registry+" Chance:"+chance+" Random:"+random);
@@ -43,12 +43,12 @@ public class GT_UO_Dimension {
         return null;
     }
 
-    public String getUOFluidKey(GT_UO_Fluid uoFluid) {
+    public String getUOFluidKey(GTUOFluid uoFluid) {
         return fFluids.inverse()
             .get(uoFluid);
     }
 
-    public GT_UO_Fluid getUOFluid(String key) {
+    public GTUOFluid getUOFluid(String key) {
         return fFluids.get(key);
     }
 }
diff --git a/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java b/src/main/java/gregtech/api/objects/GTUODimensionList.java
index f057614ccf..60d11fdaa7 100644
--- a/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java
+++ b/src/main/java/gregtech/api/objects/GTUODimensionList.java
@@ -63,15 +63,15 @@ import com.google.common.collect.HashBiMap;
 import gregtech.api.enums.Dimensions;
 import gregtech.api.enums.UndergroundFluidNames;
 
-public class GT_UO_DimensionList {
+public class GTUODimensionList {
 
     private Configuration fConfig;
     private String fCategory;
-    private final BiMap<String, GT_UO_Dimension> fDimensionList;
+    private final BiMap<String, GTUODimension> fDimensionList;
 
     public int[] blackList = new int[0];
 
-    public GT_UO_DimensionList() {
+    public GTUODimensionList() {
         fDimensionList = HashBiMap.create();
     }
 
@@ -79,11 +79,11 @@ public class GT_UO_DimensionList {
         fConfig.save();
     }
 
-    public GT_UO_Dimension GetDimension(int aDimension) {
+    public GTUODimension GetDimension(int aDimension) {
         if (CheckBlackList(aDimension)) return null;
         if (fDimensionList.containsKey(Integer.toString(aDimension)))
             return fDimensionList.get(Integer.toString(aDimension));
-        for (BiMap.Entry<String, GT_UO_Dimension> dl : fDimensionList.entrySet())
+        for (BiMap.Entry<String, GTUODimension> dl : fDimensionList.entrySet())
             if (DimensionManager.getProvider(aDimension)
                 .getClass()
                 .getName()
@@ -585,7 +585,7 @@ public class GT_UO_DimensionList {
         for (int i = 0; i < fConfig.getCategory(fCategory)
             .getChildren()
             .size(); i++) {
-            GT_UO_Dimension Dimension = new GT_UO_Dimension(
+            GTUODimension Dimension = new GTUODimension(
                 (ConfigCategory) fConfig.getCategory(fCategory)
                     .getChildren()
                     .toArray()[i]);
diff --git a/src/main/java/gregtech/api/objects/GT_UO_Fluid.java b/src/main/java/gregtech/api/objects/GTUOFluid.java
index 7f9898e02e..cd019dbc8e 100644
--- a/src/main/java/gregtech/api/objects/GT_UO_Fluid.java
+++ b/src/main/java/gregtech/api/objects/GTUOFluid.java
@@ -1,6 +1,6 @@
 package gregtech.api.objects;
 
-import static gregtech.common.GT_UndergroundOil.DIVIDER;
+import static gregtech.common.UndergroundOil.DIVIDER;
 
 import java.util.Random;
 
@@ -8,7 +8,7 @@ import net.minecraftforge.common.config.ConfigCategory;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 
-public class GT_UO_Fluid {
+public class GTUOFluid {
 
     public String Registry = "null";
     public int MaxAmount = 0;
@@ -16,7 +16,7 @@ public class GT_UO_Fluid {
     public int Chance = 0;
     public int DecreasePerOperationAmount = 5;
 
-    public GT_UO_Fluid(ConfigCategory aConfigCategory) { // TODO CONFIGURE
+    public GTUOFluid(ConfigCategory aConfigCategory) { // TODO CONFIGURE
         if (aConfigCategory.containsKey("Registry")) {
             aConfigCategory.get("Registry").comment = "Fluid registry name";
             Registry = aConfigCategory.get("Registry")
diff --git a/src/main/java/gregtech/api/objects/ItemData.java b/src/main/java/gregtech/api/objects/ItemData.java
index 779e45ac8b..071b09a55f 100644
--- a/src/main/java/gregtech/api/objects/ItemData.java
+++ b/src/main/java/gregtech/api/objects/ItemData.java
@@ -13,7 +13,7 @@ public class ItemData {
 
     private static final MaterialStack[] EMPTY_MATERIALSTACK_ARRAY = new MaterialStack[0];
 
-    public final List<Object> mExtraData = new GT_ArrayList<>(false, 1);
+    public final List<Object> mExtraData = new GTArrayList<>(false, 1);
     public final OrePrefixes mPrefix;
     public final MaterialStack mMaterial;
     public final MaterialStack[] mByProducts;
diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java
index 0a433e0d99..742c210901 100644
--- a/src/main/java/gregtech/api/objects/MaterialStack.java
+++ b/src/main/java/gregtech/api/objects/MaterialStack.java
@@ -1,7 +1,7 @@
 package gregtech.api.objects;
 
 import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 public class MaterialStack implements Cloneable {
 
@@ -44,7 +44,7 @@ public class MaterialStack implements Cloneable {
     public String toString(boolean single) {
         String temp1 = "", temp2 = mMaterial.getToolTip(true), temp3 = "", temp4 = "";
         if (mAmount > 1) {
-            temp4 = GT_Utility.toSubscript(mAmount);
+            temp4 = GTUtility.toSubscript(mAmount);
         }
         if ((!single || mAmount > 1) && isMaterialListComplex(this)) {
             temp1 = "(";
diff --git a/src/main/java/gregtech/api/objects/overclockdescriber/EUNoOverclockDescriber.java b/src/main/java/gregtech/api/objects/overclockdescriber/EUNoOverclockDescriber.java
index 1e29e2d812..6f73b5467a 100644
--- a/src/main/java/gregtech/api/objects/overclockdescriber/EUNoOverclockDescriber.java
+++ b/src/main/java/gregtech/api/objects/overclockdescriber/EUNoOverclockDescriber.java
@@ -1,13 +1,13 @@
 package gregtech.api.objects.overclockdescriber;
 
-import static gregtech.api.util.GT_Utility.trans;
+import static gregtech.api.util.GTUtility.trans;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
-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.nei.RecipeDisplayInfo;
 
 @ParametersAreNonnullByDefault
@@ -28,13 +28,13 @@ public class EUNoOverclockDescriber extends OverclockDescriber {
     }
 
     @Override
-    public GT_OverclockCalculator createCalculator(GT_OverclockCalculator template, GT_Recipe recipe) {
-        return GT_OverclockCalculator.ofNoOverclock(recipe);
+    public OverclockCalculator createCalculator(OverclockCalculator template, GTRecipe recipe) {
+        return OverclockCalculator.ofNoOverclock(recipe);
     }
 
     @Override
     public String getTierString() {
-        return GT_Utility.getColoredTierNameFromTier(tier);
+        return GTUtility.getColoredTierNameFromTier(tier);
     }
 
     @Override
@@ -60,48 +60,48 @@ public class EUNoOverclockDescriber extends OverclockDescriber {
         }
     }
 
-    protected String getTotalPowerString(GT_OverclockCalculator calculator) {
-        return GT_Utility.formatNumbers(calculator.getConsumption() * calculator.getDuration()) + " EU";
+    protected String getTotalPowerString(OverclockCalculator calculator) {
+        return GTUtility.formatNumbers(calculator.getConsumption() * calculator.getDuration()) + " EU";
     }
 
     /**
      * @return If amperage should be shown on NEI.
      */
-    protected boolean shouldShowAmperage(GT_OverclockCalculator calculator) {
+    protected boolean shouldShowAmperage(OverclockCalculator calculator) {
         return amperage != 1;
     }
 
     /**
      * @return Whole EU/t usage, without tier display.
      */
-    protected String getEUtWithoutTier(GT_OverclockCalculator calculator) {
-        return GT_Utility.formatNumbers(calculator.getConsumption()) + " EU/t";
+    protected String getEUtWithoutTier(OverclockCalculator calculator) {
+        return GTUtility.formatNumbers(calculator.getConsumption()) + " EU/t";
     }
 
     /**
      * @return Whole EU/t usage, with tier display.
      */
-    protected String getEUtWithTier(GT_OverclockCalculator calculator) {
-        return getEUtWithoutTier(calculator) + GT_Utility.getTierNameWithParentheses(calculator.getConsumption());
+    protected String getEUtWithTier(OverclockCalculator calculator) {
+        return getEUtWithoutTier(calculator) + GTUtility.getTierNameWithParentheses(calculator.getConsumption());
     }
 
     /**
      * @return Whole EU/t usage. Also displays voltage tier if it should be shown.
      */
-    protected String getEUtDisplay(GT_OverclockCalculator calculator) {
+    protected String getEUtDisplay(OverclockCalculator calculator) {
         return shouldShowAmperage(calculator) ? getEUtWithoutTier(calculator) : getEUtWithTier(calculator);
     }
 
     /**
      * @return EU/t usage, divided by amperage. With tier display.
      */
-    protected String getVoltageString(GT_OverclockCalculator calculator) {
+    protected String getVoltageString(OverclockCalculator calculator) {
         long voltage = computeVoltageForEURate(calculator.getConsumption());
-        return GT_Utility.formatNumbers(voltage) + " EU/t" + GT_Utility.getTierNameWithParentheses(voltage);
+        return GTUtility.formatNumbers(voltage) + " EU/t" + GTUtility.getTierNameWithParentheses(voltage);
     }
 
-    protected String getAmperageString(GT_OverclockCalculator calculator) {
-        return GT_Utility.formatNumbers(amperage);
+    protected String getAmperageString(OverclockCalculator calculator) {
+        return GTUtility.formatNumbers(amperage);
     }
 
     protected long computeVoltageForEURate(long euPerTick) {
diff --git a/src/main/java/gregtech/api/objects/overclockdescriber/EUOverclockDescriber.java b/src/main/java/gregtech/api/objects/overclockdescriber/EUOverclockDescriber.java
index 9d53711515..42b459e874 100644
--- a/src/main/java/gregtech/api/objects/overclockdescriber/EUOverclockDescriber.java
+++ b/src/main/java/gregtech/api/objects/overclockdescriber/EUOverclockDescriber.java
@@ -1,17 +1,17 @@
 package gregtech.api.objects.overclockdescriber;
 
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.util.GT_Utility.trans;
+import static gregtech.api.enums.GTValues.V;
+import static gregtech.api.util.GTUtility.trans;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.google.common.primitives.Ints;
 
-import gregtech.GT_Mod;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.GTMod;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
+import gregtech.api.util.OverclockCalculator;
 import gregtech.nei.RecipeDisplayInfo;
 
 @ParametersAreNonnullByDefault
@@ -23,7 +23,7 @@ public class EUOverclockDescriber extends EUNoOverclockDescriber {
     }
 
     @Override
-    public GT_OverclockCalculator createCalculator(GT_OverclockCalculator template, GT_Recipe recipe) {
+    public OverclockCalculator createCalculator(OverclockCalculator template, GTRecipe recipe) {
         return template.setEUt(Ints.saturatedCast(V[tier] * amperage));
     }
 
@@ -38,9 +38,9 @@ public class EUOverclockDescriber extends EUNoOverclockDescriber {
         if (shouldShowAmperage(recipeInfo.calculator)) {
             recipeInfo.drawText(trans("154", "Voltage: ") + getVoltageString(recipeInfo.calculator));
         }
-        if (GT_Mod.gregtechproxy.mNEIOriginalVoltage) {
+        if (GTMod.gregtechproxy.mNEIOriginalVoltage) {
             EUNoOverclockDescriber originalPower = new EUNoOverclockDescriber(tier, amperage);
-            GT_OverclockCalculator originalPowerCalculator = GT_OverclockCalculator.ofNoOverclock(recipeInfo.recipe)
+            OverclockCalculator originalPowerCalculator = OverclockCalculator.ofNoOverclock(recipeInfo.recipe)
                 .calculate();
             recipeInfo
                 .drawText(trans("275", "Original usage: ") + originalPower.getEUtDisplay(originalPowerCalculator));
@@ -51,30 +51,30 @@ public class EUOverclockDescriber extends EUNoOverclockDescriber {
     }
 
     @Override
-    protected String getEUtWithoutTier(GT_OverclockCalculator calculator) {
+    protected String getEUtWithoutTier(OverclockCalculator calculator) {
         return decorateWithOverclockLabel(super.getEUtWithoutTier(calculator), calculator);
     }
 
     @Override
-    protected String getEUtWithTier(GT_OverclockCalculator calculator) {
-        return this.getEUtWithoutTier(calculator) + GT_Utility.getTierNameWithParentheses(calculator.getConsumption());
+    protected String getEUtWithTier(OverclockCalculator calculator) {
+        return this.getEUtWithoutTier(calculator) + GTUtility.getTierNameWithParentheses(calculator.getConsumption());
     }
 
     @Override
-    protected String getVoltageString(GT_OverclockCalculator calculator) {
+    protected String getVoltageString(OverclockCalculator calculator) {
         long voltage = computeVoltageForEURate(calculator.getConsumption());
-        return decorateWithOverclockLabel(GT_Utility.formatNumbers(voltage) + " EU/t", calculator)
-            + GT_Utility.getTierNameWithParentheses(voltage);
+        return decorateWithOverclockLabel(GTUtility.formatNumbers(voltage) + " EU/t", calculator)
+            + GTUtility.getTierNameWithParentheses(voltage);
     }
 
-    protected String decorateWithOverclockLabel(String s, GT_OverclockCalculator calculator) {
+    protected String decorateWithOverclockLabel(String s, OverclockCalculator calculator) {
         if (wasOverclocked(calculator)) {
             s += " (OC)";
         }
         return s;
     }
 
-    protected boolean wasOverclocked(GT_OverclockCalculator calculator) {
+    protected boolean wasOverclocked(OverclockCalculator calculator) {
         return calculator.getPerformedOverclocks() > 0;
     }
 }
diff --git a/src/main/java/gregtech/api/objects/overclockdescriber/FusionOverclockDescriber.java b/src/main/java/gregtech/api/objects/overclockdescriber/FusionOverclockDescriber.java
index b570ebcab5..019af073f0 100644
--- a/src/main/java/gregtech/api/objects/overclockdescriber/FusionOverclockDescriber.java
+++ b/src/main/java/gregtech/api/objects/overclockdescriber/FusionOverclockDescriber.java
@@ -4,11 +4,11 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import net.minecraft.util.EnumChatFormatting;
 
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
+import gregtech.api.util.OverclockCalculator;
 import gregtech.nei.formatter.FusionSpecialValueFormatter;
 
 @ParametersAreNonnullByDefault
@@ -23,7 +23,7 @@ public class FusionOverclockDescriber extends EUOverclockDescriber {
     }
 
     @Override
-    public GT_OverclockCalculator createCalculator(GT_OverclockCalculator template, GT_Recipe recipe) {
+    public OverclockCalculator createCalculator(OverclockCalculator template, GTRecipe recipe) {
         return super.createCalculator(template, recipe)
             .limitOverclockCount(overclock(recipe.mSpecialValue, recipe.mEUt))
             .setEUtIncreasePerOC(getEUtIncreasePerOC())
@@ -40,12 +40,12 @@ public class FusionOverclockDescriber extends EUOverclockDescriber {
 
     @Override
     public String getTierString() {
-        return GT_Values.TIER_COLORS[tier] + "MK " + getFusionTier() + EnumChatFormatting.RESET;
+        return GTValues.TIER_COLORS[tier] + "MK " + getFusionTier() + EnumChatFormatting.RESET;
     }
 
     @Override
-    public boolean canHandle(GT_Recipe recipe) {
-        byte tier = GT_Utility.getTier(recipe.mEUt);
+    public boolean canHandle(GTRecipe recipe) {
+        byte tier = GTUtility.getTier(recipe.mEUt);
         if (this.tier < tier) {
             return false;
         }
diff --git a/src/main/java/gregtech/api/objects/overclockdescriber/OverclockDescriber.java b/src/main/java/gregtech/api/objects/overclockdescriber/OverclockDescriber.java
index 0b253c95fa..9f995e4758 100644
--- a/src/main/java/gregtech/api/objects/overclockdescriber/OverclockDescriber.java
+++ b/src/main/java/gregtech/api/objects/overclockdescriber/OverclockDescriber.java
@@ -1,14 +1,14 @@
 package gregtech.api.objects.overclockdescriber;
 
-import static gregtech.api.util.GT_Utility.trans;
+import static gregtech.api.util.GTUtility.trans;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
-import gregtech.GT_Mod;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.GTMod;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
+import gregtech.api.util.OverclockCalculator;
 import gregtech.nei.RecipeDisplayInfo;
 
 /**
@@ -45,12 +45,12 @@ public abstract class OverclockDescriber {
     /**
      * Creates overclock calculator from given template. This template should be used instead of building from the
      * ground to avoid issues coming from different caller using different templates, but it's not applicable when using
-     * {@link GT_OverclockCalculator#ofNoOverclock(GT_Recipe)}.
+     * {@link OverclockCalculator#ofNoOverclock(GTRecipe)}.
      *
      * @param template Calculator that can be used as template. Recipe EU/t and duration are already set.
      * @param recipe   Recipe to calculate.
      */
-    public abstract GT_OverclockCalculator createCalculator(GT_OverclockCalculator template, GT_Recipe recipe);
+    public abstract OverclockCalculator createCalculator(OverclockCalculator template, GTRecipe recipe);
 
     /**
      * Draws info about the energy this object can handle on NEI recipe GUI.
@@ -61,7 +61,7 @@ public abstract class OverclockDescriber {
         if (getDurationTicks(recipeInfo.calculator) <= 0) return;
 
         String textToDraw = trans("158", "Time: ");
-        if (GT_Mod.gregtechproxy.mNEIRecipeSecondMode) {
+        if (GTMod.gregtechproxy.mNEIRecipeSecondMode) {
             textToDraw += getDurationStringSeconds(recipeInfo.calculator);
             if (getDurationSeconds(recipeInfo.calculator) <= 1.0d) {
                 textToDraw += String.format(" (%s)", getDurationStringTicks(recipeInfo.calculator));
@@ -81,26 +81,26 @@ public abstract class OverclockDescriber {
      *
      * @return If this object can handle the supplied recipe
      */
-    public boolean canHandle(GT_Recipe recipe) {
-        byte tier = GT_Utility.getTier(recipe.mEUt);
+    public boolean canHandle(GTRecipe recipe) {
+        byte tier = GTUtility.getTier(recipe.mEUt);
         return this.tier >= tier;
     }
 
-    private int getDurationTicks(GT_OverclockCalculator calculator) {
+    private int getDurationTicks(OverclockCalculator calculator) {
         return calculator.getDuration();
     }
 
-    private double getDurationSeconds(GT_OverclockCalculator calculator) {
+    private double getDurationSeconds(OverclockCalculator calculator) {
         return 0.05d * getDurationTicks(calculator);
     }
 
-    private String getDurationStringSeconds(GT_OverclockCalculator calculator) {
-        return GT_Utility.formatNumbers(getDurationSeconds(calculator)) + GT_Utility.trans("161", " secs");
+    private String getDurationStringSeconds(OverclockCalculator calculator) {
+        return GTUtility.formatNumbers(getDurationSeconds(calculator)) + GTUtility.trans("161", " secs");
     }
 
-    private String getDurationStringTicks(GT_OverclockCalculator calculator) {
-        String ticksString = getDurationTicks(calculator) == 1 ? GT_Utility.trans("209.1", " tick")
-            : GT_Utility.trans("209", " ticks");
-        return GT_Utility.formatNumbers(getDurationTicks(calculator)) + ticksString;
+    private String getDurationStringTicks(OverclockCalculator calculator) {
+        String ticksString = getDurationTicks(calculator) == 1 ? GTUtility.trans("209.1", " tick")
+            : GTUtility.trans("209", " ticks");
+        return GTUtility.formatNumbers(getDurationTicks(calculator)) + ticksString;
     }
 }
diff --git a/src/main/java/gregtech/api/objects/overclockdescriber/SteamOverclockDescriber.java b/src/main/java/gregtech/api/objects/overclockdescriber/SteamOverclockDescriber.java
index 5da64d4028..3a2da01b08 100644
--- a/src/main/java/gregtech/api/objects/overclockdescriber/SteamOverclockDescriber.java
+++ b/src/main/java/gregtech/api/objects/overclockdescriber/SteamOverclockDescriber.java
@@ -1,16 +1,16 @@
 package gregtech.api.objects.overclockdescriber;
 
-import static gregtech.api.util.GT_Utility.trans;
+import static gregtech.api.util.GTUtility.trans;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import net.minecraft.util.StatCollector;
 
 import gregtech.api.enums.SteamVariant;
-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.nei.RecipeDisplayInfo;
 
 @ParametersAreNonnullByDefault
@@ -34,8 +34,8 @@ public class SteamOverclockDescriber extends OverclockDescriber {
     }
 
     @Override
-    public GT_OverclockCalculator createCalculator(GT_OverclockCalculator template, GT_Recipe recipe) {
-        return GT_OverclockCalculator.ofNoOverclock(recipe)
+    public OverclockCalculator createCalculator(OverclockCalculator template, GTRecipe recipe) {
+        return OverclockCalculator.ofNoOverclock(recipe)
             .setEUtDiscount(euPerTickMultiplier)
             .setSpeedBoost(durationMultiplier);
     }
@@ -48,13 +48,13 @@ public class SteamOverclockDescriber extends OverclockDescriber {
         recipeInfo.drawText(trans("153", "Usage: ") + getSteamUsageString(recipeInfo.calculator));
     }
 
-    private String getTotalPowerString(GT_OverclockCalculator calculator) {
-        return GT_Utility.formatNumbers(convertEUToSteam(calculator.getConsumption() * calculator.getDuration()))
+    private String getTotalPowerString(OverclockCalculator calculator) {
+        return GTUtility.formatNumbers(convertEUToSteam(calculator.getConsumption() * calculator.getDuration()))
             + " Steam";
     }
 
-    private String getSteamUsageString(GT_OverclockCalculator calculator) {
-        return GT_Utility.formatNumbers(20 * convertEUToSteam(calculator.getConsumption())) + " L/s Steam";
+    private String getSteamUsageString(OverclockCalculator calculator) {
+        return GTUtility.formatNumbers(20 * convertEUToSteam(calculator.getConsumption())) + " L/s Steam";
     }
 
     private static long convertEUToSteam(long eu) {
diff --git a/src/main/java/gregtech/api/recipe/BasicUIPropertiesBuilder.java b/src/main/java/gregtech/api/recipe/BasicUIPropertiesBuilder.java
index 7be2c94b23..adb2ee40e8 100644
--- a/src/main/java/gregtech/api/recipe/BasicUIPropertiesBuilder.java
+++ b/src/main/java/gregtech/api/recipe/BasicUIPropertiesBuilder.java
@@ -20,7 +20,7 @@ import com.gtnewhorizons.modularui.api.math.Size;
 import com.gtnewhorizons.modularui.common.widget.ProgressBar;
 
 import gregtech.api.gui.modularui.FallbackableSteamTexture;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.SteamTexture;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.common.gui.modularui.UIHelper;
@@ -59,7 +59,7 @@ public final class BasicUIPropertiesBuilder {
     private final ImmutableList.Builder<Pair<SteamTexture, Pair<Size, Pos2d>>> specialTexturesSteam = ImmutableList
         .builder();
 
-    private IDrawable logo = GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT;
+    private IDrawable logo = GTUITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT;
     private Size logoSize = new Size(17, 17);
     private Pos2d logoPos = new Pos2d(152, 63);
 
diff --git a/src/main/java/gregtech/api/recipe/FindRecipeQuery.java b/src/main/java/gregtech/api/recipe/FindRecipeQuery.java
index 77c0648688..16702b6be6 100644
--- a/src/main/java/gregtech/api/recipe/FindRecipeQuery.java
+++ b/src/main/java/gregtech/api/recipe/FindRecipeQuery.java
@@ -9,7 +9,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 
 // spotless:off spotless likes formatting @code to &#64;code
@@ -20,7 +20,7 @@ import gregtech.api.util.MethodsReturnNonnullByDefault;
  *
  * <pre>
  * {@code
- *     GT_Recipe recipe = recipeMap.findRecipeQuery()
+ *     GTRecipe recipe = recipeMap.findRecipeQuery()
  *         .items(inputItems)
  *         .fluids(inputFluids)
  *         .find();
@@ -33,7 +33,7 @@ import gregtech.api.util.MethodsReturnNonnullByDefault;
 @MethodsReturnNonnullByDefault
 public final class FindRecipeQuery {
 
-    private static final Predicate<GT_Recipe> ALWAYS = r -> true;
+    private static final Predicate<GTRecipe> ALWAYS = r -> true;
 
     private final RecipeMap<?> recipeMap;
 
@@ -43,10 +43,10 @@ public final class FindRecipeQuery {
     private FluidStack[] fluids;
     @Nullable
     private ItemStack specialSlot;
-    private Predicate<GT_Recipe> filter = ALWAYS;
+    private Predicate<GTRecipe> filter = ALWAYS;
     private long voltage = Integer.MAX_VALUE;
     @Nullable
-    private GT_Recipe cachedRecipe;
+    private GTRecipe cachedRecipe;
     private boolean notUnificated;
     private boolean dontCheckStackSizes;
     private boolean forCollisionCheck;
@@ -61,7 +61,7 @@ public final class FindRecipeQuery {
      * @return The first matched recipe, or null if not found.
      */
     @Nullable
-    public GT_Recipe find() {
+    public GTRecipe find() {
         return findAll().findFirst()
             .orElse(null);
     }
@@ -69,7 +69,7 @@ public final class FindRecipeQuery {
     /**
      * @return All the matched recipes in the form of Stream.
      */
-    public Stream<GT_Recipe> findAll() {
+    public Stream<GTRecipe> findAll() {
         if (items == null) {
             items = new ItemStack[0];
         }
@@ -135,7 +135,7 @@ public final class FindRecipeQuery {
      * @param filter Matched recipe will be tested by this function. If it returns false, the query will attempt to
      *               find next recipe.
      */
-    public FindRecipeQuery filter(Predicate<GT_Recipe> filter) {
+    public FindRecipeQuery filter(Predicate<GTRecipe> filter) {
         this.filter = filter;
         return this;
     }
@@ -152,7 +152,7 @@ public final class FindRecipeQuery {
     /**
      * @param cachedRecipe If this is not null, the query tests it before all other recipes.
      */
-    public FindRecipeQuery cachedRecipe(@Nullable GT_Recipe cachedRecipe) {
+    public FindRecipeQuery cachedRecipe(@Nullable GTRecipe cachedRecipe) {
         this.cachedRecipe = cachedRecipe;
         return this;
     }
diff --git a/src/main/java/gregtech/api/recipe/NEIRecipeProperties.java b/src/main/java/gregtech/api/recipe/NEIRecipeProperties.java
index 2ba49f5da1..1b62ca0390 100644
--- a/src/main/java/gregtech/api/recipe/NEIRecipeProperties.java
+++ b/src/main/java/gregtech/api/recipe/NEIRecipeProperties.java
@@ -12,7 +12,7 @@ import com.gtnewhorizons.modularui.api.math.Size;
 import codechicken.nei.recipe.HandlerInfo;
 import gregtech.api.objects.overclockdescriber.OverclockDescriber;
 import gregtech.api.util.FieldsAreNonnullByDefault;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.nei.formatter.INEISpecialInfoFormatter;
 
@@ -49,7 +49,7 @@ public final class NEIRecipeProperties {
     public final Pos2d recipeBackgroundOffset;
 
     /**
-     * Formats special description for the recipe, mainly {@link gregtech.api.util.GT_Recipe#mSpecialValue}.
+     * Formats special description for the recipe, mainly {@link GTRecipe#mSpecialValue}.
      */
     public final INEISpecialInfoFormatter neiSpecialInfoFormatter;
 
@@ -68,14 +68,14 @@ public final class NEIRecipeProperties {
     public final boolean renderRealStackSizes;
 
     /**
-     * Comparator for NEI recipe sort. {@link GT_Recipe#compareTo(GT_Recipe)} by default.
+     * Comparator for NEI recipe sort. {@link GTRecipe#compareTo(GTRecipe)} by default.
      */
-    public final Comparator<GT_Recipe> comparator;
+    public final Comparator<GTRecipe> comparator;
 
     NEIRecipeProperties(boolean registerNEI, @Nullable UnaryOperator<HandlerInfo.Builder> handlerInfoCreator,
         Size recipeBackgroundSize, Pos2d recipeBackgroundOffset, INEISpecialInfoFormatter neiSpecialInfoFormatter,
         boolean unificateOutput, boolean useCustomFilter, boolean renderRealStackSizes,
-        Comparator<GT_Recipe> comparator) {
+        Comparator<GTRecipe> comparator) {
         this.registerNEI = registerNEI;
         this.handlerInfoCreator = handlerInfoCreator;
         this.recipeBackgroundOffset = recipeBackgroundOffset;
diff --git a/src/main/java/gregtech/api/recipe/NEIRecipePropertiesBuilder.java b/src/main/java/gregtech/api/recipe/NEIRecipePropertiesBuilder.java
index 050a1c4920..3b47e9ce13 100644
--- a/src/main/java/gregtech/api/recipe/NEIRecipePropertiesBuilder.java
+++ b/src/main/java/gregtech/api/recipe/NEIRecipePropertiesBuilder.java
@@ -10,7 +10,7 @@ import com.gtnewhorizons.modularui.api.math.Pos2d;
 import com.gtnewhorizons.modularui.api.math.Size;
 
 import codechicken.nei.recipe.HandlerInfo;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.nei.formatter.DefaultSpecialValueFormatter;
 import gregtech.nei.formatter.INEISpecialInfoFormatter;
@@ -36,7 +36,7 @@ public final class NEIRecipePropertiesBuilder {
     private boolean useCustomFilter;
     private boolean renderRealStackSizes = true;
 
-    private Comparator<GT_Recipe> comparator = GT_Recipe::compareTo;
+    private Comparator<GTRecipe> comparator = GTRecipe::compareTo;
 
     NEIRecipePropertiesBuilder() {}
 
@@ -93,7 +93,7 @@ public final class NEIRecipePropertiesBuilder {
         return this;
     }
 
-    public NEIRecipePropertiesBuilder recipeComparator(Comparator<GT_Recipe> comparator) {
+    public NEIRecipePropertiesBuilder recipeComparator(Comparator<GTRecipe> comparator) {
         this.comparator = comparator;
         return this;
     }
diff --git a/src/main/java/gregtech/api/recipe/RecipeMap.java b/src/main/java/gregtech/api/recipe/RecipeMap.java
index 46b32d18dd..669c7de2cf 100644
--- a/src/main/java/gregtech/api/recipe/RecipeMap.java
+++ b/src/main/java/gregtech/api/recipe/RecipeMap.java
@@ -1,6 +1,6 @@
 package gregtech.api.recipe;
 
-import static gregtech.api.util.GT_RecipeBuilder.ENABLE_COLLISION_CHECK;
+import static gregtech.api.util.GTRecipeBuilder.ENABLE_COLLISION_CHECK;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -23,8 +23,8 @@ import org.jetbrains.annotations.Unmodifiable;
 import gregtech.api.interfaces.IRecipeMap;
 import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
 import gregtech.api.util.FieldsAreNonnullByDefault;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_RecipeBuilder;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipeBuilder;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 
 /**
@@ -82,7 +82,7 @@ public final class RecipeMap<B extends RecipeMapBackend> implements IRecipeMap {
      * @return All the recipes belonging to this recipemap.
      */
     @Unmodifiable
-    public Collection<GT_Recipe> getAllRecipes() {
+    public Collection<GTRecipe> getAllRecipes() {
         return backend.getAllRecipes();
     }
 
@@ -116,13 +116,13 @@ public final class RecipeMap<B extends RecipeMapBackend> implements IRecipeMap {
     // region add recipe
     @Deprecated
     @Nullable
-    public GT_Recipe addRecipe(GT_Recipe aRecipe) {
+    public GTRecipe addRecipe(GTRecipe aRecipe) {
         return addRecipe(aRecipe, true, false, false);
     }
 
     @Deprecated
     @Nullable
-    public GT_Recipe addRecipe(GT_Recipe aRecipe, boolean aCheckForCollisions, boolean aFakeRecipe, boolean aHidden) {
+    public GTRecipe addRecipe(GTRecipe aRecipe, boolean aCheckForCollisions, boolean aFakeRecipe, boolean aHidden) {
         aRecipe.mHidden = aHidden;
         aRecipe.mFakeRecipe = aFakeRecipe;
         if (aRecipe.mFluidInputs.length < backend.properties.minFluidInputs
@@ -137,13 +137,13 @@ public final class RecipeMap<B extends RecipeMapBackend> implements IRecipeMap {
      */
     @Deprecated
     @Nullable
-    public GT_Recipe addFakeRecipe(boolean aCheckForCollisions, @Nullable ItemStack[] aInputs,
+    public GTRecipe addFakeRecipe(boolean aCheckForCollisions, @Nullable ItemStack[] aInputs,
         @Nullable ItemStack[] aOutputs, @Nullable Object aSpecial, @Nullable FluidStack[] aFluidInputs,
         @Nullable FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue, ItemStack[][] aAlt,
         boolean hidden) {
         return addFakeRecipe(
             aCheckForCollisions,
-            new GT_Recipe.GT_Recipe_WithAlt(
+            new GTRecipe.GTRecipe_WithAlt(
                 false,
                 aInputs,
                 aOutputs,
@@ -164,23 +164,23 @@ public final class RecipeMap<B extends RecipeMapBackend> implements IRecipeMap {
      */
     @Deprecated
     @Nullable
-    public GT_Recipe addFakeRecipe(boolean aCheckForCollisions, GT_Recipe aRecipe) {
+    public GTRecipe addFakeRecipe(boolean aCheckForCollisions, GTRecipe aRecipe) {
         return addRecipe(aRecipe, aCheckForCollisions, true, false);
     }
 
     @Deprecated
     @Nullable
-    public GT_Recipe addFakeRecipe(boolean aCheckForCollisions, GT_Recipe aRecipe, boolean hidden) {
+    public GTRecipe addFakeRecipe(boolean aCheckForCollisions, GTRecipe aRecipe, boolean hidden) {
         return addRecipe(aRecipe, aCheckForCollisions, true, hidden);
     }
 
     @Nonnull
     @Override
-    public Collection<GT_Recipe> doAdd(GT_RecipeBuilder builder) {
+    public Collection<GTRecipe> doAdd(GTRecipeBuilder builder) {
         return backend.doAdd(builder);
     }
 
-    public GT_Recipe add(GT_Recipe aRecipe) {
+    public GTRecipe add(GTRecipe aRecipe) {
         return backend.compileRecipe(aRecipe);
     }
 
@@ -217,26 +217,26 @@ public final class RecipeMap<B extends RecipeMapBackend> implements IRecipeMap {
     }
 
     @Nullable
-    public GT_Recipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, boolean aNotUnificated, long aVoltage,
+    public GTRecipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, boolean aNotUnificated, long aVoltage,
         @Nullable FluidStack[] aFluids, @Nullable ItemStack... aInputs) {
         return findRecipe(aTileEntity, null, aNotUnificated, aVoltage, aFluids, null, aInputs);
     }
 
     @Nullable
-    public GT_Recipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, boolean aNotUnificated,
+    public GTRecipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, boolean aNotUnificated,
         boolean aDontCheckStackSizes, long aVoltage, @Nullable FluidStack[] aFluids, @Nullable ItemStack... aInputs) {
         return findRecipe(aTileEntity, null, aNotUnificated, aDontCheckStackSizes, aVoltage, aFluids, null, aInputs);
     }
 
     @Nullable
-    public GT_Recipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, @Nullable GT_Recipe aRecipe,
+    public GTRecipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, @Nullable GTRecipe aRecipe,
         boolean aNotUnificated, long aVoltage, @Nullable FluidStack[] aFluids, @Nullable ItemStack aSpecialSlot,
         @Nullable ItemStack... aInputs) {
         return findRecipe(aTileEntity, aRecipe, aNotUnificated, false, aVoltage, aFluids, aSpecialSlot, aInputs);
     }
 
     @Nullable
-    public GT_Recipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, @Nullable GT_Recipe aRecipe,
+    public GTRecipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, @Nullable GTRecipe aRecipe,
         boolean aNotUnificated, boolean aDontCheckStackSizes, long aVoltage, @Nullable FluidStack[] aFluids,
         @Nullable ItemStack aSpecialSlot, @Nullable ItemStack... aInputs) {
         return findRecipeQuery().items(aInputs != null ? aInputs : new ItemStack[0])
diff --git a/src/main/java/gregtech/api/recipe/RecipeMapBackend.java b/src/main/java/gregtech/api/recipe/RecipeMapBackend.java
index 8ba0895a7f..f78e367adf 100644
--- a/src/main/java/gregtech/api/recipe/RecipeMapBackend.java
+++ b/src/main/java/gregtech/api/recipe/RecipeMapBackend.java
@@ -1,9 +1,9 @@
 package gregtech.api.recipe;
 
-import static gregtech.api.util.GT_RecipeBuilder.ENABLE_COLLISION_CHECK;
-import static gregtech.api.util.GT_RecipeBuilder.handleInvalidRecipe;
-import static gregtech.api.util.GT_RecipeBuilder.handleRecipeCollision;
-import static gregtech.api.util.GT_Utility.areStacksEqualOrNull;
+import static gregtech.api.util.GTRecipeBuilder.ENABLE_COLLISION_CHECK;
+import static gregtech.api.util.GTRecipeBuilder.handleInvalidRecipe;
+import static gregtech.api.util.GTRecipeBuilder.handleRecipeCollision;
+import static gregtech.api.util.GTUtility.areStacksEqualOrNull;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,13 +28,13 @@ import org.jetbrains.annotations.Unmodifiable;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.SetMultimap;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.IRecipeMap;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_StreamUtil;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTStreamUtil;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 
 /**
@@ -52,16 +52,16 @@ public class RecipeMapBackend {
     /**
      * Recipe index based on items.
      */
-    private final SetMultimap<GT_ItemStack, GT_Recipe> itemIndex = HashMultimap.create();
+    private final SetMultimap<GTItemStack, GTRecipe> itemIndex = HashMultimap.create();
     /**
      * Recipe index based on fluids.
      */
-    private final SetMultimap<String, GT_Recipe> fluidIndex = HashMultimap.create();
+    private final SetMultimap<String, GTRecipe> fluidIndex = HashMultimap.create();
 
     /**
      * All the recipes belonging to this backend, indexed by recipe category.
      */
-    private final Map<RecipeCategory, Collection<GT_Recipe>> recipesByCategory = new HashMap<>();
+    private final Map<RecipeCategory, Collection<GTRecipe>> recipesByCategory = new HashMap<>();
 
     /**
      * List of recipemaps that also receive recipe addition from this backend.
@@ -75,7 +75,7 @@ public class RecipeMapBackend {
 
     public RecipeMapBackend(RecipeMapBackendPropertiesBuilder propertiesBuilder) {
         this.properties = propertiesBuilder.build();
-        GregTech_API.itemStackMultiMaps.add(itemIndex);
+        GregTechAPI.itemStackMultiMaps.add(itemIndex);
     }
 
     void setRecipeMap(RecipeMap<?> recipeMap) {
@@ -94,14 +94,14 @@ public class RecipeMapBackend {
      *         use {@link #compileRecipe} to add / {@link #removeRecipes} to remove.
      */
     @Unmodifiable
-    public Collection<GT_Recipe> getAllRecipes() {
+    public Collection<GTRecipe> getAllRecipes() {
         return Collections.unmodifiableCollection(allRecipes());
     }
 
     /**
      * @return Raw recipe list
      */
-    private Collection<GT_Recipe> allRecipes() {
+    private Collection<GTRecipe> allRecipes() {
         return recipesByCategory.values()
             .stream()
             .flatMap(Collection::stream)
@@ -112,13 +112,13 @@ public class RecipeMapBackend {
      * @return All the recipes belonging to this backend, indexed by recipe category.
      */
     @Unmodifiable
-    public Collection<GT_Recipe> getRecipesByCategory(RecipeCategory recipeCategory) {
+    public Collection<GTRecipe> getRecipesByCategory(RecipeCategory recipeCategory) {
         return Collections
             .unmodifiableCollection(recipesByCategory.getOrDefault(recipeCategory, Collections.emptyList()));
     }
 
     @Unmodifiable
-    public Map<RecipeCategory, Collection<GT_Recipe>> getRecipeCategoryMap() {
+    public Map<RecipeCategory, Collection<GTRecipe>> getRecipeCategoryMap() {
         return Collections.unmodifiableMap(recipesByCategory);
     }
 
@@ -129,7 +129,7 @@ public class RecipeMapBackend {
      *
      * @return Supplied recipe.
      */
-    public GT_Recipe compileRecipe(GT_Recipe recipe) {
+    public GTRecipe compileRecipe(GTRecipe recipe) {
         if (recipe.getRecipeCategory() == null) {
             recipe.setRecipeCategory(recipeMap.getDefaultRecipeCategory());
         }
@@ -148,17 +148,17 @@ public class RecipeMapBackend {
     /**
      * Adds the supplied recipe to the item cache.
      */
-    protected GT_Recipe addToItemMap(GT_Recipe recipe) {
+    protected GTRecipe addToItemMap(GTRecipe recipe) {
         for (ItemStack item : recipe.mInputs) {
             if (item == null) continue;
-            itemIndex.put(new GT_ItemStack(item), recipe);
+            itemIndex.put(new GTItemStack(item), recipe);
         }
-        if (recipe instanceof GT_Recipe.GT_Recipe_WithAlt recipeWithAlt) {
+        if (recipe instanceof GTRecipe.GTRecipe_WithAlt recipeWithAlt) {
             for (ItemStack[] itemStacks : recipeWithAlt.mOreDictAlt) {
                 if (itemStacks == null) continue;
                 for (ItemStack item : itemStacks) {
                     if (item == null) continue;
-                    itemIndex.put(new GT_ItemStack(item), recipe);
+                    itemIndex.put(new GTItemStack(item), recipe);
                 }
             }
         }
@@ -168,10 +168,10 @@ public class RecipeMapBackend {
     /**
      * Builds recipe from supplied recipe builder and adds it.
      */
-    protected Collection<GT_Recipe> doAdd(GT_RecipeBuilder builder) {
-        Iterable<? extends GT_Recipe> recipes = properties.recipeEmitter.apply(builder);
-        Collection<GT_Recipe> ret = new ArrayList<>();
-        for (GT_Recipe recipe : recipes) {
+    protected Collection<GTRecipe> doAdd(GTRecipeBuilder builder) {
+        Iterable<? extends GTRecipe> recipes = properties.recipeEmitter.apply(builder);
+        Collection<GTRecipe> ret = new ArrayList<>();
+        for (GTRecipe recipe : recipes) {
             if (recipe.mFluidInputs.length < properties.minFluidInputs
                 || recipe.mInputs.length < properties.minItemInputs) {
                 return Collections.emptyList();
@@ -199,7 +199,7 @@ public class RecipeMapBackend {
         return ret;
     }
 
-    private void handleCollision(GT_Recipe recipe) {
+    private void handleCollision(GTRecipe recipe) {
         StringBuilder errorInfo = new StringBuilder();
         boolean hasAnEntry = false;
         for (FluidStack fluid : recipe.mFluidInputs) {
@@ -241,11 +241,11 @@ public class RecipeMapBackend {
     /**
      * Removes supplied recipes from recipe list. Do not use unless absolute necessity!
      */
-    public void removeRecipes(Collection<? extends GT_Recipe> recipesToRemove) {
-        for (Collection<GT_Recipe> recipes : recipesByCategory.values()) {
+    public void removeRecipes(Collection<? extends GTRecipe> recipesToRemove) {
+        for (Collection<GTRecipe> recipes : recipesByCategory.values()) {
             recipes.removeAll(recipesToRemove);
         }
-        for (GT_ItemStack key : new HashMap<>(itemIndex.asMap()).keySet()) {
+        for (GTItemStack key : new HashMap<>(itemIndex.asMap()).keySet()) {
             itemIndex.get(key)
                 .removeAll(recipesToRemove);
         }
@@ -258,7 +258,7 @@ public class RecipeMapBackend {
     /**
      * Removes supplied recipe from recipe list. Do not use unless absolute necessity!
      */
-    public void removeRecipe(GT_Recipe recipe) {
+    public void removeRecipe(GTRecipe recipe) {
         removeRecipes(Collections.singleton(recipe));
     }
 
@@ -276,9 +276,9 @@ public class RecipeMapBackend {
      */
     public void reInit() {
         itemIndex.clear();
-        for (GT_Recipe recipe : allRecipes()) {
-            GT_OreDictUnificator.setStackArray(true, recipe.mInputs);
-            GT_OreDictUnificator.setStackArray(true, recipe.mOutputs);
+        for (GTRecipe recipe : allRecipes()) {
+            GTOreDictUnificator.setStackArray(true, recipe.mInputs);
+            GTOreDictUnificator.setStackArray(true, recipe.mOutputs);
             addToItemMap(recipe);
         }
     }
@@ -287,7 +287,7 @@ public class RecipeMapBackend {
      * @return If supplied item is a valid input for any of the recipes
      */
     public boolean containsInput(ItemStack item) {
-        return itemIndex.containsKey(new GT_ItemStack(item)) || itemIndex.containsKey(new GT_ItemStack(item, true));
+        return itemIndex.containsKey(new GTItemStack(item)) || itemIndex.containsKey(new GTItemStack(item, true));
     }
 
     /**
@@ -304,7 +304,7 @@ public class RecipeMapBackend {
      *
      * @return True if collision is found.
      */
-    boolean checkCollision(GT_Recipe recipe) {
+    boolean checkCollision(GTRecipe recipe) {
         return matchRecipeStream(recipe.mInputs, recipe.mFluidInputs, null, null, false, true, true).findAny()
             .isPresent();
     }
@@ -313,8 +313,8 @@ public class RecipeMapBackend {
      * Overwrites {@link #matchRecipeStream} method. Also override {@link #doesOverwriteFindRecipe} to make it work.
      */
     @Nullable
-    protected GT_Recipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot,
-        @Nullable GT_Recipe cachedRecipe) {
+    protected GTRecipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot,
+        @Nullable GTRecipe cachedRecipe) {
         return null;
     }
 
@@ -329,7 +329,7 @@ public class RecipeMapBackend {
      * Modifies successfully found recipe. Make sure not to mutate the found recipe but use copy!
      */
     @Nullable
-    protected GT_Recipe modifyFoundRecipe(GT_Recipe recipe, ItemStack[] items, FluidStack[] fluids,
+    protected GTRecipe modifyFoundRecipe(GTRecipe recipe, ItemStack[] items, FluidStack[] fluids,
         @Nullable ItemStack specialSlot) {
         return recipe;
     }
@@ -338,7 +338,7 @@ public class RecipeMapBackend {
      * Called when {@link #matchRecipeStream} cannot find recipe.
      */
     @Nullable
-    protected GT_Recipe findFallback(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot) {
+    protected GTRecipe findFallback(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot) {
         return null;
     }
 
@@ -357,11 +357,11 @@ public class RecipeMapBackend {
      * @param forCollisionCheck   If this method is called to check collision with already registered recipes.
      * @return Stream of matches recipes.
      */
-    Stream<GT_Recipe> matchRecipeStream(ItemStack[] rawItems, FluidStack[] fluids, @Nullable ItemStack specialSlot,
-        @Nullable GT_Recipe cachedRecipe, boolean notUnificated, boolean dontCheckStackSizes,
+    Stream<GTRecipe> matchRecipeStream(ItemStack[] rawItems, FluidStack[] fluids, @Nullable ItemStack specialSlot,
+        @Nullable GTRecipe cachedRecipe, boolean notUnificated, boolean dontCheckStackSizes,
         boolean forCollisionCheck) {
         if (doesOverwriteFindRecipe()) {
-            return GT_StreamUtil.ofNullable(overwriteFindRecipe(rawItems, fluids, specialSlot, cachedRecipe));
+            return GTStreamUtil.ofNullable(overwriteFindRecipe(rawItems, fluids, specialSlot, cachedRecipe));
         }
 
         if (recipesByCategory.isEmpty()) {
@@ -393,22 +393,22 @@ public class RecipeMapBackend {
         ItemStack[] items;
         // Unification happens here in case the item input isn't already unificated.
         if (notUnificated) {
-            items = GT_OreDictUnificator.getStackArray(true, (Object[]) rawItems);
+            items = GTOreDictUnificator.getStackArray(true, (Object[]) rawItems);
         } else {
             items = rawItems;
         }
 
-        return Stream.<Stream<GT_Recipe>>of(
+        return Stream.<Stream<GTRecipe>>of(
             // Check the recipe which has been used last time in order to not have to search for it again, if possible.
-            GT_StreamUtil.ofNullable(cachedRecipe)
+            GTStreamUtil.ofNullable(cachedRecipe)
                 .filter(recipe -> recipe.mCanBeBuffered)
                 .filter(recipe -> filterFindRecipe(recipe, items, fluids, specialSlot, dontCheckStackSizes))
                 .map(recipe -> modifyFoundRecipe(recipe, items, fluids, specialSlot))
                 .filter(Objects::nonNull),
             // Now look for the recipes inside the item index, but only when the recipes actually can have items inputs.
-            GT_StreamUtil.ofConditional(!itemIndex.isEmpty(), items)
+            GTStreamUtil.ofConditional(!itemIndex.isEmpty(), items)
                 .filter(Objects::nonNull)
-                .flatMap(item -> Stream.of(new GT_ItemStack(item), new GT_ItemStack(item, true)))
+                .flatMap(item -> Stream.of(new GTItemStack(item), new GTItemStack(item, true)))
                 .map(itemIndex::get)
                 .flatMap(Collection::stream)
                 .filter(recipe -> filterFindRecipe(recipe, items, fluids, specialSlot, dontCheckStackSizes))
@@ -416,7 +416,7 @@ public class RecipeMapBackend {
                 .filter(Objects::nonNull),
             // If the minimum amount of items required for the recipes is 0, then it could match to fluid-only recipes,
             // so check fluid index too.
-            GT_StreamUtil.ofConditional(properties.minItemInputs == 0, fluids)
+            GTStreamUtil.ofConditional(properties.minItemInputs == 0, fluids)
                 .filter(Objects::nonNull)
                 .map(
                     fluidStack -> fluidIndex.get(
@@ -428,7 +428,7 @@ public class RecipeMapBackend {
                 .filter(Objects::nonNull),
             // Lastly, find fallback.
             forCollisionCheck ? Stream.empty()
-                : GT_StreamUtil.ofSupplier(() -> findFallback(items, fluids, specialSlot))
+                : GTStreamUtil.ofSupplier(() -> findFallback(items, fluids, specialSlot))
                     .filter(Objects::nonNull))
             .flatMap(Function.identity());
     }
@@ -440,7 +440,7 @@ public class RecipeMapBackend {
      * <p>
      * Note that this won't be called if {@link #doesOverwriteFindRecipe} is true.
      */
-    protected boolean filterFindRecipe(GT_Recipe recipe, ItemStack[] items, FluidStack[] fluids,
+    protected boolean filterFindRecipe(GTRecipe recipe, ItemStack[] items, FluidStack[] fluids,
         @Nullable ItemStack specialSlot, boolean dontCheckStackSizes) {
         if (recipe.mEnabled && !recipe.mFakeRecipe
             && recipe.isRecipeInputEqual(false, dontCheckStackSizes, fluids, items)) {
diff --git a/src/main/java/gregtech/api/recipe/RecipeMapBackendProperties.java b/src/main/java/gregtech/api/recipe/RecipeMapBackendProperties.java
index 0cd08279a7..47c400a3dd 100644
--- a/src/main/java/gregtech/api/recipe/RecipeMapBackendProperties.java
+++ b/src/main/java/gregtech/api/recipe/RecipeMapBackendProperties.java
@@ -6,8 +6,8 @@ import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import gregtech.api.util.FieldsAreNonnullByDefault;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_RecipeBuilder;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipeBuilder;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 
 /**
@@ -44,18 +44,18 @@ public final class RecipeMapBackendProperties {
     /**
      * Changes how recipes are emitted by a particular recipe builder.
      */
-    public final Function<? super GT_RecipeBuilder, ? extends Iterable<? extends GT_Recipe>> recipeEmitter;
+    public final Function<? super GTRecipeBuilder, ? extends Iterable<? extends GTRecipe>> recipeEmitter;
 
     /**
      * Runs a custom hook on all recipes added <b>via builder</b>.
      */
     @Nullable
-    public final Function<? super GT_Recipe, ? extends GT_Recipe> recipeTransformer;
+    public final Function<? super GTRecipe, ? extends GTRecipe> recipeTransformer;
 
     RecipeMapBackendProperties(int minItemInputs, int minFluidInputs, boolean specialSlotSensitive,
         boolean disableOptimize,
-        Function<? super GT_RecipeBuilder, ? extends Iterable<? extends GT_Recipe>> recipeEmitter,
-        @Nullable Function<? super GT_Recipe, ? extends GT_Recipe> recipeTransformer) {
+        Function<? super GTRecipeBuilder, ? extends Iterable<? extends GTRecipe>> recipeEmitter,
+        @Nullable Function<? super GTRecipe, ? extends GTRecipe> recipeTransformer) {
         if (minItemInputs < 0 || minFluidInputs < 0) {
             throw new IllegalArgumentException("minItemInputs and minFluidInputs cannot be negative");
         }
diff --git a/src/main/java/gregtech/api/recipe/RecipeMapBackendPropertiesBuilder.java b/src/main/java/gregtech/api/recipe/RecipeMapBackendPropertiesBuilder.java
index 48a27fa42e..aad0748fa9 100644
--- a/src/main/java/gregtech/api/recipe/RecipeMapBackendPropertiesBuilder.java
+++ b/src/main/java/gregtech/api/recipe/RecipeMapBackendPropertiesBuilder.java
@@ -1,6 +1,6 @@
 package gregtech.api.recipe;
 
-import static gregtech.api.util.GT_RecipeMapUtil.buildOrEmpty;
+import static gregtech.api.util.GTRecipeMapUtil.buildOrEmpty;
 
 import java.util.function.Function;
 
@@ -9,8 +9,8 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.google.common.collect.Iterables;
 
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_RecipeBuilder;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipeBuilder;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 
 /**
@@ -28,10 +28,10 @@ public final class RecipeMapBackendPropertiesBuilder {
 
     private boolean disableOptimize;
 
-    private Function<? super GT_RecipeBuilder, ? extends Iterable<? extends GT_Recipe>> recipeEmitter = this::defaultBuildRecipe;
+    private Function<? super GTRecipeBuilder, ? extends Iterable<? extends GTRecipe>> recipeEmitter = this::defaultBuildRecipe;
 
     @Nullable
-    private Function<? super GT_Recipe, ? extends GT_Recipe> recipeTransformer;
+    private Function<? super GTRecipe, ? extends GTRecipe> recipeTransformer;
 
     RecipeMapBackendPropertiesBuilder() {}
 
@@ -66,40 +66,40 @@ public final class RecipeMapBackendPropertiesBuilder {
     }
 
     public RecipeMapBackendPropertiesBuilder recipeEmitter(
-        Function<? super GT_RecipeBuilder, ? extends Iterable<? extends GT_Recipe>> recipeEmitter) {
+        Function<? super GTRecipeBuilder, ? extends Iterable<? extends GTRecipe>> recipeEmitter) {
         this.recipeEmitter = recipeEmitter;
         return this;
     }
 
     public RecipeMapBackendPropertiesBuilder combineRecipeEmitter(
-        Function<? super GT_RecipeBuilder, ? extends Iterable<? extends GT_Recipe>> func) {
+        Function<? super GTRecipeBuilder, ? extends Iterable<? extends GTRecipe>> func) {
         // move recipeEmitter to local variable, so lambda capture the function itself instead of this
-        Function<? super GT_RecipeBuilder, ? extends Iterable<? extends GT_Recipe>> cur = this.recipeEmitter;
+        Function<? super GTRecipeBuilder, ? extends Iterable<? extends GTRecipe>> cur = this.recipeEmitter;
         return recipeEmitter(b -> Iterables.concat(cur.apply(b), func.apply(b)));
     }
 
     public RecipeMapBackendPropertiesBuilder recipeTransformer(
-        Function<? super GT_Recipe, ? extends GT_Recipe> recipeTransformer) {
+        Function<? super GTRecipe, ? extends GTRecipe> recipeTransformer) {
         this.recipeTransformer = recipeTransformer;
         return this;
     }
 
     public RecipeMapBackendPropertiesBuilder chainRecipeTransformer(
-        Function<? super GT_Recipe, ? extends GT_Recipe> func) {
+        Function<? super GTRecipe, ? extends GTRecipe> func) {
         this.recipeTransformer = this.recipeTransformer == null ? func : this.recipeTransformer.andThen(func);
         return this;
     }
 
-    private Iterable<? extends GT_Recipe> defaultBuildRecipe(GT_RecipeBuilder builder) {
+    private Iterable<? extends GTRecipe> defaultBuildRecipe(GTRecipeBuilder builder) {
         // TODO sensible validation
-        GT_RecipeBuilder b = builder;
+        GTRecipeBuilder b = builder;
         if (disableOptimize && builder.isOptimize()) {
             b = copy(builder, b).noOptimize();
         }
         return buildOrEmpty(b);
     }
 
-    private static GT_RecipeBuilder copy(GT_RecipeBuilder original, GT_RecipeBuilder b) {
+    private static GTRecipeBuilder copy(GTRecipeBuilder original, GTRecipeBuilder b) {
         return b == original ? b.copy() : b;
     }
 }
diff --git a/src/main/java/gregtech/api/recipe/RecipeMapBuilder.java b/src/main/java/gregtech/api/recipe/RecipeMapBuilder.java
index a1638a5a34..2b7bc39066 100644
--- a/src/main/java/gregtech/api/recipe/RecipeMapBuilder.java
+++ b/src/main/java/gregtech/api/recipe/RecipeMapBuilder.java
@@ -20,11 +20,11 @@ import com.gtnewhorizons.modularui.common.widget.ProgressBar;
 
 import codechicken.nei.recipe.HandlerInfo;
 import gregtech.api.gui.modularui.FallbackableSteamTexture;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.SteamTexture;
 import gregtech.api.objects.overclockdescriber.OverclockDescriber;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_RecipeBuilder;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipeBuilder;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.nei.formatter.INEISpecialInfoFormatter;
 
@@ -84,7 +84,7 @@ public final class RecipeMapBuilder<B extends RecipeMapBackend> {
         this.unlocalizedName = unlocalizedName;
         this.backendCreator = backendCreator;
         this.uiPropertiesBuilder = BasicUIProperties.builder()
-            .progressBarTexture(GT_UITextures.fallbackableProgressbar(unlocalizedName, GT_UITextures.PROGRESSBAR_ARROW))
+            .progressBarTexture(GTUITextures.fallbackableProgressbar(unlocalizedName, GTUITextures.PROGRESSBAR_ARROW))
             .neiTransferRectId(unlocalizedName);
     }
 
@@ -119,7 +119,7 @@ public final class RecipeMapBuilder<B extends RecipeMapBackend> {
      * Changes how recipes are emitted by a particular recipe builder. Can emit multiple recipe per builder.
      */
     public RecipeMapBuilder<B> recipeEmitter(
-        Function<? super GT_RecipeBuilder, ? extends Iterable<? extends GT_Recipe>> recipeEmitter) {
+        Function<? super GTRecipeBuilder, ? extends Iterable<? extends GTRecipe>> recipeEmitter) {
         backendPropertiesBuilder.recipeEmitter(recipeEmitter);
         return this;
     }
@@ -130,7 +130,7 @@ public final class RecipeMapBuilder<B extends RecipeMapBackend> {
      * Recipes added via one of the overloads of addRecipe will NOT be affected by this function.
      */
     public RecipeMapBuilder<B> recipeEmitterSingle(
-        Function<? super GT_RecipeBuilder, ? extends GT_Recipe> recipeEmitter) {
+        Function<? super GTRecipeBuilder, ? extends GTRecipe> recipeEmitter) {
         return recipeEmitter(recipeEmitter.andThen(Collections::singletonList));
     }
 
@@ -142,7 +142,7 @@ public final class RecipeMapBuilder<B extends RecipeMapBackend> {
      * Unlike {@link #recipeEmitter(Function)}, this one does not clear the existing recipe being emitted, if any
      */
     public RecipeMapBuilder<B> combineRecipeEmitter(
-        Function<? super GT_RecipeBuilder, ? extends Iterable<? extends GT_Recipe>> recipeEmitter) {
+        Function<? super GTRecipeBuilder, ? extends Iterable<? extends GTRecipe>> recipeEmitter) {
         backendPropertiesBuilder.combineRecipeEmitter(recipeEmitter);
         return this;
     }
@@ -156,7 +156,7 @@ public final class RecipeMapBuilder<B extends RecipeMapBackend> {
      * Unlike {@link #recipeEmitter(Function)}, this one does not clear the existing recipe being emitted, if any
      */
     public RecipeMapBuilder<B> combineRecipeEmitterSingle(
-        Function<? super GT_RecipeBuilder, ? extends GT_Recipe> recipeEmitter) {
+        Function<? super GTRecipeBuilder, ? extends GTRecipe> recipeEmitter) {
         return combineRecipeEmitter(recipeEmitter.andThen(Collections::singletonList));
     }
 
@@ -166,7 +166,7 @@ public final class RecipeMapBuilder<B extends RecipeMapBackend> {
      * <p>
      * Recipes added via one of the overloads of addRecipe will NOT be affected by this function.
      */
-    public RecipeMapBuilder<B> recipeTransformer(Function<? super GT_Recipe, ? extends GT_Recipe> recipeTransformer) {
+    public RecipeMapBuilder<B> recipeTransformer(Function<? super GTRecipe, ? extends GTRecipe> recipeTransformer) {
         backendPropertiesBuilder.recipeTransformer(recipeTransformer);
         return this;
     }
@@ -177,7 +177,7 @@ public final class RecipeMapBuilder<B extends RecipeMapBackend> {
      * <p>
      * Recipes added via one of the overloads of addRecipe will NOT be affected by this function.
      */
-    public RecipeMapBuilder<B> recipeTransformer(Consumer<GT_Recipe> recipeTransformer) {
+    public RecipeMapBuilder<B> recipeTransformer(Consumer<GTRecipe> recipeTransformer) {
         return recipeTransformer(withIdentityReturn(recipeTransformer));
     }
 
@@ -191,7 +191,7 @@ public final class RecipeMapBuilder<B extends RecipeMapBackend> {
      * The supplied function will be given the output of existing handler when a recipe is added.
      */
     public RecipeMapBuilder<B> chainRecipeTransformer(
-        Function<? super GT_Recipe, ? extends GT_Recipe> recipeTransformer) {
+        Function<? super GTRecipe, ? extends GTRecipe> recipeTransformer) {
         backendPropertiesBuilder.chainRecipeTransformer(recipeTransformer);
         return this;
     }
@@ -205,7 +205,7 @@ public final class RecipeMapBuilder<B extends RecipeMapBackend> {
      * Unlike {@link #recipeTransformer(Function)}, this one will not replace the existing special handler.
      * The supplied function will be given the output of existing handler when a recipe is added.
      */
-    public RecipeMapBuilder<B> chainRecipeTransformer(Consumer<GT_Recipe> recipeTransformer) {
+    public RecipeMapBuilder<B> chainRecipeTransformer(Consumer<GTRecipe> recipeTransformer) {
         return chainRecipeTransformer(withIdentityReturn(recipeTransformer));
     }
 
@@ -250,7 +250,7 @@ public final class RecipeMapBuilder<B extends RecipeMapBackend> {
      * By default, it's set to {@code GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT}.
      */
     public RecipeMapBuilder<B> progressBar(UITexture texture, ProgressBar.Direction direction) {
-        return progressBarWithFallback(GT_UITextures.fallbackableProgressbar(unlocalizedName, texture), direction);
+        return progressBarWithFallback(GTUITextures.fallbackableProgressbar(unlocalizedName, texture), direction);
     }
 
     /**
@@ -438,7 +438,7 @@ public final class RecipeMapBuilder<B extends RecipeMapBackend> {
     }
 
     /**
-     * Sets formatter for special description for the recipe, mainly {@link gregtech.api.util.GT_Recipe#mSpecialValue}.
+     * Sets formatter for special description for the recipe, mainly {@link GTRecipe#mSpecialValue}.
      */
     public RecipeMapBuilder<B> neiSpecialInfoFormatter(INEISpecialInfoFormatter neiSpecialInfoFormatter) {
         neiPropertiesBuilder.neiSpecialInfoFormatter(neiSpecialInfoFormatter);
@@ -478,7 +478,7 @@ public final class RecipeMapBuilder<B extends RecipeMapBackend> {
     /**
      * Sets custom comparator for NEI recipe sort.
      */
-    public RecipeMapBuilder<B> neiRecipeComparator(Comparator<GT_Recipe> comparator) {
+    public RecipeMapBuilder<B> neiRecipeComparator(Comparator<GTRecipe> comparator) {
         neiPropertiesBuilder.recipeComparator(comparator);
         return this;
     }
diff --git a/src/main/java/gregtech/api/recipe/RecipeMapFrontend.java b/src/main/java/gregtech/api/recipe/RecipeMapFrontend.java
index 63daa00dc7..36aee2872f 100644
--- a/src/main/java/gregtech/api/recipe/RecipeMapFrontend.java
+++ b/src/main/java/gregtech/api/recipe/RecipeMapFrontend.java
@@ -1,6 +1,6 @@
 package gregtech.api.recipe;
 
-import static gregtech.api.util.GT_Utility.trans;
+import static gregtech.api.util.GTUtility.trans;
 import static net.minecraft.util.EnumChatFormatting.GRAY;
 
 import java.util.ArrayList;
@@ -30,15 +30,15 @@ import com.gtnewhorizons.modularui.common.widget.ProgressBar;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
 import codechicken.nei.PositionedStack;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.SteamVariant;
-import gregtech.api.gui.GT_GUIColorOverride;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.GUIColorOverride;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.recipe.metadata.IRecipeMetadataStorage;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.common.gui.modularui.UIHelper;
-import gregtech.nei.GT_NEI_DefaultHandler;
+import gregtech.nei.GTNEIDefaultHandler;
 import gregtech.nei.RecipeDisplayInfo;
 
 /**
@@ -60,8 +60,8 @@ public class RecipeMapFrontend {
      */
     protected final NEIRecipeProperties neiProperties;
 
-    protected final GT_GUIColorOverride colorOverride = GT_GUIColorOverride
-        .get(GT_UITextures.BACKGROUND_NEI_SINGLE_RECIPE.location);
+    protected final GUIColorOverride colorOverride = GUIColorOverride
+        .get(GTUITextures.BACKGROUND_NEI_SINGLE_RECIPE.location);
 
     public RecipeMapFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder,
         NEIRecipePropertiesBuilder neiPropertiesBuilder) {
@@ -96,7 +96,7 @@ public class RecipeMapFrontend {
         IItemHandlerModifiable fluidInputsInventory, IItemHandlerModifiable fluidOutputsInventory,
         Supplier<Float> progressSupplier, Pos2d windowOffset) {
         ModularWindow.Builder builder = ModularWindow.builder(neiProperties.recipeBackgroundSize)
-            .setBackground(GT_UITextures.BACKGROUND_NEI_SINGLE_RECIPE);
+            .setBackground(GTUITextures.BACKGROUND_NEI_SINGLE_RECIPE);
 
         UIHelper.forEachSlots(
             (i, backgrounds, pos) -> builder.widget(
@@ -245,8 +245,8 @@ public class RecipeMapFrontend {
     }
 
     protected void drawRecipeOwnerInfo(RecipeDisplayInfo recipeInfo) {
-        GT_Recipe recipe = recipeInfo.recipe;
-        if (GT_Mod.gregtechproxy.mNEIRecipeOwner) {
+        GTRecipe recipe = recipeInfo.recipe;
+        if (GTMod.gregtechproxy.mNEIRecipeOwner) {
             if (recipe.owners.size() > 1) {
                 recipeInfo.drawText(
                     EnumChatFormatting.ITALIC + trans("273", "Original Recipe by: ")
@@ -265,7 +265,7 @@ public class RecipeMapFrontend {
                             .getName());
             }
         }
-        if (GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace && recipe.stackTraces != null
+        if (GTMod.gregtechproxy.mNEIRecipeOwnerStackTrace && recipe.stackTraces != null
             && !recipe.stackTraces.isEmpty()) {
             recipeInfo.drawText("stackTrace:");
             // todo: good way to show all stacktraces
@@ -276,23 +276,23 @@ public class RecipeMapFrontend {
     }
 
     public List<String> handleNEIItemTooltip(ItemStack stack, List<String> currentTip,
-        GT_NEI_DefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
+        GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
         for (PositionedStack pStack : neiCachedRecipe.mInputs) {
             if (stack == pStack.item) {
-                if (pStack instanceof GT_NEI_DefaultHandler.FixedPositionedStack) {
+                if (pStack instanceof GTNEIDefaultHandler.FixedPositionedStack) {
                     currentTip = handleNEIItemInputTooltip(
                         currentTip,
-                        (GT_NEI_DefaultHandler.FixedPositionedStack) pStack);
+                        (GTNEIDefaultHandler.FixedPositionedStack) pStack);
                 }
                 break;
             }
         }
         for (PositionedStack pStack : neiCachedRecipe.mOutputs) {
             if (stack == pStack.item) {
-                if (pStack instanceof GT_NEI_DefaultHandler.FixedPositionedStack) {
+                if (pStack instanceof GTNEIDefaultHandler.FixedPositionedStack) {
                     currentTip = handleNEIItemOutputTooltip(
                         currentTip,
-                        (GT_NEI_DefaultHandler.FixedPositionedStack) pStack);
+                        (GTNEIDefaultHandler.FixedPositionedStack) pStack);
                 }
                 break;
             }
@@ -301,7 +301,7 @@ public class RecipeMapFrontend {
     }
 
     protected List<String> handleNEIItemInputTooltip(List<String> currentTip,
-        GT_NEI_DefaultHandler.FixedPositionedStack pStack) {
+        GTNEIDefaultHandler.FixedPositionedStack pStack) {
         if (pStack.isNotConsumed()) {
             currentTip.add(GRAY + trans("151", "Does not get consumed in the process"));
         }
@@ -309,33 +309,33 @@ public class RecipeMapFrontend {
     }
 
     protected List<String> handleNEIItemOutputTooltip(List<String> currentTip,
-        GT_NEI_DefaultHandler.FixedPositionedStack pStack) {
+        GTNEIDefaultHandler.FixedPositionedStack pStack) {
         if (pStack.isChanceBased()) {
             currentTip.add(GRAY + trans("150", "Chance: ") + pStack.getChanceText());
         }
         return currentTip;
     }
 
-    public void drawNEIOverlays(GT_NEI_DefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
+    public void drawNEIOverlays(GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
         for (PositionedStack stack : neiCachedRecipe.mInputs) {
-            if (stack instanceof GT_NEI_DefaultHandler.FixedPositionedStack) {
-                drawNEIOverlayForInput((GT_NEI_DefaultHandler.FixedPositionedStack) stack);
+            if (stack instanceof GTNEIDefaultHandler.FixedPositionedStack) {
+                drawNEIOverlayForInput((GTNEIDefaultHandler.FixedPositionedStack) stack);
             }
         }
         for (PositionedStack stack : neiCachedRecipe.mOutputs) {
-            if (stack instanceof GT_NEI_DefaultHandler.FixedPositionedStack) {
-                drawNEIOverlayForOutput((GT_NEI_DefaultHandler.FixedPositionedStack) stack);
+            if (stack instanceof GTNEIDefaultHandler.FixedPositionedStack) {
+                drawNEIOverlayForOutput((GTNEIDefaultHandler.FixedPositionedStack) stack);
             }
         }
     }
 
-    protected void drawNEIOverlayForInput(GT_NEI_DefaultHandler.FixedPositionedStack stack) {
+    protected void drawNEIOverlayForInput(GTNEIDefaultHandler.FixedPositionedStack stack) {
         if (stack.isNotConsumed()) {
             drawNEIOverlayText("NC", stack);
         }
     }
 
-    protected void drawNEIOverlayForOutput(GT_NEI_DefaultHandler.FixedPositionedStack stack) {
+    protected void drawNEIOverlayForOutput(GTNEIDefaultHandler.FixedPositionedStack stack) {
         if (stack.isChanceBased()) {
             drawNEIOverlayText(stack.getChanceText(), stack);
         }
diff --git a/src/main/java/gregtech/api/recipe/RecipeMaps.java b/src/main/java/gregtech/api/recipe/RecipeMaps.java
index 293b4f36b5..b43b1144ee 100644
--- a/src/main/java/gregtech/api/recipe/RecipeMaps.java
+++ b/src/main/java/gregtech/api/recipe/RecipeMaps.java
@@ -4,18 +4,18 @@ import static gregtech.api.enums.Mods.Avaritia;
 import static gregtech.api.enums.Mods.GTNHIntergalactic;
 import static gregtech.api.enums.Mods.NEICustomDiagrams;
 import static gregtech.api.enums.Mods.Railcraft;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeConstants.ADDITIVE_AMOUNT;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
-import static gregtech.api.util.GT_RecipeMapUtil.GT_RecipeTemplate;
-import static gregtech.api.util.GT_RecipeMapUtil.asTemplate;
-import static gregtech.api.util.GT_RecipeMapUtil.buildOrEmpty;
-import static gregtech.api.util.GT_Utility.clamp;
-import static gregtech.api.util.GT_Utility.copyAmount;
-import static gregtech.api.util.GT_Utility.getFluidForFilledItem;
-import static gregtech.api.util.GT_Utility.isArrayEmptyOrNull;
-import static gregtech.api.util.GT_Utility.isArrayOfLength;
-import static gregtech.api.util.GT_Utility.multiplyStack;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeConstants.ADDITIVE_AMOUNT;
+import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
+import static gregtech.api.util.GTRecipeMapUtil.GTRecipeTemplate;
+import static gregtech.api.util.GTRecipeMapUtil.asTemplate;
+import static gregtech.api.util.GTRecipeMapUtil.buildOrEmpty;
+import static gregtech.api.util.GTUtility.clamp;
+import static gregtech.api.util.GTUtility.copyAmount;
+import static gregtech.api.util.GTUtility.getFluidForFilledItem;
+import static gregtech.api.util.GTUtility.isArrayEmptyOrNull;
+import static gregtech.api.util.GTUtility.isArrayOfLength;
+import static gregtech.api.util.GTUtility.multiplyStack;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32,11 +32,11 @@ import org.apache.commons.lang3.ArrayUtils;
 import com.gtnewhorizons.modularui.api.drawable.UITexture;
 import com.gtnewhorizons.modularui.common.widget.ProgressBar;
 
-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.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IRecipeMap;
 import gregtech.api.objects.ItemData;
 import gregtech.api.recipe.maps.AssemblerBackend;
@@ -68,12 +68,12 @@ import gregtech.api.recipe.maps.UnpackagerBackend;
 import gregtech.api.recipe.metadata.CompressionTierKey;
 import gregtech.api.recipe.metadata.PCBFactoryTierKey;
 import gregtech.api.recipe.metadata.PurificationPlantBaseChanceKey;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_RecipeConstants;
-import gregtech.api.util.GT_RecipeMapUtil;
-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.GTRecipeConstants;
+import gregtech.api.util.GTRecipeMapUtil;
+import gregtech.api.util.GTUtility;
 import gregtech.common.tileentities.machines.multi.purification.PurifiedWaterHelpers;
 import gregtech.nei.formatter.FuelSpecialValueFormatter;
 import gregtech.nei.formatter.FusionSpecialValueFormatter;
@@ -94,12 +94,12 @@ public final class RecipeMaps {
                 return null;
             }
             if (isOutput) {
-                return GT_UITextures.OVERLAY_SLOT_DUST;
+                return GTUITextures.OVERLAY_SLOT_DUST;
             } else {
-                return GT_UITextures.OVERLAY_SLOT_CRUSHED_ORE;
+                return GTUITextures.OVERLAY_SLOT_CRUSHED_ORE;
             }
         })
-        .progressBar(GT_UITextures.PROGRESSBAR_BATH, ProgressBar.Direction.CIRCULAR_CW)
+        .progressBar(GTUITextures.PROGRESSBAR_BATH, ProgressBar.Direction.CIRCULAR_CW)
         .build();
     public static final RecipeMap<RecipeMapBackend> thermalCentrifugeRecipes = RecipeMapBuilder
         .of("gt.recipe.thermalcentrifuge")
@@ -111,9 +111,9 @@ public final class RecipeMaps {
                 return null;
             }
             if (isOutput) {
-                return GT_UITextures.OVERLAY_SLOT_DUST;
+                return GTUITextures.OVERLAY_SLOT_DUST;
             } else {
-                return GT_UITextures.OVERLAY_SLOT_CRUSHED_ORE;
+                return GTUITextures.OVERLAY_SLOT_CRUSHED_ORE;
             }
         })
         .build();
@@ -121,17 +121,17 @@ public final class RecipeMaps {
         .maxIO(1, 1, 0, 0)
         .minInputs(1, 0)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_COMPRESSOR
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_COMPRESSOR
                 : null)
-        .progressBar(GT_UITextures.PROGRESSBAR_COMPRESS)
+        .progressBar(GTUITextures.PROGRESSBAR_COMPRESS)
         .slotOverlaysSteam(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_COMPRESSOR_STEAM
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_COMPRESSOR_STEAM
                 : null)
-        .progressBarSteam(GT_UITextures.PROGRESSBAR_COMPRESS_STEAM)
+        .progressBarSteam(GTUITextures.PROGRESSBAR_COMPRESS_STEAM)
         .neiRecipeComparator(
             Comparator
-                .<GT_Recipe, Integer>comparing(recipe -> recipe.getMetadataOrDefault(CompressionTierKey.INSTANCE, 0))
-                .thenComparing(GT_Recipe::compareTo))
+                .<GTRecipe, Integer>comparing(recipe -> recipe.getMetadataOrDefault(CompressionTierKey.INSTANCE, 0))
+                .thenComparing(GTRecipe::compareTo))
         // Avoid steam machine being used as handler icon
         .neiHandlerInfo(builder -> builder.setDisplayStack(ItemList.Machine_LV_Compressor.get(1)))
         .build();
@@ -139,27 +139,27 @@ public final class RecipeMaps {
         .of("gt.recipe.neutroniumcompressor")
         .maxIO(1, 1, 1, 0)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_COMPRESSOR
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_COMPRESSOR
                 : null)
-        .progressBar(GT_UITextures.PROGRESSBAR_COMPRESS)
+        .progressBar(GTUITextures.PROGRESSBAR_COMPRESS)
         .neiHandlerInfo(builder -> builder.setDisplayStack(getModItem(Avaritia.ID, "Singularity", 1L, 0)))
         .disableOptimize()
         .neiRecipeComparator(
             Comparator
-                .<GT_Recipe, Integer>comparing(recipe -> recipe.getMetadataOrDefault(CompressionTierKey.INSTANCE, 0))
-                .thenComparing(GT_Recipe::compareTo))
+                .<GTRecipe, Integer>comparing(recipe -> recipe.getMetadataOrDefault(CompressionTierKey.INSTANCE, 0))
+                .thenComparing(GTRecipe::compareTo))
         .build();
     public static final RecipeMap<RecipeMapBackend> extractorRecipes = RecipeMapBuilder.of("gt.recipe.extractor")
         .maxIO(1, 1, 0, 0)
         .minInputs(1, 0)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_CENTRIFUGE
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_CENTRIFUGE
                 : null)
-        .progressBar(GT_UITextures.PROGRESSBAR_EXTRACT)
+        .progressBar(GTUITextures.PROGRESSBAR_EXTRACT)
         .slotOverlaysSteam(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_CENTRIFUGE_STEAM
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_CENTRIFUGE_STEAM
                 : null)
-        .progressBarSteam(GT_UITextures.PROGRESSBAR_EXTRACT_STEAM)
+        .progressBarSteam(GTUITextures.PROGRESSBAR_EXTRACT_STEAM)
         // Avoid steam machine being used as handler icon
         .neiHandlerInfo(builder -> builder.setDisplayStack(ItemList.Machine_LV_Extractor.get(1)))
         .build();
@@ -168,8 +168,8 @@ public final class RecipeMaps {
         .maxIO(1, 1, 0, 0)
         .minInputs(1, 0)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_RECYCLE : null)
-        .progressBar(GT_UITextures.PROGRESSBAR_RECYCLE, ProgressBar.Direction.CIRCULAR_CW)
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_RECYCLE : null)
+        .progressBar(GTUITextures.PROGRESSBAR_RECYCLE, ProgressBar.Direction.CIRCULAR_CW)
         .neiTransferRectId("ic2.recycler")
         .disableRegisterNEI()
         .build();
@@ -178,11 +178,11 @@ public final class RecipeMaps {
         .maxIO(1, 1, 0, 0)
         .minInputs(1, 9)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_FURNACE : null)
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_FURNACE : null)
         .slotOverlaysSteam(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_FURNACE_STEAM
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_FURNACE_STEAM
                 : null)
-        .progressBarSteam(GT_UITextures.PROGRESSBAR_ARROW_STEAM)
+        .progressBarSteam(GTUITextures.PROGRESSBAR_ARROW_STEAM)
         .neiTransferRectId("smelting")
         .disableRegisterNEI()
         .build();
@@ -191,7 +191,7 @@ public final class RecipeMaps {
         .maxIO(1, 1, 0, 0)
         .minInputs(1, 0)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_FURNACE : null)
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_FURNACE : null)
         .neiTransferRectId("smelting")
         .disableRegisterNEI()
         .build();
@@ -201,10 +201,10 @@ public final class RecipeMaps {
         .useSpecialSlot()
         .slotOverlays((index, isFluid, isOutput, isSpecial) -> {
             if (isSpecial) {
-                return GT_UITextures.OVERLAY_SLOT_DATA_ORB;
+                return GTUITextures.OVERLAY_SLOT_DATA_ORB;
             }
             if (!isFluid && !isOutput) {
-                return GT_UITextures.OVERLAY_SLOT_MICROSCOPE;
+                return GTUITextures.OVERLAY_SLOT_MICROSCOPE;
             }
             return null;
         })
@@ -214,12 +214,12 @@ public final class RecipeMaps {
         .maxIO(2, 1, 0, 0)
         .slotOverlays((index, isFluid, isOutput, isSpecial) -> {
             if (isOutput) {
-                return GT_UITextures.OVERLAY_SLOT_CRUSHED_ORE;
+                return GTUITextures.OVERLAY_SLOT_CRUSHED_ORE;
             } else {
-                return GT_UITextures.OVERLAY_SLOT_DUST;
+                return GTUITextures.OVERLAY_SLOT_DUST;
             }
         })
-        .progressBar(GT_UITextures.PROGRESSBAR_MACERATE)
+        .progressBar(GTUITextures.PROGRESSBAR_MACERATE)
         .build();
     public static final RecipeMap<ReplicatorBackend> replicatorRecipes = RecipeMapBuilder
         .of("gt.recipe.replicator", ReplicatorBackend::new)
@@ -228,23 +228,23 @@ public final class RecipeMaps {
         .useSpecialSlot()
         .slotOverlays((index, isFluid, isOutput, isSpecial) -> {
             if (isSpecial) {
-                return GT_UITextures.OVERLAY_SLOT_DATA_ORB;
+                return GTUITextures.OVERLAY_SLOT_DATA_ORB;
             }
             if (isFluid && !isOutput) {
-                return GT_UITextures.OVERLAY_SLOT_UUM;
+                return GTUITextures.OVERLAY_SLOT_UUM;
             }
             return null;
         })
         .build();
     /**
-     * Use {@link GT_RecipeConstants#AssemblyLine} for recipe addition.
+     * Use {@link GTRecipeConstants#AssemblyLine} for recipe addition.
      */
     public static final RecipeMap<RecipeMapBackend> assemblylineVisualRecipes = RecipeMapBuilder
         .of("gt.recipe.fakeAssemblylineProcess")
         .maxIO(16, 1, 4, 0)
         .minInputs(1, 0)
         .useSpecialSlot()
-        .slotOverlays((index, isFluid, isOutput, isSpecial) -> isSpecial ? GT_UITextures.OVERLAY_SLOT_DATA_ORB : null)
+        .slotOverlays((index, isFluid, isOutput, isSpecial) -> isSpecial ? GTUITextures.OVERLAY_SLOT_DATA_ORB : null)
         .disableOptimize()
         .neiTransferRect(88, 8, 18, 72)
         .neiTransferRect(124, 8, 18, 72)
@@ -252,7 +252,7 @@ public final class RecipeMaps {
         .frontend(AssemblyLineFrontend::new)
         .build();
     /**
-     * Usually, but not always, you should use {@link GT_RecipeConstants#UniversalArcFurnace} instead.
+     * Usually, but not always, you should use {@link GTRecipeConstants#UniversalArcFurnace} instead.
      */
     public static final RecipeMap<RecipeMapBackend> plasmaArcFurnaceRecipes = RecipeMapBuilder
         .of("gt.recipe.plasmaarcfurnace")
@@ -260,7 +260,7 @@ public final class RecipeMaps {
         .minInputs(1, 1)
         .build();
     /**
-     * Usually, but not always, you should use {@link GT_RecipeConstants#UniversalArcFurnace} instead.
+     * Usually, but not always, you should use {@link GTRecipeConstants#UniversalArcFurnace} instead.
      */
     public static final RecipeMap<RecipeMapBackend> arcFurnaceRecipes = RecipeMapBuilder.of("gt.recipe.arcfurnace")
         .maxIO(1, 9, 1, 0)
@@ -274,20 +274,20 @@ public final class RecipeMaps {
         .useSpecialSlot()
         .slotOverlays((index, isFluid, isOutput, isSpecial) -> {
             if (isSpecial) {
-                return GT_UITextures.OVERLAY_SLOT_DATA_STICK;
+                return GTUITextures.OVERLAY_SLOT_DATA_STICK;
             }
             if (isFluid) {
                 return null;
             }
             if (isOutput) {
-                return GT_UITextures.OVERLAY_SLOT_PAGE_PRINTED;
+                return GTUITextures.OVERLAY_SLOT_PAGE_PRINTED;
             }
-            return GT_UITextures.OVERLAY_SLOT_PAGE_BLANK;
+            return GTUITextures.OVERLAY_SLOT_PAGE_BLANK;
         })
         .build();
     public static final RecipeMap<RecipeMapBackend> sifterRecipes = RecipeMapBuilder.of("gt.recipe.sifter")
         .maxIO(1, 9, 1, 1)
-        .progressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN)
+        .progressBar(GTUITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN)
         .build();
     public static final RecipeMap<FormingPressBackend> formingPressRecipes = RecipeMapBuilder
         .of("gt.recipe.press", FormingPressBackend::new)
@@ -295,32 +295,32 @@ public final class RecipeMaps {
         .minInputs(2, 0)
         .slotOverlays((index, isFluid, isOutput, isSpecial) -> {
             if (isOutput) {
-                return GT_UITextures.OVERLAY_SLOT_PRESS_3;
+                return GTUITextures.OVERLAY_SLOT_PRESS_3;
             }
             if (index == 0) {
-                return GT_UITextures.OVERLAY_SLOT_PRESS_1;
+                return GTUITextures.OVERLAY_SLOT_PRESS_1;
             }
-            return GT_UITextures.OVERLAY_SLOT_PRESS_2;
+            return GTUITextures.OVERLAY_SLOT_PRESS_2;
         })
-        .progressBar(GT_UITextures.PROGRESSBAR_COMPRESS)
+        .progressBar(GTUITextures.PROGRESSBAR_COMPRESS)
         .build();
     public static final RecipeMap<RecipeMapBackend> laserEngraverRecipes = RecipeMapBuilder
         .of("gt.recipe.laserengraver")
         .maxIO(4, 4, 2, 2)
         .slotOverlays(
             (index, isFluid, isOutput,
-                isSpecial) -> !isFluid && !isOutput && index != 0 ? GT_UITextures.OVERLAY_SLOT_LENS : null)
+                isSpecial) -> !isFluid && !isOutput && index != 0 ? GTUITextures.OVERLAY_SLOT_LENS : null)
         // Add a simple ordering so lower tier purified water is displayed first, otherwise it gets really confusing
         .neiRecipeComparator(
             (a, b) -> Comparator.comparing(PurifiedWaterHelpers::getWaterTierFromRecipe)
-                .thenComparing(GT_Recipe::compareTo)
+                .thenComparing(GTRecipe::compareTo)
                 .compare(a, b))
         .build();
     public static final RecipeMap<RecipeMapBackend> mixerRecipes = RecipeMapBuilder.of("gt.recipe.mixer")
         .maxIO(9, 4, 1, 1)
         .minInputs(1, 0)
-        .slotOverlays((index, isFluid, isOutput, isSpecial) -> !isFluid ? GT_UITextures.OVERLAY_SLOT_DUST : null)
-        .progressBar(GT_UITextures.PROGRESSBAR_MIXER, ProgressBar.Direction.CIRCULAR_CW)
+        .slotOverlays((index, isFluid, isOutput, isSpecial) -> !isFluid ? GTUITextures.OVERLAY_SLOT_DUST : null)
+        .progressBar(GTUITextures.PROGRESSBAR_MIXER, ProgressBar.Direction.CIRCULAR_CW)
         .build();
     public static final RecipeMap<RecipeMapBackend> autoclaveRecipes = RecipeMapBuilder.of("gt.recipe.autoclave")
         .maxIO(2, 4, 1, 1)
@@ -331,11 +331,11 @@ public final class RecipeMaps {
             }
             if (isOutput) {
                 if (index == 0) {
-                    return GT_UITextures.OVERLAY_SLOT_GEM;
+                    return GTUITextures.OVERLAY_SLOT_GEM;
                 }
-                return GT_UITextures.OVERLAY_SLOT_DUST;
+                return GTUITextures.OVERLAY_SLOT_DUST;
             }
-            return GT_UITextures.OVERLAY_SLOT_DUST;
+            return GTUITextures.OVERLAY_SLOT_DUST;
         })
         .build();
     public static final RecipeMap<RecipeMapBackend> electroMagneticSeparatorRecipes = RecipeMapBuilder
@@ -343,47 +343,47 @@ public final class RecipeMaps {
         .maxIO(1, 3, 0, 0)
         .minInputs(1, 0)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> isOutput ? GT_UITextures.OVERLAY_SLOT_DUST
-                : GT_UITextures.OVERLAY_SLOT_CRUSHED_ORE)
-        .progressBar(GT_UITextures.PROGRESSBAR_MAGNET)
+            (index, isFluid, isOutput, isSpecial) -> isOutput ? GTUITextures.OVERLAY_SLOT_DUST
+                : GTUITextures.OVERLAY_SLOT_CRUSHED_ORE)
+        .progressBar(GTUITextures.PROGRESSBAR_MAGNET)
         .build();
     public static final RecipeMap<RecipeMapBackend> polarizerRecipes = RecipeMapBuilder.of("gt.recipe.polarizer")
         .maxIO(1, 1, 0, 0)
         .minInputs(1, 0)
-        .progressBar(GT_UITextures.PROGRESSBAR_MAGNET)
+        .progressBar(GTUITextures.PROGRESSBAR_MAGNET)
         .build();
     public static final RecipeMap<RecipeMapBackend> maceratorRecipes = RecipeMapBuilder.of("gt.recipe.macerator")
         .maxIO(1, 4, 0, 0)
         .minInputs(1, 0)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> isOutput ? GT_UITextures.OVERLAY_SLOT_DUST
-                : GT_UITextures.OVERLAY_SLOT_CRUSHED_ORE)
+            (index, isFluid, isOutput, isSpecial) -> isOutput ? GTUITextures.OVERLAY_SLOT_DUST
+                : GTUITextures.OVERLAY_SLOT_CRUSHED_ORE)
         .slotOverlaysSteam(
-            (index, isFluid, isOutput, isSpecial) -> isOutput ? GT_UITextures.OVERLAY_SLOT_DUST_STEAM
-                : GT_UITextures.OVERLAY_SLOT_CRUSHED_ORE_STEAM)
-        .progressBar(GT_UITextures.PROGRESSBAR_MACERATE)
-        .progressBarSteam(GT_UITextures.PROGRESSBAR_MACERATE_STEAM)
+            (index, isFluid, isOutput, isSpecial) -> isOutput ? GTUITextures.OVERLAY_SLOT_DUST_STEAM
+                : GTUITextures.OVERLAY_SLOT_CRUSHED_ORE_STEAM)
+        .progressBar(GTUITextures.PROGRESSBAR_MACERATE)
+        .progressBarSteam(GTUITextures.PROGRESSBAR_MACERATE_STEAM)
         // Avoid steam machine being used as handler icon
         .neiHandlerInfo(builder -> builder.setDisplayStack(ItemList.Machine_LV_Macerator.get(1)))
         .build();
     public static final RecipeMap<RecipeMapBackend> chemicalBathRecipes = RecipeMapBuilder.of("gt.recipe.chemicalbath")
         .maxIO(1, 3, 1, 1)
         .minInputs(1, 1)
-        .progressBar(GT_UITextures.PROGRESSBAR_BATH, ProgressBar.Direction.CIRCULAR_CW)
+        .progressBar(GTUITextures.PROGRESSBAR_BATH, ProgressBar.Direction.CIRCULAR_CW)
         .build();
     public static final RecipeMap<FluidCannerBackend> fluidCannerRecipes = RecipeMapBuilder
         .of("gt.recipe.fluidcanner", FluidCannerBackend::new)
         .maxIO(1, 1, 1, 1)
         .minInputs(1, 0)
-        .slotOverlays((index, isFluid, isOutput, isSpecial) -> !isFluid ? GT_UITextures.OVERLAY_SLOT_CANISTER : null)
-        .progressBar(GT_UITextures.PROGRESSBAR_CANNER)
+        .slotOverlays((index, isFluid, isOutput, isSpecial) -> !isFluid ? GTUITextures.OVERLAY_SLOT_CANISTER : null)
+        .progressBar(GTUITextures.PROGRESSBAR_CANNER)
         .build();
     public static final RecipeMap<RecipeMapBackend> brewingRecipes = RecipeMapBuilder.of("gt.recipe.brewer")
         .maxIO(1, 0, 1, 1)
         .minInputs(1, 1)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_CAULDRON : null)
-        .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_CAULDRON : null)
+        .progressBar(GTUITextures.PROGRESSBAR_ARROW_MULTIPLE)
         .build();
     public static final RecipeMap<RecipeMapBackend> fluidHeaterRecipes = RecipeMapBuilder.of("gt.recipe.fluidheater")
         .maxIO(1, 0, 1, 1)
@@ -392,11 +392,11 @@ public final class RecipeMaps {
                 return null;
             }
             if (isOutput) {
-                return GT_UITextures.OVERLAY_SLOT_HEATER_2;
+                return GTUITextures.OVERLAY_SLOT_HEATER_2;
             }
-            return GT_UITextures.OVERLAY_SLOT_HEATER_1;
+            return GTUITextures.OVERLAY_SLOT_HEATER_1;
         })
-        .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
+        .progressBar(GTUITextures.PROGRESSBAR_ARROW_MULTIPLE)
         .build();
     public static final RecipeMap<RecipeMapBackend> distilleryRecipes = RecipeMapBuilder.of("gt.recipe.distillery")
         .maxIO(1, 1, 1, 1)
@@ -406,11 +406,11 @@ public final class RecipeMaps {
                 return null;
             }
             if (isOutput) {
-                return GT_UITextures.OVERLAY_SLOT_BEAKER_2;
+                return GTUITextures.OVERLAY_SLOT_BEAKER_2;
             }
-            return GT_UITextures.OVERLAY_SLOT_BEAKER_1;
+            return GTUITextures.OVERLAY_SLOT_BEAKER_1;
         })
-        .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
+        .progressBar(GTUITextures.PROGRESSBAR_ARROW_MULTIPLE)
         .recipeTransformer(r -> {
             int aInput = r.mFluidInputs[0].amount, aOutput = r.mFluidOutputs[0].amount, aDuration = r.mDuration;
 
@@ -434,14 +434,14 @@ public final class RecipeMaps {
                 aInput = (aInput + tScale - 1) / tScale;
                 aOutput = aOutput / tScale;
                 if (!isArrayEmptyOrNull(r.mOutputs)) {
-                    ItemData tData = GT_OreDictUnificator.getItemData(r.mOutputs[0]);
+                    ItemData tData = GTOreDictUnificator.getItemData(r.mOutputs[0]);
                     if (tData != null && (tData.mPrefix == OrePrefixes.dust
                         || OrePrefixes.dust.mFamiliarPrefixes.contains(tData.mPrefix))) {
-                        r.mOutputs[0] = GT_OreDictUnificator.getDust(
+                        r.mOutputs[0] = GTOreDictUnificator.getDust(
                             tData.mMaterial.mMaterial,
                             tData.mMaterial.mAmount * r.mOutputs[0].stackSize / tScale);
                     } else {
-                        if (r.mOutputs[0].stackSize / tScale == 0) r.mOutputs[0] = GT_Values.NI;
+                        if (r.mOutputs[0].stackSize / tScale == 0) r.mOutputs[0] = GTValues.NI;
                         else r.mOutputs[0] = copyAmount(r.mOutputs[0].stackSize / tScale, r.mOutputs[0]);
                     }
                 }
@@ -455,14 +455,14 @@ public final class RecipeMaps {
     public static final RecipeMap<RecipeMapBackend> fermentingRecipes = RecipeMapBuilder.of("gt.recipe.fermenter")
         .maxIO(0, 0, 1, 1)
         .minInputs(0, 1)
-        .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
+        .progressBar(GTUITextures.PROGRESSBAR_ARROW_MULTIPLE)
         .build();
     public static final RecipeMap<RecipeMapBackend> fluidSolidifierRecipes = RecipeMapBuilder
         .of("gt.recipe.fluidsolidifier")
         .maxIO(1, 1, 1, 0)
         .minInputs(1, 1)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_MOLD : null)
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_MOLD : null)
         .recipeTransformer(r -> {
             if (ArrayUtils.isNotEmpty(r.mFluidInputs)) {
                 if (Materials.PhasedGold.getMolten(1)
@@ -479,9 +479,9 @@ public final class RecipeMaps {
         .maxIO(1, 1, 0, 1)
         .minInputs(1, 0)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_CENTRIFUGE
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_CENTRIFUGE
                 : null)
-        .progressBar(GT_UITextures.PROGRESSBAR_EXTRACT)
+        .progressBar(GTUITextures.PROGRESSBAR_EXTRACT)
         .recipeTransformer(r -> {
             if (ArrayUtils.isNotEmpty(r.mFluidOutputs)) {
                 if (Materials.PhasedGold.getMolten(1)
@@ -498,10 +498,10 @@ public final class RecipeMaps {
         .minInputs(2, 0)
         .slotOverlays((index, isFluid, isOutput, isSpecial) -> {
             if (isOutput) {
-                return GT_UITextures.OVERLAY_SLOT_BOXED;
+                return GTUITextures.OVERLAY_SLOT_BOXED;
             }
             if (index != 0) {
-                return GT_UITextures.OVERLAY_SLOT_BOX;
+                return GTUITextures.OVERLAY_SLOT_BOX;
             }
             return null;
         })
@@ -510,7 +510,7 @@ public final class RecipeMaps {
         .of("gt.recipe.unpackager", UnpackagerBackend::new)
         .maxIO(1, 2, 0, 0)
         .minInputs(1, 0)
-        .slotOverlays((index, isFluid, isOutput, isSpecial) -> !isOutput ? GT_UITextures.OVERLAY_SLOT_BOXED : null)
+        .slotOverlays((index, isFluid, isOutput, isSpecial) -> !isOutput ? GTUITextures.OVERLAY_SLOT_BOXED : null)
         .build();
     public static final RecipeMap<RecipeMapBackend> fusionRecipes = RecipeMapBuilder.of("gt.recipe.fusionreactor")
         .maxIO(0, 0, 2, 1)
@@ -520,9 +520,9 @@ public final class RecipeMaps {
         .neiSpecialInfoFormatter(FusionSpecialValueFormatter.INSTANCE)
         .neiRecipeComparator(
             Comparator
-                .<GT_Recipe, Integer>comparing(
+                .<GTRecipe, Integer>comparing(
                     recipe -> FusionSpecialValueFormatter.getFusionTier(recipe.mSpecialValue, recipe.mEUt))
-                .thenComparing(GT_Recipe::compareTo))
+                .thenComparing(GTRecipe::compareTo))
         .frontend(FluidOnlyFrontend::new)
         .build();
     public static final RecipeMap<RecipeMapBackend> centrifugeRecipes = RecipeMapBuilder.of("gt.recipe.centrifuge")
@@ -532,15 +532,15 @@ public final class RecipeMaps {
                 return null;
             }
             if (isFluid) {
-                return GT_UITextures.OVERLAY_SLOT_CENTRIFUGE_FLUID;
+                return GTUITextures.OVERLAY_SLOT_CENTRIFUGE_FLUID;
             } else {
                 if (index == 0) {
-                    return GT_UITextures.OVERLAY_SLOT_CENTRIFUGE;
+                    return GTUITextures.OVERLAY_SLOT_CENTRIFUGE;
                 }
-                return GT_UITextures.OVERLAY_SLOT_CANISTER;
+                return GTUITextures.OVERLAY_SLOT_CANISTER;
             }
         })
-        .progressBar(GT_UITextures.PROGRESSBAR_EXTRACT)
+        .progressBar(GTUITextures.PROGRESSBAR_EXTRACT)
         .build();
     public static final RecipeMap<RecipeMapBackend> electrolyzerRecipes = RecipeMapBuilder.of("gt.recipe.electrolyzer")
         .maxIO(2, 6, 1, 1)
@@ -549,18 +549,18 @@ public final class RecipeMaps {
                 return null;
             }
             if (isFluid) {
-                return GT_UITextures.OVERLAY_SLOT_CHARGER_FLUID;
+                return GTUITextures.OVERLAY_SLOT_CHARGER_FLUID;
             } else {
                 if (index == 0) {
-                    return GT_UITextures.OVERLAY_SLOT_CHARGER;
+                    return GTUITextures.OVERLAY_SLOT_CHARGER;
                 }
-                return GT_UITextures.OVERLAY_SLOT_CANISTER;
+                return GTUITextures.OVERLAY_SLOT_CANISTER;
             }
         })
-        .progressBar(GT_UITextures.PROGRESSBAR_EXTRACT)
+        .progressBar(GTUITextures.PROGRESSBAR_EXTRACT)
         .build();
     /**
-     * Use {@link GT_RecipeConstants#COIL_HEAT} as heat level.
+     * Use {@link GTRecipeConstants#COIL_HEAT} as heat level.
      */
     public static final RecipeMap<RecipeMapBackend> blastFurnaceRecipes = RecipeMapBuilder.of("gt.recipe.blastfurnace")
         .maxIO(6, 6, 1, 1)
@@ -568,7 +568,7 @@ public final class RecipeMaps {
         .neiSpecialInfoFormatter(HeatingCoilSpecialValueFormatter.INSTANCE)
         .build();
     /**
-     * Use {@link GT_RecipeConstants#COIL_HEAT} as heat level.
+     * Use {@link GTRecipeConstants#COIL_HEAT} as heat level.
      */
     public static final RecipeMap<RecipeMapBackend> plasmaForgeRecipes = RecipeMapBuilder.of("gt.recipe.plasmaforge")
         .maxIO(9, 9, 9, 9)
@@ -606,14 +606,14 @@ public final class RecipeMaps {
         .disableOptimize()
         .build();
     /**
-     * Uses {@link GT_RecipeConstants#ADDITIVE_AMOUNT} for coal/charcoal amount.
+     * Uses {@link GTRecipeConstants#ADDITIVE_AMOUNT} for coal/charcoal amount.
      */
     public static final RecipeMap<RecipeMapBackend> primitiveBlastRecipes = RecipeMapBuilder
         .of("gt.recipe.primitiveblastfurnace")
         .maxIO(3, 3, 0, 0)
         .minInputs(1, 0)
         .recipeEmitter(builder -> {
-            Optional<GT_Recipe> rr = builder.eut(0)
+            Optional<GTRecipe> rr = builder.eut(0)
                 .validateInputCount(1, 2)
                 .validateOutputCount(1, 2)
                 .validateNoInputFluid()
@@ -629,7 +629,7 @@ public final class RecipeMaps {
                 return Collections.emptyList();
             int aCoalAmount = builder.getMetadataOrDefault(ADDITIVE_AMOUNT, 0);
             if (aCoalAmount <= 0) return Collections.emptyList();
-            GT_RecipeTemplate coll = asTemplate(rr.get());
+            GTRecipeTemplate coll = asTemplate(rr.get());
             for (Materials coal : new Materials[] { Materials.Coal, Materials.Charcoal }) {
                 coll.derive()
                     .setInputs(aInput1, aInput2, coal.getGems(aCoalAmount))
@@ -684,7 +684,7 @@ public final class RecipeMaps {
         })
         .build();
     /**
-     * Uses {@link GT_RecipeConstants#ADDITIVE_AMOUNT} for TNT/ITNT/... amount. Value is truncated to [0, 64]
+     * Uses {@link GTRecipeConstants#ADDITIVE_AMOUNT} for TNT/ITNT/... amount. Value is truncated to [0, 64]
      */
     public static final RecipeMap<RecipeMapBackend> implosionRecipes = RecipeMapBuilder
         .of("gt.recipe.implosioncompressor")
@@ -693,13 +693,13 @@ public final class RecipeMaps {
         .slotOverlays((index, isFluid, isOutput, isSpecial) -> {
             if (!isFluid && !isOutput) {
                 if (index == 0) {
-                    return GT_UITextures.OVERLAY_SLOT_IMPLOSION;
+                    return GTUITextures.OVERLAY_SLOT_IMPLOSION;
                 }
-                return GT_UITextures.OVERLAY_SLOT_EXPLOSIVE;
+                return GTUITextures.OVERLAY_SLOT_EXPLOSIVE;
             }
             return null;
         })
-        .progressBar(GT_UITextures.PROGRESSBAR_COMPRESS)
+        .progressBar(GTUITextures.PROGRESSBAR_COMPRESS)
         .disableOptimize()
         .recipeEmitter(b -> {
             switch (b.getItemInputsBasic().length) {
@@ -712,7 +712,7 @@ public final class RecipeMaps {
                         .map(Collections::singletonList)
                         .orElse(Collections.emptyList());
             }
-            Optional<GT_Recipe> t = b.noOptimize()
+            Optional<GTRecipe> t = b.noOptimize()
                 .duration(20)
                 .eut(30)
                 .validateInputCount(1, 1)
@@ -720,7 +720,7 @@ public final class RecipeMaps {
                 .build();
             if (!t.isPresent()) return Collections.emptyList();
             ItemStack input = b.getItemInputBasic(0);
-            GT_RecipeTemplate coll = asTemplate(t.get());
+            GTRecipeTemplate coll = asTemplate(t.get());
             int tExplosives = Math.min(b.getMetadataOrDefault(ADDITIVE_AMOUNT, 0), 64);
             int tGunpowder = tExplosives << 1; // Worst
             int tDynamite = Math.max(1, tExplosives >> 1); // good
@@ -730,11 +730,11 @@ public final class RecipeMaps {
             if (tGunpowder < 65) coll.derive()
                 .setInputs(input, ItemList.Block_Powderbarrel.get(tGunpowder));
             if (tDynamite < 17) coll.derive()
-                .setInputs(input, GT_ModHandler.getIC2Item("dynamite", tDynamite, null));
+                .setInputs(input, GTModHandler.getIC2Item("dynamite", tDynamite, null));
             coll.derive()
                 .setInputs(input, new ItemStack(Blocks.tnt, tTNT));
             coll.derive()
-                .setInputs(input, GT_ModHandler.getIC2Item("industrialTnt", tITNT, null));
+                .setInputs(input, GTModHandler.getIC2Item("industrialTnt", tITNT, null));
             return coll.getAll();
         })
         .build();
@@ -749,7 +749,7 @@ public final class RecipeMaps {
                 && isArrayEmptyOrNull(b.getFluidOutputs())
                 && (in = getFluidForFilledItem(b.getItemInputBasic(0), true)) != null
                 && (out = getFluidForFilledItem(b.getItemOutput(0), true)) != null) {
-                Collection<GT_Recipe> ret = new ArrayList<>();
+                Collection<GTRecipe> ret = new ArrayList<>();
                 b.build()
                     .ifPresent(ret::add);
                 b.itemInputs()
@@ -765,7 +765,7 @@ public final class RecipeMaps {
         .build();
     /**
      * Using {@code .addTo(chemicalReactorRecipes)} will cause the recipe to be added to single block recipe map ONLY!
-     * Use {@link GT_RecipeConstants#UniversalChemical} to add to both.
+     * Use {@link GTRecipeConstants#UniversalChemical} to add to both.
      */
     public static final RecipeMap<RecipeMapBackend> chemicalReactorRecipes = RecipeMapBuilder
         .of("gt.recipe.chemicalreactor")
@@ -774,30 +774,30 @@ public final class RecipeMaps {
         .slotOverlays((index, isFluid, isOutput, isSpecial) -> {
             if (isFluid) {
                 if (isOutput) {
-                    return GT_UITextures.OVERLAY_SLOT_VIAL_2;
+                    return GTUITextures.OVERLAY_SLOT_VIAL_2;
                 }
-                return GT_UITextures.OVERLAY_SLOT_MOLECULAR_3;
+                return GTUITextures.OVERLAY_SLOT_MOLECULAR_3;
             } else {
                 if (isOutput) {
-                    return GT_UITextures.OVERLAY_SLOT_VIAL_1;
+                    return GTUITextures.OVERLAY_SLOT_VIAL_1;
                 }
                 if (index == 0) {
-                    return GT_UITextures.OVERLAY_SLOT_MOLECULAR_1;
+                    return GTUITextures.OVERLAY_SLOT_MOLECULAR_1;
                 }
-                return GT_UITextures.OVERLAY_SLOT_MOLECULAR_2;
+                return GTUITextures.OVERLAY_SLOT_MOLECULAR_2;
             }
         })
-        .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
+        .progressBar(GTUITextures.PROGRESSBAR_ARROW_MULTIPLE)
         .disableOptimize()
         .build();
     /**
      * Using {@code .addTo(multiblockChemicalReactorRecipes)} will cause the recipe to be added to
-     * multiblock recipe map ONLY! Use {@link GT_RecipeConstants#UniversalChemical} to add to both.
+     * multiblock recipe map ONLY! Use {@link GTRecipeConstants#UniversalChemical} to add to both.
      */
     public static final RecipeMap<RecipeMapBackend> multiblockChemicalReactorRecipes = RecipeMapBuilder
         .of("gt.recipe.largechemicalreactor")
         .maxIO(6, 6, 6, 6)
-        .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
+        .progressBar(GTUITextures.PROGRESSBAR_ARROW_MULTIPLE)
         .disableOptimize()
         .frontend(LargeNEIFrontend::new)
         .build();
@@ -809,12 +809,12 @@ public final class RecipeMaps {
                 return null;
             }
             if (isFluid) {
-                return GT_UITextures.OVERLAY_SLOTS_NUMBER[index + 1];
+                return GTUITextures.OVERLAY_SLOTS_NUMBER[index + 1];
             } else {
-                return GT_UITextures.OVERLAY_SLOTS_NUMBER[0];
+                return GTUITextures.OVERLAY_SLOTS_NUMBER[0];
             }
         })
-        .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
+        .progressBar(GTUITextures.PROGRESSBAR_ARROW_MULTIPLE)
         .logoPos(80, 62)
         .frontend(DistillationTowerFrontend::new)
         .disableOptimize()
@@ -823,7 +823,7 @@ public final class RecipeMaps {
         .of("gt.recipe.craker", OilCrackerBackend::new)
         .maxIO(1, 1, 2, 1)
         .minInputs(1, 2)
-        .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
+        .progressBar(GTUITextures.PROGRESSBAR_ARROW_MULTIPLE)
         .build();
     public static final RecipeMap<RecipeMapBackend> pyrolyseRecipes = RecipeMapBuilder.of("gt.recipe.pyro")
         .maxIO(2, 1, 1, 1)
@@ -834,26 +834,26 @@ public final class RecipeMaps {
         .maxIO(2, 1, 0, 0)
         .minInputs(1, 0)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_WIREMILL : null)
-        .progressBar(GT_UITextures.PROGRESSBAR_WIREMILL)
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_WIREMILL : null)
+        .progressBar(GTUITextures.PROGRESSBAR_WIREMILL)
         .build();
     public static final RecipeMap<RecipeMapBackend> benderRecipes = RecipeMapBuilder.of("gt.recipe.metalbender")
         .maxIO(2, 1, 0, 0)
         .minInputs(2, 0)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_BENDER : null)
-        .progressBar(GT_UITextures.PROGRESSBAR_BENDING)
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_BENDER : null)
+        .progressBar(GTUITextures.PROGRESSBAR_BENDING)
         .build();
     public static final RecipeMap<RecipeMapBackend> alloySmelterRecipes = RecipeMapBuilder.of("gt.recipe.alloysmelter")
         .maxIO(2, 1, 0, 0)
         .minInputs(2, 0)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_FURNACE : null)
-        .slotOverlaysSteam((index, isFluid, isOutput, isSpecial) -> GT_UITextures.OVERLAY_SLOT_FURNACE_STEAM)
-        .progressBarSteam(GT_UITextures.PROGRESSBAR_ARROW_STEAM)
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_FURNACE : null)
+        .slotOverlaysSteam((index, isFluid, isOutput, isSpecial) -> GTUITextures.OVERLAY_SLOT_FURNACE_STEAM)
+        .progressBarSteam(GTUITextures.PROGRESSBAR_ARROW_STEAM)
         .recipeEmitter(b -> {
             if (Materials.Graphite.contains(b.getItemInputBasic(0))) return Collections.emptyList();
-            if (GT_Utility.isArrayOfLength(b.getItemInputsBasic(), 1)) {
+            if (GTUtility.isArrayOfLength(b.getItemInputsBasic(), 1)) {
                 ItemStack aInput1 = b.getItemInputBasic(0);
                 if (((OrePrefixes.ingot.contains(aInput1)) || (OrePrefixes.dust.contains(aInput1))
                     || (OrePrefixes.gem.contains(aInput1)))) return Collections.emptyList();
@@ -872,8 +872,8 @@ public final class RecipeMaps {
         .maxIO(9, 1, 1, 0)
         .minInputs(1, 0)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_CIRCUIT : null)
-        .progressBar(GT_UITextures.PROGRESSBAR_ASSEMBLE)
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_CIRCUIT : null)
+        .progressBar(GTUITextures.PROGRESSBAR_ASSEMBLE)
         .disableOptimize()
         .build();
     public static final RecipeMap<RecipeMapBackend> circuitAssemblerRecipes = RecipeMapBuilder
@@ -881,8 +881,8 @@ public final class RecipeMaps {
         .maxIO(6, 1, 1, 0)
         .minInputs(1, 0)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_CIRCUIT : null)
-        .progressBar(GT_UITextures.PROGRESSBAR_CIRCUIT_ASSEMBLER)
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_CIRCUIT : null)
+        .progressBar(GTUITextures.PROGRESSBAR_CIRCUIT_ASSEMBLER)
         .unificateOutputNEI(!NEICustomDiagrams.isModLoaded())
         .build();
     public static final RecipeMap<RecipeMapBackend> cannerRecipes = RecipeMapBuilder.of("gt.recipe.canner")
@@ -893,11 +893,11 @@ public final class RecipeMaps {
                 return null;
             }
             if (index == 0) {
-                return GT_UITextures.OVERLAY_SLOT_CANNER;
+                return GTUITextures.OVERLAY_SLOT_CANNER;
             }
-            return GT_UITextures.OVERLAY_SLOT_CANISTER;
+            return GTUITextures.OVERLAY_SLOT_CANISTER;
         })
-        .progressBar(GT_UITextures.PROGRESSBAR_CANNER)
+        .progressBar(GTUITextures.PROGRESSBAR_CANNER)
         .build();
     public static final RecipeMap<RecipeMapBackend> latheRecipes = RecipeMapBuilder.of("gt.recipe.lathe")
         .maxIO(1, 2, 0, 0)
@@ -905,14 +905,14 @@ public final class RecipeMaps {
         .slotOverlays((index, isFluid, isOutput, isSpecial) -> {
             if (isOutput) {
                 if (index == 0) {
-                    return GT_UITextures.OVERLAY_SLOT_ROD_2;
+                    return GTUITextures.OVERLAY_SLOT_ROD_2;
                 }
-                return GT_UITextures.OVERLAY_SLOT_DUST;
+                return GTUITextures.OVERLAY_SLOT_DUST;
             }
-            return GT_UITextures.OVERLAY_SLOT_ROD_1;
+            return GTUITextures.OVERLAY_SLOT_ROD_1;
         })
-        .progressBar(GT_UITextures.PROGRESSBAR_LATHE)
-        .addSpecialTexture(98, 24, 5, 18, GT_UITextures.PROGRESSBAR_LATHE_BASE)
+        .progressBar(GTUITextures.PROGRESSBAR_LATHE)
+        .addSpecialTexture(98, 24, 5, 18, GTUITextures.PROGRESSBAR_LATHE_BASE)
         .build();
     public static final RecipeMap<RecipeMapBackend> cutterRecipes = RecipeMapBuilder.of("gt.recipe.cuttingsaw")
         .maxIO(2, 4, 1, 0)
@@ -923,13 +923,13 @@ public final class RecipeMaps {
             }
             if (isOutput) {
                 if (index == 0) {
-                    return GT_UITextures.OVERLAY_SLOT_CUTTER_SLICED;
+                    return GTUITextures.OVERLAY_SLOT_CUTTER_SLICED;
                 }
-                return GT_UITextures.OVERLAY_SLOT_DUST;
+                return GTUITextures.OVERLAY_SLOT_DUST;
             }
-            return GT_UITextures.OVERLAY_SLOT_BOX;
+            return GTUITextures.OVERLAY_SLOT_BOX;
         })
-        .progressBar(GT_UITextures.PROGRESSBAR_CUT)
+        .progressBar(GTUITextures.PROGRESSBAR_CUT)
         .recipeEmitter(b -> {
             b.validateInputCount(1, 2)
                 .validateOutputCount(1, 4)
@@ -937,14 +937,14 @@ public final class RecipeMaps {
             if ((b.getFluidInputs() != null && b.getFluidInputs().length > 0) || !b.isValid())
                 return buildOrEmpty(b.validateInputFluidCount(1, 1));
             int aDuration = b.getDuration(), aEUt = b.getEUt();
-            Collection<GT_Recipe> ret = new ArrayList<>();
+            Collection<GTRecipe> ret = new ArrayList<>();
             b.copy()
                 .fluidInputs(Materials.Water.getFluid(clamp(aDuration * aEUt / 320, 4, 1000)))
                 .duration(aDuration * 2)
                 .build()
                 .ifPresent(ret::add);
             b.copy()
-                .fluidInputs(GT_ModHandler.getDistilledWater(clamp(aDuration * aEUt / 426, 3, 750)))
+                .fluidInputs(GTModHandler.getDistilledWater(clamp(aDuration * aEUt / 426, 3, 750)))
                 .duration(aDuration * 2)
                 .build()
                 .ifPresent(ret::add);
@@ -960,34 +960,34 @@ public final class RecipeMaps {
         .minInputs(2, 0)
         .slotOverlays((index, isFluid, isOutput, isSpecial) -> {
             if (isOutput) {
-                return GT_UITextures.OVERLAY_SLOT_SLICER_SLICED;
+                return GTUITextures.OVERLAY_SLOT_SLICER_SLICED;
             }
             if (index == 0) {
-                return GT_UITextures.OVERLAY_SLOT_SQUARE;
+                return GTUITextures.OVERLAY_SLOT_SQUARE;
             }
-            return GT_UITextures.OVERLAY_SLOT_SLICE_SHAPE;
+            return GTUITextures.OVERLAY_SLOT_SLICE_SHAPE;
         })
-        .progressBar(GT_UITextures.PROGRESSBAR_SLICE)
+        .progressBar(GTUITextures.PROGRESSBAR_SLICE)
         .build();
     public static final RecipeMap<RecipeMapBackend> extruderRecipes = RecipeMapBuilder.of("gt.recipe.extruder")
         .maxIO(2, 1, 0, 0)
         .minInputs(2, 0)
         .slotOverlays(
             (index, isFluid, isOutput,
-                isSpecial) -> !isFluid && !isOutput && index != 0 ? GT_UITextures.OVERLAY_SLOT_EXTRUDER_SHAPE : null)
-        .progressBar(GT_UITextures.PROGRESSBAR_EXTRUDE)
+                isSpecial) -> !isFluid && !isOutput && index != 0 ? GTUITextures.OVERLAY_SLOT_EXTRUDER_SHAPE : null)
+        .progressBar(GTUITextures.PROGRESSBAR_EXTRUDE)
         .build();
     public static final RecipeMap<RecipeMapBackend> hammerRecipes = RecipeMapBuilder.of("gt.recipe.hammer")
         .maxIO(2, 2, 2, 2)
         .minInputs(1, 0)
         .slotOverlays(
-            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_HAMMER : null)
-        .progressBar(GT_UITextures.PROGRESSBAR_HAMMER, ProgressBar.Direction.DOWN)
-        .addSpecialTexture(78, 42, 20, 6, GT_UITextures.PROGRESSBAR_HAMMER_BASE)
+            (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_HAMMER : null)
+        .progressBar(GTUITextures.PROGRESSBAR_HAMMER, ProgressBar.Direction.DOWN)
+        .addSpecialTexture(78, 42, 20, 6, GTUITextures.PROGRESSBAR_HAMMER_BASE)
         .slotOverlaysSteam(
-            (index, isFluid, isOutput, isSpecial) -> !isOutput ? GT_UITextures.OVERLAY_SLOT_HAMMER_STEAM : null)
-        .progressBarSteam(GT_UITextures.PROGRESSBAR_HAMMER_STEAM)
-        .addSpecialTextureSteam(78, 42, 20, 6, GT_UITextures.PROGRESSBAR_HAMMER_BASE_STEAM)
+            (index, isFluid, isOutput, isSpecial) -> !isOutput ? GTUITextures.OVERLAY_SLOT_HAMMER_STEAM : null)
+        .progressBarSteam(GTUITextures.PROGRESSBAR_HAMMER_STEAM)
+        .addSpecialTextureSteam(78, 42, 20, 6, GTUITextures.PROGRESSBAR_HAMMER_BASE_STEAM)
         // Avoid steam machine being used as handler icon
         .neiHandlerInfo(builder -> builder.setDisplayStack(ItemList.Machine_LV_Hammer.get(1)))
         .build();
@@ -996,14 +996,14 @@ public final class RecipeMaps {
         .minInputs(1, 0)
         .slotOverlays((index, isFluid, isOutput, isSpecial) -> {
             if (isFluid) {
-                return GT_UITextures.OVERLAY_SLOT_UUA;
+                return GTUITextures.OVERLAY_SLOT_UUA;
             }
             if (!isOutput) {
-                return GT_UITextures.OVERLAY_SLOT_CENTRIFUGE;
+                return GTUITextures.OVERLAY_SLOT_CENTRIFUGE;
             }
             return null;
         })
-        .progressBar(GT_UITextures.PROGRESSBAR_EXTRACT)
+        .progressBar(GTUITextures.PROGRESSBAR_EXTRACT)
         .build();
     public static final RecipeMap<RecipeMapBackend> massFabFakeRecipes = RecipeMapBuilder.of("gt.recipe.massfab")
         .maxIO(1, 0, 1, 1)
@@ -1014,9 +1014,9 @@ public final class RecipeMaps {
                 return null;
             }
             if (isOutput) {
-                return GT_UITextures.OVERLAY_SLOT_UUM;
+                return GTUITextures.OVERLAY_SLOT_UUM;
             }
-            return GT_UITextures.OVERLAY_SLOT_UUA;
+            return GTUITextures.OVERLAY_SLOT_UUA;
         })
         .build();
     public static final RecipeMap<FuelBackend> dieselFuels = RecipeMapBuilder
@@ -1083,20 +1083,20 @@ public final class RecipeMaps {
         .of("gt.recipe.largeelectrolyzer")
         .maxIO(1, 6, 1, 6)
         .disableRegisterNEI()
-        .recipeEmitter(GT_RecipeMapUtil::buildRecipeForMultiblock)
+        .recipeEmitter(GTRecipeMapUtil::buildRecipeForMultiblock)
         .build();
     public static final RecipeMap<RecipeMapBackend> centrifugeNonCellRecipes = RecipeMapBuilder
         .of("gt.recipe.largecentrifuge")
         .maxIO(2, 6, 1, 6)
         .disableOptimize()
         .disableRegisterNEI()
-        .recipeEmitter(GT_RecipeMapUtil::buildRecipeForMultiblock)
+        .recipeEmitter(GTRecipeMapUtil::buildRecipeForMultiblock)
         .build();
     public static final RecipeMap<RecipeMapBackend> mixerNonCellRecipes = RecipeMapBuilder.of("gt.recipe.largemixer")
         .maxIO(9, 4, 6, 4)
         .disableOptimize()
         .disableRegisterNEI()
-        .recipeEmitter(GT_RecipeMapUtil::buildRecipeForMultiblockNoCircuit)
+        .recipeEmitter(GTRecipeMapUtil::buildRecipeForMultiblockNoCircuit)
         .build();
     public static final RecipeMap<LargeBoilerFuelBackend> largeBoilerFakeFuels = RecipeMapBuilder
         .of("gt.recipe.largeboilerfakefuels", LargeBoilerFuelBackend::new)
@@ -1110,20 +1110,20 @@ public final class RecipeMaps {
         .minInputs(2, 1)
         .slotOverlays(
             (index, isFluid, isOutput,
-                isSpecial) -> !isFluid && !isOutput && index == 0 ? GT_UITextures.OVERLAY_SLOT_LENS : null)
-        .progressBar(GT_UITextures.PROGRESSBAR_ASSEMBLE)
+                isSpecial) -> !isFluid && !isOutput && index == 0 ? GTUITextures.OVERLAY_SLOT_LENS : null)
+        .progressBar(GTUITextures.PROGRESSBAR_ASSEMBLE)
         .disableOptimize()
         .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("GT5U.nei.tier"))
         .build();
     public static final RecipeMap<RecipeMapBackend> pcbFactoryRecipes = RecipeMapBuilder.of("gt.recipe.pcbfactory")
         .maxIO(6, 9, 3, 0)
         .minInputs(3, 1)
-        .progressBar(GT_UITextures.PROGRESSBAR_ASSEMBLE)
+        .progressBar(GTUITextures.PROGRESSBAR_ASSEMBLE)
         .disableOptimize()
         .neiRecipeComparator(
             Comparator
-                .<GT_Recipe, Integer>comparing(recipe -> recipe.getMetadataOrDefault(PCBFactoryTierKey.INSTANCE, 1))
-                .thenComparing(GT_Recipe::compareTo))
+                .<GTRecipe, Integer>comparing(recipe -> recipe.getMetadataOrDefault(PCBFactoryTierKey.INSTANCE, 1))
+                .thenComparing(GTRecipe::compareTo))
         .build();
     public static final RecipeMap<RecipeMapBackend> purificationClarifierRecipes = RecipeMapBuilder
         .of("gt.recipe.purificationplantclarifier")
@@ -1136,12 +1136,12 @@ public final class RecipeMaps {
         .of("gt.recipe.purificationplantozonation")
         .maxIO(0, 4, 2, 1)
         .minInputs(0, 2)
-        .progressBar(GT_UITextures.PROGRESSBAR_BATH)
+        .progressBar(GTUITextures.PROGRESSBAR_BATH)
         .neiRecipeComparator(
             Comparator
-                .<GT_Recipe, Float>comparing(
+                .<GTRecipe, Float>comparing(
                     recipe -> recipe.getMetadataOrDefault(PurificationPlantBaseChanceKey.INSTANCE, 0.0f))
-                .thenComparing(GT_Recipe::compareTo))
+                .thenComparing(GTRecipe::compareTo))
         .frontend(PurificationUnitOzonationFrontend::new)
         .disableOptimize()
         .build();
@@ -1149,12 +1149,12 @@ public final class RecipeMaps {
         .of("gt.recipe.purificationplantflocculation")
         .maxIO(0, 3, 2, 2)
         .minInputs(0, 1)
-        .progressBar(GT_UITextures.PROGRESSBAR_BATH)
+        .progressBar(GTUITextures.PROGRESSBAR_BATH)
         .neiRecipeComparator(
             Comparator
-                .<GT_Recipe, Float>comparing(
+                .<GTRecipe, Float>comparing(
                     recipe -> recipe.getMetadataOrDefault(PurificationPlantBaseChanceKey.INSTANCE, 0.0f))
-                .thenComparing(GT_Recipe::compareTo))
+                .thenComparing(GTRecipe::compareTo))
         .frontend(PurificationUnitFlocculatorFrontend::new)
         .disableOptimize()
         .build();
@@ -1163,7 +1163,7 @@ public final class RecipeMaps {
         .of("gt.recipe.purificationplantphadjustment")
         .maxIO(0, 0, 1, 1)
         .minInputs(0, 1)
-        .progressBar(GT_UITextures.PROGRESSBAR_MIXER)
+        .progressBar(GTUITextures.PROGRESSBAR_MIXER)
         .frontend(PurificationUnitPhAdjustmentFrontend::new)
         .disableOptimize()
         .build();
@@ -1172,7 +1172,7 @@ public final class RecipeMaps {
         .of("gt.recipe.purificationplantplasmaheating")
         .maxIO(0, 0, 1, 1)
         .minInputs(0, 1)
-        .progressBar(GT_UITextures.PROGRESSBAR_BOILER_HEAT)
+        .progressBar(GTUITextures.PROGRESSBAR_BOILER_HEAT)
         .frontend(PurificationUnitPlasmaHeaterFrontend::new)
         .disableOptimize()
         .build();
@@ -1180,7 +1180,7 @@ public final class RecipeMaps {
         .of("gt.recipe.purificationplantuvtreatment")
         .maxIO(9, 0, 1, 1)
         .minInputs(0, 1)
-        .progressBar(GT_UITextures.PROGRESSBAR_ARROW)
+        .progressBar(GTUITextures.PROGRESSBAR_ARROW)
         .frontend(PurificationUnitLaserFrontend::new)
         .disableOptimize()
         .build();
@@ -1188,14 +1188,14 @@ public final class RecipeMaps {
         .of("gt.recipe.purificationplantdegasifier")
         .maxIO(0, 3, 1, 2)
         .minInputs(0, 1)
-        .progressBar(GT_UITextures.PROGRESSBAR_ARROW)
+        .progressBar(GTUITextures.PROGRESSBAR_ARROW)
         .disableOptimize()
         .build();
     public static final RecipeMap<RecipeMapBackend> purificationParticleExtractionRecipes = RecipeMapBuilder
         .of("gt.recipe.purificationplantquarkextractor")
         .maxIO(2, 2, 1, 2)
         .minInputs(0, 1)
-        .progressBar(GT_UITextures.PROGRESSBAR_ARROW)
+        .progressBar(GTUITextures.PROGRESSBAR_ARROW)
         .frontend(PurificationUnitParticleExtractorFrontend::new)
         .disableOptimize()
         .build();
@@ -1203,10 +1203,10 @@ public final class RecipeMaps {
         .maxIO(1, 1, 0, 0)
         .minInputs(1, 0)
         .disableOptimize()
-        .logo(GT_UITextures.PICTURE_RADIATION_WARNING)
+        .logo(GTUITextures.PICTURE_RADIATION_WARNING)
         .logoPos(152, 41)
         .neiRecipeBackgroundSize(170, 60)
-        .neiHandlerInfo(builder -> builder.setDisplayStack(GT_ModHandler.getIC2Item("nuclearReactor", 1, null)))
+        .neiHandlerInfo(builder -> builder.setDisplayStack(GTModHandler.getIC2Item("nuclearReactor", 1, null)))
         .build();
 
     static {
diff --git a/src/main/java/gregtech/api/recipe/check/ResultInsufficientHeat.java b/src/main/java/gregtech/api/recipe/check/ResultInsufficientHeat.java
index 9383abad9d..18edab74e7 100644
--- a/src/main/java/gregtech/api/recipe/check/ResultInsufficientHeat.java
+++ b/src/main/java/gregtech/api/recipe/check/ResultInsufficientHeat.java
@@ -11,7 +11,7 @@ import net.minecraft.util.StatCollector;
 import org.jetbrains.annotations.NotNull;
 
 import gregtech.api.enums.HeatingCoilLevel;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 public class ResultInsufficientHeat implements CheckRecipeResult {
 
@@ -38,7 +38,7 @@ public class ResultInsufficientHeat implements CheckRecipeResult {
         return Objects.requireNonNull(
             StatCollector.translateToLocalFormatted(
                 "GT5U.gui.text.insufficient_heat",
-                GT_Utility.formatNumbers(required),
+                GTUtility.formatNumbers(required),
                 HeatingCoilLevel.getDisplayNameFromHeat(required, true)));
     }
 
diff --git a/src/main/java/gregtech/api/recipe/check/ResultInsufficientMachineTier.java b/src/main/java/gregtech/api/recipe/check/ResultInsufficientMachineTier.java
index 1fb2183edb..2f144049f1 100644
--- a/src/main/java/gregtech/api/recipe/check/ResultInsufficientMachineTier.java
+++ b/src/main/java/gregtech/api/recipe/check/ResultInsufficientMachineTier.java
@@ -10,7 +10,7 @@ import net.minecraft.util.StatCollector;
 
 import org.jetbrains.annotations.NotNull;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 public class ResultInsufficientMachineTier implements CheckRecipeResult {
 
@@ -37,7 +37,7 @@ public class ResultInsufficientMachineTier implements CheckRecipeResult {
         return Objects.requireNonNull(
             StatCollector.translateToLocalFormatted(
                 "GT5U.gui.text.insufficient_machine_tier",
-                GT_Utility.formatNumbers(required)));
+                GTUtility.formatNumbers(required)));
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/recipe/check/ResultInsufficientPower.java b/src/main/java/gregtech/api/recipe/check/ResultInsufficientPower.java
index 45b50aebf6..33b86ecbf8 100644
--- a/src/main/java/gregtech/api/recipe/check/ResultInsufficientPower.java
+++ b/src/main/java/gregtech/api/recipe/check/ResultInsufficientPower.java
@@ -10,7 +10,7 @@ import net.minecraft.util.StatCollector;
 
 import org.jetbrains.annotations.NotNull;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 public class ResultInsufficientPower implements CheckRecipeResult {
 
@@ -37,8 +37,8 @@ public class ResultInsufficientPower implements CheckRecipeResult {
         return Objects.requireNonNull(
             StatCollector.translateToLocalFormatted(
                 "GT5U.gui.text.insufficient_power",
-                GT_Utility.formatNumbers(required),
-                GT_Utility.getColoredTierNameFromVoltage(required)));
+                GTUtility.formatNumbers(required),
+                GTUtility.getColoredTierNameFromVoltage(required)));
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/recipe/check/ResultInsufficientStartupPower.java b/src/main/java/gregtech/api/recipe/check/ResultInsufficientStartupPower.java
index c33e9bfff1..9adf82aa28 100644
--- a/src/main/java/gregtech/api/recipe/check/ResultInsufficientStartupPower.java
+++ b/src/main/java/gregtech/api/recipe/check/ResultInsufficientStartupPower.java
@@ -10,7 +10,7 @@ import net.minecraft.util.StatCollector;
 
 import org.jetbrains.annotations.NotNull;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 public class ResultInsufficientStartupPower implements CheckRecipeResult {
 
@@ -37,7 +37,7 @@ public class ResultInsufficientStartupPower implements CheckRecipeResult {
         return Objects.requireNonNull(
             StatCollector.translateToLocalFormatted(
                 "GT5U.gui.text.insufficient_startup_power",
-                GT_Utility.formatNumbers(required)));
+                GTUtility.formatNumbers(required)));
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/recipe/check/ResultInsufficientStartupPowerBigInt.java b/src/main/java/gregtech/api/recipe/check/ResultInsufficientStartupPowerBigInt.java
index f4b186c9a1..32aab79465 100644
--- a/src/main/java/gregtech/api/recipe/check/ResultInsufficientStartupPowerBigInt.java
+++ b/src/main/java/gregtech/api/recipe/check/ResultInsufficientStartupPowerBigInt.java
@@ -1,6 +1,6 @@
 package gregtech.api.recipe.check;
 
-import static util.Util.toStandardForm;
+import static kekztech.util.Util.toStandardForm;
 
 import java.math.BigInteger;
 import java.util.Objects;
diff --git a/src/main/java/gregtech/api/recipe/check/SingleRecipeCheck.java b/src/main/java/gregtech/api/recipe/check/SingleRecipeCheck.java
index 8683812d84..d339f8acfd 100644
--- a/src/main/java/gregtech/api/recipe/check/SingleRecipeCheck.java
+++ b/src/main/java/gregtech/api/recipe/check/SingleRecipeCheck.java
@@ -22,11 +22,11 @@ import net.minecraftforge.fluids.FluidStack;
 
 import com.google.common.collect.ImmutableMap;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.GT_Utility.ItemId;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.GTUtility.ItemId;
 
 /**
  * Used by machines that are locked to a single recipe, for faster recipe check.
@@ -37,10 +37,10 @@ import gregtech.api.util.GT_Utility.ItemId;
  * <ul>
  * {@link gregtech.api.recipe.FindRecipeQuery#find Find recipe from recipemap}: O(NCR)
  * where N = number of machine inputs, C = average amount of recipe candidates found for specific input,
- * R = computation time to {@link GT_Recipe#isRecipeInputEqual check if inputs match to recipe}
+ * R = computation time to {@link GTRecipe#isRecipeInputEqual check if inputs match to recipe}
  * </ul>
  * <ul>
- * {@link GT_Recipe#isRecipeInputEqual Check if inputs match to recipe}: O(NM)
+ * {@link GTRecipe#isRecipeInputEqual Check if inputs match to recipe}: O(NM)
  * where N = number of machine inputs, M = number of recipe inputs
  * </ul>
  * </ul>
@@ -52,7 +52,7 @@ import gregtech.api.util.GT_Utility.ItemId;
 public class SingleRecipeCheck {
 
     @Nonnull
-    private final GT_Recipe recipe;
+    private final GTRecipe recipe;
     @Nonnull
     private final RecipeMap<?> recipeMap;
     @Nonnull
@@ -63,7 +63,7 @@ public class SingleRecipeCheck {
     private final int totalItemCost;
     private final int totalFluidCost;
 
-    private SingleRecipeCheck(@Nonnull GT_Recipe recipe, @Nonnull RecipeMap<?> recipeMap,
+    private SingleRecipeCheck(@Nonnull GTRecipe recipe, @Nonnull RecipeMap<?> recipeMap,
         @Nonnull ImmutableMap<ItemId, Integer> itemCost, @Nonnull ImmutableMap<Fluid, Integer> fluidCost) {
         this.recipe = recipe;
         this.recipeMap = recipeMap;
@@ -81,7 +81,7 @@ public class SingleRecipeCheck {
     }
 
     @Nonnull
-    public GT_Recipe getRecipe() {
+    public GTRecipe getRecipe() {
         return recipe;
     }
 
@@ -188,14 +188,14 @@ public class SingleRecipeCheck {
         // At load time we do a recipe check again, so in case the recipe is gone, we can stop tracking.
         // Of course the next step would be auto migrating to new recipe (if any), but given
         // we don't yet have a mean to uniquely name a recipe, this will have to make do.
-        // Consider move serialization code to GT_Recipe once this has been proven to work
+        // Consider move serialization code to GTRecipe once this has been proven to work
         NBTTagCompound tag = new NBTTagCompound();
         tag.setString("recipemap", recipeMap.unlocalizedName);
         if (recipe.mInputs != null) {
-            tag.setTag("inputs", writeList(recipe.mInputs, GT_Utility::saveItem));
+            tag.setTag("inputs", writeList(recipe.mInputs, GTUtility::saveItem));
         }
         if (recipe.mOutputs != null) {
-            tag.setTag("outputs", writeList(recipe.mOutputs, GT_Utility::saveItem));
+            tag.setTag("outputs", writeList(recipe.mOutputs, GTUtility::saveItem));
         }
         if (recipe.mChances != null) {
             tag.setIntArray("chances", recipe.mChances);
@@ -270,45 +270,44 @@ public class SingleRecipeCheck {
             return null;
         }
 
-        GT_Recipe foundRecipe = tryFindRecipe(mapToUse, tag);
+        GTRecipe foundRecipe = tryFindRecipe(mapToUse, tag);
         if (foundRecipe == null) return null;
         return new SingleRecipeCheck(foundRecipe, mapToUse, loadItemCost(tag), loadFluidCost(tag));
     }
 
     private static ImmutableMap<Fluid, Integer> loadFluidCost(NBTTagCompound tag) {
-        return GT_Utility.streamCompounds(tag.getTagList("fluidCost", Constants.NBT.TAG_COMPOUND))
+        return GTUtility.streamCompounds(tag.getTagList("fluidCost", Constants.NBT.TAG_COMPOUND))
             .collect(
-                GT_Utility
+                GTUtility
                     .toImmutableMapSerial(t -> FluidRegistry.getFluid(t.getString("id")), t -> t.getInteger("count")));
     }
 
     private static ImmutableMap<ItemId, Integer> loadItemCost(NBTTagCompound tag) {
-        return GT_Utility.streamCompounds(tag.getTagList("itemCost", Constants.NBT.TAG_COMPOUND))
+        return GTUtility.streamCompounds(tag.getTagList("itemCost", Constants.NBT.TAG_COMPOUND))
             .collect(
-                GT_Utility
-                    .toImmutableMapSerial(t -> ItemId.create(t.getCompoundTag("id")), t -> t.getInteger("count")));
+                GTUtility.toImmutableMapSerial(t -> ItemId.create(t.getCompoundTag("id")), t -> t.getInteger("count")));
     }
 
-    private static GT_Recipe tryFindRecipe(@Nonnull RecipeMap<?> recipeMap, NBTTagCompound tag) {
-        ItemStack[] inputs = GT_Utility.streamCompounds(tag.getTagList("inputs", Constants.NBT.TAG_COMPOUND))
-            .map(GT_Utility::loadItem)
+    private static GTRecipe tryFindRecipe(@Nonnull RecipeMap<?> recipeMap, NBTTagCompound tag) {
+        ItemStack[] inputs = GTUtility.streamCompounds(tag.getTagList("inputs", Constants.NBT.TAG_COMPOUND))
+            .map(GTUtility::loadItem)
             .toArray(ItemStack[]::new);
-        ItemStack[] outputs = GT_Utility.streamCompounds(tag.getTagList("outputs", Constants.NBT.TAG_COMPOUND))
-            .map(GT_Utility::loadItem)
+        ItemStack[] outputs = GTUtility.streamCompounds(tag.getTagList("outputs", Constants.NBT.TAG_COMPOUND))
+            .map(GTUtility::loadItem)
             .toArray(ItemStack[]::new);
-        FluidStack[] fInputs = GT_Utility.streamCompounds(tag.getTagList("fInputs", Constants.NBT.TAG_COMPOUND))
+        FluidStack[] fInputs = GTUtility.streamCompounds(tag.getTagList("fInputs", Constants.NBT.TAG_COMPOUND))
             .map(FluidStack::loadFluidStackFromNBT)
             .toArray(FluidStack[]::new);
-        FluidStack[] fOutputs = GT_Utility.streamCompounds(tag.getTagList("fOutputs", Constants.NBT.TAG_COMPOUND))
+        FluidStack[] fOutputs = GTUtility.streamCompounds(tag.getTagList("fOutputs", Constants.NBT.TAG_COMPOUND))
             .map(FluidStack::loadFluidStackFromNBT)
             .toArray(FluidStack[]::new);
         int eut = tag.getInteger("eut");
-        GT_Recipe found = recipeMap.findRecipe(null, false, GT_Values.V[GT_Utility.getTier(eut)], fInputs, inputs);
+        GTRecipe found = recipeMap.findRecipe(null, false, GTValues.V[GTUtility.getTier(eut)], fInputs, inputs);
         int[] chances = tag.getIntArray("chances");
         if (chances.length == 0) chances = null;
-        if (found == null || !GT_Utility.equals(inputs, found.mInputs)
+        if (found == null || !GTUtility.equals(inputs, found.mInputs)
             || !Arrays.equals(fInputs, found.mFluidInputs)
-            || !GT_Utility.equals(outputs, found.mOutputs)
+            || !GTUtility.equals(outputs, found.mOutputs)
             || !Arrays.equals(fOutputs, found.mFluidOutputs)
             || !Arrays.equals(chances, found.mChances)
             || found.mDuration != tag.getInteger("duration")
@@ -350,7 +349,7 @@ public class SingleRecipeCheck {
         private Map<ItemId, Integer> afterItems;
         private Map<Fluid, Integer> afterFluids;
 
-        private GT_Recipe recipe;
+        private GTRecipe recipe;
 
         private Builder(@Nonnull RecipeMap<?> recipeMap) {
             this.recipeMap = recipeMap;
@@ -368,7 +367,7 @@ public class SingleRecipeCheck {
             return this;
         }
 
-        public Builder setRecipe(@Nonnull GT_Recipe recipe) {
+        public Builder setRecipe(@Nonnull GTRecipe recipe) {
             this.recipe = recipe;
             return this;
         }
diff --git a/src/main/java/gregtech/api/recipe/maps/AssemblerBackend.java b/src/main/java/gregtech/api/recipe/maps/AssemblerBackend.java
index cfa25e9fe2..8273c895b2 100644
--- a/src/main/java/gregtech/api/recipe/maps/AssemblerBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/AssemblerBackend.java
@@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack;
 import gregtech.api.enums.ItemList;
 import gregtech.api.recipe.RecipeMapBackend;
 import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 
 @ParametersAreNonnullByDefault
@@ -21,7 +21,7 @@ public class AssemblerBackend extends RecipeMapBackend {
     }
 
     @Override
-    protected GT_Recipe modifyFoundRecipe(GT_Recipe recipe, ItemStack[] items, FluidStack[] fluids,
+    protected GTRecipe modifyFoundRecipe(GTRecipe recipe, ItemStack[] items, FluidStack[] fluids,
         @Nullable ItemStack specialSlot) {
         for (ItemStack item : items) {
             if (ItemList.Paper_Printed_Pages.isStackEqual(item, false, true)) {
diff --git a/src/main/java/gregtech/api/recipe/maps/AssemblyLineFrontend.java b/src/main/java/gregtech/api/recipe/maps/AssemblyLineFrontend.java
index 3d56c96b82..4bf3f7f56e 100644
--- a/src/main/java/gregtech/api/recipe/maps/AssemblyLineFrontend.java
+++ b/src/main/java/gregtech/api/recipe/maps/AssemblyLineFrontend.java
@@ -10,7 +10,7 @@ import com.gtnewhorizons.modularui.api.math.Pos2d;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.ProgressBar;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.recipe.BasicUIPropertiesBuilder;
 import gregtech.api.recipe.NEIRecipePropertiesBuilder;
 import gregtech.api.recipe.RecipeMapFrontend;
@@ -52,21 +52,21 @@ public class AssemblyLineFrontend extends RecipeMapFrontend {
         int bar2Width = 18;
         List<Supplier<Float>> splitProgress = splitProgress(progressSupplier, bar1Width, bar2Width);
         builder.widget(
-            new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ASSEMBLY_LINE_1, bar1Width)
+            new ProgressBar().setTexture(GTUITextures.PROGRESSBAR_ASSEMBLY_LINE_1, bar1Width)
                 .setDirection(ProgressBar.Direction.RIGHT)
                 .setProgress(splitProgress.get(0))
                 .setSynced(false, false)
                 .setPos(new Pos2d(88, 8).add(windowOffset))
                 .setSize(bar1Width, 72));
         builder.widget(
-            new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ASSEMBLY_LINE_2, bar2Width)
+            new ProgressBar().setTexture(GTUITextures.PROGRESSBAR_ASSEMBLY_LINE_2, bar2Width)
                 .setDirection(ProgressBar.Direction.RIGHT)
                 .setProgress(splitProgress.get(1))
                 .setSynced(false, false)
                 .setPos(new Pos2d(124, 8).add(windowOffset))
                 .setSize(bar2Width, 72));
         builder.widget(
-            new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ASSEMBLY_LINE_3, 18)
+            new ProgressBar().setTexture(GTUITextures.PROGRESSBAR_ASSEMBLY_LINE_3, 18)
                 .setDirection(ProgressBar.Direction.UP)
                 .setProgress(progressSupplier)
                 .setSynced(false, false)
diff --git a/src/main/java/gregtech/api/recipe/maps/FluidCannerBackend.java b/src/main/java/gregtech/api/recipe/maps/FluidCannerBackend.java
index e5681f59aa..9bbe087e54 100644
--- a/src/main/java/gregtech/api/recipe/maps/FluidCannerBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/FluidCannerBackend.java
@@ -8,11 +8,11 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.recipe.RecipeMapBackend;
 import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-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;
 
 @ParametersAreNonnullByDefault
@@ -24,17 +24,17 @@ public class FluidCannerBackend extends RecipeMapBackend {
     }
 
     @Override
-    protected GT_Recipe findFallback(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot) {
+    protected GTRecipe findFallback(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot) {
         if (items.length == 0 || items[0] == null) {
             return null;
         }
 
         if (fluids.length > 0 && fluids[0] != null) {
-            ItemStack filledItem = GT_Utility.fillFluidContainer(fluids[0], items[0], false, true);
-            FluidStack fluidToTake = GT_Utility.getFluidForFilledItem(filledItem, true);
+            ItemStack filledItem = GTUtility.fillFluidContainer(fluids[0], items[0], false, true);
+            FluidStack fluidToTake = GTUtility.getFluidForFilledItem(filledItem, true);
             if (fluidToTake != null) {
-                return GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, items[0]))
+                return GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, items[0]))
                     .itemOutputs(filledItem)
                     .fluidInputs(fluidToTake)
                     .duration(Math.max(fluidToTake.amount / 64, 16))
@@ -45,11 +45,11 @@ public class FluidCannerBackend extends RecipeMapBackend {
                     .orElse(null);
             }
         }
-        FluidStack drainedFluid = GT_Utility.getFluidForFilledItem(items[0], true);
+        FluidStack drainedFluid = GTUtility.getFluidForFilledItem(items[0], true);
         if (drainedFluid != null) {
-            return GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, items[0]))
-                .itemOutputs(GT_Utility.getContainerItem(items[0], true))
+            return GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, items[0]))
+                .itemOutputs(GTUtility.getContainerItem(items[0], true))
                 .fluidOutputs(drainedFluid)
                 .duration(Math.max(drainedFluid.amount / 64, 16))
                 .eut(1)
diff --git a/src/main/java/gregtech/api/recipe/maps/FormingPressBackend.java b/src/main/java/gregtech/api/recipe/maps/FormingPressBackend.java
index ce3ea3e89c..ccf6e63c29 100644
--- a/src/main/java/gregtech/api/recipe/maps/FormingPressBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/FormingPressBackend.java
@@ -7,12 +7,12 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.recipe.RecipeMapBackend;
 import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-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;
 
 /**
@@ -27,7 +27,7 @@ public class FormingPressBackend extends RecipeMapBackend {
     }
 
     @Override
-    protected GT_Recipe modifyFoundRecipe(GT_Recipe recipe, ItemStack[] items, FluidStack[] fluids,
+    protected GTRecipe modifyFoundRecipe(GTRecipe recipe, ItemStack[] items, FluidStack[] fluids,
         @Nullable ItemStack specialSlot) {
         for (ItemStack mold : items) {
             if (ItemList.Shape_Mold_Credit.isStackEqual(mold, false, true)) {
@@ -46,7 +46,7 @@ public class FormingPressBackend extends RecipeMapBackend {
     }
 
     @Override
-    protected GT_Recipe findFallback(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot) {
+    protected GTRecipe findFallback(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot) {
         if (items.length < 2) {
             return null;
         }
@@ -54,16 +54,16 @@ public class FormingPressBackend extends RecipeMapBackend {
     }
 
     @Nullable
-    private GT_Recipe findRenamingRecipe(ItemStack[] inputs) {
+    private GTRecipe findRenamingRecipe(ItemStack[] inputs) {
         ItemStack mold = findNameMoldIndex(inputs);
         if (mold == null) return null;
         ItemStack input = findStackToRename(inputs, mold);
         if (input == null) return null;
-        ItemStack output = GT_Utility.copyAmount(1, input);
+        ItemStack output = GTUtility.copyAmount(1, input);
         if (output == null) return null;
         output.setStackDisplayName(mold.getDisplayName());
-        return GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(0, mold), GT_Utility.copyAmount(1, input))
+        return GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(0, mold), GTUtility.copyAmount(1, input))
             .itemOutputs(output)
             .duration(128)
             .eut(8)
diff --git a/src/main/java/gregtech/api/recipe/maps/FuelBackend.java b/src/main/java/gregtech/api/recipe/maps/FuelBackend.java
index 49c989e174..e5f0ab40d1 100644
--- a/src/main/java/gregtech/api/recipe/maps/FuelBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/FuelBackend.java
@@ -12,23 +12,23 @@ import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.recipe.RecipeMapBackend;
 import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public class FuelBackend extends RecipeMapBackend {
 
-    private final Map<String, GT_Recipe> recipesByFluidInput = new HashMap<>();
+    private final Map<String, GTRecipe> recipesByFluidInput = new HashMap<>();
 
     public FuelBackend(RecipeMapBackendPropertiesBuilder propertiesBuilder) {
         super(propertiesBuilder.disableOptimize());
     }
 
     @Override
-    protected Collection<GT_Recipe> doAdd(GT_RecipeBuilder builder) {
+    protected Collection<GTRecipe> doAdd(GTRecipeBuilder builder) {
         if (builder.getDuration() == -1) {
             builder.duration(0);
         }
@@ -39,11 +39,11 @@ public class FuelBackend extends RecipeMapBackend {
     }
 
     @Override
-    public GT_Recipe compileRecipe(GT_Recipe recipe) {
+    public GTRecipe compileRecipe(GTRecipe recipe) {
         super.compileRecipe(recipe);
-        if (recipe.mInputs != null && GT_Utility.getNonnullElementCount(recipe.mInputs) == 1
-            && (recipe.mFluidInputs == null || GT_Utility.getNonnullElementCount(recipe.mFluidInputs) == 0)) {
-            FluidStack fluidStack = GT_Utility.getFluidForFilledItem(recipe.mInputs[0], true);
+        if (recipe.mInputs != null && GTUtility.getNonnullElementCount(recipe.mInputs) == 1
+            && (recipe.mFluidInputs == null || GTUtility.getNonnullElementCount(recipe.mFluidInputs) == 0)) {
+            FluidStack fluidStack = GTUtility.getFluidForFilledItem(recipe.mInputs[0], true);
             if (fluidStack != null) {
                 fluidStack.amount = 0;
                 recipesByFluidInput.put(
@@ -51,9 +51,9 @@ public class FuelBackend extends RecipeMapBackend {
                         .getName(),
                     recipe);
             }
-        } else if ((recipe.mInputs == null || GT_Utility.getNonnullElementCount(recipe.mInputs) == 0)
+        } else if ((recipe.mInputs == null || GTUtility.getNonnullElementCount(recipe.mInputs) == 0)
             && recipe.mFluidInputs != null
-            && GT_Utility.getNonnullElementCount(recipe.mFluidInputs) >= 1
+            && GTUtility.getNonnullElementCount(recipe.mFluidInputs) >= 1
             && recipe.mFluidInputs[0] != null) {
                 recipesByFluidInput.put(
                     recipe.mFluidInputs[0].getFluid()
@@ -64,12 +64,12 @@ public class FuelBackend extends RecipeMapBackend {
     }
 
     @Nullable
-    public GT_Recipe findFuel(FluidStack fluidStack) {
+    public GTRecipe findFuel(FluidStack fluidStack) {
         return findFuel(fluidStack.getFluid());
     }
 
     @Nullable
-    public GT_Recipe findFuel(Fluid fluid) {
+    public GTRecipe findFuel(Fluid fluid) {
         return recipesByFluidInput.get(fluid.getName());
     }
 }
diff --git a/src/main/java/gregtech/api/recipe/maps/FurnaceBackend.java b/src/main/java/gregtech/api/recipe/maps/FurnaceBackend.java
index c4095eeb4e..e501db3c40 100644
--- a/src/main/java/gregtech/api/recipe/maps/FurnaceBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/FurnaceBackend.java
@@ -6,11 +6,11 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_ModHandler;
-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.MethodsReturnNonnullByDefault;
 
 /**
@@ -25,18 +25,18 @@ public class FurnaceBackend extends NonGTBackend {
     }
 
     @Override
-    protected GT_Recipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot,
-        @Nullable GT_Recipe cachedRecipe) {
+    protected GTRecipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot,
+        @Nullable GTRecipe cachedRecipe) {
         if (items.length == 0 || items[0] == null) {
             return null;
         }
         if (cachedRecipe != null && cachedRecipe.isRecipeInputEqual(false, true, fluids, items)) {
             return cachedRecipe;
         }
-        ItemStack output = GT_ModHandler.getSmeltingOutput(items[0], false, null);
+        ItemStack output = GTModHandler.getSmeltingOutput(items[0], false, null);
         return output == null ? null
-            : GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, items[0]))
+            : GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, items[0]))
                 .itemOutputs(output)
                 .duration(128)
                 .eut(4)
@@ -47,6 +47,6 @@ public class FurnaceBackend extends NonGTBackend {
 
     @Override
     public boolean containsInput(ItemStack item) {
-        return GT_ModHandler.getSmeltingOutput(item, false, null) != null;
+        return GTModHandler.getSmeltingOutput(item, false, null) != null;
     }
 }
diff --git a/src/main/java/gregtech/api/recipe/maps/LargeBoilerFuelBackend.java b/src/main/java/gregtech/api/recipe/maps/LargeBoilerFuelBackend.java
index b38b66e41b..a27e425efb 100644
--- a/src/main/java/gregtech/api/recipe/maps/LargeBoilerFuelBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/LargeBoilerFuelBackend.java
@@ -9,11 +9,11 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.recipe.RecipeMapBackend;
 import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTRecipe;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 
 @SuppressWarnings({ "unused", "UnusedReturnValue" })
@@ -46,11 +46,11 @@ public class LargeBoilerFuelBackend extends RecipeMapBackend {
         return ALLOWED_SOLID_FUELS.add(itemregistryName + ":" + meta);
     }
 
-    public GT_Recipe addDenseLiquidRecipe(GT_Recipe recipe) {
+    public GTRecipe addDenseLiquidRecipe(GTRecipe recipe) {
         return addRecipe(recipe, ((double) recipe.mSpecialValue) / 10, false);
     }
 
-    public GT_Recipe addDieselRecipe(GT_Recipe recipe) {
+    public GTRecipe addDieselRecipe(GTRecipe recipe) {
         return addRecipe(recipe, ((double) recipe.mSpecialValue) / 40, false);
     }
 
@@ -61,12 +61,12 @@ public class LargeBoilerFuelBackend extends RecipeMapBackend {
     }
 
     @Nullable
-    public GT_Recipe addSolidRecipe(@Nullable ItemStack fuelItemStack) {
+    public GTRecipe addSolidRecipe(@Nullable ItemStack fuelItemStack) {
         if (fuelItemStack == null) {
             return null;
         }
         if (!addedGeneralDesc) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .duration(1)
                 .eut(1)
                 .specialValue(1)
@@ -82,17 +82,17 @@ public class LargeBoilerFuelBackend extends RecipeMapBackend {
 
         String registryName = Item.itemRegistry.getNameForObject(fuelItemStack.getItem());
         boolean isHighTierAllowed = ALLOWED_SOLID_FUELS.contains(registryName + ":" + fuelItemStack.getItemDamage());
-        return GT_Values.RA.stdBuilder()
+        return GTValues.RA.stdBuilder()
             .itemInputs(fuelItemStack)
             .duration(1)
             .eut(0)
-            .specialValue(GT_ModHandler.getFuelValue(fuelItemStack) / 1600)
+            .specialValue(GTModHandler.getFuelValue(fuelItemStack) / 1600)
             .build()
-            .map(r -> addRecipe(r, ((double) GT_ModHandler.getFuelValue(fuelItemStack)) / 1600, isHighTierAllowed))
+            .map(r -> addRecipe(r, ((double) GTModHandler.getFuelValue(fuelItemStack)) / 1600, isHighTierAllowed))
             .orElse(null);
     }
 
-    private GT_Recipe addRecipe(GT_Recipe recipe, double baseBurnTime, boolean isHighTierAllowed) {
+    private GTRecipe addRecipe(GTRecipe recipe, double baseBurnTime, boolean isHighTierAllowed) {
         // Some recipes will have a burn time like 15.9999999 and % always rounds down
         double floatErrorCorrection = 0.0001;
 
diff --git a/src/main/java/gregtech/api/recipe/maps/MicrowaveBackend.java b/src/main/java/gregtech/api/recipe/maps/MicrowaveBackend.java
index 53623cb0c7..ae4b5f5d35 100644
--- a/src/main/java/gregtech/api/recipe/maps/MicrowaveBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/MicrowaveBackend.java
@@ -1,8 +1,8 @@
 package gregtech.api.recipe.maps;
 
-import static gregtech.api.enums.GT_Values.W;
-import static gregtech.api.util.GT_RecipeConstants.EXPLODE;
-import static gregtech.api.util.GT_RecipeConstants.ON_FIRE;
+import static gregtech.api.enums.GTValues.W;
+import static gregtech.api.util.GTRecipeConstants.EXPLODE;
+import static gregtech.api.util.GTRecipeConstants.ON_FIRE;
 
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
@@ -13,18 +13,18 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntityFurnace;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.SubTag;
 import gregtech.api.objects.ItemData;
 import gregtech.api.objects.MaterialStack;
 import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-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_RecipeBuilder;
-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.GTRecipeBuilder;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 
 /**
@@ -39,8 +39,8 @@ public class MicrowaveBackend extends NonGTBackend {
     }
 
     @Override
-    protected GT_Recipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot,
-        @Nullable GT_Recipe cachedRecipe) {
+    protected GTRecipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot,
+        @Nullable GTRecipe cachedRecipe) {
         if (items.length == 0 || items[0] == null) {
             return null;
         }
@@ -48,12 +48,12 @@ public class MicrowaveBackend extends NonGTBackend {
             return cachedRecipe;
         }
 
-        ItemStack output = GT_ModHandler.getSmeltingOutput(items[0], false, null);
+        ItemStack output = GTModHandler.getSmeltingOutput(items[0], false, null);
 
-        if (GT_Utility.areStacksEqual(items[0], new ItemStack(Items.book, 1, W))) {
-            return GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, items[0]))
-                .itemOutputs(GT_Utility.getWrittenBook("Manual_Microwave", ItemList.Book_Written_03.get(1)))
+        if (GTUtility.areStacksEqual(items[0], new ItemStack(Items.book, 1, W))) {
+            return GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, items[0]))
+                .itemOutputs(GTUtility.getWrittenBook("Manual_Microwave", ItemList.Book_Written_03.get(1)))
                 .duration(32)
                 .eut(4)
                 .noOptimize()
@@ -63,37 +63,36 @@ public class MicrowaveBackend extends NonGTBackend {
 
         // Check Container Item of Input since it is around the Input, then the Input itself, then Container Item of
         // Output and last check the Output itself
-        for (ItemStack item : new ItemStack[] { GT_Utility.getContainerItem(items[0], true), items[0],
-            GT_Utility.getContainerItem(output, true), output }) {
+        for (ItemStack item : new ItemStack[] { GTUtility.getContainerItem(items[0], true), items[0],
+            GTUtility.getContainerItem(output, true), output }) {
             if (item == null) continue;
-            if (GT_Utility.areStacksEqual(item, new ItemStack(Blocks.netherrack, 1, W), true)
-                || GT_Utility.areStacksEqual(item, new ItemStack(Blocks.tnt, 1, W), true)
-                || GT_Utility.areStacksEqual(item, new ItemStack(Items.egg, 1, W), true)
-                || GT_Utility.areStacksEqual(item, new ItemStack(Items.firework_charge, 1, W), true)
-                || GT_Utility.areStacksEqual(item, new ItemStack(Items.fireworks, 1, W), true)
-                || GT_Utility.areStacksEqual(item, new ItemStack(Items.fire_charge, 1, W), true)) {
-                GT_Log.exp
-                    .println("Microwave Explosion due to TNT || EGG || FIREWORKCHARGE || FIREWORK || FIRE CHARGE");
-                return GT_RecipeBuilder.empty()
+            if (GTUtility.areStacksEqual(item, new ItemStack(Blocks.netherrack, 1, W), true)
+                || GTUtility.areStacksEqual(item, new ItemStack(Blocks.tnt, 1, W), true)
+                || GTUtility.areStacksEqual(item, new ItemStack(Items.egg, 1, W), true)
+                || GTUtility.areStacksEqual(item, new ItemStack(Items.firework_charge, 1, W), true)
+                || GTUtility.areStacksEqual(item, new ItemStack(Items.fireworks, 1, W), true)
+                || GTUtility.areStacksEqual(item, new ItemStack(Items.fire_charge, 1, W), true)) {
+                GTLog.exp.println("Microwave Explosion due to TNT || EGG || FIREWORKCHARGE || FIREWORK || FIRE CHARGE");
+                return GTRecipeBuilder.empty()
                     .metadata(EXPLODE, true)
                     .build()
                     .orElse(null);
             }
 
-            ItemData itemData = GT_OreDictUnificator.getItemData(item);
+            ItemData itemData = GTOreDictUnificator.getItemData(item);
             if (itemData != null) {
                 if (itemData.mMaterial != null && itemData.mMaterial.mMaterial != null) {
                     if (itemData.mMaterial.mMaterial.contains(SubTag.METAL)
                         || itemData.mMaterial.mMaterial.contains(SubTag.EXPLOSIVE)) {
-                        GT_Log.exp.println("Microwave Explosion due to METAL insertion");
-                        return GT_RecipeBuilder.empty()
+                        GTLog.exp.println("Microwave Explosion due to METAL insertion");
+                        return GTRecipeBuilder.empty()
                             .metadata(EXPLODE, true)
                             .build()
                             .orElse(null);
                     }
                     if (itemData.mMaterial.mMaterial.contains(SubTag.FLAMMABLE)) {
-                        GT_Log.exp.println("Microwave INFLAMMATION due to FLAMMABLE insertion");
-                        return GT_RecipeBuilder.empty()
+                        GTLog.exp.println("Microwave INFLAMMATION due to FLAMMABLE insertion");
+                        return GTRecipeBuilder.empty()
                             .metadata(ON_FIRE, true)
                             .build()
                             .orElse(null);
@@ -103,15 +102,15 @@ public class MicrowaveBackend extends NonGTBackend {
                     if (materialStack == null) continue;
                     if (materialStack.mMaterial.contains(SubTag.METAL)
                         || materialStack.mMaterial.contains(SubTag.EXPLOSIVE)) {
-                        GT_Log.exp.println("Microwave Explosion due to METAL insertion");
-                        return GT_RecipeBuilder.empty()
+                        GTLog.exp.println("Microwave Explosion due to METAL insertion");
+                        return GTRecipeBuilder.empty()
                             .metadata(EXPLODE, true)
                             .build()
                             .orElse(null);
                     }
                     if (materialStack.mMaterial.contains(SubTag.FLAMMABLE)) {
-                        GT_Log.exp.println("Microwave INFLAMMATION due to FLAMMABLE insertion");
-                        return GT_RecipeBuilder.empty()
+                        GTLog.exp.println("Microwave INFLAMMATION due to FLAMMABLE insertion");
+                        return GTRecipeBuilder.empty()
                             .metadata(ON_FIRE, true)
                             .build()
                             .orElse(null);
@@ -119,8 +118,8 @@ public class MicrowaveBackend extends NonGTBackend {
                 }
             }
             if (TileEntityFurnace.getItemBurnTime(item) > 0) {
-                GT_Log.exp.println("Microwave INFLAMMATION due to BURNABLE insertion");
-                return GT_RecipeBuilder.empty()
+                GTLog.exp.println("Microwave INFLAMMATION due to BURNABLE insertion");
+                return GTRecipeBuilder.empty()
                     .metadata(ON_FIRE, true)
                     .build()
                     .orElse(null);
@@ -128,8 +127,8 @@ public class MicrowaveBackend extends NonGTBackend {
         }
 
         return output == null ? null
-            : GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, items[0]))
+            : GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, items[0]))
                 .itemOutputs(output)
                 .duration(32)
                 .eut(4)
@@ -140,6 +139,6 @@ public class MicrowaveBackend extends NonGTBackend {
 
     @Override
     public boolean containsInput(ItemStack item) {
-        return GT_ModHandler.getSmeltingOutput(item, false, null) != null;
+        return GTModHandler.getSmeltingOutput(item, false, null) != null;
     }
 }
diff --git a/src/main/java/gregtech/api/recipe/maps/NonGTBackend.java b/src/main/java/gregtech/api/recipe/maps/NonGTBackend.java
index 1e871df372..3a66a1c980 100644
--- a/src/main/java/gregtech/api/recipe/maps/NonGTBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/NonGTBackend.java
@@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.recipe.RecipeMapBackend;
 import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 
 /**
@@ -24,8 +24,8 @@ public abstract class NonGTBackend extends RecipeMapBackend {
     }
 
     @Override
-    protected abstract GT_Recipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids,
-        @Nullable ItemStack specialSlot, @Nullable GT_Recipe cachedRecipe);
+    protected abstract GTRecipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids,
+        @Nullable ItemStack specialSlot, @Nullable GTRecipe cachedRecipe);
 
     @Override
     protected boolean doesOverwriteFindRecipe() {
@@ -46,7 +46,7 @@ public abstract class NonGTBackend extends RecipeMapBackend {
     public void reInit() {}
 
     @Override
-    protected GT_Recipe addToItemMap(GT_Recipe recipe) {
+    protected GTRecipe addToItemMap(GTRecipe recipe) {
         return recipe;
     }
 }
diff --git a/src/main/java/gregtech/api/recipe/maps/OilCrackerBackend.java b/src/main/java/gregtech/api/recipe/maps/OilCrackerBackend.java
index c2c312a48a..6417334d34 100644
--- a/src/main/java/gregtech/api/recipe/maps/OilCrackerBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/OilCrackerBackend.java
@@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.recipe.RecipeMapBackend;
 import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 
 @ParametersAreNonnullByDefault
@@ -23,7 +23,7 @@ public class OilCrackerBackend extends RecipeMapBackend {
     }
 
     @Override
-    public GT_Recipe compileRecipe(GT_Recipe recipe) {
+    public GTRecipe compileRecipe(GTRecipe recipe) {
         super.compileRecipe(recipe);
         if (recipe.mFluidInputs != null && recipe.mFluidInputs.length > 1 && recipe.mFluidInputs[1] != null) {
             validCatalystFluidNames.add(
diff --git a/src/main/java/gregtech/api/recipe/maps/PrinterBackend.java b/src/main/java/gregtech/api/recipe/maps/PrinterBackend.java
index a933886447..788828df52 100644
--- a/src/main/java/gregtech/api/recipe/maps/PrinterBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/PrinterBackend.java
@@ -1,6 +1,6 @@
 package gregtech.api.recipe.maps;
 
-import static gregtech.api.enums.GT_Values.L;
+import static gregtech.api.enums.GTValues.L;
 
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
@@ -12,13 +12,13 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.enums.Dyes;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.recipe.RecipeMapBackend;
 import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_ModHandler;
-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.MethodsReturnNonnullByDefault;
 
 /**
@@ -33,14 +33,14 @@ public class PrinterBackend extends RecipeMapBackend {
     }
 
     @Override
-    protected GT_Recipe modifyFoundRecipe(GT_Recipe recipe, ItemStack[] items, FluidStack[] fluids,
+    protected GTRecipe modifyFoundRecipe(GTRecipe recipe, ItemStack[] items, FluidStack[] fluids,
         @Nullable ItemStack specialSlot) {
         if (items[0].getItem() == Items.paper) {
             assert specialSlot != null;
             if (!ItemList.Tool_DataStick.isStackEqual(specialSlot, false, true)) return null;
             NBTTagCompound nbt = specialSlot.getTagCompound();
-            if (nbt == null || GT_Utility.isStringInvalid(nbt.getString("title"))
-                || GT_Utility.isStringInvalid(nbt.getString("author"))) return null;
+            if (nbt == null || GTUtility.isStringInvalid(nbt.getString("title"))
+                || GTUtility.isStringInvalid(nbt.getString("author"))) return null;
 
             recipe = recipe.copy();
             recipe.mCanBeBuffered = false;
@@ -67,7 +67,7 @@ public class PrinterBackend extends RecipeMapBackend {
             recipe = recipe.copy();
             recipe.mCanBeBuffered = false;
             recipe.mOutputs[0].setTagCompound(
-                GT_Utility.getNBTContainingString(
+                GTUtility.getNBTContainingString(
                     new NBTTagCompound(),
                     "GT.PunchCardData",
                     nbt.getString("GT.PunchCardData")));
@@ -77,7 +77,7 @@ public class PrinterBackend extends RecipeMapBackend {
     }
 
     @Override
-    protected GT_Recipe findFallback(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot) {
+    protected GTRecipe findFallback(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot) {
         if (items.length == 0 || items[0] == null || fluids.length == 0 || fluids[0] == null) {
             return null;
         }
@@ -88,7 +88,7 @@ public class PrinterBackend extends RecipeMapBackend {
         }
         if (dye == null) return null;
 
-        ItemStack batchRecolorOutput = GT_ModHandler.getAllRecipeOutput(
+        ItemStack batchRecolorOutput = GTModHandler.getAllRecipeOutput(
             null,
             items[0],
             items[0],
@@ -100,8 +100,8 @@ public class PrinterBackend extends RecipeMapBackend {
             items[0],
             items[0]);
         if (batchRecolorOutput != null) {
-            return GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(8, items[0]))
+            return GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(8, items[0]))
                 .itemOutputs(batchRecolorOutput)
                 .fluidInputs(new FluidStack(fluids[0].getFluid(), (int) L))
                 .duration(256)
@@ -112,11 +112,11 @@ public class PrinterBackend extends RecipeMapBackend {
                 .orElse(null);
         }
 
-        ItemStack singleRecolorOutput = GT_ModHandler
+        ItemStack singleRecolorOutput = GTModHandler
             .getAllRecipeOutput(null, items[0], ItemList.DYE_ONLY_ITEMS[dye.mIndex].get(1));
         if (singleRecolorOutput != null) {
-            return GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, items[0]))
+            return GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, items[0]))
                 .itemOutputs(singleRecolorOutput)
                 .fluidInputs(new FluidStack(fluids[0].getFluid(), (int) L))
                 .duration(32)
diff --git a/src/main/java/gregtech/api/recipe/maps/PurificationUnitClarifierFrontend.java b/src/main/java/gregtech/api/recipe/maps/PurificationUnitClarifierFrontend.java
index c7dad7ea3a..e681c95403 100644
--- a/src/main/java/gregtech/api/recipe/maps/PurificationUnitClarifierFrontend.java
+++ b/src/main/java/gregtech/api/recipe/maps/PurificationUnitClarifierFrontend.java
@@ -11,13 +11,13 @@ import com.gtnewhorizons.modularui.api.math.Size;
 
 import codechicken.nei.PositionedStack;
 import gregtech.api.enums.ItemList;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.recipe.BasicUIPropertiesBuilder;
 import gregtech.api.recipe.NEIRecipePropertiesBuilder;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.common.gui.modularui.UIHelper;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitClarifier;
-import gregtech.nei.GT_NEI_DefaultHandler;
+import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitClarifier;
+import gregtech.nei.GTNEIDefaultHandler;
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
@@ -28,7 +28,7 @@ public class PurificationUnitClarifierFrontend extends PurificationUnitRecipeMap
         super(
             80,
             uiPropertiesBuilder.logoPos(new Pos2d(160, 100))
-                .progressBarTexture(new FallbackableUITexture(GT_UITextures.PROGRESSBAR_CLARIFIER))
+                .progressBarTexture(new FallbackableUITexture(GTUITextures.PROGRESSBAR_CLARIFIER))
                 .logoPos(new Pos2d(152, 90)),
             neiPropertiesBuilder.recipeBackgroundSize(new Size(170, 120)));
     }
@@ -60,12 +60,12 @@ public class PurificationUnitClarifierFrontend extends PurificationUnitRecipeMap
     }
 
     @Override
-    public void drawNEIOverlays(GT_NEI_DefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
+    public void drawNEIOverlays(GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
         super.drawNEIOverlays(neiCachedRecipe);
 
         for (PositionedStack stack : neiCachedRecipe.mInputs) {
             if (stack.item.isItemEqual(ItemList.ActivatedCarbonFilterMesh.get(1))) {
-                drawNEIOverlayText((int) (GT_MetaTileEntity_PurificationUnitClarifier.FILTER_DAMAGE_RATE) + "%", stack);
+                drawNEIOverlayText((int) (MTEPurificationUnitClarifier.FILTER_DAMAGE_RATE) + "%", stack);
             }
         }
     }
diff --git a/src/main/java/gregtech/api/recipe/maps/PurificationUnitFlocculatorFrontend.java b/src/main/java/gregtech/api/recipe/maps/PurificationUnitFlocculatorFrontend.java
index 9366237b67..d0373d4310 100644
--- a/src/main/java/gregtech/api/recipe/maps/PurificationUnitFlocculatorFrontend.java
+++ b/src/main/java/gregtech/api/recipe/maps/PurificationUnitFlocculatorFrontend.java
@@ -15,14 +15,14 @@ import com.gtnewhorizons.modularui.api.math.Size;
 
 import codechicken.nei.PositionedStack;
 import gregtech.api.enums.Materials;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.recipe.BasicUIPropertiesBuilder;
 import gregtech.api.recipe.NEIRecipePropertiesBuilder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.common.gui.modularui.UIHelper;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitFlocculation;
-import gregtech.nei.GT_NEI_DefaultHandler;
+import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitFlocculation;
+import gregtech.nei.GTNEIDefaultHandler;
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
@@ -33,7 +33,7 @@ public class PurificationUnitFlocculatorFrontend extends PurificationUnitRecipeM
         super(
             80,
             uiPropertiesBuilder.logoPos(new Pos2d(160, 100))
-                .progressBarTexture(new FallbackableUITexture(GT_UITextures.PROGRESSBAR_FLOCCULATION))
+                .progressBarTexture(new FallbackableUITexture(GTUITextures.PROGRESSBAR_FLOCCULATION))
                 .logoPos(new Pos2d(152, 100)),
             neiPropertiesBuilder.recipeBackgroundSize(new Size(170, 120)));
     }
@@ -60,30 +60,29 @@ public class PurificationUnitFlocculatorFrontend extends PurificationUnitRecipeM
     @Override
     @NotNull
     public List<String> handleNEIItemTooltip(ItemStack stack, List<String> currentTip,
-        GT_NEI_DefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
-        if (stack
-            .isItemEqual(GT_Utility.getFluidDisplayStack(Materials.PolyAluminiumChloride.getFluid(1000L), false))) {
+        GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
+        if (stack.isItemEqual(GTUtility.getFluidDisplayStack(Materials.PolyAluminiumChloride.getFluid(1000L), false))) {
             currentTip.add("Consumed during operation");
             currentTip.add(
-                "+" + GT_MetaTileEntity_PurificationUnitFlocculation.SUCCESS_PER_LEVEL
+                "+" + MTEPurificationUnitFlocculation.SUCCESS_PER_LEVEL
                     + "%/"
-                    + GT_MetaTileEntity_PurificationUnitFlocculation.INPUT_CHEMICAL_PER_LEVEL
+                    + MTEPurificationUnitFlocculation.INPUT_CHEMICAL_PER_LEVEL
                     + "L");
         } else if (stack
-            .isItemEqual(GT_Utility.getFluidDisplayStack(Materials.FlocculationWasteLiquid.getFluid(1000L), false))) {
+            .isItemEqual(GTUtility.getFluidDisplayStack(Materials.FlocculationWasteLiquid.getFluid(1000L), false))) {
                 currentTip.add("Returned in amount equivalent to consumed flocculant.");
             }
         return super.handleNEIItemTooltip(stack, currentTip, neiCachedRecipe);
     }
 
     @Override
-    public void drawNEIOverlays(GT_NEI_DefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
+    public void drawNEIOverlays(GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
         super.drawNEIOverlays(neiCachedRecipe);
 
         // Display flocculation chemical
         neiCachedRecipe.mInputs.add(
             new PositionedStack(
-                GT_Utility.getFluidDisplayStack(Materials.PolyAluminiumChloride.getFluid(100000L), true),
+                GTUtility.getFluidDisplayStack(Materials.PolyAluminiumChloride.getFluid(100000L), true),
                 5,
                 -1,
                 false));
@@ -91,7 +90,7 @@ public class PurificationUnitFlocculatorFrontend extends PurificationUnitRecipeM
         // Display waste output
         neiCachedRecipe.mOutputs.add(
             new PositionedStack(
-                GT_Utility.getFluidDisplayStack(Materials.FlocculationWasteLiquid.getFluid(100000L), true),
+                GTUtility.getFluidDisplayStack(Materials.FlocculationWasteLiquid.getFluid(100000L), true),
                 147,
                 48,
                 false));
diff --git a/src/main/java/gregtech/api/recipe/maps/PurificationUnitLaserFrontend.java b/src/main/java/gregtech/api/recipe/maps/PurificationUnitLaserFrontend.java
index df42259864..9c90acd8ad 100644
--- a/src/main/java/gregtech/api/recipe/maps/PurificationUnitLaserFrontend.java
+++ b/src/main/java/gregtech/api/recipe/maps/PurificationUnitLaserFrontend.java
@@ -11,8 +11,8 @@ import gregtech.api.recipe.BasicUIPropertiesBuilder;
 import gregtech.api.recipe.NEIRecipePropertiesBuilder;
 import gregtech.api.recipe.RecipeMapFrontend;
 import gregtech.common.gui.modularui.UIHelper;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitUVTreatment;
-import gregtech.nei.GT_NEI_DefaultHandler;
+import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitUVTreatment;
+import gregtech.nei.GTNEIDefaultHandler;
 
 public class PurificationUnitLaserFrontend extends RecipeMapFrontend {
 
@@ -22,13 +22,13 @@ public class PurificationUnitLaserFrontend extends RecipeMapFrontend {
     }
 
     @Override
-    public void drawNEIOverlays(GT_NEI_DefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
-        final int numLenses = GT_MetaTileEntity_PurificationUnitUVTreatment.LENS_ITEMS.size();
+    public void drawNEIOverlays(GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
+        final int numLenses = MTEPurificationUnitUVTreatment.LENS_ITEMS.size();
         List<Pos2d> positions = UIHelper.getGridPositions(numLenses, 12, -4, 3, 3);
         // Put in lens items
         for (int i = 0; i < numLenses; ++i) {
             Pos2d position = positions.get(i);
-            ItemStack lens = GT_MetaTileEntity_PurificationUnitUVTreatment.LENS_ITEMS.get(i);
+            ItemStack lens = MTEPurificationUnitUVTreatment.LENS_ITEMS.get(i);
             neiCachedRecipe.mInputs.add(new PositionedStack(lens, position.x, position.y, false));
         }
         super.drawNEIOverlays(neiCachedRecipe);
diff --git a/src/main/java/gregtech/api/recipe/maps/PurificationUnitOzonationFrontend.java b/src/main/java/gregtech/api/recipe/maps/PurificationUnitOzonationFrontend.java
index cdfd41b78c..e9c1277cb3 100644
--- a/src/main/java/gregtech/api/recipe/maps/PurificationUnitOzonationFrontend.java
+++ b/src/main/java/gregtech/api/recipe/maps/PurificationUnitOzonationFrontend.java
@@ -9,7 +9,7 @@ import com.gtnewhorizons.modularui.api.drawable.FallbackableUITexture;
 import com.gtnewhorizons.modularui.api.math.Pos2d;
 import com.gtnewhorizons.modularui.api.math.Size;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.recipe.BasicUIPropertiesBuilder;
 import gregtech.api.recipe.NEIRecipePropertiesBuilder;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
@@ -24,7 +24,7 @@ public class PurificationUnitOzonationFrontend extends PurificationUnitRecipeMap
         super(
             120,
             uiPropertiesBuilder.logoPos(new Pos2d(160, 100))
-                .progressBarTexture(new FallbackableUITexture(GT_UITextures.PROGRESSBAR_OZONATION))
+                .progressBarTexture(new FallbackableUITexture(GTUITextures.PROGRESSBAR_OZONATION))
                 .logoPos(new Pos2d(152, 97)),
             neiPropertiesBuilder.recipeBackgroundSize(new Size(170, 180)));
     }
diff --git a/src/main/java/gregtech/api/recipe/maps/PurificationUnitParticleExtractorFrontend.java b/src/main/java/gregtech/api/recipe/maps/PurificationUnitParticleExtractorFrontend.java
index bbbd88fd5f..d738ce0750 100644
--- a/src/main/java/gregtech/api/recipe/maps/PurificationUnitParticleExtractorFrontend.java
+++ b/src/main/java/gregtech/api/recipe/maps/PurificationUnitParticleExtractorFrontend.java
@@ -12,7 +12,7 @@ import gregtech.api.recipe.BasicUIPropertiesBuilder;
 import gregtech.api.recipe.NEIRecipePropertiesBuilder;
 import gregtech.api.recipe.RecipeMapFrontend;
 import gregtech.common.gui.modularui.UIHelper;
-import gregtech.nei.GT_NEI_DefaultHandler;
+import gregtech.nei.GTNEIDefaultHandler;
 
 public class PurificationUnitParticleExtractorFrontend extends RecipeMapFrontend {
 
@@ -25,7 +25,7 @@ public class PurificationUnitParticleExtractorFrontend extends RecipeMapFrontend
     }
 
     @Override
-    public void drawNEIOverlays(GT_NEI_DefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
+    public void drawNEIOverlays(GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
         List<Pos2d> positions = UIHelper.getGridPositions(2, 30, 14, 2, 1);
         Pos2d pos1 = positions.get(0);
         Pos2d pos2 = positions.get(1);
diff --git a/src/main/java/gregtech/api/recipe/maps/PurificationUnitPhAdjustmentFrontend.java b/src/main/java/gregtech/api/recipe/maps/PurificationUnitPhAdjustmentFrontend.java
index 7e9eded675..e78d2a395a 100644
--- a/src/main/java/gregtech/api/recipe/maps/PurificationUnitPhAdjustmentFrontend.java
+++ b/src/main/java/gregtech/api/recipe/maps/PurificationUnitPhAdjustmentFrontend.java
@@ -15,13 +15,13 @@ import com.gtnewhorizons.modularui.api.math.Size;
 
 import codechicken.nei.PositionedStack;
 import gregtech.api.enums.Materials;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.recipe.BasicUIPropertiesBuilder;
 import gregtech.api.recipe.NEIRecipePropertiesBuilder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitPhAdjustment;
-import gregtech.nei.GT_NEI_DefaultHandler;
+import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitPhAdjustment;
+import gregtech.nei.GTNEIDefaultHandler;
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
@@ -32,7 +32,7 @@ public class PurificationUnitPhAdjustmentFrontend extends PurificationUnitRecipe
         super(
             80,
             uiPropertiesBuilder.logoPos(new Pos2d(160, 100))
-                .progressBarTexture(new FallbackableUITexture(GT_UITextures.PROGRESSBAR_PH_NEUTRALIZATION))
+                .progressBarTexture(new FallbackableUITexture(GTUITextures.PROGRESSBAR_PH_NEUTRALIZATION))
                 .logoPos(new Pos2d(152, 90)),
             neiPropertiesBuilder.recipeBackgroundSize(new Size(170, 120)));
     }
@@ -54,24 +54,23 @@ public class PurificationUnitPhAdjustmentFrontend extends PurificationUnitRecipe
     @Override
     @NotNull
     public List<String> handleNEIItemTooltip(ItemStack stack, List<String> currentTip,
-        GT_NEI_DefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
+        GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
         // Add pH adjustment values
         if (stack.isItemEqual(Materials.SodiumHydroxide.getDust(1))) {
-            currentTip
-                .add("+" + GT_MetaTileEntity_PurificationUnitPhAdjustment.PH_PER_ALKALINE_DUST * 64 + " pH/stack");
+            currentTip.add("+" + MTEPurificationUnitPhAdjustment.PH_PER_ALKALINE_DUST * 64 + " pH/stack");
         } else
-            if (stack.isItemEqual(GT_Utility.getFluidDisplayStack(Materials.HydrochloricAcid.getFluid(1000L), false))) {
-                currentTip.add(GT_MetaTileEntity_PurificationUnitPhAdjustment.PH_PER_10_ACID_LITER * 100 + " pH/1000L");
+            if (stack.isItemEqual(GTUtility.getFluidDisplayStack(Materials.HydrochloricAcid.getFluid(1000L), false))) {
+                currentTip.add(MTEPurificationUnitPhAdjustment.PH_PER_10_ACID_LITER * 100 + " pH/1000L");
             }
         return super.handleNEIItemTooltip(stack, currentTip, neiCachedRecipe);
     }
 
     @Override
-    public void drawNEIOverlays(GT_NEI_DefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
+    public void drawNEIOverlays(GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
         neiCachedRecipe.mInputs.add(new PositionedStack(Materials.SodiumHydroxide.getDust(64), 3, 1, false));
         neiCachedRecipe.mInputs.add(
             new PositionedStack(
-                GT_Utility.getFluidDisplayStack(Materials.HydrochloricAcid.getFluid(1000L), true),
+                GTUtility.getFluidDisplayStack(Materials.HydrochloricAcid.getFluid(1000L), true),
                 147,
                 1,
                 false));
diff --git a/src/main/java/gregtech/api/recipe/maps/PurificationUnitPlasmaHeaterFrontend.java b/src/main/java/gregtech/api/recipe/maps/PurificationUnitPlasmaHeaterFrontend.java
index 5c63353b98..a7f35c86a5 100644
--- a/src/main/java/gregtech/api/recipe/maps/PurificationUnitPlasmaHeaterFrontend.java
+++ b/src/main/java/gregtech/api/recipe/maps/PurificationUnitPlasmaHeaterFrontend.java
@@ -11,12 +11,12 @@ import com.gtnewhorizons.modularui.api.math.Size;
 
 import codechicken.nei.PositionedStack;
 import gregtech.api.enums.Materials;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.recipe.BasicUIPropertiesBuilder;
 import gregtech.api.recipe.NEIRecipePropertiesBuilder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
-import gregtech.nei.GT_NEI_DefaultHandler;
+import gregtech.nei.GTNEIDefaultHandler;
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
@@ -27,7 +27,7 @@ public class PurificationUnitPlasmaHeaterFrontend extends PurificationUnitRecipe
         super(
             120,
             uiPropertiesBuilder.logoPos(new Pos2d(152, 90))
-                .progressBarTexture(new FallbackableUITexture(GT_UITextures.PROGRESSBAR_PLASMA_HEATER)),
+                .progressBarTexture(new FallbackableUITexture(GTUITextures.PROGRESSBAR_PLASMA_HEATER)),
             neiPropertiesBuilder.recipeBackgroundSize(new Size(170, 120)));
     }
 
@@ -46,12 +46,12 @@ public class PurificationUnitPlasmaHeaterFrontend extends PurificationUnitRecipe
     }
 
     @Override
-    public void drawNEIOverlays(GT_NEI_DefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
+    public void drawNEIOverlays(GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
         neiCachedRecipe.mInputs.add(
-            new PositionedStack(GT_Utility.getFluidDisplayStack(Materials.Helium.getPlasma(10L), true), 26, 53, false));
+            new PositionedStack(GTUtility.getFluidDisplayStack(Materials.Helium.getPlasma(10L), true), 26, 53, false));
         neiCachedRecipe.mInputs.add(
             new PositionedStack(
-                GT_Utility.getFluidDisplayStack(Materials.SuperCoolant.getFluid(100L), true),
+                GTUtility.getFluidDisplayStack(Materials.SuperCoolant.getFluid(100L), true),
                 107,
                 52,
                 false));
diff --git a/src/main/java/gregtech/api/recipe/maps/RecyclerBackend.java b/src/main/java/gregtech/api/recipe/maps/RecyclerBackend.java
index 55fb9b4cc4..c149be4219 100644
--- a/src/main/java/gregtech/api/recipe/maps/RecyclerBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/RecyclerBackend.java
@@ -6,12 +6,12 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 
 /**
@@ -26,17 +26,17 @@ public class RecyclerBackend extends NonGTBackend {
     }
 
     @Override
-    protected GT_Recipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot,
-        @Nullable GT_Recipe cachedRecipe) {
+    protected GTRecipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot,
+        @Nullable GTRecipe cachedRecipe) {
         if (items.length == 0 || items[0] == null) {
             return null;
         }
         if (cachedRecipe != null && cachedRecipe.isRecipeInputEqual(false, true, fluids, items)) {
             return cachedRecipe;
         }
-        GT_RecipeBuilder builder = GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, items[0]));
-        ItemStack output = GT_ModHandler.getRecyclerOutput(items[0], 0);
+        GTRecipeBuilder builder = GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, items[0]));
+        ItemStack output = GTModHandler.getRecyclerOutput(items[0], 0);
         if (output != null) {
             builder.itemOutputs(output)
                 .outputChances(1250);
@@ -50,6 +50,6 @@ public class RecyclerBackend extends NonGTBackend {
 
     @Override
     public boolean containsInput(ItemStack item) {
-        return GT_ModHandler.getRecyclerOutput(item, 0) != null;
+        return GTModHandler.getRecyclerOutput(item, 0) != null;
     }
 }
diff --git a/src/main/java/gregtech/api/recipe/maps/ReplicatorBackend.java b/src/main/java/gregtech/api/recipe/maps/ReplicatorBackend.java
index f201698457..b40b3dd082 100644
--- a/src/main/java/gregtech/api/recipe/maps/ReplicatorBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/ReplicatorBackend.java
@@ -12,34 +12,34 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Element;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TierEU;
 import gregtech.api.recipe.RecipeMapBackend;
 import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_RecipeConstants;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTRecipeConstants;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
-import gregtech.common.items.behaviors.Behaviour_DataOrb;
+import gregtech.common.items.behaviors.BehaviourDataOrb;
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public class ReplicatorBackend extends RecipeMapBackend {
 
-    private final Map<Materials, GT_Recipe> recipesByMaterial = new HashMap<>();
+    private final Map<Materials, GTRecipe> recipesByMaterial = new HashMap<>();
 
     public ReplicatorBackend(RecipeMapBackendPropertiesBuilder propertiesBuilder) {
         super(propertiesBuilder.recipeEmitter(ReplicatorBackend::replicatorRecipeEmitter));
     }
 
     @Override
-    public GT_Recipe compileRecipe(GT_Recipe recipe) {
+    public GTRecipe compileRecipe(GTRecipe recipe) {
         super.compileRecipe(recipe);
-        Materials material = recipe.getMetadata(GT_RecipeConstants.MATERIAL);
+        Materials material = recipe.getMetadata(GTRecipeConstants.MATERIAL);
         assert material != null; // checked by replicatorRecipeEmitter
         recipesByMaterial.put(material, recipe);
         return recipe;
@@ -51,8 +51,8 @@ public class ReplicatorBackend extends RecipeMapBackend {
     }
 
     @Override
-    protected GT_Recipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot,
-        @Nullable GT_Recipe cachedRecipe) {
+    protected GTRecipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot,
+        @Nullable GTRecipe cachedRecipe) {
         if (specialSlot == null) {
             return null;
         }
@@ -65,19 +65,19 @@ public class ReplicatorBackend extends RecipeMapBackend {
 
     @Nullable
     private static Materials getMaterialFromDataOrb(ItemStack stack) {
-        if (ItemList.Tool_DataOrb.isStackEqual(stack, false, true) && Behaviour_DataOrb.getDataTitle(stack)
+        if (ItemList.Tool_DataOrb.isStackEqual(stack, false, true) && BehaviourDataOrb.getDataTitle(stack)
             .equals("Elemental-Scan")) {
-            return Element.get(Behaviour_DataOrb.getDataName(stack)).mLinkedMaterials.stream()
+            return Element.get(BehaviourDataOrb.getDataName(stack)).mLinkedMaterials.stream()
                 .findFirst()
                 .orElse(null);
         }
         return null;
     }
 
-    private static Collection<GT_Recipe> replicatorRecipeEmitter(GT_RecipeBuilder builder) {
-        Materials material = builder.getMetadata(GT_RecipeConstants.MATERIAL);
+    private static Collection<GTRecipe> replicatorRecipeEmitter(GTRecipeBuilder builder) {
+        Materials material = builder.getMetadata(GTRecipeConstants.MATERIAL);
         if (material == null) {
-            throw new IllegalStateException("GT_RecipeConstants.MATERIAL must be set for replicator recipe");
+            throw new IllegalStateException("GTRecipeConstants.MATERIAL must be set for replicator recipe");
         }
         return Optional.of(material)
             .map(material1 -> material1.mElement)
@@ -85,7 +85,7 @@ public class ReplicatorBackend extends RecipeMapBackend {
             .map(ReplicatorBackend::getUUMAmountFromMass)
             .flatMap(
                 uum -> builder.fluidInputs(Materials.UUMatter.getFluid(uum))
-                    .duration(GT_Utility.safeInt(uum * 512L, 1))
+                    .duration(GTUtility.safeInt(uum * 512L, 1))
                     .eut(TierEU.RECIPE_LV)
                     .ignoreCollision()
                     .noOptimize()
@@ -95,6 +95,6 @@ public class ReplicatorBackend extends RecipeMapBackend {
     }
 
     private static int getUUMAmountFromMass(long mass) {
-        return GT_Utility.safeInt((long) Math.pow(mass, GT_Mod.gregtechproxy.replicatorExponent), 1);
+        return GTUtility.safeInt((long) Math.pow(mass, GTMod.gregtechproxy.replicatorExponent), 1);
     }
 }
diff --git a/src/main/java/gregtech/api/recipe/maps/SpaceProjectFrontend.java b/src/main/java/gregtech/api/recipe/maps/SpaceProjectFrontend.java
index 98463dcc4d..70c9605e1b 100644
--- a/src/main/java/gregtech/api/recipe/maps/SpaceProjectFrontend.java
+++ b/src/main/java/gregtech/api/recipe/maps/SpaceProjectFrontend.java
@@ -1,6 +1,6 @@
 package gregtech.api.recipe.maps;
 
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.util.GTUtility.formatNumbers;
 import static net.minecraft.util.EnumChatFormatting.GRAY;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -22,7 +22,7 @@ import com.gtnewhorizons.modularui.common.widget.ProgressBar;
 import appeng.util.ReadableNumberConverter;
 import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.PositionedStack;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.recipe.BasicUIPropertiesBuilder;
 import gregtech.api.recipe.NEIRecipePropertiesBuilder;
 import gregtech.api.recipe.RecipeMapFrontend;
@@ -31,7 +31,7 @@ import gregtech.common.gui.modularui.UIHelper;
 import gregtech.common.misc.spaceprojects.SpaceProjectManager;
 import gregtech.common.misc.spaceprojects.SpaceProjectManager.FakeSpaceProjectRecipe;
 import gregtech.common.misc.spaceprojects.interfaces.ISpaceProject;
-import gregtech.nei.GT_NEI_DefaultHandler;
+import gregtech.nei.GTNEIDefaultHandler;
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
@@ -76,7 +76,7 @@ public class SpaceProjectFrontend extends RecipeMapFrontend {
 
     @Override
     protected List<String> handleNEIItemInputTooltip(List<String> currentTip,
-        GT_NEI_DefaultHandler.FixedPositionedStack pStack) {
+        GTNEIDefaultHandler.FixedPositionedStack pStack) {
         super.handleNEIItemOutputTooltip(currentTip, pStack);
         if (pStack.isFluid()) return currentTip;
         currentTip.add(GRAY + translateToLocal("Item Count: ") + formatNumbers(pStack.realStackSize));
@@ -84,11 +84,11 @@ public class SpaceProjectFrontend extends RecipeMapFrontend {
     }
 
     @Override
-    public void drawNEIOverlays(GT_NEI_DefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
+    public void drawNEIOverlays(GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) {
         for (PositionedStack stack : neiCachedRecipe.mInputs) {
-            if (stack instanceof GT_NEI_DefaultHandler.FixedPositionedStack pStack && stack.item != null
+            if (stack instanceof GTNEIDefaultHandler.FixedPositionedStack pStack && stack.item != null
                 && !pStack.isFluid()) {
-                int stackSize = ((GT_NEI_DefaultHandler.FixedPositionedStack) stack).realStackSize;
+                int stackSize = ((GTNEIDefaultHandler.FixedPositionedStack) stack).realStackSize;
                 String displayString;
                 if (stack.item.stackSize > 9999) {
                     displayString = ReadableNumberConverter.INSTANCE.toWideReadableForm(stackSize);
@@ -114,14 +114,14 @@ public class SpaceProjectFrontend extends RecipeMapFrontend {
         int bar2Width = 18;
         List<Supplier<Float>> splitProgress = splitProgress(progressSupplier, bar1Width, bar2Width);
         builder.widget(
-            new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ASSEMBLY_LINE_1, 17)
+            new ProgressBar().setTexture(GTUITextures.PROGRESSBAR_ASSEMBLY_LINE_1, 17)
                 .setDirection(ProgressBar.Direction.RIGHT)
                 .setProgress(splitProgress.get(0))
                 .setSynced(false, false)
                 .setPos(new Pos2d(70, 28).add(windowOffset))
                 .setSize(bar1Width, 72));
         builder.widget(
-            new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ASSEMBLY_LINE_2, 18)
+            new ProgressBar().setTexture(GTUITextures.PROGRESSBAR_ASSEMBLY_LINE_2, 18)
                 .setDirection(ProgressBar.Direction.RIGHT)
                 .setProgress(splitProgress.get(1))
                 .setSynced(false, false)
diff --git a/src/main/java/gregtech/api/recipe/maps/TranscendentPlasmaMixerFrontend.java b/src/main/java/gregtech/api/recipe/maps/TranscendentPlasmaMixerFrontend.java
index 7a5d7ff164..7a4036e7ba 100644
--- a/src/main/java/gregtech/api/recipe/maps/TranscendentPlasmaMixerFrontend.java
+++ b/src/main/java/gregtech/api/recipe/maps/TranscendentPlasmaMixerFrontend.java
@@ -1,6 +1,6 @@
 package gregtech.api.recipe.maps;
 
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.util.GTUtility.formatNumbers;
 
 import java.util.List;
 
@@ -11,7 +11,7 @@ import com.gtnewhorizons.modularui.api.math.Pos2d;
 import gregtech.api.recipe.BasicUIPropertiesBuilder;
 import gregtech.api.recipe.NEIRecipePropertiesBuilder;
 import gregtech.api.recipe.RecipeMapFrontend;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.common.gui.modularui.UIHelper;
 import gregtech.nei.RecipeDisplayInfo;
@@ -45,12 +45,12 @@ public class TranscendentPlasmaMixerFrontend extends RecipeMapFrontend {
         // These look odd because recipeInfo.recipe.mEUt is actually the EU per litre of fluid processed, not
         // the EU/t.
         recipeInfo.drawText(
-            GT_Utility.trans("152", "Total: ")
+            GTUtility.trans("152", "Total: ")
                 + formatNumbers(1000L * recipeInfo.recipe.mDuration / 100L * recipeInfo.recipe.mEUt)
                 + " EU");
         // 1000 / (20 ticks * 5 seconds) = 10L/t. 10L/t * x EU/L = 10 * x EU/t.
         long averageUsage = 10L * recipeInfo.recipe.mEUt;
         recipeInfo.drawText(
-            "Average: " + formatNumbers(averageUsage) + " EU/t" + GT_Utility.getTierNameWithParentheses(averageUsage));
+            "Average: " + formatNumbers(averageUsage) + " EU/t" + GTUtility.getTierNameWithParentheses(averageUsage));
     }
 }
diff --git a/src/main/java/gregtech/api/recipe/maps/UnpackagerBackend.java b/src/main/java/gregtech/api/recipe/maps/UnpackagerBackend.java
index e7297f0609..9ea34609f6 100644
--- a/src/main/java/gregtech/api/recipe/maps/UnpackagerBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/UnpackagerBackend.java
@@ -6,12 +6,12 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.recipe.RecipeMapBackend;
 import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTRecipe;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 
 @ParametersAreNonnullByDefault
@@ -23,16 +23,16 @@ public class UnpackagerBackend extends RecipeMapBackend {
     }
 
     @Override
-    protected GT_Recipe findFallback(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot) {
+    protected GTRecipe findFallback(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot) {
         if (items.length == 0 || !ItemList.IC2_Scrapbox.isStackEqual(items[0], false, true)) {
             return null;
         }
 
-        ItemStack output = GT_ModHandler.getRandomScrapboxDrop();
+        ItemStack output = GTModHandler.getRandomScrapboxDrop();
         if (output == null) {
             return null;
         }
-        return GT_Values.RA.stdBuilder()
+        return GTValues.RA.stdBuilder()
             .itemInputs(ItemList.IC2_Scrapbox.get(1))
             .itemOutputs(output)
             .duration(16)
diff --git a/src/main/java/gregtech/api/recipe/metadata/CompressionTierKey.java b/src/main/java/gregtech/api/recipe/metadata/CompressionTierKey.java
index 384b5ce2d9..88bd3d6664 100644
--- a/src/main/java/gregtech/api/recipe/metadata/CompressionTierKey.java
+++ b/src/main/java/gregtech/api/recipe/metadata/CompressionTierKey.java
@@ -1,6 +1,6 @@
 package gregtech.api.recipe.metadata;
 
-import static gregtech.api.util.GT_Utility.trans;
+import static gregtech.api.util.GTUtility.trans;
 
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/gregtech/api/recipe/metadata/PCBFactoryTierKey.java b/src/main/java/gregtech/api/recipe/metadata/PCBFactoryTierKey.java
index 05db919b57..ada5574b01 100644
--- a/src/main/java/gregtech/api/recipe/metadata/PCBFactoryTierKey.java
+++ b/src/main/java/gregtech/api/recipe/metadata/PCBFactoryTierKey.java
@@ -1,6 +1,6 @@
 package gregtech.api.recipe.metadata;
 
-import static gregtech.api.util.GT_Utility.trans;
+import static gregtech.api.util.GTUtility.trans;
 
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/gregtech/api/recipe/metadata/PCBFactoryUpgradeKey.java b/src/main/java/gregtech/api/recipe/metadata/PCBFactoryUpgradeKey.java
index 8257f1e6ef..4891c88848 100644
--- a/src/main/java/gregtech/api/recipe/metadata/PCBFactoryUpgradeKey.java
+++ b/src/main/java/gregtech/api/recipe/metadata/PCBFactoryUpgradeKey.java
@@ -1,6 +1,6 @@
 package gregtech.api.recipe.metadata;
 
-import static gregtech.api.util.GT_Utility.trans;
+import static gregtech.api.util.GTUtility.trans;
 
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/gregtech/api/registries/LHECoolantRegistry.java b/src/main/java/gregtech/api/registries/LHECoolantRegistry.java
index 7944132572..084086c841 100644
--- a/src/main/java/gregtech/api/registries/LHECoolantRegistry.java
+++ b/src/main/java/gregtech/api/registries/LHECoolantRegistry.java
@@ -7,6 +7,8 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
+import gregtech.common.tileentities.machines.multi.MTEHeatExchanger;
+
 public class LHECoolantRegistry {
 
     private static final Map<String, LHECoolantInfo> lheCoolants = new HashMap<>();
@@ -15,9 +17,9 @@ public class LHECoolantRegistry {
      * Registers a coolant for use in Large Heat Exchangers and Whakawhiti Weras.
      * See the constants in {@link #registerBaseCoolants()} as a reference for what the multipliers should be.
      * The multipliers are used in
-     * {@link gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_HeatExchanger#checkProcessing()}
-     * and {@link gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_HeatExchanger#onRunningTick()}.
-     * 
+     * {@link MTEHeatExchanger#checkProcessing()}
+     * and {@link MTEHeatExchanger#onRunningTick()}.
+     *
      * @param coldFluidName        The fluid name of the resulting cold coolant
      * @param hotFluidName         The fluid name of the input hot coolant
      * @param steamMultiplier      The steam multiplier
diff --git a/src/main/java/gregtech/api/render/TextureFactory.java b/src/main/java/gregtech/api/render/TextureFactory.java
index 26142fd606..a87b20ccb4 100644
--- a/src/main/java/gregtech/api/render/TextureFactory.java
+++ b/src/main/java/gregtech/api/render/TextureFactory.java
@@ -6,7 +6,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.ITextureBuilder;
-import gregtech.common.render.GT_TextureBuilder;
+import gregtech.common.render.GTTextureBuilder;
 
 /**
  * <p>
@@ -152,6 +152,6 @@ public final class TextureFactory {
      * @return An instance of the {@link ITextureBuilder} implementation
      */
     public static ITextureBuilder builder() {
-        return new GT_TextureBuilder();
+        return new GTTextureBuilder();
     }
 }
diff --git a/src/main/java/gregtech/api/task/tasks/PollutionTask.java b/src/main/java/gregtech/api/task/tasks/PollutionTask.java
index 060a91acab..3770409fb1 100644
--- a/src/main/java/gregtech/api/task/tasks/PollutionTask.java
+++ b/src/main/java/gregtech/api/task/tasks/PollutionTask.java
@@ -8,7 +8,7 @@ import gregtech.api.enums.TickTime;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
 import gregtech.api.task.TaskHost;
 import gregtech.api.task.TickableTask;
-import gregtech.common.GT_Pollution;
+import gregtech.common.Pollution;
 
 public class PollutionTask<T extends TaskHost & IMachineProgress> extends TickableTask<T> {
 
@@ -38,7 +38,7 @@ public class PollutionTask<T extends TaskHost & IMachineProgress> extends Tickab
     public void update(long tick, boolean isServerSide) {
         if (isServerSide && tick % POLLUTION_TICK == 0 && taskHost.hasThingsToDo()) {
             if (taskHost instanceof final TileEntity entity) {
-                GT_Pollution.addPollution(entity, getPollutionPerSecond());
+                Pollution.addPollution(entity, getPollutionPerSecond());
             }
         }
     }
diff --git a/src/main/java/gregtech/api/threads/GT_Runnable_Cable_Update.java b/src/main/java/gregtech/api/threads/RunnableCableUpdate.java
index 5e3b36f473..7ed4e28554 100644
--- a/src/main/java/gregtech/api/threads/GT_Runnable_Cable_Update.java
+++ b/src/main/java/gregtech/api/threads/RunnableCableUpdate.java
@@ -6,21 +6,21 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import com.gtnewhorizon.gtnhlib.util.CoordinatePacker;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.interfaces.tileentity.IMachineBlockUpdateable;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
-import gregtech.common.GT_Proxy;
+import gregtech.api.metatileentity.implementations.MTECable;
+import gregtech.common.GTProxy;
 
-public class GT_Runnable_Cable_Update extends GT_Runnable_MachineBlockUpdate {
+public class RunnableCableUpdate extends RunnableMachineUpdate {
 
-    protected GT_Runnable_Cable_Update(World aWorld, int posX, int posY, int posZ) {
+    protected RunnableCableUpdate(World aWorld, int posX, int posY, int posZ) {
         super(aWorld, posX, posY, posZ);
     }
 
     public static void setCableUpdateValues(World aWorld, int posX, int posY, int posZ) {
         if (isEnabled) {
-            EXECUTOR_SERVICE.submit(new GT_Runnable_Cable_Update(aWorld, posX, posY, posZ));
+            EXECUTOR_SERVICE.submit(new RunnableCableUpdate(aWorld, posX, posY, posZ));
         }
     }
 
@@ -36,7 +36,7 @@ public class GT_Runnable_Cable_Update extends GT_Runnable_MachineBlockUpdate {
 
                 final TileEntity tTileEntity;
 
-                GT_Proxy.TICK_LOCK.lock();
+                GTProxy.TICK_LOCK.lock();
                 try {
                     // we dont want to go over cables that are in unloaded chunks
                     // keeping the lock just to make sure no CME happens
@@ -46,7 +46,7 @@ public class GT_Runnable_Cable_Update extends GT_Runnable_MachineBlockUpdate {
                         tTileEntity = null;
                     }
                 } finally {
-                    GT_Proxy.TICK_LOCK.unlock();
+                    GTProxy.TICK_LOCK.unlock();
                 }
 
                 // See if the block itself needs an update
@@ -56,7 +56,7 @@ public class GT_Runnable_Cable_Update extends GT_Runnable_MachineBlockUpdate {
                 // Now see if we should add the nearby blocks to the queue:
                 // only add blocks the cable is connected to
                 if (tTileEntity instanceof BaseMetaPipeEntity metaPipe
-                    && metaPipe.getMetaTileEntity() instanceof GT_MetaPipeEntity_Cable cable) {
+                    && metaPipe.getMetaTileEntity() instanceof MTECable cable) {
                     for (int i = 0; i < ForgeDirection.VALID_DIRECTIONS.length; i++) {
                         final ForgeDirection side = ForgeDirection.VALID_DIRECTIONS[i];
                         if (cable.isConnectedAtSide(side)) {
@@ -70,7 +70,7 @@ public class GT_Runnable_Cable_Update extends GT_Runnable_MachineBlockUpdate {
                 }
             }
         } catch (Exception e) {
-            GT_Mod.GT_FML_LOGGER.error(
+            GTMod.GT_FML_LOGGER.error(
                 "Well this update was broken... " + initialX
                     + ", "
                     + initialY
diff --git a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java b/src/main/java/gregtech/api/threads/RunnableMachineUpdate.java
index 339556e246..d11e176f3d 100644
--- a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java
+++ b/src/main/java/gregtech/api/threads/RunnableMachineUpdate.java
@@ -11,15 +11,15 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import com.gtnewhorizon.gtnhlib.util.CoordinatePacker;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.tileentity.IMachineBlockUpdateable;
-import gregtech.common.GT_Proxy;
+import gregtech.common.GTProxy;
 import it.unimi.dsi.fastutil.longs.LongArrayFIFOQueue;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
 import it.unimi.dsi.fastutil.longs.LongSet;
 
-public class GT_Runnable_MachineBlockUpdate implements Runnable {
+public class RunnableMachineUpdate implements Runnable {
 
     // used by runner thread
     protected final int initialX, initialY, initialZ;
@@ -36,7 +36,7 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable {
     protected static ExecutorService EXECUTOR_SERVICE;
 
     // This class should never be initiated outside of this class!
-    protected GT_Runnable_MachineBlockUpdate(World aWorld, int posX, int posY, int posZ) {
+    protected RunnableMachineUpdate(World aWorld, int posX, int posY, int posZ) {
         this.world = aWorld;
         this.initialX = posX;
         this.initialY = posY;
@@ -51,15 +51,15 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable {
     }
 
     public static void setEnabled() {
-        GT_Runnable_MachineBlockUpdate.isEnabled = true;
+        RunnableMachineUpdate.isEnabled = true;
     }
 
     public static void setDisabled() {
-        GT_Runnable_MachineBlockUpdate.isEnabled = false;
+        RunnableMachineUpdate.isEnabled = false;
     }
 
     public static void setEnabled(boolean isEnabled) {
-        GT_Runnable_MachineBlockUpdate.isEnabled = isEnabled;
+        RunnableMachineUpdate.isEnabled = isEnabled;
     }
 
     public static boolean isCurrentThreadEnabled() {
@@ -67,7 +67,7 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable {
     }
 
     public static void setCurrentThreadEnabled(boolean perThreadEnable) {
-        GT_Runnable_MachineBlockUpdate.perThreadEnable.set(perThreadEnable);
+        RunnableMachineUpdate.perThreadEnable.set(perThreadEnable);
     }
 
     protected static boolean isEnabled = true;
@@ -75,7 +75,7 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable {
 
     public static void setMachineUpdateValues(World aWorld, int posX, int posY, int posZ) {
         if (isEnabled() && isCurrentThreadEnabled()) {
-            EXECUTOR_SERVICE.submit(new GT_Runnable_MachineBlockUpdate(aWorld, posX, posY, posZ));
+            EXECUTOR_SERVICE.submit(new RunnableMachineUpdate(aWorld, posX, posY, posZ));
         }
     }
 
@@ -91,30 +91,30 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable {
 
     public static void shutdownExecutorService() {
         try {
-            GT_Mod.GT_FML_LOGGER.info("Shutting down Machine block update executor service");
+            GTMod.GT_FML_LOGGER.info("Shutting down Machine block update executor service");
             EXECUTOR_SERVICE.shutdown(); // Disable new tasks from being submitted
             // Wait a while for existing tasks to terminate
             if (!EXECUTOR_SERVICE.awaitTermination(60, TimeUnit.SECONDS)) {
                 EXECUTOR_SERVICE.shutdownNow(); // Cancel currently executing tasks
                 // Wait a while for tasks to respond to being cancelled
                 if (!EXECUTOR_SERVICE.awaitTermination(60, TimeUnit.SECONDS)) {
-                    GT_Mod.GT_FML_LOGGER.error(
+                    GTMod.GT_FML_LOGGER.error(
                         "Well this didn't terminated well... GT_Runnable_MachineBlockUpdate.shutdownExecutorService");
                 }
             }
         } catch (InterruptedException ie) {
-            GT_Mod.GT_FML_LOGGER.error("Well this interruption got interrupted...", ie);
+            GTMod.GT_FML_LOGGER.error("Well this interruption got interrupted...", ie);
             // (Re-)Cancel if current thread also interrupted
             EXECUTOR_SERVICE.shutdownNow();
             // Preserve interrupt status
             Thread.currentThread()
                 .interrupt();
         } catch (Exception e) {
-            GT_Mod.GT_FML_LOGGER.error("Well this didn't terminated well...", e);
+            GTMod.GT_FML_LOGGER.error("Well this didn't terminated well...", e);
             // (Re-)Cancel in case
             EXECUTOR_SERVICE.shutdownNow();
         } finally {
-            GT_Mod.GT_FML_LOGGER.info("Leaving... GT_Runnable_MachineBlockUpdate.shutdownExecutorService");
+            GTMod.GT_FML_LOGGER.info("Leaving... GT_Runnable_MachineBlockUpdate.shutdownExecutorService");
         }
     }
 
@@ -135,13 +135,13 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable {
                 // `loadedTileEntityList`... which might be in the process
                 // of being iterated over during `UpdateEntities()`... which might cause a
                 // ConcurrentModificationException. So, lock that shit.
-                GT_Proxy.TICK_LOCK.lock();
+                GTProxy.TICK_LOCK.lock();
                 try {
                     tTileEntity = world.getTileEntity(posX, posY, posZ);
-                    isMachineBlock = GregTech_API
+                    isMachineBlock = GregTechAPI
                         .isMachineBlock(world.getBlock(posX, posY, posZ), world.getBlockMetadata(posX, posY, posZ));
                 } finally {
-                    GT_Proxy.TICK_LOCK.unlock();
+                    GTProxy.TICK_LOCK.unlock();
                 }
 
                 // See if the block itself needs an update
@@ -167,7 +167,7 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable {
                 }
             }
         } catch (Exception e) {
-            GT_Mod.GT_FML_LOGGER.error(
+            GTMod.GT_FML_LOGGER.error(
                 "Well this update was broken... " + initialX
                     + ", "
                     + initialY
diff --git a/src/main/java/gregtech/api/threads/GT_Runnable_Sound.java b/src/main/java/gregtech/api/threads/RunnableSound.java
index 9021a60e89..30704f2a97 100644
--- a/src/main/java/gregtech/api/threads/GT_Runnable_Sound.java
+++ b/src/main/java/gregtech/api/threads/RunnableSound.java
@@ -3,10 +3,10 @@ package gregtech.api.threads;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
-import gregtech.api.util.GT_PlayedSound;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTPlayedSound;
+import gregtech.api.util.GTUtility;
 
-public class GT_Runnable_Sound implements Runnable {
+public class RunnableSound implements Runnable {
 
     private final double mX, mY, mZ;
     private final int mTimeUntilNextSound;
@@ -14,7 +14,7 @@ public class GT_Runnable_Sound implements Runnable {
     private final ResourceLocation mSoundResourceLocation;
     private final float mSoundStrength, mSoundModulation;
 
-    public GT_Runnable_Sound(World aWorld, double aX, double aY, double aZ, int aTimeUntilNextSound,
+    public RunnableSound(World aWorld, double aX, double aY, double aZ, int aTimeUntilNextSound,
         ResourceLocation aSoundResourceLocation, float aSoundStrength, float aSoundModulation) {
         mWorld = aWorld;
         mX = aX;
@@ -29,11 +29,11 @@ public class GT_Runnable_Sound implements Runnable {
     @Override
     public void run() {
         try {
-            GT_PlayedSound tSound;
-            if (GT_Utility.sPlayedSoundMap.containsKey(tSound = new GT_PlayedSound(mSoundResourceLocation, mX, mY, mZ)))
+            GTPlayedSound tSound;
+            if (GTUtility.sPlayedSoundMap.containsKey(tSound = new GTPlayedSound(mSoundResourceLocation, mX, mY, mZ)))
                 return;
             mWorld.playSound(mX, mY, mZ, mSoundResourceLocation.toString(), mSoundStrength, mSoundModulation, false);
-            GT_Utility.sPlayedSoundMap.put(tSound, mTimeUntilNextSound);
+            GTUtility.sPlayedSoundMap.put(tSound, mTimeUntilNextSound);
         } catch (Throwable e) {
             /**/
         }
diff --git a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java b/src/main/java/gregtech/api/util/AssemblyLineServer.java
index 4c0348683a..49e3882982 100644
--- a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java
+++ b/src/main/java/gregtech/api/util/AssemblyLineServer.java
@@ -9,11 +9,11 @@ import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
 
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsBotania;
 
-public class GT_Assemblyline_Server {
+public class AssemblyLineServer {
 
     public static LinkedHashMap<String, String> lServerNames = new LinkedHashMap<>();
     private static LinkedHashMap<String, String> internal2 = new LinkedHashMap<>(), internal3 = new LinkedHashMap<>(),
@@ -21,7 +21,7 @@ public class GT_Assemblyline_Server {
     private static HashMap<String, Property> internal = new HashMap<>();
 
     public static void fillMap(FMLPreInitializationEvent aEvent) {
-        Configuration conf = GT_LanguageManager.sEnglishFile;
+        Configuration conf = GTLanguageManager.sEnglishFile;
 
         ConfigCategory cat = conf.getCategory("languagefile");
         internal.putAll(cat.getValues());
@@ -56,10 +56,10 @@ public class GT_Assemblyline_Server {
                                 entry.getKey()
                                     .length() - ".name".length()));
                     i = i % 1000;
-                    if (GregTech_API.sGeneratedMaterials[i] != null) lServerNames.put(
+                    if (GregTechAPI.sGeneratedMaterials[i] != null) lServerNames.put(
                         entry.getKey(),
                         entry.getValue()
-                            .replace("material", GregTech_API.sGeneratedMaterials[i].toString()));
+                            .replace("material", GregTechAPI.sGeneratedMaterials[i].toString()));
                     else lServerNames.put(entry.getKey(), null);
                 }
             } catch (Exception ignored) {}
@@ -192,10 +192,10 @@ public class GT_Assemblyline_Server {
                                 entry.getKey()
                                     .length() - ".name".length()));
                     i = i % 1000;
-                    if (GregTech_API.sGeneratedMaterials[i] != null) lServerNames.put(
+                    if (GregTechAPI.sGeneratedMaterials[i] != null) lServerNames.put(
                         entry.getKey(),
                         entry.getValue()
-                            .replace("material", GregTech_API.sGeneratedMaterials[i].toString()));
+                            .replace("material", GregTechAPI.sGeneratedMaterials[i].toString()));
                     else lServerNames.put(entry.getKey(), null);
                 } else if (entry.getKey()
                     .contains("blockmetal")) {
diff --git a/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java b/src/main/java/gregtech/api/util/AssemblyLineUtils.java
index dbe0ff2c40..22bed1884b 100644
--- a/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java
+++ b/src/main/java/gregtech/api/util/AssemblyLineUtils.java
@@ -1,6 +1,6 @@
 package gregtech.api.util;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -18,21 +18,21 @@ import net.minecraftforge.common.util.Constants.NBT;
 import net.minecraftforge.fluids.FluidStack;
 
 import cpw.mods.fml.common.FMLCommonHandler;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.util.GTRecipe.RecipeAssemblyLine;
 
-public class GT_AssemblyLineUtils {
+public class AssemblyLineUtils {
 
     /**
      * A cache of Recipes using the Output as Key.
      */
-    private static final HashMap<GT_ItemStack, GT_Recipe_AssemblyLine> sRecipeCacheByOutput = new HashMap<>();
+    private static final HashMap<GTItemStack, GTRecipe.RecipeAssemblyLine> sRecipeCacheByOutput = new HashMap<>();
     /**
      * A cache of Recipes using the Recipe Hash String as Key.
      */
-    private static final HashMap<String, GT_Recipe_AssemblyLine> sRecipeCacheByRecipeHash = new HashMap<>();
+    private static final HashMap<String, GTRecipe.RecipeAssemblyLine> sRecipeCacheByRecipeHash = new HashMap<>();
 
     /**
      * Checks the DataStick for deprecated/invalid recipes, updating them as required.
@@ -40,14 +40,14 @@ public class GT_AssemblyLineUtils {
      * @param aDataStick - The DataStick to process
      * @return Is this DataStick now valid with a current recipe?
      */
-    public static GT_Recipe_AssemblyLine processDataStick(ItemStack aDataStick) {
+    public static GTRecipe.RecipeAssemblyLine processDataStick(ItemStack aDataStick) {
         if (!isItemDataStick(aDataStick)) {
             return null;
         }
         if (doesDataStickNeedUpdate(aDataStick)) {
             ItemStack aStickOutput = getDataStickOutput(aDataStick);
             if (aStickOutput != null) {
-                GT_Recipe_AssemblyLine aIntendedRecipe = findAssemblyLineRecipeByOutput(aStickOutput);
+                GTRecipe.RecipeAssemblyLine aIntendedRecipe = findAssemblyLineRecipeByOutput(aStickOutput);
                 if (aIntendedRecipe != null && setAssemblyLineRecipeOnDataStick(aDataStick, aIntendedRecipe))
                     return aIntendedRecipe;
             }
@@ -59,9 +59,9 @@ public class GT_AssemblyLineUtils {
      * Finds an Assembly Line recipe from a DataStick.
      *
      * @param aDataStick - The DataStick to check.
-     * @return The GT_Recipe_AssemblyLine recipe contained on the DataStick, if any.
+     * @return The GTRecipe_AssemblyLine recipe contained on the DataStick, if any.
      */
-    public static GT_Recipe_AssemblyLine findAssemblyLineRecipeFromDataStick(ItemStack aDataStick) {
+    public static RecipeAssemblyLine findAssemblyLineRecipeFromDataStick(ItemStack aDataStick) {
         return findAssemblyLineRecipeFromDataStick(aDataStick, false).getRecipe();
     }
 
@@ -69,9 +69,9 @@ public class GT_AssemblyLineUtils {
      * Finds an Assembly Line recipe from a DataStick.
      *
      * @param aDataStick         - The DataStick to check.
-     * @param aReturnBuiltRecipe - Do we return a GT_Recipe_AssemblyLine built from the data on the Data Stick instead
+     * @param aReturnBuiltRecipe - Do we return a GTRecipe_AssemblyLine built from the data on the Data Stick instead
      *                           of searching the Recipe Map?
-     * @return The GT_Recipe_AssemblyLine recipe contained on the DataStick, if any.
+     * @return The GTRecipe_AssemblyLine recipe contained on the DataStick, if any.
      */
     @Nonnull
     public static LookupResult findAssemblyLineRecipeFromDataStick(ItemStack aDataStick, boolean aReturnBuiltRecipe) {
@@ -90,8 +90,9 @@ public class GT_AssemblyLineUtils {
 
         // Get From Cache
         if (doesDataStickHaveRecipeHash(aDataStick)) {
-            GT_Recipe_AssemblyLine aRecipeFromCache = sRecipeCacheByRecipeHash.get(getHashFromDataStack(aDataStick));
-            if (aRecipeFromCache != null && GT_Utility.areStacksEqual(aOutput, aRecipeFromCache.mOutput)) {
+            GTRecipe.RecipeAssemblyLine aRecipeFromCache = sRecipeCacheByRecipeHash
+                .get(getHashFromDataStack(aDataStick));
+            if (aRecipeFromCache != null && GTUtility.areStacksEqual(aOutput, aRecipeFromCache.mOutput)) {
                 return LookupResultType.VALID_STACK_AND_VALID_HASH.getResult(aRecipeFromCache);
             } // else: no cache, or the old recipe run into a hash collision with a different new recipe
         }
@@ -104,45 +105,45 @@ public class GT_AssemblyLineUtils {
 
             List<ItemStack> tAltCurrent = new ArrayList<>();
             for (int j = 0; j < count; j++) {
-                ItemStack tLoaded = GT_Utility.loadItem(aTag, "a" + i + ":" + j);
+                ItemStack tLoaded = GTUtility.loadItem(aTag, "a" + i + ":" + j);
                 if (tLoaded == null) {
                     continue;
                 }
                 tAltCurrent.add(tLoaded);
-                if (GT_Values.D1) {
+                if (GTValues.D1) {
                     GT_FML_LOGGER.info("Item Alt " + i + " : " + tLoaded.getUnlocalizedName());
                 }
             }
             mOreDictAlt.add(tAltCurrent);
-            ItemStack tLoaded = GT_Utility.loadItem(aTag, "" + i);
+            ItemStack tLoaded = GTUtility.loadItem(aTag, "" + i);
             if (tLoaded == null) {
                 continue;
             }
             aInputs.add(tLoaded);
-            if (GT_Values.D1) {
+            if (GTValues.D1) {
                 GT_FML_LOGGER.info("Item " + i + " : " + tLoaded.getUnlocalizedName());
             }
         }
 
-        if (GT_Values.D1) {
+        if (GTValues.D1) {
             GT_FML_LOGGER.info("All Items done, start fluid check");
         }
         for (int i = 0; i < 4; i++) {
             if (!aTag.hasKey("f" + i)) continue;
-            FluidStack tLoaded = GT_Utility.loadFluid(aTag, "f" + i);
+            FluidStack tLoaded = GTUtility.loadFluid(aTag, "f" + i);
             if (tLoaded == null) continue;
             aFluidInputs.add(tLoaded);
-            if (GT_Values.D1) {
+            if (GTValues.D1) {
                 GT_FML_LOGGER.info("Fluid " + i + " " + tLoaded.getUnlocalizedName());
             }
         }
         if (!aTag.hasKey("output") || !aTag.hasKey("time")
             || aTag.getInteger("time") <= 0
             || !aTag.hasKey("eu")
-            || !GT_Utility.isStackValid(aOutput)) {
+            || !GTUtility.isStackValid(aOutput)) {
             return LookupResultType.INVALID_STICK.getResult();
         }
-        if (GT_Values.D1) {
+        if (GTValues.D1) {
             GT_FML_LOGGER.info("Found Data Stick recipe");
         }
 
@@ -152,7 +153,7 @@ public class GT_AssemblyLineUtils {
         // Try build a recipe instance
         if (aReturnBuiltRecipe) {
             return LookupResultType.VALID_STACK_AND_VALID_HASH.getResult(
-                new GT_Recipe_AssemblyLine(
+                new GTRecipe.RecipeAssemblyLine(
                     null,
                     0,
                     aInputs.toArray(new ItemStack[0]),
@@ -162,17 +163,17 @@ public class GT_AssemblyLineUtils {
                     aEU));
         }
 
-        for (GT_Recipe_AssemblyLine aRecipe : GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes) {
+        for (GTRecipe.RecipeAssemblyLine aRecipe : RecipeAssemblyLine.sAssemblylineRecipes) {
             if (aRecipe.mEUt != aEU || aRecipe.mDuration != aTime) continue;
-            if (!GT_Utility.areStacksEqual(aOutput, aRecipe.mOutput, true)) continue;
-            if (!GT_Utility.areStackListsEqual(Arrays.asList(aRecipe.mInputs), aInputs, false, true)) continue;
+            if (!GTUtility.areStacksEqual(aOutput, aRecipe.mOutput, true)) continue;
+            if (!GTUtility.areStackListsEqual(Arrays.asList(aRecipe.mInputs), aInputs, false, true)) continue;
             if (!Objects.equals(Arrays.asList(aRecipe.mFluidInputs), aFluidInputs)) continue;
             if (!areStacksEqual(aRecipe.mOreDictAlt, mOreDictAlt)) continue;
 
             // Cache it
             String aRecipeHash = generateRecipeHash(aRecipe);
             sRecipeCacheByRecipeHash.put(aRecipeHash, aRecipe);
-            sRecipeCacheByOutput.put(new GT_ItemStack(aRecipe.mOutput), aRecipe);
+            sRecipeCacheByOutput.put(new GTItemStack(aRecipe.mOutput), aRecipe);
             if (doesDataStickHaveRecipeHash(aDataStick)) {
                 String aStickHash = getHashFromDataStack(aDataStick);
                 if (aRecipeHash.equals(aStickHash))
@@ -192,31 +193,31 @@ public class GT_AssemblyLineUtils {
 
     private static boolean areStacksEqual(ItemStack[] lhs, List<ItemStack> rhs) {
         return lhs == null ? rhs.isEmpty()
-            : !rhs.isEmpty() && GT_Utility.areStackListsEqual(Arrays.asList(lhs), rhs, false, true);
+            : !rhs.isEmpty() && GTUtility.areStackListsEqual(Arrays.asList(lhs), rhs, false, true);
     }
 
     /**
-     * Finds a GT_Recipe_AssemblyLine based on the expected output ItemStack.
+     * Finds a GTRecipe_AssemblyLine based on the expected output ItemStack.
      *
-     * @param aOutput - The Output of a GT_Recipe_AssemblyLine.
-     * @return First found GT_Recipe_AssemblyLine with matching output.
+     * @param aOutput - The Output of a GTRecipe_AssemblyLine.
+     * @return First found GTRecipe_AssemblyLine with matching output.
      */
-    public static GT_Recipe_AssemblyLine findAssemblyLineRecipeByOutput(ItemStack aOutput) {
+    public static GTRecipe.RecipeAssemblyLine findAssemblyLineRecipeByOutput(ItemStack aOutput) {
         if (aOutput == null) {
             return null;
         }
 
         // Check the cache
-        GT_ItemStack aCacheStack = new GT_ItemStack(aOutput);
-        GT_Recipe_AssemblyLine aRecipeFromCache = sRecipeCacheByOutput.get(aCacheStack);
+        GTItemStack aCacheStack = new GTItemStack(aOutput);
+        RecipeAssemblyLine aRecipeFromCache = sRecipeCacheByOutput.get(aCacheStack);
         if (aRecipeFromCache != null) {
             return aRecipeFromCache;
         }
 
         // Iterate all recipes and return the first matching based on Output.
-        for (GT_Recipe_AssemblyLine aRecipe : GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes) {
+        for (RecipeAssemblyLine aRecipe : GTRecipe.RecipeAssemblyLine.sAssemblylineRecipes) {
             ItemStack aRecipeOutput = aRecipe.mOutput;
-            if (GT_Utility.areStacksEqual(aRecipeOutput, aOutput)) {
+            if (GTUtility.areStacksEqual(aRecipeOutput, aOutput)) {
                 // Cache it to prevent future iterations of all recipes
                 sRecipeCacheByOutput.put(aCacheStack, aRecipe);
                 sRecipeCacheByRecipeHash.put(generateRecipeHash(aRecipe), aRecipe);
@@ -230,7 +231,7 @@ public class GT_AssemblyLineUtils {
      * @param aRecipe - The recipe to generate a Recipe Hash String from.
      * @return The Recipe Hash String.
      */
-    public static String generateRecipeHash(GT_Recipe_AssemblyLine aRecipe) {
+    public static String generateRecipeHash(GTRecipe.RecipeAssemblyLine aRecipe) {
         String aHash = "Invalid.Recipe.Hash";
         if (aRecipe != null) {
             aHash = "Hash." + aRecipe.getPersistentHash();
@@ -242,10 +243,10 @@ public class GT_AssemblyLineUtils {
      * @param aRecipe - The recipe to add to internal caches
      * @throws IllegalArgumentException if given recipe collide with any existing recipe in the cache
      */
-    public static void addRecipeToCache(GT_Recipe_AssemblyLine aRecipe) {
+    public static void addRecipeToCache(RecipeAssemblyLine aRecipe) {
         if (aRecipe != null) {
             String aHash = "Hash." + aRecipe.getPersistentHash();
-            GT_Recipe_AssemblyLine existing = sRecipeCacheByOutput.put(new GT_ItemStack(aRecipe.mOutput), aRecipe);
+            GTRecipe.RecipeAssemblyLine existing = sRecipeCacheByOutput.put(new GTItemStack(aRecipe.mOutput), aRecipe);
             if (existing != null) throw new IllegalArgumentException("Duplicate assline recipe for " + aRecipe.mOutput);
             existing = sRecipeCacheByRecipeHash.put(aHash, aRecipe);
             if (existing != null && !existing.equals(aRecipe))
@@ -270,7 +271,7 @@ public class GT_AssemblyLineUtils {
      * @return Is this ItemStack a Data Stick?
      */
     public static boolean isItemDataStick(ItemStack aStack) {
-        return GT_Utility.isStackValid(aStack) && ItemList.Tool_DataStick.isStackEqual(aStack, false, true);
+        return GTUtility.isStackValid(aStack) && ItemList.Tool_DataStick.isStackEqual(aStack, false, true);
     }
 
     /**
@@ -292,7 +293,7 @@ public class GT_AssemblyLineUtils {
             String aStickHash = getHashFromDataStack(aDataStick);
             if (isValidHash(aStickHash) && doesDataStickHaveOutput(aDataStick)) {
                 ItemStack aStickOutput = getDataStickOutput(aDataStick);
-                GT_Recipe_AssemblyLine aIntendedRecipe = findAssemblyLineRecipeByOutput(aStickOutput);
+                GTRecipe.RecipeAssemblyLine aIntendedRecipe = findAssemblyLineRecipeByOutput(aStickOutput);
                 return !aStickHash.equals(generateRecipeHash(aIntendedRecipe));
             }
         }
@@ -320,7 +321,7 @@ public class GT_AssemblyLineUtils {
      */
     public static ItemStack getDataStickOutput(ItemStack aDataStick) {
         if (doesDataStickHaveOutput(aDataStick)) {
-            return GT_Utility.loadItem(aDataStick.getTagCompound(), "output");
+            return GTUtility.loadItem(aDataStick.getTagCompound(), "output");
         }
         return null;
     }
@@ -363,29 +364,30 @@ public class GT_AssemblyLineUtils {
     /**
      *
      * @param aDataStick - The Data Stick to update.
-     * @param aNewRecipe - The New GT_Recipe_AssemblyLine recipe to update it with.
+     * @param aNewRecipe - The New GTRecipe_AssemblyLine recipe to update it with.
      * @return Did we set the new recipe data & Recipe Hash String on the Data Stick?
      */
-    public static boolean setAssemblyLineRecipeOnDataStick(ItemStack aDataStick, GT_Recipe_AssemblyLine aNewRecipe) {
+    public static boolean setAssemblyLineRecipeOnDataStick(ItemStack aDataStick,
+        GTRecipe.RecipeAssemblyLine aNewRecipe) {
         return setAssemblyLineRecipeOnDataStick(aDataStick, aNewRecipe, true);
     }
 
-    public static boolean setAssemblyLineRecipeOnDataStick(ItemStack aDataStick, GT_Recipe_AssemblyLine aNewRecipe,
+    public static boolean setAssemblyLineRecipeOnDataStick(ItemStack aDataStick, GTRecipe.RecipeAssemblyLine aNewRecipe,
         boolean setUpdateTime) {
         if (isItemDataStick(aDataStick) && aNewRecipe.mOutput != null) {
             String s = aNewRecipe.mOutput.getDisplayName();
             if (FMLCommonHandler.instance()
                 .getEffectiveSide()
                 .isServer()) {
-                s = GT_Assemblyline_Server.lServerNames.get(aNewRecipe.mOutput.getDisplayName());
+                s = AssemblyLineServer.lServerNames.get(aNewRecipe.mOutput.getDisplayName());
                 if (s == null) {
                     s = aNewRecipe.mOutput.getDisplayName();
                 }
             }
 
             String aHash = generateRecipeHash(aNewRecipe);
-            if (GT_Values.D1) {
-                GT_Recipe_AssemblyLine aOldRecipe = findAssemblyLineRecipeFromDataStick(aDataStick, true).recipe;
+            if (GTValues.D1) {
+                GTRecipe.RecipeAssemblyLine aOldRecipe = findAssemblyLineRecipeFromDataStick(aDataStick, true).recipe;
                 GT_FML_LOGGER.info(
                     "Updating data stick: " + aDataStick.getDisplayName()
                         + " | Old Recipe Hash: "
@@ -410,10 +412,10 @@ public class GT_AssemblyLineUtils {
             // remove possible old NBTTagCompound
             aDataStick.setTagCompound(new NBTTagCompound());
             if (displayName != null) aDataStick.setStackDisplayName(displayName);
-            if (GT_Values.D1) {
-                GT_Utility.ItemNBT.setBookTitle(aDataStick, s + " Construction Data (" + aHash + ")");
+            if (GTValues.D1) {
+                GTUtility.ItemNBT.setBookTitle(aDataStick, s + " Construction Data (" + aHash + ")");
             } else {
-                GT_Utility.ItemNBT.setBookTitle(aDataStick, s + " Construction Data");
+                GTUtility.ItemNBT.setBookTitle(aDataStick, s + " Construction Data");
             }
 
             NBTTagCompound tNBT = aDataStick.getTagCompound();
@@ -451,7 +453,7 @@ public class GT_AssemblyLineUtils {
                             if (FMLCommonHandler.instance()
                                 .getEffectiveSide()
                                 .isServer()) {
-                                s = GT_Assemblyline_Server.lServerNames.get(tStack.getDisplayName());
+                                s = AssemblyLineServer.lServerNames.get(tStack.getDisplayName());
                                 if (s == null) s = tStack.getDisplayName();
                             }
 
@@ -476,7 +478,7 @@ public class GT_AssemblyLineUtils {
                         if (FMLCommonHandler.instance()
                             .getEffectiveSide()
                             .isServer()) {
-                            s = GT_Assemblyline_Server.lServerNames.get(aNewRecipe.mInputs[i].getDisplayName());
+                            s = AssemblyLineServer.lServerNames.get(aNewRecipe.mInputs[i].getDisplayName());
                             if (s == null) s = aNewRecipe.mInputs[i].getDisplayName();
                         }
                         tNBTList.appendTag(
@@ -493,7 +495,7 @@ public class GT_AssemblyLineUtils {
                     if (FMLCommonHandler.instance()
                         .getEffectiveSide()
                         .isServer()) {
-                        s = GT_Assemblyline_Server.lServerNames.get(aNewRecipe.mFluidInputs[i].getLocalizedName());
+                        s = AssemblyLineServer.lServerNames.get(aNewRecipe.mFluidInputs[i].getLocalizedName());
                         if (s == null) s = aNewRecipe.mFluidInputs[i].getLocalizedName();
                     }
                     tNBTList.appendTag(
@@ -531,7 +533,7 @@ public class GT_AssemblyLineUtils {
             return singletonResult;
         }
 
-        public LookupResult getResult(GT_Recipe_AssemblyLine recipe) {
+        public LookupResult getResult(GTRecipe.RecipeAssemblyLine recipe) {
             if ((recipe == null) != recipeNull)
                 throw new IllegalArgumentException("This result type does not allow given input");
             return new LookupResult(recipe, this);
@@ -540,15 +542,15 @@ public class GT_AssemblyLineUtils {
 
     public static class LookupResult {
 
-        private final GT_Recipe_AssemblyLine recipe;
+        private final GTRecipe.RecipeAssemblyLine recipe;
         private final LookupResultType type;
 
-        LookupResult(GT_Recipe_AssemblyLine recipe, LookupResultType type) {
+        LookupResult(GTRecipe.RecipeAssemblyLine recipe, LookupResultType type) {
             this.recipe = recipe;
             this.type = type;
         }
 
-        public GT_Recipe_AssemblyLine getRecipe() {
+        public GTRecipe.RecipeAssemblyLine getRecipe() {
             return recipe;
         }
 
diff --git a/src/main/java/gregtech/api/util/BlastFurnaceGasStat.java b/src/main/java/gregtech/api/util/BlastFurnaceGasStat.java
index ac1601e846..822e2f036e 100644
--- a/src/main/java/gregtech/api/util/BlastFurnaceGasStat.java
+++ b/src/main/java/gregtech/api/util/BlastFurnaceGasStat.java
@@ -6,9 +6,8 @@ import java.util.List;
 
 import net.minecraftforge.fluids.FluidStack;
 
-import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-
+import bartworks.system.material.Werkstoff;
+import bartworks.system.material.WerkstoffLoader;
 import gregtech.api.enums.Materials;
 
 public class BlastFurnaceGasStat {
diff --git a/src/main/java/gregtech/api/util/GT_CircuitryBehavior.java b/src/main/java/gregtech/api/util/CircuitryBehavior.java
index 63fb7d1e70..3859be590a 100644
--- a/src/main/java/gregtech/api/util/GT_CircuitryBehavior.java
+++ b/src/main/java/gregtech/api/util/CircuitryBehavior.java
@@ -4,7 +4,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.IRedstoneCircuitBlock;
 
 /**
@@ -22,13 +22,13 @@ import gregtech.api.interfaces.IRedstoneCircuitBlock;
  * <p/>
  * All Functions run usually in a seperate try/catch Block, so that failed Logic won't crash the TileEntity.
  */
-public abstract class GT_CircuitryBehavior {
+public abstract class CircuitryBehavior {
 
     /**
      * @param aIndex 0 - 1023 are my own Indices, so use other Numbers!
      */
-    public GT_CircuitryBehavior(int aIndex) {
-        GregTech_API.sCircuitryBehaviors.put(aIndex, this);
+    public CircuitryBehavior(int aIndex) {
+        GregTechAPI.sCircuitryBehaviors.put(aIndex, this);
     }
 
     /**
diff --git a/src/main/java/gregtech/api/util/ColorsMetadataSection.java b/src/main/java/gregtech/api/util/ColorsMetadataSection.java
index fb9cc6dd56..7e420f3451 100644
--- a/src/main/java/gregtech/api/util/ColorsMetadataSection.java
+++ b/src/main/java/gregtech/api/util/ColorsMetadataSection.java
@@ -37,7 +37,7 @@ public class ColorsMetadataSection implements IMetadataSection {
             try {
                 if (!hex.isEmpty()) colorValue = Integer.parseUnsignedInt(hex, 16);
             } catch (final NumberFormatException e) {
-                GT_Log.err.println("Couldn't format color correctly of " + key + " -> " + hex);
+                GTLog.err.println("Couldn't format color correctly of " + key + " -> " + hex);
             }
             intMap.put(key, colorValue);
         }
diff --git a/src/main/java/gregtech/api/util/ColorsMetadataSectionSerializer.java b/src/main/java/gregtech/api/util/ColorsMetadataSectionSerializer.java
index 389662d041..8eb91802cb 100644
--- a/src/main/java/gregtech/api/util/ColorsMetadataSectionSerializer.java
+++ b/src/main/java/gregtech/api/util/ColorsMetadataSectionSerializer.java
@@ -14,8 +14,8 @@ import com.google.gson.JsonSerializationContext;
 
 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.Dyes;
 
 @SideOnly(Side.CLIENT)
@@ -24,7 +24,7 @@ public class ColorsMetadataSectionSerializer extends BaseMetadataSectionSerializ
     public ColorsMetadataSection deserialize(JsonElement metadataColors, Type type,
         JsonDeserializationContext context) {
         // Default values
-        boolean enableGuiTint = GregTech_API.sColoredGUI;
+        boolean enableGuiTint = GregTechAPI.sColoredGUI;
         Map<String, String> hexGuiTintMap = new HashMap<>();
         Map<String, String> hexTextColorMap = new HashMap<>();
 
@@ -39,7 +39,7 @@ public class ColorsMetadataSectionSerializer extends BaseMetadataSectionSerializ
                         entry.getValue()
                             .getAsString());
                 } else {
-                    GT_Mod.GT_FML_LOGGER.warn("ColorOverride expects primitive value for key `textColor`");
+                    GTMod.GT_FML_LOGGER.warn("ColorOverride expects primitive value for key `textColor`");
                 }
             }
         }
@@ -50,7 +50,7 @@ public class ColorsMetadataSectionSerializer extends BaseMetadataSectionSerializ
                 .getJsonObjectBooleanFieldValueOrDefault(guiTints, "enableGuiTintWhenPainted", true);
 
             for (Dyes dye : Dyes.values()) {
-                hexGuiTintMap.put(dye.mName, GT_Util.toHexString(dye.getRGBA()));
+                hexGuiTintMap.put(dye.mName, GTUtil.toHexString(dye.getRGBA()));
             }
 
             for (String key : hexGuiTintMap.keySet()) {
@@ -59,7 +59,7 @@ public class ColorsMetadataSectionSerializer extends BaseMetadataSectionSerializ
                         key,
                         JsonUtils.getJsonObjectStringFieldValueOrDefault(guiTints, key, hexGuiTintMap.get(key)));
                 } else {
-                    hexGuiTintMap.replace(key, GT_Util.toHexString(Dyes.dyeWhite.getRGBA()));
+                    hexGuiTintMap.replace(key, GTUtil.toHexString(Dyes.dyeWhite.getRGBA()));
                 }
             }
         }
diff --git a/src/main/java/gregtech/api/util/GT_CoverBehavior.java b/src/main/java/gregtech/api/util/CoverBehavior.java
index 9394b3957f..7e6f1049e9 100644
--- a/src/main/java/gregtech/api/util/GT_CoverBehavior.java
+++ b/src/main/java/gregtech/api/util/CoverBehavior.java
@@ -1,6 +1,6 @@
 package gregtech.api.util;
 
-import static gregtech.api.enums.GT_Values.E;
+import static gregtech.api.enums.GTValues.E;
 
 import java.lang.ref.WeakReference;
 
@@ -10,22 +10,22 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 
 /**
  * For Covers with a special behavior. Has fixed storage format of 4 byte. Not very convenient...
  */
-public abstract class GT_CoverBehavior extends GT_CoverBehaviorBase<ISerializableObject.LegacyCoverData> {
+public abstract class CoverBehavior extends CoverBehaviorBase<ISerializableObject.LegacyCoverData> {
 
     public boolean mPlayerNotified = false;
 
-    public GT_CoverBehavior() {
+    public CoverBehavior() {
         this(null);
     }
 
-    public GT_CoverBehavior(ITexture coverTexture) {
+    public CoverBehavior(ITexture coverTexture) {
         super(ISerializableObject.LegacyCoverData.class, coverTexture);
     }
 
@@ -245,7 +245,7 @@ public abstract class GT_CoverBehavior extends GT_CoverBehaviorBase<ISerializabl
         if (hasCoverGUI() && aPlayer instanceof EntityPlayerMP) {
             lastPlayer = new WeakReference<>(aPlayer);
             mPlayerNotified = false;
-            GT_UIInfos.openCoverUI(aTileEntity, aPlayer, side);
+            GTUIInfos.openCoverUI(aTileEntity, aPlayer, side);
             return true;
         }
         return false;
@@ -397,6 +397,6 @@ public abstract class GT_CoverBehavior extends GT_CoverBehaviorBase<ISerializabl
      * @return the ItemStack dropped by this Cover
      */
     public ItemStack getDrop(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-        return GT_OreDictUnificator.get(true, aTileEntity.getCoverItemAtSide(side));
+        return GTOreDictUnificator.get(true, aTileEntity.getCoverItemAtSide(side));
     }
 }
diff --git a/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java b/src/main/java/gregtech/api/util/CoverBehaviorBase.java
index f5bd7a92f4..0c8ef81533 100644
--- a/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java
+++ b/src/main/java/gregtech/api/util/CoverBehaviorBase.java
@@ -1,6 +1,6 @@
 package gregtech.api.util;
 
-import static gregtech.api.enums.GT_Values.E;
+import static gregtech.api.enums.GTValues.E;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
@@ -26,12 +26,12 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.ButtonWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.gui.GT_GUIColorOverride;
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.api.GregTechAPI;
+import gregtech.api.gui.GUIColorOverride;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.gui.modularui.GUITextureSet;
-import gregtech.api.gui.widgets.GT_CoverTickRateButton;
+import gregtech.api.gui.widgets.CoverTickRateButton;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.common.covers.CoverInfo;
@@ -41,24 +41,24 @@ import gregtech.common.covers.CoverInfo;
  *
  * @author glease
  */
-public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
+public abstract class CoverBehaviorBase<T extends ISerializableObject> {
 
     public WeakReference<EntityPlayer> lastPlayer = null;
     private final Class<T> typeToken;
     private final ITexture coverFGTexture;
 
-    protected GT_CoverBehaviorBase(Class<T> typeToken) {
+    protected CoverBehaviorBase(Class<T> typeToken) {
         this(typeToken, null);
     }
 
-    protected GT_CoverBehaviorBase(Class<T> typeToken, ITexture coverTexture) {
+    protected CoverBehaviorBase(Class<T> typeToken, ITexture coverTexture) {
         this.typeToken = typeToken;
         this.coverFGTexture = coverTexture;
         reloadColorOverride();
     }
 
     public void reloadColorOverride() {
-        this.colorOverride = GT_GUIColorOverride.get(guiTexturePath);
+        this.colorOverride = GUIColorOverride.get(guiTexturePath);
     }
 
     public abstract T createDataObject(int aLegacyData);
@@ -122,7 +122,7 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
 
     /**
      * Get the special foreground cover texture associated with this cover. Return null if one should use the texture
-     * passed to {@link gregtech.api.GregTech_API#registerCover(ItemStack, ITexture, GT_CoverBehaviorBase)} or its
+     * passed to {@link GregTechAPI#registerCover(ItemStack, ITexture, CoverBehaviorBase)} or its
      * overloads.
      */
     public final ITexture getSpecialCoverFGTexture(ForgeDirection side, int aCoverID,
@@ -132,7 +132,7 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
 
     /**
      * Get the special cover texture associated with this cover. Return null if one should use the texture passed to
-     * {@link gregtech.api.GregTech_API#registerCover(ItemStack, ITexture, GT_CoverBehaviorBase)} or its overloads.
+     * {@link GregTechAPI#registerCover(ItemStack, ITexture, CoverBehaviorBase)} or its overloads.
      */
     public final ITexture getSpecialCoverTexture(ForgeDirection side, int aCoverID, ISerializableObject aCoverVariable,
         ICoverable aTileEntity) {
@@ -409,10 +409,10 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
     // region UI stuff
 
     protected GT_TooltipDataCache mTooltipCache = new GT_TooltipDataCache();
-    protected GT_GUIColorOverride colorOverride;
+    protected GUIColorOverride colorOverride;
     private static final String guiTexturePath = "gregtech:textures/gui/GuiCover.png";
 
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new UIFactory(buildContext).createWindow();
     }
 
@@ -422,9 +422,9 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
      */
     protected class UIFactory {
 
-        private final GT_CoverUIBuildContext uiBuildContext;
+        private final CoverUIBuildContext uiBuildContext;
 
-        public UIFactory(GT_CoverUIBuildContext buildContext) {
+        public UIFactory(CoverUIBuildContext buildContext) {
             this.uiBuildContext = buildContext;
         }
 
@@ -443,10 +443,10 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
 
             final CoverInfo coverInfo = uiBuildContext.getTile()
                 .getCoverInfoAtSide(uiBuildContext.getCoverSide());
-            final GT_CoverBehaviorBase<?> behavior = coverInfo.getCoverBehavior();
+            final CoverBehaviorBase<?> behavior = coverInfo.getCoverBehavior();
             if (coverInfo.getMinimumTickRate() > 0 && behavior.allowsTickRateAddition()) {
                 builder.widget(
-                    new GT_CoverTickRateButton(coverInfo, builder).setPos(getGUIWidth() - 24, getGUIHeight() - 24));
+                    new CoverTickRateButton(coverInfo, builder).setPos(getGUIWidth() - 24, getGUIHeight() - 24));
             }
 
             return builder.build();
@@ -463,7 +463,7 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
          */
         protected void addUIWidgets(ModularWindow.Builder builder) {}
 
-        public GT_CoverUIBuildContext getUIBuildContext() {
+        public CoverUIBuildContext getUIBuildContext() {
             return uiBuildContext;
         }
 
@@ -501,11 +501,11 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
             return !getUIBuildContext().getTile()
                 .isDead()
                 && getUIBuildContext().getTile()
-                    .getCoverBehaviorAtSideNew(getUIBuildContext().getCoverSide()) != GregTech_API.sNoBehavior;
+                    .getCoverBehaviorAtSideNew(getUIBuildContext().getCoverSide()) != GregTechAPI.sNoBehavior;
         }
 
         protected void addTitleToUI(ModularWindow.Builder builder) {
-            ItemStack coverItem = GT_Utility.intToStack(getUIBuildContext().getCoverID());
+            ItemStack coverItem = GTUtility.intToStack(getUIBuildContext().getCoverID());
             if (coverItem != null) {
                 builder.widget(
                     new ItemDrawable(coverItem).asWidget()
@@ -551,7 +551,7 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
     }
 
     protected ItemStack getDisplayStackImpl(int aCoverID, T aCoverVariable) {
-        return GT_Utility.intToStack(aCoverID);
+        return GTUtility.intToStack(aCoverID);
     }
 
     protected ITexture getSpecialCoverFGTextureImpl(ForgeDirection side, int aCoverID, T aCoverVariable,
@@ -621,7 +621,7 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
         ICoverable aTileEntity, EntityPlayer aPlayer) {
         if (hasCoverGUI() && aPlayer instanceof EntityPlayerMP) {
             lastPlayer = new WeakReference<>(aPlayer);
-            GT_UIInfos.openCoverUI(aTileEntity, aPlayer, side);
+            GTUIInfos.openCoverUI(aTileEntity, aPlayer, side);
             return true;
         }
         return false;
@@ -771,7 +771,7 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
      * @return the ItemStack dropped by this Cover
      */
     protected ItemStack getDropImpl(ForgeDirection side, int aCoverID, T aCoverVariable, ICoverable aTileEntity) {
-        return GT_OreDictUnificator.get(true, aTileEntity.getCoverItemAtSide(side));
+        return GTOreDictUnificator.get(true, aTileEntity.getCoverItemAtSide(side));
     }
 
     // endregion
@@ -810,7 +810,7 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
      * sets the Cover upon placement.
      */
     public void placeCover(ForgeDirection side, ItemStack aCover, ICoverable aTileEntity) {
-        aTileEntity.setCoverIDAtSide(side, GT_Utility.stackToInt(aCover));
+        aTileEntity.setCoverIDAtSide(side, GTUtility.stackToInt(aCover));
     }
 
     public boolean allowsCopyPasteTool() {
diff --git a/src/main/java/gregtech/api/util/ExoticEnergyInputHelper.java b/src/main/java/gregtech/api/util/ExoticEnergyInputHelper.java
new file mode 100644
index 0000000000..6640f03835
--- /dev/null
+++ b/src/main/java/gregtech/api/util/ExoticEnergyInputHelper.java
@@ -0,0 +1,103 @@
+package gregtech.api.util;
+
+import static gregtech.api.util.GTUtility.filterValidMTEs;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti;
+import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyTunnel;
+
+public class ExoticEnergyInputHelper {
+
+    /**
+     * The Valid Types of TecTech Hatch List.
+     */
+    private static final List<Class<? extends MTEHatch>> sExoticEnergyHatchType = new ArrayList<>();
+
+    static {
+        register(MTEHatchEnergyMulti.class);
+        register(MTEHatchEnergyTunnel.class);
+    }
+
+    public static void register(Class<? extends MTEHatch> clazz) {
+        if (!MTEHatch.class.isAssignableFrom(clazz))
+            throw new IllegalArgumentException(clazz.getName() + " is not a subclass of " + MTEHatch.class.getName());
+        sExoticEnergyHatchType.add(clazz);
+    }
+
+    public static boolean drainEnergy(long aEU, Collection<? extends MTEHatch> hatches) {
+        for (MTEHatch tHatch : hatches) {
+            long tDrain = Math.min(
+                tHatch.getBaseMetaTileEntity()
+                    .getStoredEU(),
+                aEU);
+            tHatch.getBaseMetaTileEntity()
+                .decreaseStoredEnergyUnits(tDrain, false);
+            aEU -= tDrain;
+        }
+        return aEU <= 0;
+    }
+
+    public static boolean isExoticEnergyInput(IMetaTileEntity aHatch) {
+        for (Class<?> clazz : sExoticEnergyHatchType) {
+            if (clazz.isInstance(aHatch)) return true;
+        }
+        return false;
+    }
+
+    public static long getTotalEuMulti(Collection<? extends MTEHatch> hatches) {
+        long rEU = 0L;
+        for (MTEHatch tHatch : filterValidMTEs(hatches)) {
+            rEU += tHatch.getBaseMetaTileEntity()
+                .getInputVoltage() * tHatch.maxWorkingAmperesIn();
+        }
+        return rEU;
+    }
+
+    public static long getMaxInputVoltageMulti(Collection<? extends MTEHatch> hatches) {
+        long rVoltage = 0;
+        for (MTEHatch tHatch : filterValidMTEs(hatches)) {
+            rVoltage += tHatch.getBaseMetaTileEntity()
+                .getInputVoltage();
+        }
+        return rVoltage;
+    }
+
+    public static long getAverageInputVoltageMulti(Collection<? extends MTEHatch> hatches) {
+        long rVoltage = 0;
+        for (MTEHatch tHatch : filterValidMTEs(hatches)) {
+            rVoltage += tHatch.getBaseMetaTileEntity()
+                .getInputVoltage();
+        }
+        if (hatches.isEmpty()) {
+            return 0;
+        }
+        return rVoltage / hatches.size();
+    }
+
+    public static long getMaxInputAmpsMulti(Collection<? extends MTEHatch> hatches) {
+        long rAmp = 0;
+        for (MTEHatch tHatch : filterValidMTEs(hatches)) {
+            rAmp += tHatch.getBaseMetaTileEntity()
+                .getInputAmperage();
+        }
+        return rAmp;
+    }
+
+    public static long getMaxWorkingInputAmpsMulti(Collection<? extends MTEHatch> hatches) {
+        long rAmp = 0;
+        for (MTEHatch tHatch : filterValidMTEs(hatches)) {
+            rAmp += tHatch.maxWorkingAmperesIn();
+        }
+        return rAmp;
+    }
+
+    public static List<Class<? extends MTEHatch>> getAllClasses() {
+        return Collections.unmodifiableList(sExoticEnergyHatchType);
+    }
+}
diff --git a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java
index b5bfff9e29..8f36600e2a 100644
--- a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java
+++ b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java
@@ -1,6 +1,6 @@
 package gregtech.api.util;
 
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.fishPondRecipes;
 
 import java.util.ArrayList;
@@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.WeightedRandomFishable;
 import net.minecraftforge.common.FishingHooks;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -50,8 +50,8 @@ public class FishPondFakeRecipe {
                         ItemStack t = (ItemStack) ReflectionUtils
                             .getField(WeightedRandomFishable.class, "field_150711_b")
                             .get(u);
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.getIntegratedCircuit(mType))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.getIntegratedCircuit(mType))
                             .itemOutputs(t)
                             .duration(5 * SECONDS)
                             .eut(0)
diff --git a/src/main/java/gregtech/api/util/GT_ApiaryModifier.java b/src/main/java/gregtech/api/util/GTApiaryModifier.java
index 4a89345670..955b2e60f9 100644
--- a/src/main/java/gregtech/api/util/GT_ApiaryModifier.java
+++ b/src/main/java/gregtech/api/util/GTApiaryModifier.java
@@ -2,7 +2,7 @@ package gregtech.api.util;
 
 import net.minecraft.world.biome.BiomeGenBase;
 
-public class GT_ApiaryModifier {
+public class GTApiaryModifier {
 
     public float territory = 1f;
     public float mutation = 1f;
diff --git a/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java b/src/main/java/gregtech/api/util/GTApiaryUpgrade.java
index 9ed7a56e1e..5de373a57e 100644
--- a/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java
+++ b/src/main/java/gregtech/api/util/GTApiaryUpgrade.java
@@ -12,12 +12,12 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.biome.BiomeGenBase;
 
 import gregtech.api.enums.OrePrefixes;
-import gregtech.common.items.GT_MetaGenerated_Item_03;
+import gregtech.common.items.MetaGeneratedItem03;
 
 /**
- * Actual items are defined in {@link GT_MetaGenerated_Item_03}
+ * Actual items are defined in {@link MetaGeneratedItem03}
  */
-public enum GT_ApiaryUpgrade {
+public enum GTApiaryUpgrade {
 
     speed1(UNIQUE_INDEX.SPEED_UPGRADE, 32200, 1, (mods, n) -> mods.maxSpeed = 1),
     speed2(UNIQUE_INDEX.SPEED_UPGRADE, 32201, 1, (mods, n) -> mods.maxSpeed = 2),
@@ -146,36 +146,35 @@ public enum GT_ApiaryUpgrade {
         HEATER_UPGRADE,
         SIEVE_UPGRADE,;
 
-        void apply(Consumer<GT_ApiaryUpgrade> fn) {
+        void apply(Consumer<GTApiaryUpgrade> fn) {
             UNIQUE_UPGRADE_LIST.get(this)
                 .forEach(fn);
         }
     }
 
-    private static final EnumMap<UNIQUE_INDEX, ArrayList<GT_ApiaryUpgrade>> UNIQUE_UPGRADE_LIST = new EnumMap<>(
+    private static final EnumMap<UNIQUE_INDEX, ArrayList<GTApiaryUpgrade>> UNIQUE_UPGRADE_LIST = new EnumMap<>(
         UNIQUE_INDEX.class);
 
     private int meta = 0;
     private int maxnumber = 1;
 
-    private final GT_Utility.ItemId id;
+    private final GTUtility.ItemId id;
     private final UNIQUE_INDEX unique_index;
-    private final BiConsumer<GT_ApiaryModifier, Integer> applier;
+    private final BiConsumer<GTApiaryModifier, Integer> applier;
 
-    private final HashSet<GT_Utility.ItemId> blacklistedUpgrades = new HashSet<>();
+    private final HashSet<GTUtility.ItemId> blacklistedUpgrades = new HashSet<>();
 
-    GT_ApiaryUpgrade(UNIQUE_INDEX unique_index, int meta, int maxnumber,
-        BiConsumer<GT_ApiaryModifier, Integer> applier) {
+    GTApiaryUpgrade(UNIQUE_INDEX unique_index, int meta, int maxnumber, BiConsumer<GTApiaryModifier, Integer> applier) {
         this.unique_index = unique_index;
         this.meta = meta;
         this.maxnumber = maxnumber;
         this.applier = applier;
-        this.id = GT_Utility.ItemId.createNoCopy(get(1));
+        this.id = GTUtility.ItemId.createNoCopy(get(1));
     }
 
     private void setup_static_variables() {
         quickLookup.put(this.meta, this);
-        ArrayList<GT_ApiaryUpgrade> un = UNIQUE_UPGRADE_LIST.get(this.unique_index);
+        ArrayList<GTApiaryUpgrade> un = UNIQUE_UPGRADE_LIST.get(this.unique_index);
         if (un != null) un.forEach((u) -> {
             u.blacklistedUpgrades.add(this.id);
             this.blacklistedUpgrades.add(u.id);
@@ -187,14 +186,14 @@ public enum GT_ApiaryUpgrade {
         un.add(this);
     }
 
-    public static GT_ApiaryUpgrade getUpgrade(ItemStack s) {
+    public static GTApiaryUpgrade getUpgrade(ItemStack s) {
         if (s == null) return null;
         if (!isUpgrade(s)) return null;
         return quickLookup.get(s.getItemDamage());
     }
 
     public boolean isAllowedToWorkWith(ItemStack s) {
-        GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(s);
+        GTUtility.ItemId id = GTUtility.ItemId.createNoCopy(s);
         return !blacklistedUpgrades.contains(id);
     }
 
@@ -202,23 +201,23 @@ public enum GT_ApiaryUpgrade {
         return maxnumber;
     }
 
-    public void applyModifiers(GT_ApiaryModifier mods, ItemStack stack) {
+    public void applyModifiers(GTApiaryModifier mods, ItemStack stack) {
         if (applier != null) applier.accept(mods, stack.stackSize);
     }
 
     public ItemStack get(int count) {
-        return new ItemStack(GT_MetaGenerated_Item_03.INSTANCE, count, meta);
+        return new ItemStack(MetaGeneratedItem03.INSTANCE, count, meta);
     }
 
     public static boolean isUpgrade(ItemStack s) {
         return OrePrefixes.apiaryUpgrade.contains(s);
     }
 
-    private static final HashMap<Integer, GT_ApiaryUpgrade> quickLookup = new HashMap<>();
+    private static final HashMap<Integer, GTApiaryUpgrade> quickLookup = new HashMap<>();
 
     static {
-        EnumSet.allOf(GT_ApiaryUpgrade.class)
-            .forEach(GT_ApiaryUpgrade::setup_static_variables);
+        EnumSet.allOf(GTApiaryUpgrade.class)
+            .forEach(GTApiaryUpgrade::setup_static_variables);
         speed8upgraded.blacklistedUpgrades.add(production.id);
         production.blacklistedUpgrades.add(speed8upgraded.id);
     }
diff --git a/src/main/java/gregtech/api/util/GT_BaseCrop.java b/src/main/java/gregtech/api/util/GTBaseCrop.java
index d8608c85a0..2ddf37bbeb 100644
--- a/src/main/java/gregtech/api/util/GT_BaseCrop.java
+++ b/src/main/java/gregtech/api/util/GTBaseCrop.java
@@ -1,6 +1,6 @@
 package gregtech.api.util;
 
-import static gregtech.api.enums.GT_Values.E;
+import static gregtech.api.enums.GTValues.E;
 import static gregtech.api.enums.Mods.IC2CropPlugin;
 
 import java.lang.reflect.InvocationTargetException;
@@ -13,22 +13,22 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.objects.ItemData;
-import gregtech.common.blocks.GT_Block_Ores_Abstract;
-import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.common.blocks.BlockOresAbstract;
+import gregtech.common.blocks.TileEntityOres;
 import ic2.api.crops.CropCard;
 import ic2.api.crops.Crops;
 import ic2.api.crops.ICropTile;
 import speiger.src.crops.api.ICropCardInfo;
 
-public class GT_BaseCrop extends CropCard implements ICropCardInfo {
+public class GTBaseCrop extends CropCard implements ICropCardInfo {
 
-    public static ArrayList<GT_BaseCrop> sCropList = new ArrayList<>();
+    public static ArrayList<GTBaseCrop> sCropList = new ArrayList<>();
     private String mName = E;
     private String mDiscoveredBy = "Gregorius Techneticies";
     private String[] mAttributes;
@@ -56,10 +56,10 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo {
      * @param aGrowthSpeed  how fast the Crop grows. if < 0 then its set to Tier*300
      * @param aHarvestSize  the size the Crop needs to be harvested. forced to be between 2 and max size
      */
-    public GT_BaseCrop(int aID, String aCropName, String aDiscoveredBy, ItemStack aBaseSeed, int aTier, int aMaxSize,
+    public GTBaseCrop(int aID, String aCropName, String aDiscoveredBy, ItemStack aBaseSeed, int aTier, int aMaxSize,
         int aGrowthSpeed, int aAfterHarvestSize, int aHarvestSize, int aStatChemical, int aStatFood, int aStatDefensive,
         int aStatColor, int aStatWeed, String[] aAttributes, ItemStack aDrop, ItemStack[] aSpecialDrops) {
-        new GT_BaseCrop(
+        new GTBaseCrop(
             aID,
             aCropName,
             aDiscoveredBy,
@@ -94,15 +94,15 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo {
      * @param aHarvestSize  the size the Crop needs to be harvested. forced to be between 2 and max size
      * @param aBlock        the block below needed for crop to grow. If null no block needed
      */
-    public GT_BaseCrop(int aID, String aCropName, String aDiscoveredBy, ItemStack aBaseSeed, int aTier, int aMaxSize,
+    public GTBaseCrop(int aID, String aCropName, String aDiscoveredBy, ItemStack aBaseSeed, int aTier, int aMaxSize,
         int aGrowthSpeed, int aAfterHarvestSize, int aHarvestSize, int aStatChemical, int aStatFood, int aStatDefensive,
         int aStatColor, int aStatWeed, String[] aAttributes, Materials aBlock, ItemStack aDrop,
         ItemStack[] aSpecialDrops) {
         mName = aCropName;
-        aID = GT_Config.addIDConfig(ConfigCategories.IDs.crops, mName.replaceAll(" ", "_"), aID);
+        aID = GTConfig.addIDConfig(ConfigCategories.IDs.crops, mName.replaceAll(" ", "_"), aID);
         if (aDiscoveredBy != null && !aDiscoveredBy.equals(E)) mDiscoveredBy = aDiscoveredBy;
         if (aDrop != null && aID > 0 && aID < 256) {
-            mDrop = GT_Utility.copyOrNull(aDrop);
+            mDrop = GTUtility.copyOrNull(aDrop);
             mSpecialDrops = aSpecialDrops;
             mTier = Math.max(1, aTier);
             mMaxSize = Math.max(3, aMaxSize);
@@ -116,7 +116,7 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo {
             mAttributes = aAttributes;
             mBlock = aBlock;
             if (!Crops.instance.registerCrop(this, aID))
-                throw new GT_ItsNotMyFaultException("Make sure the Crop ID is valid!");
+                throw new GTItsNotMyFaultException("Make sure the Crop ID is valid!");
             if (aBaseSeed != null) Crops.instance.registerBaseSeed(aBaseSeed, this, 1, 1, 1, 1);
             sCropList.add(this);
         }
@@ -206,9 +206,9 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo {
         int tDrop = 0;
         if (mSpecialDrops != null && (tDrop = java.util.concurrent.ThreadLocalRandom.current()
             .nextInt(0, (mSpecialDrops.length * 2) + 2)) < mSpecialDrops.length && mSpecialDrops[tDrop] != null) {
-            return GT_Utility.copyOrNull(mSpecialDrops[tDrop]);
+            return GTUtility.copyOrNull(mSpecialDrops[tDrop]);
         }
-        return GT_Utility.copyOrNull(mDrop);
+        return GTUtility.copyOrNull(mDrop);
     }
 
     @Override
@@ -228,7 +228,7 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo {
      * @return True if the crop needs a block below it to grow to its max size
      */
     public boolean needsBlockBelow() {
-        return GT_Mod.gregtechproxy.mCropNeedBlock && this.mBlock != null;
+        return GTMod.gregtechproxy.mCropNeedBlock && this.mBlock != null;
     }
 
     public boolean isBlockBelow(ICropTile aCrop) {
@@ -238,11 +238,11 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo {
         for (int i = 1; i < this.getrootslength(aCrop); i++) {
             Block tBlock = aCrop.getWorld()
                 .getBlock(aCrop.getLocation().posX, aCrop.getLocation().posY - i, aCrop.getLocation().posZ);
-            if ((tBlock instanceof GT_Block_Ores_Abstract)) {
+            if ((tBlock instanceof BlockOresAbstract)) {
                 TileEntity tTileEntity = aCrop.getWorld()
                     .getTileEntity(aCrop.getLocation().posX, aCrop.getLocation().posY - i, aCrop.getLocation().posZ);
-                if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-                    Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData
+                if ((tTileEntity instanceof TileEntityOres)) {
+                    Materials tMaterial = GregTechAPI.sGeneratedMaterials[(((TileEntityOres) tTileEntity).mMetaData
                         % 1000)];
                     if ((tMaterial != null) && (tMaterial != Materials._NULL)) {
                         return tMaterial == mBlock;
@@ -270,7 +270,7 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo {
         if (!this.needsBlockBelow()) return true;
 
         // get material from stack
-        ItemData tAssociation = GT_OreDictUnificator.getAssociation(aItem);
+        ItemData tAssociation = GTOreDictUnificator.getAssociation(aItem);
         if (tAssociation == null) return false;
 
         // return true if it's an ore of the material
@@ -304,8 +304,8 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo {
     @Override
     public ItemStack getDisplayItem() {
         if (mSpecialDrops != null && mSpecialDrops[mSpecialDrops.length - 1] != null) {
-            return GT_Utility.copyOrNull(mSpecialDrops[mSpecialDrops.length - 1]);
+            return GTUtility.copyOrNull(mSpecialDrops[mSpecialDrops.length - 1]);
         }
-        return GT_Utility.copyOrNull(mDrop);
+        return GTUtility.copyOrNull(mDrop);
     }
 }
diff --git a/src/main/java/gregtech/api/util/GT_BlockMap.java b/src/main/java/gregtech/api/util/GTBlockMap.java
index 9ffe273cac..a5ac98d427 100644
--- a/src/main/java/gregtech/api/util/GT_BlockMap.java
+++ b/src/main/java/gregtech/api/util/GTBlockMap.java
@@ -8,7 +8,7 @@ import net.minecraft.block.Block;
 import gnu.trove.map.TByteObjectMap;
 import gnu.trove.map.hash.TByteObjectHashMap;
 
-public class GT_BlockMap<V> {
+public class GTBlockMap<V> {
 
     public static final byte WILDCARD = -1;
     private final ConcurrentHashMap<Block, TByteObjectMap<V>> backing = new ConcurrentHashMap<>();
@@ -122,7 +122,7 @@ public class GT_BlockMap<V> {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        GT_BlockMap<?> that = (GT_BlockMap<?>) o;
+        GTBlockMap<?> that = (GTBlockMap<?>) o;
 
         return backing.equals(that.backing);
     }
diff --git a/src/main/java/gregtech/api/util/GT_BlockSet.java b/src/main/java/gregtech/api/util/GTBlockSet.java
index 1d13afd056..6c91193832 100644
--- a/src/main/java/gregtech/api/util/GT_BlockSet.java
+++ b/src/main/java/gregtech/api/util/GTBlockSet.java
@@ -2,9 +2,9 @@ package gregtech.api.util;
 
 import net.minecraft.block.Block;
 
-public class GT_BlockSet {
+public class GTBlockSet {
 
-    private final GT_BlockMap<Object> backing = new GT_BlockMap<>();
+    private final GTBlockMap<Object> backing = new GTBlockMap<>();
 
     public boolean add(Block block, byte meta) {
         return backing.put(block, meta, this) != this;
@@ -27,7 +27,7 @@ public class GT_BlockSet {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        GT_BlockSet that = (GT_BlockSet) o;
+        GTBlockSet that = (GTBlockSet) o;
 
         return backing.equals(that.backing);
     }
diff --git a/src/main/java/gregtech/api/util/GT_CLS_Compat.java b/src/main/java/gregtech/api/util/GTCLSCompat.java
index c560435e30..823a7b850e 100644
--- a/src/main/java/gregtech/api/util/GT_CLS_Compat.java
+++ b/src/main/java/gregtech/api/util/GTCLSCompat.java
@@ -10,13 +10,13 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 
 import cpw.mods.fml.common.ProgressManager;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Materials;
-import gregtech.common.GT_Proxy;
-import gregtech.loaders.postload.GT_PostLoad;
+import gregtech.common.GTProxy;
+import gregtech.loaders.postload.GTPostLoad;
 
 @SuppressWarnings("rawtypes, unchecked, deprecation")
-public class GT_CLS_Compat {
+public class GTCLSCompat {
 
     private static Class alexiilMinecraftDisplayer;
     private static Class alexiilProgressDisplayer;
@@ -35,13 +35,13 @@ public class GT_CLS_Compat {
             alexiilMinecraftDisplayer = Class.forName("alexiil.mods.load.MinecraftDisplayer");
             alexiilProgressDisplayer = Class.forName("alexiil.mods.load.ProgressDisplayer");
         } catch (ClassNotFoundException ex) {
-            GT_Mod.GT_FML_LOGGER.catching(ex);
+            GTMod.GT_FML_LOGGER.catching(ex);
         }
 
         try {
             cpwProgressBar = Class.forName("cpw.mods.fml.common.ProgressManager$ProgressBar");
         } catch (ClassNotFoundException ex) {
-            GT_Mod.GT_FML_LOGGER.catching(ex);
+            GTMod.GT_FML_LOGGER.catching(ex);
         }
 
         Optional.ofNullable(alexiilMinecraftDisplayer)
@@ -51,7 +51,7 @@ public class GT_CLS_Compat {
                     isReplacingVanillaMaterials = e.getField("isReplacingVanillaMaterials");
                     isRegisteringGTmaterials = e.getField("isRegisteringGTmaterials");
                 } catch (NoSuchMethodException | NoSuchFieldException ex) {
-                    GT_Mod.GT_FML_LOGGER.catching(ex);
+                    GTMod.GT_FML_LOGGER.catching(ex);
                 }
             });
 
@@ -60,7 +60,7 @@ public class GT_CLS_Compat {
                 try {
                     displayProgress = e.getMethod("displayProgress", String.class, float.class);
                 } catch (NoSuchMethodException ex) {
-                    GT_Mod.GT_FML_LOGGER.catching(ex);
+                    GTMod.GT_FML_LOGGER.catching(ex);
                 }
             });
 
@@ -68,11 +68,11 @@ public class GT_CLS_Compat {
             progressBarStep = cpwProgressBar.getDeclaredField("step");
             progressBarStep.setAccessible(true);
         } catch (NoSuchFieldException ex) {
-            GT_Mod.GT_FML_LOGGER.catching(ex);
+            GTMod.GT_FML_LOGGER.catching(ex);
         }
     }
 
-    private GT_CLS_Compat() {}
+    private GTCLSCompat() {}
 
     private static <T> void registerAndReportProgression(String materialsType, Collection<T> materials,
         ProgressManager.ProgressBar progressBar, Function<T, Object> getName, Consumer<T> action) {
@@ -93,44 +93,44 @@ public class GT_CLS_Compat {
                 try {
                     displayProgress.invoke(null, materialName, (float) currentStep / sizeStep);
                 } catch (IllegalAccessException | InvocationTargetException iae) {
-                    GT_Mod.GT_FML_LOGGER.error("While updating progression", iae);
+                    GTMod.GT_FML_LOGGER.error("While updating progression", iae);
                 }
                 try {
                     progressBarStep.set(progressBar, currentStep);
                 } catch (IllegalAccessException iae) {
-                    GT_Mod.GT_FML_LOGGER.error("While updating intermediate progression steps number", iae);
+                    GTMod.GT_FML_LOGGER.error("While updating intermediate progression steps number", iae);
                 }
                 progressBar.step(materialName);
             }
             if (nextBakingMsgAt < now) {
                 nextBakingMsgAt = now + bakingMsgEvery;
-                GT_Mod.GT_FML_LOGGER
+                GTMod.GT_FML_LOGGER
                     .info(String.format("%s - Baking: %d%%", materialsType, currentStep * 100 / sizeStep));
             }
             action.accept(m);
             currentStep += 1;
         }
-        GT_Mod.GT_FML_LOGGER.info(String.format("%s - Baking: Done", materialsType));
+        GTMod.GT_FML_LOGGER.info(String.format("%s - Baking: Done", materialsType));
         try {
             progressBarStep.set(progressBar, currentStep);
         } catch (IllegalAccessException iae) {
-            GT_Mod.GT_FML_LOGGER.error("While updating final progression steps number", iae);
+            GTMod.GT_FML_LOGGER.error("While updating final progression steps number", iae);
         }
     }
 
-    public static void stepMaterialsCLS(Collection<GT_Proxy.OreDictEventContainer> mEvents,
+    public static void stepMaterialsCLS(Collection<GTProxy.OreDictEventContainer> mEvents,
         ProgressManager.ProgressBar progressBar) throws IllegalAccessException {
         try {
             isRegisteringGTmaterials.set(null, true);
         } catch (IllegalArgumentException | IllegalAccessException e) {
-            GT_Mod.GT_FML_LOGGER.catching(e);
+            GTMod.GT_FML_LOGGER.catching(e);
         }
         registerAndReportProgression(
             "GregTech materials",
             mEvents,
             progressBar,
             m -> m.mMaterial,
-            GT_Proxy::registerRecipes);
+            GTProxy::registerRecipes);
         ProgressManager.pop(progressBar);
         isRegisteringGTmaterials.set(null, false);
     }
@@ -140,14 +140,14 @@ public class GT_CLS_Compat {
         try {
             isReplacingVanillaMaterials.set(null, true);
         } catch (IllegalArgumentException | IllegalAccessException e) {
-            GT_Mod.GT_FML_LOGGER.catching(e);
+            GTMod.GT_FML_LOGGER.catching(e);
         }
         registerAndReportProgression(
             "Vanilla materials",
             replacedVanillaItemsSet,
             progressBar,
             m -> m.mDefaultLocalName,
-            GT_PostLoad::doActualRegistration);
+            GTPostLoad::doActualRegistration);
     }
 
     public static void pushToDisplayProgress() throws InvocationTargetException, IllegalAccessException {
diff --git a/src/main/java/gregtech/api/util/GT_ChunkAssociatedData.java b/src/main/java/gregtech/api/util/GTChunkAssociatedData.java
index bb73cf77ed..7a81c715cb 100644
--- a/src/main/java/gregtech/api/util/GT_ChunkAssociatedData.java
+++ b/src/main/java/gregtech/api/util/GTChunkAssociatedData.java
@@ -41,7 +41,7 @@ import net.minecraftforge.event.world.WorldEvent;
 import org.apache.commons.io.FileUtils;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
 /**
@@ -63,9 +63,9 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
  * @author glease
  */
 @ParametersAreNonnullByDefault
-public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.IData> {
+public abstract class GTChunkAssociatedData<T extends GTChunkAssociatedData.IData> {
 
-    private static final Map<String, GT_ChunkAssociatedData<?>> instances = new ConcurrentHashMap<>();
+    private static final Map<String, GTChunkAssociatedData<?>> instances = new ConcurrentHashMap<>();
     private static final int IO_PARALLELISM = Math.min(
         8,
         Math.max(
@@ -102,7 +102,7 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID
      * @param version      An integer marking the version of this data. Useful later when the data's serialized form
      *                     changed.
      */
-    protected GT_ChunkAssociatedData(String aId, Class<T> elementType, int regionLength, byte version,
+    protected GTChunkAssociatedData(String aId, Class<T> elementType, int regionLength, byte version,
         boolean saveDefaults) {
         if (regionLength * regionLength > Short.MAX_VALUE || regionLength <= 0)
             throw new IllegalArgumentException("Region invalid: " + regionLength);
@@ -159,7 +159,7 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID
     }
 
     public void clear() {
-        if (GT_Values.debugWorldData) {
+        if (GTValues.debugWorldData) {
             long dirtyRegionCount = masterMap.values()
                 .stream()
                 .flatMap(
@@ -167,7 +167,7 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID
                         .stream())
                 .filter(SuperRegion::isDirty)
                 .count();
-            if (dirtyRegionCount > 0) GT_Log.out.println(
+            if (dirtyRegionCount > 0) GTLog.out.println(
                 "Clearing ChunkAssociatedData with " + dirtyRegionCount + " regions dirty. Data might have been lost!");
         }
         masterMap.clear();
@@ -198,8 +198,8 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID
                 try {
                     f.get();
                 } catch (Exception e) {
-                    GT_Log.err.println("Data save error: " + mId);
-                    e.printStackTrace(GT_Log.err);
+                    GTLog.err.println("Data save error: " + mId);
+                    e.printStackTrace(GTLog.err);
                 }
             });
     }
@@ -216,14 +216,14 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID
      * Clear all mappings, regardless of whether they are dirty
      */
     public static void clearAll() {
-        for (GT_ChunkAssociatedData<?> d : instances.values()) d.clear();
+        for (GTChunkAssociatedData<?> d : instances.values()) d.clear();
     }
 
     /**
      * Save all mappings
      */
     public static void saveAll() {
-        for (GT_ChunkAssociatedData<?> d : instances.values()) d.save();
+        for (GTChunkAssociatedData<?> d : instances.values()) d.save();
     }
 
     /**
@@ -233,7 +233,7 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID
      * Be aware of the memory consumption though.
      */
     protected void loadAll(World w) {
-        if (GT_Values.debugWorldData && masterMap.containsKey(w.provider.dimensionId)) GT_Log.err.println(
+        if (GTValues.debugWorldData && masterMap.containsKey(w.provider.dimensionId)) GTLog.err.println(
             "Reloading ChunkAssociatedData " + mId + " for world " + w.provider.dimensionId + " discards old data!");
         if (!getSaveDirectory(w).isDirectory())
             // nothing to load...
@@ -255,8 +255,8 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID
                     try {
                         return f.get();
                     } catch (Exception e) {
-                        GT_Log.err.println("Error loading region");
-                        e.printStackTrace(GT_Log.err);
+                        GTLog.err.println("Error loading region");
+                        e.printStackTrace(GTLog.err);
                         return null;
                     }
                 })
@@ -264,8 +264,8 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID
                 .collect(Collectors.toMap(SuperRegion::getCoord, Function.identity()));
             masterMap.put(w.provider.dimensionId, worldData);
         } catch (IOException | UncheckedIOException e) {
-            GT_Log.err.println("Error loading all region");
-            e.printStackTrace(GT_Log.err);
+            GTLog.err.println("Error loading all region");
+            e.printStackTrace(GTLog.err);
         }
     }
 
@@ -369,8 +369,8 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID
             try {
                 save0();
             } catch (IOException e) {
-                GT_Log.err.println("Error saving data " + backingStorage.getPath());
-                e.printStackTrace(GT_Log.err);
+                GTLog.err.println("Error saving data " + backingStorage.getPath());
+                e.printStackTrace(GTLog.err);
             }
         }
 
@@ -422,14 +422,14 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID
             try {
                 loadFromFile(backingStorage);
             } catch (IOException | RuntimeException e) {
-                GT_Log.err.println("Primary storage file broken in " + backingStorage.getPath());
-                e.printStackTrace(GT_Log.err);
+                GTLog.err.println("Primary storage file broken in " + backingStorage.getPath());
+                e.printStackTrace(GTLog.err);
                 // in case the primary storage is broken
                 try {
                     loadFromFile(getTmpFile());
                 } catch (IOException | RuntimeException e2) {
-                    GT_Log.err.println("Backup storage file broken in " + backingStorage.getPath());
-                    e2.printStackTrace(GT_Log.err);
+                    GTLog.err.println("Backup storage file broken in " + backingStorage.getPath());
+                    e2.printStackTrace(GTLog.err);
                 }
             }
         }
@@ -441,7 +441,7 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID
                 if (b == 0) {
                     loadV0(input, world);
                 } else {
-                    GT_Log.err.printf("Unknown ChunkAssociatedData version %d\n", b);
+                    GTLog.err.printf("Unknown ChunkAssociatedData version %d\n", b);
                 }
             }
         }
@@ -477,14 +477,14 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID
 
         @SubscribeEvent
         public void onWorldSave(WorldEvent.Save e) {
-            for (GT_ChunkAssociatedData<?> d : instances.values()) {
+            for (GTChunkAssociatedData<?> d : instances.values()) {
                 d.save(e.world);
             }
         }
 
         @SubscribeEvent
         public void onWorldUnload(WorldEvent.Unload e) {
-            for (GT_ChunkAssociatedData<?> d : instances.values()) {
+            for (GTChunkAssociatedData<?> d : instances.values()) {
                 // there is no need to explicitly do a save here
                 // forge will send a WorldEvent.Save on server thread before this event is distributed
                 d.masterMap.remove(e.world.provider.dimensionId);
diff --git a/src/main/java/gregtech/api/util/GT_ClientPreference.java b/src/main/java/gregtech/api/util/GTClientPreference.java
index 3ea2730a0c..f265094ca3 100644
--- a/src/main/java/gregtech/api/util/GT_ClientPreference.java
+++ b/src/main/java/gregtech/api/util/GTClientPreference.java
@@ -3,14 +3,14 @@ package gregtech.api.util;
 import gregtech.common.config.client.ConfigPreference;
 import gregtech.common.config.client.ConfigWaila;
 
-public class GT_ClientPreference {
+public class GTClientPreference {
 
     private final boolean mSingleBlockInitialFilter;
     private final boolean mSingleBlockInitialMultiStack;
     private final boolean mInputBusInitialFilter;
     private final boolean wailaAverageNS;
 
-    public GT_ClientPreference(boolean mSingleBlockInitialFilter, boolean mSingleBlockInitialMultiStack,
+    public GTClientPreference(boolean mSingleBlockInitialFilter, boolean mSingleBlockInitialMultiStack,
         boolean mInputBusInitialFilter, boolean wailaAverageNS) {
         this.mSingleBlockInitialFilter = mSingleBlockInitialFilter;
         this.mSingleBlockInitialMultiStack = mSingleBlockInitialMultiStack;
@@ -18,7 +18,7 @@ public class GT_ClientPreference {
         this.wailaAverageNS = wailaAverageNS;
     }
 
-    public GT_ClientPreference() {
+    public GTClientPreference() {
         this.mSingleBlockInitialFilter = ConfigPreference.singleBlockInitialFilter;
         this.mSingleBlockInitialMultiStack = ConfigPreference.singleBlockInitialAllowMultiStack;
         this.mInputBusInitialFilter = ConfigPreference.inputBusInitialFilter;
diff --git a/src/main/java/gregtech/api/util/GT_Config.java b/src/main/java/gregtech/api/util/GTConfig.java
index e1157febb4..68ff810414 100644
--- a/src/main/java/gregtech/api/util/GT_Config.java
+++ b/src/main/java/gregtech/api/util/GTConfig.java
@@ -1,15 +1,15 @@
 package gregtech.api.util;
 
-import static gregtech.api.enums.GT_Values.E;
+import static gregtech.api.enums.GTValues.E;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 
-public class GT_Config implements Runnable {
+public class GTConfig implements Runnable {
 
     public static boolean troll = false;
 
@@ -18,22 +18,22 @@ public class GT_Config implements Runnable {
     public static Configuration undergroundFluidsFile;
     public final Configuration mConfig;
 
-    public GT_Config(Configuration aConfig) {
+    public GTConfig(Configuration aConfig) {
         mConfig = aConfig;
         mConfig.load();
         mConfig.save();
-        GregTech_API.sAfterGTPreload.add(this); // in case of crash on startup
-        GregTech_API.sAfterGTLoad.add(this); // in case of crash on startup
-        GregTech_API.sAfterGTPostload.add(this);
-        if (GT_Values.lateConfigSave) GregTech_API.sFirstWorldTick.add(this);
+        GregTechAPI.sAfterGTPreload.add(this); // in case of crash on startup
+        GregTechAPI.sAfterGTLoad.add(this); // in case of crash on startup
+        GregTechAPI.sAfterGTPostload.add(this);
+        if (GTValues.lateConfigSave) GregTechAPI.sFirstWorldTick.add(this);
     }
 
     private static boolean shouldSave() {
-        return GT_Values.lateConfigSave ? GT_Values.worldTickHappened : GregTech_API.sPostloadFinished;
+        return GTValues.lateConfigSave ? GTValues.worldTickHappened : GregTechAPI.sPostloadFinished;
     }
 
     public static int addIDConfig(Object aCategory, String aName, int aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
+        if (GTUtility.isStringInvalid(aName)) return aDefault;
         Property tProperty = sConfigFileIDs.get(
             aCategory.toString()
                 .replaceAll("\\|", "."),
@@ -45,11 +45,11 @@ public class GT_Config implements Runnable {
     }
 
     public static String getStackConfigName(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return E;
-        Object rName = GT_OreDictUnificator.getAssociation(aStack);
+        if (GTUtility.isStackInvalid(aStack)) return E;
+        Object rName = GTOreDictUnificator.getAssociation(aStack);
         if (rName != null) return rName.toString();
         try {
-            if (GT_Utility.isStringValid(rName = aStack.getUnlocalizedName())) return rName.toString();
+            if (GTUtility.isStringValid(rName = aStack.getUnlocalizedName())) return rName.toString();
         } catch (Throwable e) {
             /* Do nothing */
         }
@@ -66,7 +66,7 @@ public class GT_Config implements Runnable {
     }
 
     public boolean get(Object aCategory, String aName, boolean aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
+        if (GTUtility.isStringInvalid(aName)) return aDefault;
         Property tProperty = mConfig.get(
             aCategory.toString()
                 .replaceAll("\\|", "_"),
@@ -82,7 +82,7 @@ public class GT_Config implements Runnable {
     }
 
     public int get(Object aCategory, String aName, int aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
+        if (GTUtility.isStringInvalid(aName)) return aDefault;
         Property tProperty = mConfig.get(
             aCategory.toString()
                 .replaceAll("\\|", "_"),
@@ -98,7 +98,7 @@ public class GT_Config implements Runnable {
     }
 
     public double get(Object aCategory, String aName, double aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
+        if (GTUtility.isStringInvalid(aName)) return aDefault;
         Property tProperty = mConfig.get(
             aCategory.toString()
                 .replaceAll("\\|", "_"),
@@ -114,7 +114,7 @@ public class GT_Config implements Runnable {
     }
 
     public String get(Object aCategory, String aName, String aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
+        if (GTUtility.isStringInvalid(aName)) return aDefault;
         Property tProperty = mConfig.get(
             aCategory.toString()
                 .replaceAll("\\|", "_"),
@@ -130,19 +130,19 @@ public class GT_Config implements Runnable {
     }
 
     public String[] get(Object aCategory, String aName, String... aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
+        if (GTUtility.isStringInvalid(aName)) return aDefault;
         Property tProperty = mConfig.get(
             aCategory.toString()
                 .replaceAll("\\|", "_"),
             aName.replaceAll("\\|", "_"),
             aDefault);
         String[] rResult = tProperty.getStringList();
-        if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save();
+        if (!tProperty.wasRead() && GregTechAPI.sPostloadFinished) mConfig.save();
         return rResult;
     }
 
     public String getWithValidValues(Object aCategory, String aName, String[] validValues, String aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
+        if (GTUtility.isStringInvalid(aName)) return aDefault;
         Property tProperty = mConfig.get(
             aCategory.toString()
                 .replaceAll("\\|", "_"),
@@ -151,7 +151,7 @@ public class GT_Config implements Runnable {
             null,
             validValues);
         String rResult = tProperty.getString();
-        if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save();
+        if (!tProperty.wasRead() && GregTechAPI.sPostloadFinished) mConfig.save();
         return rResult;
     }
 
diff --git a/src/main/java/gregtech/api/util/GT_CreativeTab.java b/src/main/java/gregtech/api/util/GTCreativeTab.java
index 1049f40278..54d8877a83 100644
--- a/src/main/java/gregtech/api/util/GT_CreativeTab.java
+++ b/src/main/java/gregtech/api/util/GTCreativeTab.java
@@ -7,11 +7,11 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.ItemList;
 
-public class GT_CreativeTab extends CreativeTabs {
+public class GTCreativeTab extends CreativeTabs {
 
-    public GT_CreativeTab(String aName, String aLocalName) {
+    public GTCreativeTab(String aName, String aLocalName) {
         super("GregTech." + aName);
-        GT_LanguageManager.addStringLocalization("itemGroup.GregTech." + aName, aLocalName);
+        GTLanguageManager.addStringLocalization("itemGroup.GregTech." + aName, aLocalName);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/util/GT_FoodStat.java b/src/main/java/gregtech/api/util/GTFoodStat.java
index 5eda76f9d0..51e8818f62 100644
--- a/src/main/java/gregtech/api/util/GT_FoodStat.java
+++ b/src/main/java/gregtech/api/util/GTFoodStat.java
@@ -6,12 +6,12 @@ import net.minecraft.item.EnumAction;
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.PotionEffect;
 
-import gregtech.api.damagesources.GT_DamageSources;
+import gregtech.api.damagesources.GTDamageSources;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.IFoodStat;
-import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.items.MetaBaseItem;
 
-public class GT_FoodStat implements IFoodStat {
+public class GTFoodStat implements IFoodStat {
 
     private final int mFoodLevel;
     private final int[] mPotionEffects;
@@ -32,42 +32,42 @@ public class GT_FoodStat implements IFoodStat {
      *                            none Duration of the Potion in Ticks Level of the Effect. [0, 1, 2] are for [I, II,
      *                            III] The likelihood that this Potion Effect takes place upon being eaten [1 - 100]
      */
-    public GT_FoodStat(int aFoodLevel, float aSaturation, EnumAction aAction, ItemStack aEmptyContainer,
+    public GTFoodStat(int aFoodLevel, float aSaturation, EnumAction aAction, ItemStack aEmptyContainer,
         boolean aAlwaysEdible, boolean aInvisibleParticles, boolean aIsRotten, int... aPotionEffects) {
         mFoodLevel = aFoodLevel;
         mSaturation = aSaturation;
         mAction = aAction == null ? EnumAction.eat : aAction;
         mPotionEffects = aPotionEffects;
-        mEmptyContainer = GT_Utility.copyOrNull(aEmptyContainer);
+        mEmptyContainer = GTUtility.copyOrNull(aEmptyContainer);
         mInvisibleParticles = aInvisibleParticles;
         mAlwaysEdible = aAlwaysEdible;
         mIsRotten = aIsRotten;
     }
 
-    public GT_FoodStat setExplosive() {
+    public GTFoodStat setExplosive() {
         mExplosive = true;
         return this;
     }
 
-    public GT_FoodStat setMilk() {
+    public GTFoodStat setMilk() {
         mMilk = true;
         return this;
     }
 
     @Override
-    public int getFoodLevel(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer) {
+    public int getFoodLevel(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer) {
         return mFoodLevel;
     }
 
     @Override
-    public float getSaturation(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer) {
+    public float getSaturation(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer) {
         return mSaturation;
     }
 
     @Override
-    public void onEaten(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer) {
+    public void onEaten(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer) {
         aStack.stackSize--;
-        ItemStack tStack = GT_OreDictUnificator.get(GT_Utility.copyOrNull(mEmptyContainer));
+        ItemStack tStack = GTOreDictUnificator.get(GTUtility.copyOrNull(mEmptyContainer));
         if (tStack != null && !aPlayer.inventory.addItemStackToInventory(tStack))
             aPlayer.dropPlayerItemWithRandomChoice(tStack, true);
 
@@ -100,23 +100,23 @@ public class GT_FoodStat implements IFoodStat {
                     .setEntity(aPlayer)
                     .setWorld(aPlayer.worldObj)
                     .run();
-                aPlayer.attackEntityFrom(GT_DamageSources.getExplodingDamage(), Float.MAX_VALUE);
+                aPlayer.attackEntityFrom(GTDamageSources.getExplodingDamage(), Float.MAX_VALUE);
             }
         }
     }
 
     @Override
-    public EnumAction getFoodAction(GT_MetaBase_Item aItem, ItemStack aStack) {
+    public EnumAction getFoodAction(MetaBaseItem aItem, ItemStack aStack) {
         return mAction;
     }
 
     @Override
-    public boolean alwaysEdible(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer) {
+    public boolean alwaysEdible(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer) {
         return mAlwaysEdible;
     }
 
     @Override
-    public boolean isRotten(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer) {
+    public boolean isRotten(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer) {
         return mIsRotten;
     }
 }
diff --git a/src/main/java/gregtech/api/util/GT_Forestry_Compat.java b/src/main/java/gregtech/api/util/GTForestryCompat.java
index 554964a4ed..379604205a 100644
--- a/src/main/java/gregtech/api/util/GT_Forestry_Compat.java
+++ b/src/main/java/gregtech/api/util/GTForestryCompat.java
@@ -3,8 +3,8 @@ package gregtech.api.util;
 import static gregtech.api.recipe.RecipeMaps.centrifugeNonCellRecipes;
 import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
 import static gregtech.api.recipe.RecipeMaps.scannerFakeRecipes;
-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.Map;
 
@@ -13,16 +13,16 @@ import net.minecraft.item.ItemStack;
 import forestry.api.recipes.ICentrifugeRecipe;
 import forestry.api.recipes.ISqueezerRecipe;
 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.recipe.RecipeMaps;
 
-public class GT_Forestry_Compat {
+public class GTForestryCompat {
 
     public static void populateFakeNeiRecipes() {
         if (ItemList.FR_Bee_Drone.get(1L) != null) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.FR_Bee_Drone.getWildcard(1L))
                 .itemOutputs(ItemList.FR_Bee_Drone.getWithName(1L, "Scanned Drone"))
                 .fluidInputs(Materials.Honey.getFluid(100L))
@@ -34,7 +34,7 @@ public class GT_Forestry_Compat {
                 .addTo(scannerFakeRecipes);
         }
         if (ItemList.FR_Bee_Princess.get(1L) != null) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.FR_Bee_Princess.getWildcard(1L))
                 .itemOutputs(ItemList.FR_Bee_Princess.getWithName(1L, "Scanned Princess"))
                 .fluidInputs(Materials.Honey.getFluid(100L))
@@ -46,7 +46,7 @@ public class GT_Forestry_Compat {
                 .addTo(scannerFakeRecipes);
         }
         if (ItemList.FR_Bee_Queen.get(1L) != null) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.FR_Bee_Queen.getWildcard(1L))
                 .itemOutputs(ItemList.FR_Bee_Queen.getWithName(1L, "Scanned Queen"))
                 .fluidInputs(Materials.Honey.getFluid(100L))
@@ -58,7 +58,7 @@ public class GT_Forestry_Compat {
                 .addTo(scannerFakeRecipes);
         }
         if (ItemList.FR_Tree_Sapling.get(1L) != null) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.FR_Tree_Sapling.getWildcard(1L))
                 .itemOutputs(ItemList.FR_Tree_Sapling.getWithName(1L, "Scanned Sapling"))
                 .fluidInputs(Materials.Honey.getFluid(100L))
@@ -70,7 +70,7 @@ public class GT_Forestry_Compat {
                 .addTo(scannerFakeRecipes);
         }
         if (ItemList.FR_Butterfly.get(1L) != null) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.FR_Butterfly.getWildcard(1L))
                 .itemOutputs(ItemList.FR_Butterfly.getWithName(1L, "Scanned Butterfly"))
                 .fluidInputs(Materials.Honey.getFluid(100L))
@@ -82,7 +82,7 @@ public class GT_Forestry_Compat {
                 .addTo(scannerFakeRecipes);
         }
         if (ItemList.FR_Larvae.get(1L) != null) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.FR_Larvae.getWildcard(1L))
                 .itemOutputs(ItemList.FR_Larvae.getWithName(1L, "Scanned Larvae"))
                 .fluidInputs(Materials.Honey.getFluid(100L))
@@ -94,7 +94,7 @@ public class GT_Forestry_Compat {
                 .addTo(scannerFakeRecipes);
         }
         if (ItemList.FR_Serum.get(1L) != null) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.FR_Serum.getWildcard(1L))
                 .itemOutputs(ItemList.FR_Serum.getWithName(1L, "Scanned Serum"))
                 .fluidInputs(Materials.Honey.getFluid(100L))
@@ -106,7 +106,7 @@ public class GT_Forestry_Compat {
                 .addTo(scannerFakeRecipes);
         }
         if (ItemList.FR_Caterpillar.get(1L) != null) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.FR_Caterpillar.getWildcard(1L))
                 .itemOutputs(ItemList.FR_Caterpillar.getWithName(1L, "Scanned Caterpillar"))
                 .fluidInputs(Materials.Honey.getFluid(100L))
@@ -118,7 +118,7 @@ public class GT_Forestry_Compat {
                 .addTo(scannerFakeRecipes);
         }
         if (ItemList.FR_PollenFertile.get(1L) != null) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.FR_PollenFertile.getWildcard(1L))
                 .itemOutputs(ItemList.FR_PollenFertile.getWithName(1L, "Scanned Pollen"))
                 .fluidInputs(Materials.Honey.getFluid(100L))
@@ -144,7 +144,7 @@ public class GT_Forestry_Compat {
                         .copy();
                     i++;
                 }
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(tRecipe.getInput())
                     .itemOutputs(tOutputs)
                     .outputChances(tChances)
@@ -152,7 +152,7 @@ public class GT_Forestry_Compat {
                     .eut(5)
                     .addTo(centrifugeRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(tRecipe.getInput())
                     .itemOutputs(tOutputs)
                     .outputChances(tChances)
@@ -161,8 +161,8 @@ public class GT_Forestry_Compat {
                     .addTo(centrifugeNonCellRecipes);
             }
         } catch (Throwable e) {
-            if (GT_Values.D1) {
-                e.printStackTrace(GT_Log.err);
+            if (GTValues.D1) {
+                e.printStackTrace(GTLog.err);
             }
         }
     }
@@ -172,7 +172,7 @@ public class GT_Forestry_Compat {
             for (ISqueezerRecipe tRecipe : RecipeManagers.squeezerManager.recipes()) {
                 if ((tRecipe.getResources().length == 1) && (tRecipe.getFluidOutput() != null)
                     && (tRecipe.getResources()[0] != null)) {
-                    GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+                    GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder();
                     recipeBuilder.itemInputs(tRecipe.getResources()[0]);
                     if (tRecipe.getRemnants() != null) {
                         recipeBuilder.itemOutputs(tRecipe.getRemnants())
@@ -185,8 +185,8 @@ public class GT_Forestry_Compat {
                 }
             }
         } 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/api/util/GT_GC_Compat.java b/src/main/java/gregtech/api/util/GTGCCompat.java
index 24710ab0ac..0491d0f9f4 100644
--- a/src/main/java/gregtech/api/util/GT_GC_Compat.java
+++ b/src/main/java/gregtech/api/util/GTGCCompat.java
@@ -12,7 +12,7 @@ import micdoodle8.mods.galacticraft.api.transmission.NetworkType;
 import micdoodle8.mods.galacticraft.api.transmission.tile.IConnector;
 import micdoodle8.mods.galacticraft.core.energy.EnergyConfigHandler;
 
-public class GT_GC_Compat {
+public class GTGCCompat {
 
     public static long insertEnergyInto(TileEntity tTileEntity, long aVoltage, ForgeDirection tDirection) {
         // GC Compat
diff --git a/src/main/java/gregtech/api/util/GT_IBoxableWrapper.java b/src/main/java/gregtech/api/util/GTIBoxableWrapper.java
index 796699c261..fcb7846a20 100644
--- a/src/main/java/gregtech/api/util/GT_IBoxableWrapper.java
+++ b/src/main/java/gregtech/api/util/GTIBoxableWrapper.java
@@ -4,10 +4,10 @@ import net.minecraft.item.ItemStack;
 
 import ic2.api.item.IBoxable;
 
-public class GT_IBoxableWrapper implements IBoxable {
+public class GTIBoxableWrapper implements IBoxable {
 
     @Override
     public boolean canBeStoredInToolbox(ItemStack itemstack) {
-        return GT_Utility.isStackInList(itemstack, GT_ModHandler.sBoxableItems);
+        return GTUtility.isStackInList(itemstack, GTModHandler.sBoxableItems);
     }
 }
diff --git a/src/main/java/gregtech/api/util/GT_ItsNotMyFaultException.java b/src/main/java/gregtech/api/util/GTItsNotMyFaultException.java
index f47a356d7b..5d21fd2420 100644
--- a/src/main/java/gregtech/api/util/GT_ItsNotMyFaultException.java
+++ b/src/main/java/gregtech/api/util/GTItsNotMyFaultException.java
@@ -1,12 +1,12 @@
 package gregtech.api.util;
 
-public class GT_ItsNotMyFaultException extends RuntimeException {
+public class GTItsNotMyFaultException extends RuntimeException {
 
     private static final long serialVersionUID = -8752778866486460495L;
 
     private final String mError;
 
-    public GT_ItsNotMyFaultException(String aError) {
+    public GTItsNotMyFaultException(String aError) {
         mError = aError;
     }
 
diff --git a/src/main/java/gregtech/api/util/GT_LanguageManager.java b/src/main/java/gregtech/api/util/GTLanguageManager.java
index 4a9dc878ed..d68b438027 100644
--- a/src/main/java/gregtech/api/util/GT_LanguageManager.java
+++ b/src/main/java/gregtech/api/util/GTLanguageManager.java
@@ -1,6 +1,6 @@
 package gregtech.api.util;
 
-import static gregtech.api.enums.GT_Values.E;
+import static gregtech.api.enums.GTValues.E;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
@@ -15,9 +15,9 @@ import net.minecraftforge.common.config.Property;
 
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.ReflectionHelper;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 
-public class GT_LanguageManager {
+public class GTLanguageManager {
 
     /**
      * Buffer to reduce memory allocation when injecting data to LanguageRegistry.
@@ -126,7 +126,7 @@ public class GT_LanguageManager {
 
     private static synchronized String writeToLangFile(String trimmedKey, String aEnglish) {
         Property tProperty = sEnglishFile.get("LanguageFile", trimmedKey, aEnglish);
-        if (hasUnsavedEntry && GregTech_API.sPostloadFinished) {
+        if (hasUnsavedEntry && GregTechAPI.sPostloadFinished) {
             sEnglishFile.save();
             hasUnsavedEntry = false;
         }
@@ -144,7 +144,7 @@ public class GT_LanguageManager {
     }
 
     private static synchronized void markFileDirty() {
-        if (GregTech_API.sPostloadFinished) {
+        if (GregTechAPI.sPostloadFinished) {
             sEnglishFile.save();
         } else {
             hasUnsavedEntry = true;
@@ -183,12 +183,12 @@ public class GT_LanguageManager {
 
     @SuppressWarnings("unused")
     public static String getTranslateableItemStackName(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return "null";
+        if (GTUtility.isStackInvalid(aStack)) return "null";
         NBTTagCompound tNBT = aStack.getTagCompound();
         if (tNBT != null && tNBT.hasKey("display")) {
             String tName = tNBT.getCompoundTag("display")
                 .getString("Name");
-            if (GT_Utility.isStringValid(tName)) {
+            if (GTUtility.isStringValid(tName)) {
                 return tName;
             }
         }
diff --git a/src/main/java/gregtech/api/util/GT_Log.java b/src/main/java/gregtech/api/util/GTLog.java
index 2d00c2e061..eba6b0fe50 100644
--- a/src/main/java/gregtech/api/util/GT_Log.java
+++ b/src/main/java/gregtech/api/util/GTLog.java
@@ -11,7 +11,7 @@ import java.util.List;
  * <p/>
  * Just a simple Logging Function. If on Server, then this will point to System.out and System.err
  */
-public class GT_Log {
+public class GTLog {
 
     public static PrintStream out = System.out;
     public static PrintStream err = System.err;
diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GTModHandler.java
index b5c7c6fb6e..8c06f2ad47 100644
--- a/src/main/java/gregtech/api/util/GT_ModHandler.java
+++ b/src/main/java/gregtech/api/util/GTModHandler.java
@@ -1,19 +1,19 @@
 package gregtech.api.util;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
-import static gregtech.api.enums.GT_Values.B;
-import static gregtech.api.enums.GT_Values.D1;
-import static gregtech.api.enums.GT_Values.DW;
-import static gregtech.api.enums.GT_Values.E;
-import static gregtech.api.enums.GT_Values.M;
-import static gregtech.api.enums.GT_Values.RA;
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.enums.GT_Values.VN;
-import static gregtech.api.enums.GT_Values.W;
+import static gregtech.GTMod.GT_FML_LOGGER;
+import static gregtech.api.enums.GTValues.B;
+import static gregtech.api.enums.GTValues.D1;
+import static gregtech.api.enums.GTValues.DW;
+import static gregtech.api.enums.GTValues.E;
+import static gregtech.api.enums.GTValues.M;
+import static gregtech.api.enums.GTValues.RA;
+import static gregtech.api.enums.GTValues.V;
+import static gregtech.api.enums.GTValues.VN;
+import static gregtech.api.enums.GTValues.W;
 import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
 import static gregtech.api.recipe.RecipeMaps.oreWasherRecipes;
-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.ArrayList;
 import java.util.Arrays;
@@ -57,8 +57,8 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
 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.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OreDictNames;
@@ -67,11 +67,11 @@ import gregtech.api.enums.Tier;
 import gregtech.api.enums.ToolDictNames;
 import gregtech.api.interfaces.IDamagableItem;
 import gregtech.api.interfaces.IItemContainer;
-import gregtech.api.interfaces.internal.IGT_CraftingRecipe;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe;
-import gregtech.api.objects.GT_HashSet;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.interfaces.internal.IGTCraftingRecipe;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe;
+import gregtech.api.objects.GTHashSet;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.objects.ItemData;
 import gregtech.api.recipe.RecipeCategories;
 import gregtech.api.recipe.RecipeMap;
@@ -91,7 +91,7 @@ import ic2.core.item.ItemToolbox;
  * <p/>
  * Due to the many imports, this File can cause compile Problems if not all the APIs are installed
  */
-public class GT_ModHandler {
+public class GTModHandler {
 
     public static final List<IRecipe> sSingleNonBlockDamagableRecipeList = new ArrayList<>(1000);
     private static final Map<String, ItemStack> sIC2ItemMap = new HashMap<>();
@@ -102,12 +102,12 @@ public class GT_ModHandler {
     private static final List<InventoryCrafting> delayedRemovalByRecipe = new ArrayList<>();
 
     public static Collection<String> sNativeRecipeClasses = new HashSet<>(), sSpecialRecipeClasses = new HashSet<>();
-    public static GT_HashSet<GT_ItemStack> sNonReplaceableItems = new GT_HashSet<>();
-    public static Object sBoxableWrapper = new GT_IBoxableWrapper();
-    public static Collection<GT_ItemStack> sBoxableItems = new ArrayList<>();
+    public static GTHashSet<GTItemStack> sNonReplaceableItems = new GTHashSet<>();
+    public static Object sBoxableWrapper = new GTIBoxableWrapper();
+    public static Collection<GTItemStack> sBoxableItems = new ArrayList<>();
     private static final Map<IRecipeInput, RecipeOutput> emptyRecipeMap = new HashMap<>();
-    private static Set<GT_Utility.ItemId> recyclerWhitelist;
-    private static Set<GT_Utility.ItemId> recyclerBlacklist;
+    private static Set<GTUtility.ItemId> recyclerWhitelist;
+    private static Set<GTUtility.ItemId> recyclerBlacklist;
 
     private static boolean sBufferCraftingRecipes = true;
     public static List<Integer> sSingleNonBlockDamagableRecipeList_list = new ArrayList<>(100);
@@ -170,10 +170,10 @@ public class GT_ModHandler {
     static {
         sNativeRecipeClasses.add(ShapedRecipes.class.getName());
         sNativeRecipeClasses.add(ShapedOreRecipe.class.getName());
-        sNativeRecipeClasses.add(GT_Shaped_Recipe.class.getName());
+        sNativeRecipeClasses.add(GTShapedRecipe.class.getName());
         sNativeRecipeClasses.add(ShapelessRecipes.class.getName());
         sNativeRecipeClasses.add(ShapelessOreRecipe.class.getName());
-        sNativeRecipeClasses.add(GT_Shapeless_Recipe.class.getName());
+        sNativeRecipeClasses.add(GTShapelessRecipe.class.getName());
         sNativeRecipeClasses.add(ic2.core.AdvRecipe.class.getName());
         sNativeRecipeClasses.add(ic2.core.AdvShapelessRecipe.class.getName());
         sNativeRecipeClasses.add("appeng.recipes.game.ShapedRecipe");
@@ -315,7 +315,7 @@ public class GT_ModHandler {
      *               properly, stupid Mojang...
      */
     public static ItemStack setFuelValue(ItemStack aStack, short aValue) {
-        aStack.setTagCompound(GT_Utility.getNBTContainingShort(aStack.getTagCompound(), "GT.ItemFuelValue", aValue));
+        aStack.setTagCompound(GTUtility.getNBTContainingShort(aStack.getTagCompound(), "GT.ItemFuelValue", aValue));
         return aStack;
     }
 
@@ -332,16 +332,16 @@ public class GT_ModHandler {
      * Gets an Item from IndustrialCraft, and returns a Replacement Item if not possible
      */
     public static ItemStack getIC2Item(String aItem, long aAmount, ItemStack aReplacement) {
-        if (GT_Utility.isStringInvalid(aItem) || !GregTech_API.sPreloadStarted) return null;
-        // if (D1) GT_Log.out.println("Requested the Item '" + aItem + "' from the IC2-API");
+        if (GTUtility.isStringInvalid(aItem) || !GregTechAPI.sPreloadStarted) return null;
+        // if (D1) GTLog.out.println("Requested the Item '" + aItem + "' from the IC2-API");
         if (!sIC2ItemMap.containsKey(aItem)) try {
             ItemStack tStack = IC2Items.getItem(aItem);
             sIC2ItemMap.put(aItem, tStack);
-            if (tStack == null && D1) GT_Log.err.println(aItem + " is not found in the IC2 Items!");
+            if (tStack == null && D1) GTLog.err.println(aItem + " is not found in the IC2 Items!");
         } catch (Throwable e) {
             /* Do nothing */
         }
-        return GT_Utility.copyAmount(aAmount, sIC2ItemMap.get(aItem), aReplacement);
+        return GTUtility.copyAmount(aAmount, sIC2ItemMap.get(aItem), aReplacement);
     }
 
     /**
@@ -381,18 +381,18 @@ public class GT_ModHandler {
      */
     public static ItemStack getModItem(String aModID, String aItem, long aAmount, ItemStack aReplacement) {
         ItemStack result;
-        if (GT_Utility.isStringInvalid(aItem) || !GregTech_API.sPreloadStarted) {
+        if (GTUtility.isStringInvalid(aItem) || !GregTechAPI.sPreloadStarted) {
             result = null;
         } else {
-            result = GT_Utility
+            result = GTUtility
                 .copyAmount(aAmount, GameRegistry.findItemStack(aModID, aItem, (int) aAmount), aReplacement);
         }
 
         if (result == null) {
             String reason;
-            if (GT_Utility.isStringInvalid(aItem)) {
+            if (GTUtility.isStringInvalid(aItem)) {
                 reason = "the name of the item is an invalid string";
-            } else if (!GregTech_API.sPreloadStarted) {
+            } else if (!GregTechAPI.sPreloadStarted) {
                 reason = "the GT5U preloading phase has not yet started";
             } else {
                 reason = "the item was not found in the game registry";
@@ -402,8 +402,8 @@ public class GT_ModHandler {
                 + aModID
                 + "\" has returned null because "
                 + reason;
-            GT_Log.out.println(log_message);
-            new Exception().printStackTrace(GT_Log.out);
+            GTLog.out.println(log_message);
+            new Exception().printStackTrace(GTLog.out);
         }
         return result;
     }
@@ -472,26 +472,26 @@ public class GT_ModHandler {
      * Adds a Scrapbox Drop. Fails at April first for the "suddenly Hoes"-Feature of IC2
      */
     public static boolean addScrapboxDrop(float aChance, ItemStack aOutput) {
-        aOutput = GT_OreDictUnificator.get(true, aOutput);
+        aOutput = GTOreDictUnificator.get(true, aOutput);
         if (aOutput == null || aChance <= 0) return false;
         aOutput.stackSize = 1;
-        if (GT_Config.troll && !GT_Utility.areStacksEqual(aOutput, new ItemStack(Items.wooden_hoe, 1, 0))) return false;
+        if (GTConfig.troll && !GTUtility.areStacksEqual(aOutput, new ItemStack(Items.wooden_hoe, 1, 0))) return false;
         try {
-            GT_Utility.callMethod(
-                GT_Utility.getFieldContent("ic2.api.recipe.Recipes", "scrapboxDrops", true, true),
+            GTUtility.callMethod(
+                GTUtility.getFieldContent("ic2.api.recipe.Recipes", "scrapboxDrops", true, true),
                 "addDrop",
                 true,
                 false,
                 true,
-                GT_Utility.copyOrNull(aOutput),
+                GTUtility.copyOrNull(aOutput),
                 aChance);
-            GT_Utility.callMethod(
-                GT_Utility.getFieldContent("ic2.api.recipe.Recipes", "scrapboxDrops", true, true),
+            GTUtility.callMethod(
+                GTUtility.getFieldContent("ic2.api.recipe.Recipes", "scrapboxDrops", true, true),
                 "addRecipe",
                 true,
                 true,
                 false,
-                GT_Utility.copyOrNull(aOutput),
+                GTUtility.copyOrNull(aOutput),
                 aChance);
         } catch (Throwable e) {
             /* Do nothing */
@@ -516,10 +516,10 @@ public class GT_ModHandler {
      * Just simple Furnace smelting. Unbelievable how Minecraft fails at making a simple ItemStack->ItemStack mapping...
      */
     public static boolean addSmeltingRecipe(ItemStack aInput, ItemStack aOutput) {
-        aOutput = GT_OreDictUnificator.get(true, aOutput);
+        aOutput = GTOreDictUnificator.get(true, aOutput);
         if (aInput == null || aOutput == null) return false;
         FurnaceRecipes.smelting()
-            .func_151394_a(aInput, GT_Utility.copyOrNull(aOutput), 0.0F);
+            .func_151394_a(aInput, GTUtility.copyOrNull(aOutput), 0.0F);
         return true;
     }
 
@@ -541,7 +541,7 @@ public class GT_ModHandler {
             || (OrePrefixes.gem.contains(aInput)))) {
             return false;
         }
-        GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+        GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder();
         if (input2 == null) {
             recipeBuilder.itemInputs(aInput);
         } else {
@@ -588,7 +588,7 @@ public class GT_ModHandler {
             }
 
             for (ItemStack tStack : (iRecipeInputRecipeOutputEntry.getKey()).getInputs()) {
-                if (!GT_Utility.isStackValid(tStack)) {
+                if (!GTUtility.isStackValid(tStack)) {
                     continue;
                 }
 
@@ -604,10 +604,10 @@ public class GT_ModHandler {
                                 .contains("ic2.itemPurifiedCrushed"))))
                             continue;
                         switch (aGTRecipeMap.unlocalizedName) {
-                            case "gt.recipe.macerator", "gt.recipe.extractor", "gt.recipe.compressor" -> GT_Values.RA
+                            case "gt.recipe.macerator", "gt.recipe.extractor", "gt.recipe.compressor" -> GTValues.RA
                                 .stdBuilder()
                                 .itemInputs(
-                                    GT_Utility.copyAmount(
+                                    GTUtility.copyAmount(
                                         iRecipeInputRecipeOutputEntry.getKey()
                                             .getAmount(),
                                         tStack))
@@ -615,9 +615,9 @@ public class GT_ModHandler {
                                 .duration(15 * SECONDS)
                                 .eut(2)
                                 .addTo(aGTRecipeMap);
-                            case "gt.recipe.thermalcentrifuge" -> GT_Values.RA.stdBuilder()
+                            case "gt.recipe.thermalcentrifuge" -> GTValues.RA.stdBuilder()
                                 .itemInputs(
-                                    GT_Utility.copyAmount(
+                                    GTUtility.copyAmount(
                                         iRecipeInputRecipeOutputEntry.getKey()
                                             .getAmount(),
                                         tStack))
@@ -627,7 +627,7 @@ public class GT_ModHandler {
                                 .addTo(aGTRecipeMap);
                         }
                     } catch (Exception e) {
-                        e.printStackTrace(GT_Log.err);
+                        e.printStackTrace(GTLog.err);
                     }
                 }
                 if (aRemoveIC2Recipe) {
@@ -637,7 +637,7 @@ public class GT_ModHandler {
             }
 
         }
-        GT_Utility.bulkRemoveSimpleIC2MachineRecipe(aRecipesToRemove, aIC2RecipeList);
+        GTUtility.bulkRemoveSimpleIC2MachineRecipe(aRecipesToRemove, aIC2RecipeList);
     }
 
     public static Map<IRecipeInput, RecipeOutput> getExtractorRecipeList() {
@@ -695,7 +695,7 @@ public class GT_ModHandler {
             .itemInputs(aInput)
             .itemOutputs((ItemStack) aOutput[0], (ItemStack) aOutput[1], (ItemStack) aOutput[2])
             .outputChances(aChances)
-            .fluidInputs(GT_ModHandler.getWater(aWaterAmount))
+            .fluidInputs(GTModHandler.getWater(aWaterAmount))
             .duration(25 * SECONDS)
             .eut(16)
             .addTo(oreWasherRecipes);
@@ -704,7 +704,7 @@ public class GT_ModHandler {
             .itemInputs(aInput)
             .itemOutputs((ItemStack) aOutput[0], (ItemStack) aOutput[1], (ItemStack) aOutput[2])
             .outputChances(aChances)
-            .fluidInputs(GT_ModHandler.getDistilledWater(aWaterAmount / 5))
+            .fluidInputs(GTModHandler.getDistilledWater(aWaterAmount / 5))
             .duration(15 * SECONDS)
             .eut(16)
             .addTo(oreWasherRecipes);
@@ -813,10 +813,10 @@ public class GT_ModHandler {
         int machineTier) {
         if (aRecipe != null) {
             for (int i = 3; i < aRecipe.length; i++) {
-                if (!(aRecipe[i] instanceof GT_MetaTileEntity_BasicMachine_GT_Recipe.X)) continue;
+                if (!(aRecipe[i] instanceof MTEBasicMachineWithRecipe.X)) continue;
 
                 // spotless:off
-                aRecipe[i] = switch ((GT_MetaTileEntity_BasicMachine_GT_Recipe.X) aRecipe[i]) {
+                aRecipe[i] = switch ((MTEBasicMachineWithRecipe.X) aRecipe[i]) {
                     case CIRCUIT            -> Tier.ELECTRIC[machineTier].mManagingObject;
                     case BETTER_CIRCUIT     -> Tier.ELECTRIC[machineTier].mBetterManagingObject;
                     case HULL               -> Tier.ELECTRIC[machineTier].mHullObject;
@@ -1058,11 +1058,11 @@ public class GT_ModHandler {
                 // spotless:on
             }
 
-            if (!GT_ModHandler.addCraftingRecipe(
+            if (!GTModHandler.addCraftingRecipe(
                 aResult,
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.BUFFERED
-                    | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                    | GT_ModHandler.RecipeBits.REVERSIBLE,
+                GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.BUFFERED
+                    | GTModHandler.RecipeBits.NOT_REMOVABLE
+                    | GTModHandler.RecipeBits.REVERSIBLE,
                 aRecipe)) {
                 throw new IllegalArgumentException("INVALID CRAFTING RECIPE FOR: " + aResult.getDisplayName());
             }
@@ -1080,7 +1080,7 @@ public class GT_ModHandler {
         boolean aRemoveAllOtherNativeRecipes, boolean aCheckForCollisions,
         boolean aOnlyAddIfThereIsAnyRecipeOutputtingThis, boolean aOnlyAddIfResultIsNotNull, Object[] aRecipe) {
 
-        aResult = GT_OreDictUnificator.get(true, aResult);
+        aResult = GTOreDictUnificator.get(true, aResult);
         if (aOnlyAddIfResultIsNotNull && aResult == null) return false;
         if (aResult != null && Items.feather.getDamage(aResult) == W) Items.feather.setDamage(aResult, 0);
         if (aRecipe == null || aRecipe.length == 0) return false;
@@ -1191,18 +1191,18 @@ public class GT_ModHandler {
             for (; idx < aRecipe.length; idx += 2) {
                 if (aRecipe[idx] == null || aRecipe[idx + 1] == null) {
                     if (D1) {
-                        GT_Log.err.println(
+                        GTLog.err.println(
                             "WARNING: Missing Item for shaped Recipe: "
                                 + (aResult == null ? "null" : aResult.getDisplayName()));
-                        for (Object tContent : aRecipe) GT_Log.err.println(tContent);
+                        for (Object tContent : aRecipe) GTLog.err.println(tContent);
                     }
                     return false;
                 }
                 Character chr = (Character) aRecipe[idx];
                 Object in = aRecipe[idx + 1];
                 if (in instanceof ItemStack is) {
-                    tItemStackMap.put(chr, GT_Utility.copyOrNull(is));
-                    tItemDataMap.put(chr, GT_OreDictUnificator.getItemData(is));
+                    tItemStackMap.put(chr, GTUtility.copyOrNull(is));
+                    tItemDataMap.put(chr, GTOreDictUnificator.getItemData(is));
                 } else if (in instanceof ItemData) {
                     String tString = in.toString();
                     switch (tString) {
@@ -1212,7 +1212,7 @@ public class GT_ModHandler {
                         case "stoneEndstone" -> tItemDataMap.put(chr, new ItemData(Materials.Endstone, M));
                         default -> tItemDataMap.put(chr, (ItemData) in);
                     }
-                    ItemStack tStack = GT_OreDictUnificator.getFirstOre(in, 1);
+                    ItemStack tStack = GTOreDictUnificator.getFirstOre(in, 1);
                     if (tStack == null) tRemoveRecipe = false;
                     else tItemStackMap.put(chr, tStack);
                     in = aRecipe[idx + 1] = in.toString();
@@ -1229,7 +1229,7 @@ public class GT_ModHandler {
                         tItemDataMap.put(chr, new ItemData(Materials.Diamond, M));
                     else if (in.equals(OreDictNames.craftingAnvil.toString()))
                         tItemDataMap.put(chr, new ItemData(Materials.Iron, M * 10));
-                    ItemStack tStack = GT_OreDictUnificator.getFirstOre(in, 1);
+                    ItemStack tStack = GTOreDictUnificator.getFirstOre(in, 1);
                     if (tStack == null) tRemoveRecipe = false;
                     else tItemStackMap.put(chr, tStack);
                 } else {
@@ -1242,8 +1242,8 @@ public class GT_ModHandler {
                 int x = -1;
                 for (char chr : shape.toString()
                     .toCharArray()) tData[++x] = tItemDataMap.get(chr);
-                if (GT_Utility.arrayContainsNonNull(tData))
-                    GT_OreDictUnificator.addItemData(aResult, new ItemData(tData));
+                if (GTUtility.arrayContainsNonNull(tData))
+                    GTOreDictUnificator.addItemData(aResult, new ItemData(tData));
             }
 
             if (aCheckForCollisions && tRemoveRecipe) {
@@ -1259,7 +1259,7 @@ public class GT_ModHandler {
                 else removeRecipeDelayed(tRecipe);
             }
         } catch (Throwable e) {
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
 
         if (aResult == null || aResult.stackSize <= 0) return false;
@@ -1285,7 +1285,7 @@ public class GT_ModHandler {
                     tRecipe.getClass()
                         .getName()))
                     continue;
-                if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(tRecipe.getRecipeOutput()), aResult, true)) {
+                if (GTUtility.areStacksEqual(GTOreDictUnificator.get(tRecipe.getRecipeOutput()), aResult, true)) {
                     tList.remove(i--);
                     tList_sS = tList.size();
                     tThereWasARecipe = true;
@@ -1296,12 +1296,12 @@ public class GT_ModHandler {
         if (Items.feather.getDamage(aResult) == W || Items.feather.getDamage(aResult) < 0)
             Items.feather.setDamage(aResult, 0);
 
-        GT_Utility.updateItemStack(aResult);
+        GTUtility.updateItemStack(aResult);
 
         if (tThereWasARecipe || !aOnlyAddIfThereIsAnyRecipeOutputtingThis) {
             if (sBufferCraftingRecipes && aBuffered) sBufferRecipeList.add(
-                new GT_Shaped_Recipe(
-                    GT_Utility.copyOrNull(aResult),
+                new GTShapedRecipe(
+                    GTUtility.copyOrNull(aResult),
                     aDismantleable,
                     aRemovable,
                     aKeepNBT,
@@ -1309,8 +1309,8 @@ public class GT_ModHandler {
                     aEnchantmentLevelsAdded,
                     aRecipe).setMirrored(aMirrored));
             else GameRegistry.addRecipe(
-                new GT_Shaped_Recipe(
-                    GT_Utility.copyOrNull(aResult),
+                new GTShapedRecipe(
+                    GTUtility.copyOrNull(aResult),
                     aDismantleable,
                     aRemovable,
                     aKeepNBT,
@@ -1368,7 +1368,7 @@ public class GT_ModHandler {
     private static boolean addShapelessCraftingRecipe(ItemStack aResult, Enchantment[] aEnchantmentsAdded,
         int[] aEnchantmentLevelsAdded, boolean aBuffered, boolean aKeepNBT, boolean aDismantleable, boolean aRemovable,
         Object[] aRecipe) {
-        aResult = GT_OreDictUnificator.get(true, aResult);
+        aResult = GTOreDictUnificator.get(true, aResult);
         if (aRecipe == null || aRecipe.length == 0) return false;
         for (byte i = 0; i < aRecipe.length; i++) {
             if (aRecipe[i] instanceof IItemContainer) aRecipe[i] = ((IItemContainer) aRecipe[i]).get(1);
@@ -1382,16 +1382,16 @@ public class GT_ModHandler {
             int i = 0;
             for (Object tObject : aRecipe) {
                 if (tObject == null) {
-                    if (D1) GT_Log.err.println(
+                    if (D1) GTLog.err.println(
                         "WARNING: Missing Item for shapeless Recipe: "
                             + (aResult == null ? "null" : aResult.getDisplayName()));
-                    for (Object tContent : aRecipe) GT_Log.err.println(tContent);
+                    for (Object tContent : aRecipe) GTLog.err.println(tContent);
                     return false;
                 }
                 if (tObject instanceof ItemStack) {
                     tRecipe[i] = (ItemStack) tObject;
                 } else if (tObject instanceof String) {
-                    tRecipe[i] = GT_OreDictUnificator.getFirstOre(tObject, 1);
+                    tRecipe[i] = GTOreDictUnificator.getFirstOre(tObject, 1);
                     if (tRecipe[i] == null) break;
                 }
                 i++;
@@ -1399,7 +1399,7 @@ public class GT_ModHandler {
             if (sBufferCraftingRecipes && aBuffered) removeRecipeDelayed(tRecipe);
             else removeRecipe(tRecipe);
         } catch (Throwable e) {
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
 
         if (aResult == null || aResult.stackSize <= 0) return false;
@@ -1407,11 +1407,11 @@ public class GT_ModHandler {
         if (Items.feather.getDamage(aResult) == W || Items.feather.getDamage(aResult) < 0)
             Items.feather.setDamage(aResult, 0);
 
-        GT_Utility.updateItemStack(aResult);
+        GTUtility.updateItemStack(aResult);
 
         if (sBufferCraftingRecipes && aBuffered) sBufferRecipeList.add(
-            new GT_Shapeless_Recipe(
-                GT_Utility.copyOrNull(aResult),
+            new GTShapelessRecipe(
+                GTUtility.copyOrNull(aResult),
                 aDismantleable,
                 aRemovable,
                 aKeepNBT,
@@ -1419,8 +1419,8 @@ public class GT_ModHandler {
                 aEnchantmentLevelsAdded,
                 aRecipe));
         else GameRegistry.addRecipe(
-            new GT_Shapeless_Recipe(
-                GT_Utility.copyOrNull(aResult),
+            new GTShapelessRecipe(
+                GTUtility.copyOrNull(aResult),
                 aDismantleable,
                 aRemovable,
                 aKeepNBT,
@@ -1438,7 +1438,7 @@ public class GT_ModHandler {
             for (ItemStack tInput : FurnaceRecipes.smelting()
                 .getSmeltingList()
                 .keySet()) {
-                if (GT_Utility.isStackValid(tInput) && GT_Utility.areStacksEqual(aInput, tInput, true)) {
+                if (GTUtility.isStackValid(tInput) && GTUtility.areStacksEqual(aInput, tInput, true)) {
                     FurnaceRecipes.smelting()
                         .getSmeltingList()
                         .remove(tInput);
@@ -1458,7 +1458,7 @@ public class GT_ModHandler {
                 .getSmeltingList()
                 .values()
                 .removeIf(
-                    tOutput -> GT_Utility.isStackValid(tOutput) && GT_Utility.areStacksEqual(aOutput, tOutput, true));
+                    tOutput -> GTUtility.isStackValid(tOutput) && GTUtility.areStacksEqual(aOutput, tOutput, true));
         }
         return false;
     }
@@ -1489,8 +1489,8 @@ public class GT_ModHandler {
         try {
             for (int i = 0; i < tList_sS; i++) {
                 for (; i < tList_sS; i++) {
-                    if ((!(tList.get(i) instanceof IGT_CraftingRecipe)
-                        || ((IGT_CraftingRecipe) tList.get(i)).isRemovable()) && tList.get(i)
+                    if ((!(tList.get(i) instanceof IGTCraftingRecipe)
+                        || ((IGTCraftingRecipe) tList.get(i)).isRemovable()) && tList.get(i)
                             .matches(aCrafting, DW)) {
                         rReturn = tList.get(i)
                             .getCraftingResult(aCrafting);
@@ -1500,7 +1500,7 @@ public class GT_ModHandler {
                 }
             }
         } catch (Throwable e) {
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
         return rReturn;
     }
@@ -1533,7 +1533,7 @@ public class GT_ModHandler {
 
         Set<IRecipe> tListToRemove = tList.parallelStream()
             .filter(tRecipe -> {
-                if ((tRecipe instanceof IGT_CraftingRecipe) && !((IGT_CraftingRecipe) tRecipe).isRemovable())
+                if ((tRecipe instanceof IGTCraftingRecipe) && !((IGTCraftingRecipe) tRecipe).isRemovable())
                     return false;
                 return toRemove.stream()
                     .anyMatch(aCrafting -> tRecipe.matches(aCrafting, DW));
@@ -1572,7 +1572,7 @@ public class GT_ModHandler {
         boolean rReturn = false;
         final ArrayList<IRecipe> tList = (ArrayList<IRecipe>) CraftingManager.getInstance()
             .getRecipeList();
-        aOutput = GT_OreDictUnificator.get(aOutput);
+        aOutput = GTOreDictUnificator.get(aOutput);
         int tList_sS = tList.size();
         for (int i = 0; i < tList_sS; i++) {
             final IRecipe tRecipe = tList.get(i);
@@ -1590,8 +1590,8 @@ public class GT_ModHandler {
                     continue;
             }
             ItemStack tStack = tRecipe.getRecipeOutput();
-            if ((!(tRecipe instanceof IGT_CraftingRecipe) || ((IGT_CraftingRecipe) tRecipe).isRemovable())
-                && GT_Utility.areStacksEqual(GT_OreDictUnificator.get(tStack), aOutput, aIgnoreNBT)) {
+            if ((!(tRecipe instanceof IGTCraftingRecipe) || ((IGTCraftingRecipe) tRecipe).isRemovable())
+                && GTUtility.areStacksEqual(GTOreDictUnificator.get(tStack), aOutput, aIgnoreNBT)) {
                 tList.remove(i--);
                 tList_sS = tList.size();
                 rReturn = true;
@@ -1605,22 +1605,22 @@ public class GT_ModHandler {
             .getRecipeList();
 
         Set<ItemStack> setToRemove = toRemove.parallelStream()
-            .map(GT_OreDictUnificator::get_nocopy)
+            .map(GTOreDictUnificator::get_nocopy)
             .collect(Collectors.toSet());
 
         GT_FML_LOGGER.info("BulkRemoveRecipeByOutput: tList: " + tList.size() + " setToRemove: " + setToRemove.size());
 
         Set<IRecipe> tListToRemove = tList.parallelStream()
             .filter(tRecipe -> {
-                if ((tRecipe instanceof IGT_CraftingRecipe) && !((IGT_CraftingRecipe) tRecipe).isRemovable())
+                if ((tRecipe instanceof IGTCraftingRecipe) && !((IGTCraftingRecipe) tRecipe).isRemovable())
                     return false;
                 if (sSpecialRecipeClasses.contains(
                     tRecipe.getClass()
                         .getName()))
                     return false;
-                final ItemStack tStack = GT_OreDictUnificator.get_nocopy(tRecipe.getRecipeOutput());
+                final ItemStack tStack = GTOreDictUnificator.get_nocopy(tRecipe.getRecipeOutput());
                 return setToRemove.stream()
-                    .anyMatch(aOutput -> GT_Utility.areStacksEqual(tStack, aOutput, true));
+                    .anyMatch(aOutput -> GTUtility.areStacksEqual(tStack, aOutput, true));
             })
             .collect(Collectors.toSet());
 
@@ -1738,17 +1738,17 @@ public class GT_ModHandler {
             try {
                 found = iRecipe.matches(aCrafting, DW);
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
             if (found) {
                 ItemStack tOutput = aUncopiedStack ? iRecipe.getRecipeOutput() : iRecipe.getCraftingResult(aCrafting);
                 if (tOutput == null || tOutput.stackSize <= 0) {
                     // Seriously, who would ever do that shit?
-                    if (!GregTech_API.sPostloadFinished) throw new GT_ItsNotMyFaultException(
+                    if (!GregTechAPI.sPostloadFinished) throw new GTItsNotMyFaultException(
                         "Seems another Mod added a Crafting Recipe with null Output. Tell the Developer of said Mod to fix that.");
                 } else {
                     if (aUncopiedStack) return tOutput;
-                    return GT_Utility.copyOrNull(tOutput);
+                    return GTUtility.copyOrNull(tOutput);
                 }
             }
         }
@@ -1760,18 +1760,17 @@ public class GT_ModHandler {
      * example This also removes old Recipes from the List.
      */
     public static List<ItemStack> getVanillyToolRecipeOutputs(ItemStack... aRecipe) {
-        if (!GregTech_API.sPostloadStarted || GregTech_API.sPostloadFinished)
-            sSingleNonBlockDamagableRecipeList.clear();
+        if (!GregTechAPI.sPostloadStarted || GregTechAPI.sPostloadFinished) sSingleNonBlockDamagableRecipeList.clear();
         if (sSingleNonBlockDamagableRecipeList.isEmpty()) {
             for (IRecipe tRecipe : CraftingManager.getInstance()
                 .getRecipeList()) {
                 ItemStack tStack = tRecipe.getRecipeOutput();
-                if (GT_Utility.isStackValid(tStack) && tStack.getMaxStackSize() == 1
+                if (GTUtility.isStackValid(tStack) && tStack.getMaxStackSize() == 1
                     && tStack.getMaxDamage() > 0
                     && !(tStack.getItem() instanceof ItemBlock)
                     && !(tStack.getItem() instanceof IReactorComponent)
                     && !isElectricItem(tStack)
-                    && !GT_Utility.isStackInList(tStack, sNonReplaceableItems)) {
+                    && !GTUtility.isStackInList(tStack, sNonReplaceableItems)) {
                     if (!(tRecipe instanceof ShapelessRecipes || tRecipe instanceof ShapelessOreRecipe)) {
                         if (tRecipe instanceof ShapedOreRecipe) {
                             boolean temp = true;
@@ -1806,16 +1805,15 @@ public class GT_ModHandler {
                     }
                 }
             }
-            GT_Log.out.println(
-                "GT_Mod: Created a List of Tool Recipes containing " + sSingleNonBlockDamagableRecipeList.size()
+            GTLog.out.println(
+                "GTMod: Created a List of Tool Recipes containing " + sSingleNonBlockDamagableRecipeList.size()
                     + " Recipes for recycling."
                     + (sSingleNonBlockDamagableRecipeList.size() > 1024
                         ? " Scanning all these Recipes is the reason for the startup Lag you receive right now."
                         : E));
         }
         List<ItemStack> rList = getRecipeOutputs(sSingleNonBlockDamagableRecipeList, true, aRecipe);
-        if (!GregTech_API.sPostloadStarted || GregTech_API.sPostloadFinished)
-            sSingleNonBlockDamagableRecipeList.clear();
+        if (!GregTechAPI.sPostloadStarted || GregTechAPI.sPostloadFinished) sSingleNonBlockDamagableRecipeList.clear();
         return rList;
     }
 
@@ -1844,7 +1842,7 @@ public class GT_ModHandler {
             .stream()
             .filter(
                 tRecipe -> !(tRecipe instanceof ShapelessRecipes) && !(tRecipe instanceof ShapelessOreRecipe)
-                    && !(tRecipe instanceof IGT_CraftingRecipe))
+                    && !(tRecipe instanceof IGTCraftingRecipe))
             .filter(tRecipe -> {
                 try {
                     ItemStack tOutput = tRecipe.getRecipeOutput();
@@ -1879,11 +1877,11 @@ public class GT_ModHandler {
             aList.stream()
                 .filter(tRecipe -> {
                     if (tRecipe instanceof ShapelessRecipes || tRecipe instanceof ShapelessOreRecipe
-                        || tRecipe instanceof IGT_CraftingRecipe) return false;
+                        || tRecipe instanceof IGTCraftingRecipe) return false;
                     try {
                         return tRecipe.matches(aCrafting, DW);
                     } catch (Throwable e) {
-                        e.printStackTrace(GT_Log.err);
+                        e.printStackTrace(GTLog.err);
                         return false;
                     }
                 })
@@ -1899,14 +1897,14 @@ public class GT_ModHandler {
             try {
                 matched = tRecipe.matches(aCrafting, DW);
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
             if (matched) {
                 ItemStack tOutput = tRecipe.getCraftingResult(aCrafting);
 
                 if (tOutput == null || tOutput.stackSize <= 0) {
                     // Seriously, who would ever do that shit?
-                    if (!GregTech_API.sPostloadFinished) throw new GT_ItsNotMyFaultException(
+                    if (!GregTechAPI.sPostloadFinished) throw new GTItsNotMyFaultException(
                         "Seems another Mod added a Crafting Recipe with null Output. Tell the Developer of said Mod to fix that.");
                     continue;
                 }
@@ -1915,8 +1913,8 @@ public class GT_ModHandler {
                 if (tOutput.getMaxStackSize() != 1) continue;
                 if (tRecipe instanceof ShapelessRecipes) continue;
                 if (tRecipe instanceof ShapelessOreRecipe) continue;
-                if (tRecipe instanceof IGT_CraftingRecipe) continue;
-                rList.add(GT_Utility.copyOrNull(tOutput));
+                if (tRecipe instanceof IGTCraftingRecipe) continue;
+                rList.add(GTUtility.copyOrNull(tOutput));
                 iterator.remove();
             }
         }
@@ -1928,11 +1926,11 @@ public class GT_ModHandler {
      */
     public static ItemStack getSmeltingOutput(ItemStack aInput, boolean aRemoveInput, ItemStack aOutputSlot) {
         if (aInput == null || aInput.stackSize < 1) return null;
-        ItemStack rStack = GT_OreDictUnificator.get(
+        ItemStack rStack = GTOreDictUnificator.get(
             FurnaceRecipes.smelting()
                 .getSmeltingResult(aInput));
 
-        if (rStack != null && (aOutputSlot == null || (GT_Utility.areStacksEqual(rStack, aOutputSlot)
+        if (rStack != null && (aOutputSlot == null || (GTUtility.areStacksEqual(rStack, aOutputSlot)
             && rStack.stackSize + aOutputSlot.stackSize <= aOutputSlot.getMaxStackSize()))) {
             if (aRemoveInput) aInput.stackSize--;
             return rStack;
@@ -1961,10 +1959,10 @@ public class GT_ModHandler {
                         rRecipeMetaData.setTag("return", tEntry.getValue().metadata);
                         for (byte i = 0; i < aOutputSlots.length && i < tList.length; i++) {
                             if (tList[i] != null) {
-                                if (aOutputSlots[i] == null || (GT_Utility.areStacksEqual(tList[i], aOutputSlots[i])
+                                if (aOutputSlots[i] == null || (GTUtility.areStacksEqual(tList[i], aOutputSlots[i])
                                     && tList[i].stackSize + aOutputSlots[i].stackSize
                                         <= aOutputSlots[i].getMaxStackSize())) {
-                                    rList[i] = GT_Utility.copyOrNull(tList[i]);
+                                    rList[i] = GTUtility.copyOrNull(tList[i]);
                                 } else {
                                     return new ItemStack[aOutputSlots.length];
                                 }
@@ -1979,7 +1977,7 @@ public class GT_ModHandler {
                 }
             }
         } catch (Throwable e) {
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return new ItemStack[aOutputSlots.length];
     }
@@ -2016,23 +2014,23 @@ public class GT_ModHandler {
         recyclerWhitelist = new HashSet<>();
         for (IRecipeInput input : ic2.api.recipe.Recipes.recyclerWhitelist) {
             for (ItemStack stack : input.getInputs()) {
-                recyclerWhitelist.add(GT_Utility.ItemId.create(stack.getItem(), stack.getItemDamage(), null));
+                recyclerWhitelist.add(GTUtility.ItemId.create(stack.getItem(), stack.getItemDamage(), null));
             }
         }
         recyclerBlacklist = new HashSet<>();
         for (IRecipeInput input : ic2.api.recipe.Recipes.recyclerBlacklist) {
             for (ItemStack stack : input.getInputs()) {
-                recyclerBlacklist.add(GT_Utility.ItemId.create(stack.getItem(), stack.getItemDamage(), null));
+                recyclerBlacklist.add(GTUtility.ItemId.create(stack.getItem(), stack.getItemDamage(), null));
             }
         }
     }
 
-    private static boolean searchRecyclerCache(ItemStack stack, Set<GT_Utility.ItemId> set) {
-        if (set.contains(GT_Utility.ItemId.createWithoutNBT(stack))) {
+    private static boolean searchRecyclerCache(ItemStack stack, Set<GTUtility.ItemId> set) {
+        if (set.contains(GTUtility.ItemId.createWithoutNBT(stack))) {
             return true;
         }
         // ic2.api.recipe.RecipeInputItemStack#matches expects item with wildcard meta to accept arbitrary meta
-        return set.contains(GT_Utility.ItemId.createAsWildcard(stack));
+        return set.contains(GTUtility.ItemId.createAsWildcard(stack));
     }
 
     /**
@@ -2148,16 +2146,16 @@ public class GT_ModHandler {
      * Uses an Item. Tries to discharge in case of Electric Items
      */
     public static boolean damageOrDechargeItem(ItemStack aStack, int aDamage, int aDecharge, EntityLivingBase aPlayer) {
-        if (GT_Utility.isStackInvalid(aStack) || (aStack.getMaxStackSize() <= 1 && aStack.stackSize > 1)) return false;
+        if (GTUtility.isStackInvalid(aStack) || (aStack.getMaxStackSize() <= 1 && aStack.stackSize > 1)) return false;
         if (aPlayer instanceof EntityPlayer && ((EntityPlayer) aPlayer).capabilities.isCreativeMode) return true;
         if (aStack.getItem() instanceof IDamagableItem) {
             return ((IDamagableItem) aStack.getItem()).doDamageToItem(aStack, aDamage);
-        } else if (GT_ModHandler.isElectricItem(aStack)) {
+        } else if (GTModHandler.isElectricItem(aStack)) {
             if (canUseElectricItem(aStack, aDecharge)) {
                 if (aPlayer instanceof EntityPlayer) {
-                    return GT_ModHandler.useElectricItem(aStack, aDecharge, (EntityPlayer) aPlayer);
+                    return GTModHandler.useElectricItem(aStack, aDecharge, (EntityPlayer) aPlayer);
                 }
-                return GT_ModHandler.dischargeElectricItem(aStack, aDecharge, Integer.MAX_VALUE, true, false, true)
+                return GTModHandler.dischargeElectricItem(aStack, aDecharge, Integer.MAX_VALUE, true, false, true)
                     >= aDecharge;
             }
         } else if (aStack.getItem()
@@ -2169,7 +2167,7 @@ public class GT_ModHandler {
                 }
                 if (aStack.getItemDamage() >= aStack.getMaxDamage()) {
                     aStack.setItemDamage(aStack.getMaxDamage() + 1);
-                    ItemStack tStack = GT_Utility.getContainerItem(aStack, true);
+                    ItemStack tStack = GTUtility.getContainerItem(aStack, true);
                     if (tStack != null) {
                         aStack.func_150996_a(tStack.getItem());
                         aStack.setItemDamage(tStack.getItemDamage());
@@ -2189,24 +2187,24 @@ public class GT_ModHandler {
      */
     public static boolean useSolderingIron(ItemStack aStack, EntityLivingBase aPlayer, IInventory aExternalInventory) {
         if (aPlayer == null || aStack == null) return false;
-        if (GT_Utility.isStackInList(aStack, GregTech_API.sSolderingToolList)) {
+        if (GTUtility.isStackInList(aStack, GregTechAPI.sSolderingToolList)) {
             if (aPlayer instanceof EntityPlayer tPlayer) {
                 if (tPlayer.capabilities.isCreativeMode) return true;
                 if (isElectricItem(aStack) && ic2.api.item.ElectricItem.manager.getCharge(aStack) > 1000.0d) {
                     if (consumeSolderingMaterial(tPlayer)
                         || (aExternalInventory != null && consumeSolderingMaterial(aExternalInventory))) {
                         if (canUseElectricItem(aStack, 10000)) {
-                            return GT_ModHandler.useElectricItem(aStack, 10000, (EntityPlayer) aPlayer);
+                            return GTModHandler.useElectricItem(aStack, 10000, (EntityPlayer) aPlayer);
                         }
-                        GT_ModHandler.useElectricItem(
+                        GTModHandler.useElectricItem(
                             aStack,
                             (int) ic2.api.item.ElectricItem.manager.getCharge(aStack),
                             (EntityPlayer) aPlayer);
                         return false;
                     } else {
-                        GT_Utility.sendChatToPlayer(
+                        GTUtility.sendChatToPlayer(
                             (EntityPlayer) aPlayer,
-                            GT_Utility.trans("094.1", "Not enough soldering material!"));
+                            GTUtility.trans("094.1", "Not enough soldering material!"));
                     }
                 }
             } else {
@@ -2252,7 +2250,7 @@ public class GT_ModHandler {
     public static boolean consumeSolderingMaterial(IInventory aInventory) {
         for (int i = 0; i < aInventory.getSizeInventory(); i++) {
             ItemStack tStack = aInventory.getStackInSlot(i);
-            if (GT_Utility.isStackInList(tStack, GregTech_API.sSolderingMetalList)) {
+            if (GTUtility.isStackInList(tStack, GregTechAPI.sSolderingMetalList)) {
                 if (tStack.stackSize < 1) return false;
                 if (tStack.stackSize == 1) {
                     tStack = null;
@@ -2318,7 +2316,7 @@ public class GT_ModHandler {
 
         final Item item = aStack.getItem();
 
-        if (item instanceof final GT_MetaBase_Item metaBaseItem) {
+        if (item instanceof final MetaBaseItem metaBaseItem) {
             final Long[] stats = metaBaseItem.getElectricStats(aStack);
             if (stats != null && stats.length > 0) {
                 return Optional.of(new Long[] { metaBaseItem.getRealCharge(aStack), stats[0] });
@@ -2343,7 +2341,7 @@ public class GT_ModHandler {
             } catch (Throwable ignored) {
                 /* Do nothing */
             }
-            sBoxableItems.add(new GT_ItemStack(aStack));
+            sBoxableItems.add(new GTItemStack(aStack));
         }
     }
 
@@ -2357,11 +2355,11 @@ public class GT_ModHandler {
     public static int getCapsuleCellContainerCount(ItemStack aStack) {
         if (aStack == null) return 0;
 
-        if (GT_Utility.areStacksEqual(GT_Utility.getContainerForFilledItem(aStack, true), ItemList.Cell_Empty.get(1))) {
+        if (GTUtility.areStacksEqual(GTUtility.getContainerForFilledItem(aStack, true), ItemList.Cell_Empty.get(1))) {
             return 1;
         }
 
-        if (GT_Utility.areStacksEqual(aStack, getIC2Item("waterCell", 1, W))) {
+        if (GTUtility.areStacksEqual(aStack, getIC2Item("waterCell", 1, W))) {
             return 1;
         }
 
diff --git a/src/main/java/gregtech/api/util/GT_MusicSystem.java b/src/main/java/gregtech/api/util/GTMusicSystem.java
index 7c0ec929e9..362c397e67 100644
--- a/src/main/java/gregtech/api/util/GT_MusicSystem.java
+++ b/src/main/java/gregtech/api/util/GTMusicSystem.java
@@ -34,12 +34,12 @@ import com.jcraft.jorbis.VorbisFile;
 import baubles.api.BaublesApi;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.network.ByteBufUtils;
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.net.GT_Packet_MusicSystemData;
+import gregtech.GTMod;
+import gregtech.api.enums.GTValues;
+import gregtech.api.net.GTPacketMusicSystemData;
 import gregtech.client.ElectricJukeboxSound;
-import gregtech.common.items.GT_WirelessHeadphones;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_BetterJukebox;
+import gregtech.common.items.ItemWirelessHeadphones;
+import gregtech.common.tileentities.machines.basic.MTEBetterJukebox;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
@@ -56,9 +56,9 @@ import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
  *
  * @author eigenraven
  */
-public final class GT_MusicSystem {
+public final class GTMusicSystem {
 
-    private GT_MusicSystem() {}
+    private GTMusicSystem() {}
 
     public static final class MusicSource {
 
@@ -68,7 +68,7 @@ public final class GT_MusicSystem {
         /** Currently playing track */
         public ResourceLocation currentRecord;
         /** Headphone range */
-        public GT_MetaTileEntity_BetterJukebox.HeadphoneLimit headphoneLimit;
+        public MTEBetterJukebox.HeadphoneLimit headphoneLimit;
         /**
          * {@link System#currentTimeMillis()} at the time this record started playing, in server time
          */
@@ -219,7 +219,7 @@ public final class GT_MusicSystem {
                 final String path = ByteBufUtils.readUTF8String(bytes);
                 source.currentRecord = new ResourceLocation(domain, path);
             }
-            source.headphoneLimit = GT_MetaTileEntity_BetterJukebox.HeadphoneLimit.ENTRIES.get(bytes.readByte());
+            source.headphoneLimit = MTEBetterJukebox.HeadphoneLimit.ENTRIES.get(bytes.readByte());
             source.headphoneBlockRange = ByteBufUtils.readVarInt(bytes, 5);
             source.startedPlayingAtMs = bytes.readLong();
             source.playingForMs = bytes.readLong();
@@ -293,7 +293,7 @@ public final class GT_MusicSystem {
             });
             if (tickAnyDirty || musicSourcesDirty) {
                 musicSourcesDirty = false;
-                GT_Values.NW.sendToAll(new GT_Packet_MusicSystemData(serialize()));
+                GTValues.NW.sendToAll(new GTPacketMusicSystemData(serialize()));
             }
         }
 
@@ -462,10 +462,10 @@ public final class GT_MusicSystem {
                             json.soundDurationsMs.put(res.toString(), (int) Math.ceil(totalSeconds * 1000.0f));
                         }
                     } catch (Exception e) {
-                        GT_Mod.GT_FML_LOGGER.warn("Skipping {}", record.recordName, e);
+                        GTMod.GT_FML_LOGGER.warn("Skipping {}", record.recordName, e);
                     }
                 }
-                GT_Mod.GT_FML_LOGGER.info(
+                GTMod.GT_FML_LOGGER.info(
                     "Sound durations json: \n{}",
                     new GsonBuilder().setPrettyPrinting()
                         .create()
@@ -502,7 +502,7 @@ public final class GT_MusicSystem {
                 final int baublesSize = baubles.getSizeInventory();
                 for (int i = 0; i < baublesSize; i++) {
                     final ItemStack item = baubles.getStackInSlot(i);
-                    if (item != null && item.getItem() instanceof GT_WirelessHeadphones headphones) {
+                    if (item != null && item.getItem() instanceof ItemWirelessHeadphones headphones) {
                         final UUID id = headphones.getBoundJukeboxUUID(item);
                         if (id != null) {
                             wornHeadphones.add(id);
@@ -593,7 +593,7 @@ public final class GT_MusicSystem {
             final long pauseDurationMs = now - pauseTimeMs;
 
             // We manipulate server state here, because we've checked this is singleplayer pausing.
-            GT_MusicSystem.ServerSystem.onPauseMs(pauseDurationMs);
+            GTMusicSystem.ServerSystem.onPauseMs(pauseDurationMs);
             musicSources.forEach((uuid, source) -> { source.startedPlayingAtMs += pauseDurationMs; });
             activelyPlayingMusic.forEach((uuid, data) -> {
                 data.originalStartTime += pauseDurationMs;
@@ -626,7 +626,7 @@ public final class GT_MusicSystem {
 
             try {
                 final ArrayList<URL> candidates = Collections.list(
-                    GT_MusicSystem.class.getClassLoader()
+                    GTMusicSystem.class.getClassLoader()
                         .getResources("soundmeta/durations.json"));
                 final Path configPath = Loader.instance()
                     .getConfigDir()
@@ -652,7 +652,7 @@ public final class GT_MusicSystem {
                                     .intValue());
                         }
                     } catch (Exception e) {
-                        GT_Mod.GT_FML_LOGGER.error("Could not parse sound durations from {}", url, e);
+                        GTMod.GT_FML_LOGGER.error("Could not parse sound durations from {}", url, e);
                     }
                 }
             } catch (IOException e) {
diff --git a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java b/src/main/java/gregtech/api/util/GTOreDictUnificator.java
index 82c14f2aeb..6168b03211 100644
--- a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java
+++ b/src/main/java/gregtech/api/util/GTOreDictUnificator.java
@@ -1,8 +1,8 @@
 package gregtech.api.util;
 
-import static gregtech.api.enums.GT_Values.E;
-import static gregtech.api.enums.GT_Values.M;
-import static gregtech.api.enums.GT_Values.W;
+import static gregtech.api.enums.GTValues.E;
+import static gregtech.api.enums.GTValues.M;
+import static gregtech.api.enums.GTValues.W;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -18,12 +18,12 @@ import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.objects.ItemData;
 import gregtech.api.objects.MaterialStack;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenCustomHashMap;
@@ -34,25 +34,25 @@ import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
  * <p/>
  * This is the Core of my OreDict Unification Code
  * <p/>
- * If you just want to use this to unificate your Items, then use the Function in the GregTech_API File
+ * If you just want to use this to unificate your Items, then use the Function in the GregTechAPI File
  * <p/>
  * P.S. It is intended to be named "Unificator" and not "Unifier", because that sounds more awesome.
  */
-public class GT_OreDictUnificator {
+public class GTOreDictUnificator {
 
     private static final Map<String, ItemStack> sName2StackMap = new HashMap<>();
     private static final Map<ItemStack, ItemData> sItemStack2DataMap = new Object2ObjectOpenCustomHashMap<>(
-        GT_ItemStack.ITEMSTACK_HASH_STRATEGY2);
+        GTItemStack.ITEMSTACK_HASH_STRATEGY2);
     private static final Map<ItemStack, List<ItemStack>> sUnificationTable = new Object2ObjectOpenCustomHashMap<>(
-        GT_ItemStack.ITEMSTACK_HASH_STRATEGY2);
+        GTItemStack.ITEMSTACK_HASH_STRATEGY2);
     private static final Set<ItemStack> sNoUnificationList = new ObjectOpenCustomHashSet<>(
-        GT_ItemStack.ITEMSTACK_HASH_STRATEGY2);
+        GTItemStack.ITEMSTACK_HASH_STRATEGY2);
     private static int isRegisteringOre = 0, isAddingOre = 0;
     private static boolean mRunThroughTheList = true;
 
     static {
-        GregTech_API.sItemStackMappings.add(sItemStack2DataMap);
-        GregTech_API.sItemStackMappings.add(sUnificationTable);
+        GregTechAPI.sItemStackMappings.add(sItemStack2DataMap);
+        GregTechAPI.sItemStackMappings.add(sUnificationTable);
     }
 
     /**
@@ -60,12 +60,12 @@ public class GT_OreDictUnificator {
      * the Industrial Diamond, which is better than regular Diamond, but also usable in absolutely all Diamond Recipes.
      */
     public static void addToBlacklist(ItemStack aStack) {
-        if (GT_Utility.isStackValid(aStack) && !GT_Utility.isStackInStackSet(aStack, sNoUnificationList))
+        if (GTUtility.isStackValid(aStack) && !GTUtility.isStackInStackSet(aStack, sNoUnificationList))
             sNoUnificationList.add(aStack);
     }
 
     public static boolean isBlacklisted(ItemStack aStack) {
-        return GT_Utility.isStackInStackSet(aStack, sNoUnificationList);
+        return GTUtility.isStackInStackSet(aStack, sNoUnificationList);
     }
 
     public static void add(OrePrefixes aPrefix, Materials aMaterial, ItemStack aStack) {
@@ -79,13 +79,13 @@ public class GT_OreDictUnificator {
     public static void set(OrePrefixes aPrefix, Materials aMaterial, ItemStack aStack, boolean aOverwrite,
         boolean aAlreadyRegistered) {
         if (aMaterial == null || aPrefix == null
-            || GT_Utility.isStackInvalid(aStack)
+            || GTUtility.isStackInvalid(aStack)
             || Items.feather.getDamage(aStack) == W) return;
         isAddingOre++;
-        aStack = GT_Utility.copyAmount(1, aStack);
+        aStack = GTUtility.copyAmount(1, aStack);
         if (!aAlreadyRegistered) registerOre(aPrefix.get(aMaterial), aStack);
         addAssociation(aPrefix, aMaterial, aStack, isBlacklisted(aStack));
-        if (aOverwrite || GT_Utility.isStackInvalid(
+        if (aOverwrite || GTUtility.isStackInvalid(
             sName2StackMap.get(
                 aPrefix.get(aMaterial)
                     .toString())))
@@ -97,10 +97,10 @@ public class GT_OreDictUnificator {
     }
 
     public static ItemStack getFirstOre(Object aName, long aAmount) {
-        if (GT_Utility.isStringInvalid(aName)) return null;
+        if (GTUtility.isStringInvalid(aName)) return null;
         ItemStack tStack = sName2StackMap.get(aName.toString());
-        if (GT_Utility.isStackValid(tStack)) return GT_Utility.copyAmount(aAmount, tStack);
-        return GT_Utility.copyAmount(aAmount, getOresImmutable(aName).toArray());
+        if (GTUtility.isStackValid(tStack)) return GTUtility.copyAmount(aAmount, tStack);
+        return GTUtility.copyAmount(aAmount, getOresImmutable(aName).toArray());
     }
 
     public static ItemStack get(Object aName, long aAmount) {
@@ -131,24 +131,24 @@ public class GT_OreDictUnificator {
         boolean aNoInvalidAmounts) {
         if (aNoInvalidAmounts && aAmount < 1) return null;
         final ItemStack stackFromName = sName2StackMap.get(aName.toString());
-        if (stackFromName != null) return GT_Utility.copyAmount(aAmount, stackFromName);
+        if (stackFromName != null) return GTUtility.copyAmount(aAmount, stackFromName);
         if (aMentionPossibleTypos) {
-            GT_Log.err.println("Unknown Key for Unification, Typo? " + aName);
+            GTLog.err.println("Unknown Key for Unification, Typo? " + aName);
         }
         final ItemStack stackFirstOre = getFirstOre(aName, aAmount);
-        if (stackFirstOre != null) return GT_Utility.copyAmount(aAmount, stackFirstOre);
-        return GT_Utility.copyAmount(aAmount, aReplacement);
+        if (stackFirstOre != null) return GTUtility.copyAmount(aAmount, stackFirstOre);
+        return GTUtility.copyAmount(aAmount, aReplacement);
     }
 
     public static ItemStack[] setStackArray(boolean aUseBlackList, ItemStack... aStacks) {
-        for (int i = 0; i < aStacks.length; i++) aStacks[i] = get(aUseBlackList, GT_Utility.copyOrNull(aStacks[i]));
+        for (int i = 0; i < aStacks.length; i++) aStacks[i] = get(aUseBlackList, GTUtility.copyOrNull(aStacks[i]));
         return aStacks;
     }
 
     public static ItemStack[] getStackArray(boolean aUseBlackList, Object... aStacks) {
         ItemStack[] rStacks = new ItemStack[aStacks.length];
         for (int i = 0; i < aStacks.length; i++) {
-            rStacks[i] = get(aUseBlackList, GT_Utility.copy(aStacks[i]), true);
+            rStacks[i] = get(aUseBlackList, GTUtility.copy(aStacks[i]), true);
         }
         return rStacks;
     }
@@ -158,9 +158,9 @@ public class GT_OreDictUnificator {
     }
 
     public static ItemStack setStack(boolean aUseBlackList, ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return aStack;
+        if (GTUtility.isStackInvalid(aStack)) return aStack;
         ItemStack tStack = get(aUseBlackList, aStack);
-        if (GT_Utility.areStacksEqual(aStack, tStack)) return aStack;
+        if (GTUtility.areStacksEqual(aStack, tStack)) return aStack;
         aStack.func_150996_a(tStack.getItem());
         Items.feather.setDamage(aStack, Items.feather.getDamage(tStack));
         return aStack;
@@ -178,23 +178,23 @@ public class GT_OreDictUnificator {
      * @param unsafe If true, it does not limit stack size by 64.
      */
     public static ItemStack get(boolean aUseBlackList, ItemStack aStack, boolean unsafe) {
-        if (GT_Utility.isStackInvalid(aStack)) return null;
+        if (GTUtility.isStackInvalid(aStack)) return null;
         ItemData tPrefixMaterial = getAssociation(aStack);
         if (tPrefixMaterial == null || !tPrefixMaterial.hasValidPrefixMaterialData()
-            || (aUseBlackList && tPrefixMaterial.mBlackListed)) return GT_Utility.copyOrNull(aStack);
-        if (aUseBlackList && !GregTech_API.sUnificationEntriesRegistered && isBlacklisted(aStack)) {
+            || (aUseBlackList && tPrefixMaterial.mBlackListed)) return GTUtility.copyOrNull(aStack);
+        if (aUseBlackList && !GregTechAPI.sUnificationEntriesRegistered && isBlacklisted(aStack)) {
             tPrefixMaterial.mBlackListed = true;
-            return GT_Utility.copyOrNull(aStack);
+            return GTUtility.copyOrNull(aStack);
         }
         if (tPrefixMaterial.mUnificationTarget == null)
             tPrefixMaterial.mUnificationTarget = sName2StackMap.get(tPrefixMaterial.toString());
         ItemStack rStack = tPrefixMaterial.mUnificationTarget;
-        if (GT_Utility.isStackInvalid(rStack)) return GT_Utility.copyOrNull(aStack);
+        if (GTUtility.isStackInvalid(rStack)) return GTUtility.copyOrNull(aStack);
         ItemStack newStack;
         if (unsafe) {
-            newStack = GT_Utility.copyAmountUnsafe(aStack.stackSize, rStack);
+            newStack = GTUtility.copyAmountUnsafe(aStack.stackSize, rStack);
         } else {
-            newStack = GT_Utility.copyAmount(aStack.stackSize, rStack);
+            newStack = GTUtility.copyAmount(aStack.stackSize, rStack);
         }
         // NBT is assigned by reference here, so mutating it may have unexpected side effects.
         newStack.setTagCompound(aStack.getTagCompound());
@@ -214,18 +214,18 @@ public class GT_OreDictUnificator {
      * comparisons
      */
     static ItemStack get_nocopy(boolean aUseBlackList, ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return null;
+        if (GTUtility.isStackInvalid(aStack)) return null;
         ItemData tPrefixMaterial = getAssociation(aStack);
         if (tPrefixMaterial == null || !tPrefixMaterial.hasValidPrefixMaterialData()
             || (aUseBlackList && tPrefixMaterial.mBlackListed)) return aStack;
-        if (aUseBlackList && !GregTech_API.sUnificationEntriesRegistered && isBlacklisted(aStack)) {
+        if (aUseBlackList && !GregTechAPI.sUnificationEntriesRegistered && isBlacklisted(aStack)) {
             tPrefixMaterial.mBlackListed = true;
             return aStack;
         }
         if (tPrefixMaterial.mUnificationTarget == null)
             tPrefixMaterial.mUnificationTarget = sName2StackMap.get(tPrefixMaterial.toString());
         ItemStack rStack = tPrefixMaterial.mUnificationTarget;
-        if (GT_Utility.isStackInvalid(rStack)) return aStack;
+        if (GTUtility.isStackInvalid(rStack)) return aStack;
 
         // Yes, == and not .equals().
         // This check is primarily intended to optimize for the case where both rStack and aStack
@@ -255,7 +255,7 @@ public class GT_OreDictUnificator {
      * false.
      */
     public static boolean isInputStackEqual(ItemStack aStack, ItemStack unified_tStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return false;
+        if (GTUtility.isStackInvalid(aStack)) return false;
         return isInputStackEqual(aStack, getAssociation(aStack), unified_tStack);
     }
 
@@ -265,25 +265,25 @@ public class GT_OreDictUnificator {
      */
     public static boolean isInputStackEqual(ItemStack aStack, ItemData aStackPrefixData, ItemStack unified_tStack) {
         boolean alreadyCompared = false;
-        if (GT_Utility.isStackInvalid(aStack)) return false;
+        if (GTUtility.isStackInvalid(aStack)) return false;
         ItemStack rStack = null;
         if (aStackPrefixData == null || !aStackPrefixData.hasValidPrefixMaterialData())
-            return GT_Utility.areStacksEqual(aStack, unified_tStack, true);
+            return GTUtility.areStacksEqual(aStack, unified_tStack, true);
         else if (aStackPrefixData.mBlackListed) {
-            if (GT_Utility.areStacksEqual(aStack, unified_tStack, true)) return true;
+            if (GTUtility.areStacksEqual(aStack, unified_tStack, true)) return true;
             else alreadyCompared = true;
         }
-        if (!alreadyCompared && !GregTech_API.sUnificationEntriesRegistered && isBlacklisted(aStack)) {
+        if (!alreadyCompared && !GregTechAPI.sUnificationEntriesRegistered && isBlacklisted(aStack)) {
             aStackPrefixData.mBlackListed = true;
-            if (GT_Utility.areStacksEqual(aStack, unified_tStack, true)) return true;
+            if (GTUtility.areStacksEqual(aStack, unified_tStack, true)) return true;
             else alreadyCompared = true;
         }
         if (aStackPrefixData.mUnificationTarget == null)
             aStackPrefixData.mUnificationTarget = sName2StackMap.get(aStackPrefixData.toString());
         rStack = aStackPrefixData.mUnificationTarget;
-        if (GT_Utility.isStackInvalid(rStack))
-            return !alreadyCompared && GT_Utility.areStacksEqual(aStack, unified_tStack, true);
-        return GT_Utility.areStacksEqual(rStack, unified_tStack, true);
+        if (GTUtility.isStackInvalid(rStack))
+            return !alreadyCompared && GTUtility.areStacksEqual(aStack, unified_tStack, true);
+        return GTUtility.areStacksEqual(rStack, unified_tStack, true);
     }
 
     public static List<ItemStack> getNonUnifiedStacks(Object obj) {
@@ -293,9 +293,9 @@ public class GT_OreDictUnificator {
             synchronized (sUnificationTable) {
                 if (sUnificationTable.isEmpty() && !sItemStack2DataMap.isEmpty()) {
                     for (ItemStack tGTStack0 : sItemStack2DataMap.keySet()) {
-                        ItemStack tStack0 = GT_ItemStack.internalCopyStack(tGTStack0);
+                        ItemStack tStack0 = GTItemStack.internalCopyStack(tGTStack0);
                         ItemStack tStack1 = get_nocopy(false, tStack0);
-                        if (!GT_Utility.areStacksEqual(tStack0, tStack1)) {
+                        if (!GTUtility.areStacksEqual(tStack0, tStack1)) {
                             List<ItemStack> list = sUnificationTable.computeIfAbsent(tStack1, k -> new ArrayList<>());
                             // greg's original code tries to dedupe the list using List#contains, which won't work
                             // on vanilla ItemStack. I removed it since it never worked and can be slow.
@@ -316,7 +316,7 @@ public class GT_OreDictUnificator {
             List<ItemStack> tList = sUnificationTable.get(aStack);
             if (tList != null) {
                 for (ItemStack tStack : tList) {
-                    ItemStack tStack1 = GT_Utility.copyAmount(aStack.stackSize, tStack);
+                    ItemStack tStack1 = GTUtility.copyAmount(aStack.stackSize, tStack);
                     rList.add(tStack1);
                 }
             }
@@ -325,7 +325,7 @@ public class GT_OreDictUnificator {
     }
 
     public static void addItemData(ItemStack aStack, ItemData aData) {
-        if (GT_Utility.isStackValid(aStack) && getItemData(aStack) == null && aData != null) setItemData(aStack, aData);
+        if (GTUtility.isStackValid(aStack) && getItemData(aStack) == null && aData != null) setItemData(aStack, aData);
     }
 
     public static void addItemDataFromInputs(ItemStack output, Object... inputs) {
@@ -333,20 +333,20 @@ public class GT_OreDictUnificator {
         ItemData[] tData = new ItemData[length];
         for (int i = 0; i < length; i++) {
             if (inputs[i] instanceof ItemStack) {
-                tData[i] = GT_OreDictUnificator.getItemData((ItemStack) inputs[i]);
+                tData[i] = GTOreDictUnificator.getItemData((ItemStack) inputs[i]);
             } else if (inputs[i] instanceof ItemData) {
                 tData[i] = (ItemData) inputs[i];
             } else {
                 throw new IllegalArgumentException();
             }
         }
-        if (GT_Utility.arrayContainsNonNull(tData)) {
-            GT_OreDictUnificator.addItemData(output, new ItemData(tData));
+        if (GTUtility.arrayContainsNonNull(tData)) {
+            GTOreDictUnificator.addItemData(output, new ItemData(tData));
         }
     }
 
     public static void setItemData(ItemStack aStack, ItemData aData) {
-        if (GT_Utility.isStackInvalid(aStack) || aData == null) return;
+        if (GTUtility.isStackInvalid(aStack) || aData == null) return;
         ItemData tData = getItemData(aStack);
         if (tData == null || !tData.hasValidPrefixMaterialData()) {
             if (tData != null) for (Object tObject : tData.mExtraData)
@@ -354,7 +354,7 @@ public class GT_OreDictUnificator {
             if (aStack.stackSize > 1) {
                 if (aData.mMaterial != null) aData.mMaterial.mAmount /= aStack.stackSize;
                 for (MaterialStack tMaterial : aData.mByProducts) tMaterial.mAmount /= aStack.stackSize;
-                aStack = GT_Utility.copyAmount(1, aStack);
+                aStack = GTUtility.copyAmount(1, aStack);
             }
             sItemStack2DataMap.put(aStack, aData);
             if (aData.hasValidMaterialData()) {
@@ -363,20 +363,20 @@ public class GT_OreDictUnificator {
                 for (MaterialStack tMaterial : aData.mByProducts)
                     tValidMaterialAmount += tMaterial.mMaterial.contains(SubTag.NO_RECYCLING) ? 0
                         : tMaterial.mAmount >= 0 ? tMaterial.mAmount : M;
-                if (tValidMaterialAmount < M) GT_ModHandler.addToRecyclerBlackList(aStack);
+                if (tValidMaterialAmount < M) GTModHandler.addToRecyclerBlackList(aStack);
             }
             if (mRunThroughTheList) {
-                if (GregTech_API.sLoadStarted) {
+                if (GregTechAPI.sLoadStarted) {
                     mRunThroughTheList = false;
                     for (Entry<ItemStack, ItemData> tEntry : sItemStack2DataMap.entrySet()) if (!tEntry.getValue()
                         .hasValidPrefixData() || tEntry.getValue().mPrefix.mAllowNormalRecycling)
-                        GT_RecipeRegistrator.registerMaterialRecycling(
-                            GT_ItemStack.internalCopyStack(tEntry.getKey()),
+                        GTRecipeRegistrator.registerMaterialRecycling(
+                            GTItemStack.internalCopyStack(tEntry.getKey()),
                             tEntry.getValue());
                 }
             } else {
                 if (!aData.hasValidPrefixData() || aData.mPrefix.mAllowNormalRecycling)
-                    GT_RecipeRegistrator.registerMaterialRecycling(aStack, aData);
+                    GTRecipeRegistrator.registerMaterialRecycling(aStack, aData);
             }
         } else {
             for (Object tObject : aData.mExtraData)
@@ -385,7 +385,7 @@ public class GT_OreDictUnificator {
     }
 
     public static void removeItemData(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) {
+        if (GTUtility.isStackInvalid(aStack)) {
             return;
         }
         sItemStack2DataMap.remove(aStack);
@@ -393,18 +393,18 @@ public class GT_OreDictUnificator {
 
     public static void addAssociation(OrePrefixes aPrefix, Materials aMaterial, ItemStack aStack,
         boolean aBlackListed) {
-        if (aPrefix == null || aMaterial == null || GT_Utility.isStackInvalid(aStack)) return;
+        if (aPrefix == null || aMaterial == null || GTUtility.isStackInvalid(aStack)) return;
         if (Items.feather.getDamage(aStack) == W) for (byte i = 0; i < 16; i++)
-            setItemData(GT_Utility.copyAmountAndMetaData(1, i, aStack), new ItemData(aPrefix, aMaterial, aBlackListed));
+            setItemData(GTUtility.copyAmountAndMetaData(1, i, aStack), new ItemData(aPrefix, aMaterial, aBlackListed));
         setItemData(aStack, new ItemData(aPrefix, aMaterial, aBlackListed));
     }
 
     @Nullable
     public static ItemData getItemData(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return null;
+        if (GTUtility.isStackInvalid(aStack)) return null;
         ItemData rData = sItemStack2DataMap.get(aStack);
         if (rData == null) { // Try the lookup again but with wildcard damage value
-            rData = sItemStack2DataMap.get(GT_ItemStack.internalCopyStack(aStack, true));
+            rData = sItemStack2DataMap.get(GTItemStack.internalCopyStack(aStack, true));
         }
         return rData;
     }
@@ -416,14 +416,14 @@ public class GT_OreDictUnificator {
     }
 
     public static boolean isItemStackInstanceOf(ItemStack aStack, Object aName) {
-        if (GT_Utility.isStringInvalid(aName) || GT_Utility.isStackInvalid(aStack)) return false;
+        if (GTUtility.isStringInvalid(aName) || GTUtility.isStackInvalid(aStack)) return false;
         for (ItemStack tOreStack : getOresImmutable(aName.toString()))
-            if (GT_Utility.areStacksEqual(tOreStack, aStack, true)) return true;
+            if (GTUtility.areStacksEqual(tOreStack, aStack, true)) return true;
         return false;
     }
 
     public static boolean isItemStackDye(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return false;
+        if (GTUtility.isStackInvalid(aStack)) return false;
 
         for (Dyes tDye : Dyes.VALUES) if (isItemStackInstanceOf(aStack, tDye.toString())) return true;
 
@@ -435,17 +435,17 @@ public class GT_OreDictUnificator {
     }
 
     public static boolean registerOre(Object aName, ItemStack aStack) {
-        if (aName == null || GT_Utility.isStackInvalid(aStack)) return false;
+        if (aName == null || GTUtility.isStackInvalid(aStack)) return false;
 
         String tName = aName.toString();
 
-        if (GT_Utility.isStringInvalid(tName)) return false;
+        if (GTUtility.isStringInvalid(tName)) return false;
 
         for (ItemStack itemStack : getOresImmutable(tName))
-            if (GT_Utility.areStacksEqual(itemStack, aStack, true)) return false;
+            if (GTUtility.areStacksEqual(itemStack, aStack, true)) return false;
 
         isRegisteringOre++;
-        OreDictionary.registerOre(tName, GT_Utility.copyAmount(1, aStack));
+        OreDictionary.registerOre(tName, GTUtility.copyAmount(1, aStack));
         isRegisteringOre--;
         return true;
     }
@@ -561,7 +561,7 @@ public class GT_OreDictUnificator {
     public static ArrayList<ItemStack> getOres(Object aOreName) {
         String aName = aOreName == null ? E : aOreName.toString();
         ArrayList<ItemStack> rList = new ArrayList<>();
-        if (GT_Utility.isStringValid(aName)) rList.addAll(OreDictionary.getOres(aName));
+        if (GTUtility.isStringValid(aName)) rList.addAll(OreDictionary.getOres(aName));
         return rList;
     }
 
@@ -572,7 +572,7 @@ public class GT_OreDictUnificator {
     public static List<ItemStack> getOresImmutable(@Nullable Object aOreName) {
         String aName = aOreName == null ? E : aOreName.toString();
 
-        return GT_Utility.isStringValid(aName) ? Collections.unmodifiableList(OreDictionary.getOres(aName))
+        return GTUtility.isStringValid(aName) ? Collections.unmodifiableList(OreDictionary.getOres(aName))
             : Collections.emptyList();
     }
 }
diff --git a/src/main/java/gregtech/api/util/GT_PlayedSound.java b/src/main/java/gregtech/api/util/GTPlayedSound.java
index 8604d9b81f..0b527136b3 100644
--- a/src/main/java/gregtech/api/util/GT_PlayedSound.java
+++ b/src/main/java/gregtech/api/util/GTPlayedSound.java
@@ -2,12 +2,12 @@ package gregtech.api.util;
 
 import net.minecraft.util.ResourceLocation;
 
-public class GT_PlayedSound {
+public class GTPlayedSound {
 
     public final String mSoundName;
     public final int mX, mY, mZ;
 
-    public GT_PlayedSound(ResourceLocation aSoundResourceLocation, double aX, double aY, double aZ) {
+    public GTPlayedSound(ResourceLocation aSoundResourceLocation, double aX, double aY, double aZ) {
         mSoundName = aSoundResourceLocation.toString();
         mX = (int) aX;
         mY = (int) aY;
@@ -16,10 +16,10 @@ public class GT_PlayedSound {
 
     @Override
     public boolean equals(Object aObject) {
-        if (aObject instanceof GT_PlayedSound) {
-            return ((GT_PlayedSound) aObject).mX == mX && ((GT_PlayedSound) aObject).mY == mY
-                && ((GT_PlayedSound) aObject).mZ == mZ
-                && ((GT_PlayedSound) aObject).mSoundName.equals(mSoundName);
+        if (aObject instanceof GTPlayedSound) {
+            return ((GTPlayedSound) aObject).mX == mX && ((GTPlayedSound) aObject).mY == mY
+                && ((GTPlayedSound) aObject).mZ == mZ
+                && ((GTPlayedSound) aObject).mSoundName.equals(mSoundName);
         }
         return false;
     }
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GTRecipe.java
index c0812dcaef..7aa3dfbdfb 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GTRecipe.java
@@ -1,6 +1,6 @@
 package gregtech.api.util;
 
-import static gregtech.api.enums.GT_Values.D2;
+import static gregtech.api.enums.GTValues.D2;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,16 +22,16 @@ import org.jetbrains.annotations.NotNull;
 
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModContainer;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.logic.FluidInventoryLogic;
 import gregtech.api.logic.ItemInventoryLogic;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_MultiInput;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
+import gregtech.api.metatileentity.implementations.MTEHatchMultiInput;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.objects.ItemData;
 import gregtech.api.recipe.RecipeCategory;
 import gregtech.api.recipe.RecipeMap;
@@ -41,8 +41,9 @@ import gregtech.api.recipe.metadata.EmptyRecipeMetadataStorage;
 import gregtech.api.recipe.metadata.IRecipeMetadataStorage;
 import gregtech.api.util.extensions.ArrayExt;
 import gregtech.api.util.item.ItemHolder;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_InputBus_ME;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Input_ME;
+import gregtech.common.tileentities.machines.MTEHatchInputBusME;
+import gregtech.common.tileentities.machines.MTEHatchInputME;
+import gregtech.nei.GTNEIDefaultHandler;
 import ic2.core.Ic2Items;
 import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
@@ -50,7 +51,7 @@ import it.unimi.dsi.fastutil.objects.Reference2LongArrayMap;
 import it.unimi.dsi.fastutil.objects.Reference2LongMap;
 import it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap;
 
-public class GT_Recipe implements Comparable<GT_Recipe> {
+public class GTRecipe implements Comparable<GTRecipe> {
 
     private static ItemStack dataStick;
     private static ItemStack dataOrb;
@@ -155,12 +156,12 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         public RecipeItemInput(ItemStack stack, boolean recipeIsNBTSensitive) {
             Objects.requireNonNull(stack);
             this.inputAmount = stack.stackSize;
-            final boolean stackNeedsNBT = GT_Recipe.shouldCheckNBT(stack);
+            final boolean stackNeedsNBT = GTRecipe.shouldCheckNBT(stack);
             this.usesNbtMatching = recipeIsNBTSensitive | stackNeedsNBT;
             if (stackNeedsNBT) {
                 this.unifiedStack = stack;
             } else {
-                this.unifiedStack = GT_OreDictUnificator.get_nocopy(true, stack);
+                this.unifiedStack = GTOreDictUnificator.get_nocopy(true, stack);
                 if (!this.usesNbtMatching) {
                     this.unifiedStack.setTagCompound(null);
                 }
@@ -172,7 +173,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
          *         {@link RecipeItemInput#usesNbtMatching}).
          */
         public boolean matchesType(final ItemStack other) {
-            return GT_Utility.areStacksEqual(this.unifiedStack, other, !usesNbtMatching);
+            return GTUtility.areStacksEqual(this.unifiedStack, other, !usesNbtMatching);
         }
 
         /**
@@ -180,20 +181,20 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
          */
         public boolean matchesRecipe(final ItemData oredictOther, final ItemStack other) {
             if (usesNbtMatching) {
-                return GT_Utility.areStacksEqual(this.unifiedStack, other, false);
+                return GTUtility.areStacksEqual(this.unifiedStack, other, false);
             } else {
-                return GT_OreDictUnificator.isInputStackEqual(other, oredictOther, unifiedStack);
+                return GTOreDictUnificator.isInputStackEqual(other, oredictOther, unifiedStack);
             }
         }
     }
 
-    private GT_Recipe(GT_Recipe aRecipe, boolean shallow) {
-        mInputs = shallow ? aRecipe.mInputs : GT_Utility.copyItemArray(aRecipe.mInputs);
-        mOutputs = shallow ? aRecipe.mOutputs : GT_Utility.copyItemArray(aRecipe.mOutputs);
+    private GTRecipe(GTRecipe aRecipe, boolean shallow) {
+        mInputs = shallow ? aRecipe.mInputs : GTUtility.copyItemArray(aRecipe.mInputs);
+        mOutputs = shallow ? aRecipe.mOutputs : GTUtility.copyItemArray(aRecipe.mOutputs);
         mSpecialItems = aRecipe.mSpecialItems;
         mChances = aRecipe.mChances;
-        mFluidInputs = shallow ? aRecipe.mFluidInputs : GT_Utility.copyFluidArray(aRecipe.mFluidInputs);
-        mFluidOutputs = shallow ? aRecipe.mFluidOutputs : GT_Utility.copyFluidArray(aRecipe.mFluidOutputs);
+        mFluidInputs = shallow ? aRecipe.mFluidInputs : GTUtility.copyFluidArray(aRecipe.mFluidInputs);
+        mFluidOutputs = shallow ? aRecipe.mFluidOutputs : GTUtility.copyFluidArray(aRecipe.mFluidOutputs);
         mDuration = aRecipe.mDuration;
         mSpecialValue = aRecipe.mSpecialValue;
         mEUt = aRecipe.mEUt;
@@ -209,9 +210,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
     }
 
     /**
-     * Only for {@link GT_RecipeBuilder}.
+     * Only for {@link GTRecipeBuilder}.
      */
-    GT_Recipe(ItemStack[] mInputs, ItemStack[] mOutputs, FluidStack[] mFluidInputs, FluidStack[] mFluidOutputs,
+    GTRecipe(ItemStack[] mInputs, ItemStack[] mOutputs, FluidStack[] mFluidInputs, FluidStack[] mFluidOutputs,
         int[] mChances, Object mSpecialItems, int mDuration, int mEUt, int mSpecialValue, boolean mEnabled,
         boolean mHidden, boolean mFakeRecipe, boolean mCanBeBuffered, boolean mNeedsEmptyOutput, boolean nbtSensitive,
         String[] neiDesc, @Nullable IRecipeMetadataStorage metadataStorage, RecipeCategory recipeCategory) {
@@ -237,7 +238,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         reloadOwner();
     }
 
-    public GT_Recipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances,
+    public GTRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances,
         FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
         if (aInputs == null) aInputs = new ItemStack[0];
         if (aOutputs == null) aOutputs = new ItemStack[0];
@@ -251,10 +252,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         aFluidInputs = ArrayExt.withoutNulls(aFluidInputs, FluidStack[]::new);
         aFluidOutputs = ArrayExt.withoutNulls(aFluidOutputs, FluidStack[]::new);
 
-        GT_OreDictUnificator.setStackArray(true, aInputs);
-        GT_OreDictUnificator.setStackArray(true, aOutputs);
+        GTOreDictUnificator.setStackArray(true, aInputs);
+        GTOreDictUnificator.setStackArray(true, aOutputs);
 
-        for (ItemStack tStack : aOutputs) GT_Utility.updateItemStack(tStack);
+        for (ItemStack tStack : aOutputs) GTUtility.updateItemStack(tStack);
 
         for (int i = 0; i < aChances.length; i++) if (aChances[i] <= 0) aChances[i] = 10000;
         for (int i = 0; i < aFluidInputs.length; i++) aFluidInputs[i] = aFluidInputs[i].copy();
@@ -304,7 +305,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
     }
 
     // aSpecialValue = EU per Liter! If there is no Liquid for this Object, then it gets multiplied with 1000!
-    public GT_Recipe(ItemStack aInput1, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4,
+    public GTRecipe(ItemStack aInput1, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4,
         int aSpecialValue, int aType) {
         this(
             true,
@@ -348,8 +349,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         }
     }
 
-    // Dummy GT_Recipe maker...
-    public GT_Recipe(ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances,
+    // Dummy GTRecipe maker...
+    public GTRecipe(ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances,
         FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
         this(
             true,
@@ -368,7 +369,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
      * Re-unificates all the items present in recipes.
      */
     public static void reInit() {
-        GT_Log.out.println("GT_Mod: Re-Unificating Recipes.");
+        GTLog.out.println("GTMod: Re-Unificating Recipes.");
         for (RecipeMap<?> map : RecipeMap.ALL_RECIPE_MAPS.values()) {
             map.getBackend()
                 .reInit();
@@ -377,19 +378,19 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
 
     public ItemStack getRepresentativeInput(int aIndex) {
         if (aIndex < 0 || aIndex >= mInputs.length) return null;
-        return GT_Utility.copyOrNull(mInputs[aIndex]);
+        return GTUtility.copyOrNull(mInputs[aIndex]);
     }
 
     public ItemStack getOutput(int aIndex) {
         if (aIndex < 0 || aIndex >= mOutputs.length) return null;
-        return GT_Utility.copyOrNull(mOutputs[aIndex]);
+        return GTUtility.copyOrNull(mOutputs[aIndex]);
     }
 
     /**
      * Dictates the ItemStacks displayed in the output slots of any NEI page handled by the default GT NEI handler.
-     * Override to make shown items differ from a GT_Recipe's item output array
+     * Override to make shown items differ from a GTRecipe's item output array
      *
-     * @see gregtech.nei.GT_NEI_DefaultHandler
+     * @see GTNEIDefaultHandler
      * @param i Slot index
      * @return ItemStack to be displayed in the slot
      */
@@ -416,28 +417,28 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
     public void checkCellBalance() {
         if (!D2 || mInputs.length < 1) return;
 
-        int tInputAmount = GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(mInputs);
-        int tOutputAmount = GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(mOutputs);
+        int tInputAmount = GTModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(mInputs);
+        int tOutputAmount = GTModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(mOutputs);
 
         if (tInputAmount < tOutputAmount) {
             if (!Materials.Tin.contains(mInputs)) {
-                GT_Log.err.println("You get more Cells, than you put in? There must be something wrong.");
-                new Exception().printStackTrace(GT_Log.err);
+                GTLog.err.println("You get more Cells, than you put in? There must be something wrong.");
+                new Exception().printStackTrace(GTLog.err);
             }
         } else if (tInputAmount > tOutputAmount) {
             if (!Materials.Tin.contains(mOutputs)) {
-                GT_Log.err.println("You get less Cells, than you put in? GT Machines usually don't destroy Cells.");
-                new Exception().printStackTrace(GT_Log.err);
+                GTLog.err.println("You get less Cells, than you put in? GT Machines usually don't destroy Cells.");
+                new Exception().printStackTrace(GTLog.err);
             }
         }
     }
 
-    public GT_Recipe copy() {
-        return new GT_Recipe(this, false);
+    public GTRecipe copy() {
+        return new GTRecipe(this, false);
     }
 
-    public GT_Recipe copyShallow() {
-        return new GT_Recipe(this, true);
+    public GTRecipe copyShallow() {
+        return new GTRecipe(this, true);
     }
 
     public boolean isRecipeInputEqual(boolean aDecreaseStacksizeBySuccess, FluidStack[] aFluidInputs,
@@ -511,7 +512,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
                 }
             }
             final RecipeItemInput[] frozenCache = newCache.toArray(new RecipeItemInput[0]);
-            if (GregTech_API.sFullLoadFinished) {
+            if (GregTechAPI.sFullLoadFinished) {
                 mergedInputCache = frozenCache;
             }
             return frozenCache;
@@ -569,7 +570,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
 
         final ItemData[] unifiedProvidedInputs = new ItemData[aInputs.length];
         for (int i = 0; i < aInputs.length; i++) {
-            unifiedProvidedInputs[i] = GT_OreDictUnificator.getAssociation(aInputs[i]);
+            unifiedProvidedInputs[i] = GTOreDictUnificator.getAssociation(aInputs[i]);
         }
         final @NotNull RecipeItemInput @NotNull [] combinedInputs = getCachedCombinedItemInputs();
 
@@ -645,7 +646,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
             }
             final ItemData[] unifiedProvidedInputs = new ItemData[aInputs.length];
             for (int i = 0; i < aInputs.length; i++) {
-                unifiedProvidedInputs[i] = GT_OreDictUnificator.getAssociation(aInputs[i]);
+                unifiedProvidedInputs[i] = GTOreDictUnificator.getAssociation(aInputs[i]);
             }
 
             recipeItemLoop: for (final RecipeItemInput combinedInput : combinedInputs) {
@@ -679,9 +680,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
      */
     private static boolean shouldCheckNBT(ItemStack item) {
         if (GTppRecipeHelper) {
-            return GT_Utility.areStacksEqual(item, ic2FluidCell, true)
-                || GT_Utility.areStacksEqual(item, dataStick, true)
-                || GT_Utility.areStacksEqual(item, dataOrb, true);
+            return GTUtility.areStacksEqual(item, ic2FluidCell, true) || GTUtility.areStacksEqual(item, dataStick, true)
+                || GTUtility.areStacksEqual(item, dataOrb, true);
         }
         return false;
     }
@@ -741,7 +741,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
     }
 
     @Override
-    public int compareTo(GT_Recipe recipe) {
+    public int compareTo(GTRecipe recipe) {
         // first lowest tier recipes
         // then fastest
         // then with lowest special value
@@ -809,7 +809,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
     }
 
     /**
-     * Exists only for recipe copying from external. For ordinal use case, use {@link GT_RecipeBuilder#recipeCategory}.
+     * Exists only for recipe copying from external. For ordinal use case, use {@link GTRecipeBuilder#recipeCategory}.
      */
     public void setRecipeCategory(RecipeCategory recipeCategory) {
         this.recipeCategory = recipeCategory;
@@ -822,18 +822,18 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         "gregtech.api.recipe.RecipeMap",
         "gregtech.api.recipe.RecipeMapBackend",
         "gregtech.api.recipe.RecipeMapBackendPropertiesBuilder",
-        "gregtech.api.util.GT_Recipe",
-        "gregtech.api.util.GT_RecipeBuilder",
-        "gregtech.api.util.GT_RecipeConstants",
-        "gregtech.api.util.GT_RecipeMapUtil",
-        "gregtech.common.GT_RecipeAdder");
+        "gregtech.api.util.GTRecipe",
+        "gregtech.api.util.GTRecipeBuilder",
+        "gregtech.api.util.GTRecipeConstants",
+        "gregtech.api.util.GTRecipeMapUtil",
+        "gregtech.common.GTRecipeAdder");
 
     public void reloadOwner() {
         setOwner(
             Loader.instance()
                 .activeModContainer());
 
-        if (GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace) {
+        if (GTMod.gregtechproxy.mNEIRecipeOwnerStackTrace) {
             List<String> toAdd = new ArrayList<>();
             for (StackTraceElement stackTrace : Thread.currentThread()
                 .getStackTrace()) {
@@ -881,54 +881,54 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         }
     }
 
-    public GT_Recipe setInputs(ItemStack... aInputs) {
+    public GTRecipe setInputs(ItemStack... aInputs) {
         // TODO determine if we need this without trailing nulls call
         this.mInputs = ArrayExt.withoutTrailingNulls(aInputs, ItemStack[]::new);
         return this;
     }
 
-    public GT_Recipe setOutputs(ItemStack... aOutputs) {
+    public GTRecipe setOutputs(ItemStack... aOutputs) {
         this.mOutputs = ArrayExt.withoutTrailingNulls(aOutputs, ItemStack[]::new);
         return this;
     }
 
-    public GT_Recipe setFluidInputs(FluidStack... aInputs) {
+    public GTRecipe setFluidInputs(FluidStack... aInputs) {
         this.mFluidInputs = ArrayExt.withoutTrailingNulls(aInputs, FluidStack[]::new);
         return this;
     }
 
-    public GT_Recipe setFluidOutputs(FluidStack... aOutputs) {
+    public GTRecipe setFluidOutputs(FluidStack... aOutputs) {
         this.mFluidOutputs = ArrayExt.withoutTrailingNulls(aOutputs, FluidStack[]::new);
         return this;
     }
 
-    public GT_Recipe setDuration(int aDuration) {
+    public GTRecipe setDuration(int aDuration) {
         this.mDuration = aDuration;
         return this;
     }
 
-    public GT_Recipe setEUt(int aEUt) {
+    public GTRecipe setEUt(int aEUt) {
         this.mEUt = aEUt;
         return this;
     }
 
-    public static class GT_Recipe_AssemblyLine {
+    public static class RecipeAssemblyLine {
 
-        public static final ArrayList<GT_Recipe_AssemblyLine> sAssemblylineRecipes = new ArrayList<>();
+        public static final ArrayList<RecipeAssemblyLine> sAssemblylineRecipes = new ArrayList<>();
 
         static {
             if (!Boolean.getBoolean("com.gtnh.gt5u.ignore-invalid-assline-recipe"))
-                GregTech_API.sFirstWorldTick.add(GT_Recipe_AssemblyLine::checkInvalidRecipes);
-            else GT_Log.out.println("NOT CHECKING INVALID ASSLINE RECIPE.");
+                GregTechAPI.sFirstWorldTick.add(RecipeAssemblyLine::checkInvalidRecipes);
+            else GTLog.out.println("NOT CHECKING INVALID ASSLINE RECIPE.");
         }
 
         private static void checkInvalidRecipes() {
             int invalidCount = 0;
-            GT_Log.out.println("Started assline validation");
-            for (GT_Recipe_AssemblyLine recipe : sAssemblylineRecipes) {
+            GTLog.out.println("Started assline validation");
+            for (RecipeAssemblyLine recipe : sAssemblylineRecipes) {
                 if (recipe.getPersistentHash() == 0) {
                     invalidCount++;
-                    GT_Log.err.printf("Invalid recipe: %s%n", recipe);
+                    GTLog.err.printf("Invalid recipe: %s%n", recipe);
                 }
             }
             if (invalidCount > 0) throw new RuntimeException(
@@ -950,7 +950,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
          * <p>
          * if you set one yourself, it will give you one of the RunetimeExceptions!
          */
-        public GT_Recipe_AssemblyLine(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs,
+        public RecipeAssemblyLine(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs,
             FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt) {
             this(
                 aResearchItem,
@@ -963,11 +963,11 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
                 new ItemStack[aInputs.length][]);
             int tPersistentHash = 1;
             for (ItemStack tInput : aInputs)
-                tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(tInput, true, false);
-            tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(aResearchItem, true, false);
-            tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(aOutput, true, false);
+                tPersistentHash = tPersistentHash * 31 + GTUtility.persistentHash(tInput, true, false);
+            tPersistentHash = tPersistentHash * 31 + GTUtility.persistentHash(aResearchItem, true, false);
+            tPersistentHash = tPersistentHash * 31 + GTUtility.persistentHash(aOutput, true, false);
             for (FluidStack tFluidInput : aFluidInputs)
-                tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(tFluidInput, true, false);
+                tPersistentHash = tPersistentHash * 31 + GTUtility.persistentHash(tFluidInput, true, false);
             tPersistentHash = tPersistentHash * 31 + aResearchTime;
             tPersistentHash = tPersistentHash * 31 + aDuration;
             tPersistentHash = tPersistentHash * 31 + aEUt;
@@ -979,7 +979,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
          * <p>
          * if you don't set one yourself, it will break a lot of stuff!
          */
-        public GT_Recipe_AssemblyLine(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs,
+        public RecipeAssemblyLine(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs,
             FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt, ItemStack[][] aAlt) {
             mResearchItem = aResearchItem;
             mResearchTime = aResearchTime;
@@ -995,16 +995,16 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         public int hashCode() {
             final int prime = 31;
             int result = 1;
-            GT_ItemStack[] thisInputs = new GT_ItemStack[this.mInputs.length];
+            GTItemStack[] thisInputs = new GTItemStack[this.mInputs.length];
             int totalInputStackSize = 0;
             for (int i = 0; i < this.mInputs.length; i++) {
-                thisInputs[i] = new GT_ItemStack(this.mInputs[i]);
+                thisInputs[i] = new GTItemStack(this.mInputs[i]);
                 totalInputStackSize += thisInputs[i].mStackSize;
             }
             int inputHash = Arrays.deepHashCode(thisInputs);
             int inputFluidHash = Arrays.deepHashCode(this.mFluidInputs);
-            GT_ItemStack thisOutput = new GT_ItemStack(mOutput);
-            GT_ItemStack thisResearch = new GT_ItemStack(mResearchItem);
+            GTItemStack thisOutput = new GTItemStack(mOutput);
+            GTItemStack thisResearch = new GTItemStack(mResearchItem);
             int miscRecipeDataHash = Arrays.deepHashCode(
                 new Object[] { totalInputStackSize, mDuration, mEUt, thisOutput, thisResearch, mResearchTime });
             result = prime * result + inputFluidHash;
@@ -1018,7 +1018,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
             if (this == obj) {
                 return true;
             }
-            if (!(obj instanceof GT_Recipe_AssemblyLine other)) {
+            if (!(obj instanceof RecipeAssemblyLine other)) {
                 return false;
             }
             if (this.mInputs.length != other.mInputs.length) {
@@ -1028,23 +1028,23 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
                 return false;
             }
             // Check Outputs Match
-            GT_ItemStack output1 = new GT_ItemStack(this.mOutput);
-            GT_ItemStack output2 = new GT_ItemStack(other.mOutput);
+            GTItemStack output1 = new GTItemStack(this.mOutput);
+            GTItemStack output2 = new GTItemStack(other.mOutput);
             if (!output1.equals(output2)) {
                 return false;
             }
             // Check Scanned Item Match
-            GT_ItemStack scan1 = new GT_ItemStack(this.mResearchItem);
-            GT_ItemStack scan2 = new GT_ItemStack(other.mResearchItem);
+            GTItemStack scan1 = new GTItemStack(this.mResearchItem);
+            GTItemStack scan2 = new GTItemStack(other.mResearchItem);
             if (!scan1.equals(scan2)) {
                 return false;
             }
             // Check Items Match
-            GT_ItemStack[] thisInputs = new GT_ItemStack[this.mInputs.length];
-            GT_ItemStack[] otherInputs = new GT_ItemStack[other.mInputs.length];
+            GTItemStack[] thisInputs = new GTItemStack[this.mInputs.length];
+            GTItemStack[] otherInputs = new GTItemStack[other.mInputs.length];
             for (int i = 0; i < thisInputs.length; i++) {
-                thisInputs[i] = new GT_ItemStack(this.mInputs[i]);
-                otherInputs[i] = new GT_ItemStack(other.mInputs[i]);
+                thisInputs[i] = new GTItemStack(this.mInputs[i]);
+                otherInputs[i] = new GTItemStack(other.mInputs[i]);
             }
             for (int i = 0; i < thisInputs.length; i++) {
                 if (!thisInputs[i].equals(otherInputs[i]) || thisInputs[i].mStackSize != otherInputs[i].mStackSize) {
@@ -1064,13 +1064,13 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
 
         public int getPersistentHash() {
             if (mPersistentHash == 0)
-                GT_Log.err.println("Assline recipe persistent hash has not been set! Recipe: " + mOutput);
+                GTLog.err.println("Assline recipe persistent hash has not been set! Recipe: " + mOutput);
             return mPersistentHash;
         }
 
         @Override
         public String toString() {
-            return "GT_Recipe_AssemblyLine{" + "mResearchItem="
+            return "GTRecipe_AssemblyLine{" + "mResearchItem="
                 + mResearchItem
                 + ", mResearchTime="
                 + mResearchTime
@@ -1106,16 +1106,16 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
          * @return An array containing the amount of item to consume from the first slot of every input bus.
          *         {@code null} if at least one item fails to match the recipe ingredient.
          */
-        public static int[] getItemConsumptionAmountArray(ArrayList<GT_MetaTileEntity_Hatch_InputBus> inputBusses,
-            GT_Recipe_AssemblyLine recipe) {
+        public static int[] getItemConsumptionAmountArray(ArrayList<MTEHatchInputBus> inputBusses,
+            RecipeAssemblyLine recipe) {
             int itemCount = recipe.mInputs.length;
             if (itemCount == 0) return null;
             int[] tStacks = new int[itemCount];
             for (int i = 0; i < itemCount; i++) {
-                GT_MetaTileEntity_Hatch_InputBus inputBus = inputBusses.get(i);
+                MTEHatchInputBus inputBus = inputBusses.get(i);
                 if (!inputBus.isValid()) return null;
                 ItemStack slotStack;
-                if (inputBus instanceof GT_MetaTileEntity_Hatch_InputBus_ME meBus) {
+                if (inputBus instanceof MTEHatchInputBusME meBus) {
                     slotStack = meBus.getShadowItemStack(0);
                 } else {
                     slotStack = inputBus.getStackInSlot(0);
@@ -1132,13 +1132,13 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
 
         public static int getMatchedIngredientAmount(ItemStack aSlotStack, ItemStack aIngredient, ItemStack[] alts) {
             if (alts == null || alts.length == 0) {
-                if (GT_Utility.areStacksEqual(aSlotStack, aIngredient, true)) {
+                if (GTUtility.areStacksEqual(aSlotStack, aIngredient, true)) {
                     return aIngredient.stackSize;
                 }
                 return -1;
             }
             for (ItemStack tAltStack : alts) {
-                if (GT_Utility.areStacksEqual(aSlotStack, tAltStack, true)) {
+                if (GTUtility.areStacksEqual(aSlotStack, tAltStack, true)) {
                     return tAltStack.stackSize;
                 }
             }
@@ -1147,30 +1147,30 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
 
         /**
          * @param inputBusses      Input bus list to check. Usually the input bus list of multi.
-         * @param itemConsumptions Should be generated by {@link GT_Recipe_AssemblyLine#getItemConsumptionAmountArray}.
+         * @param itemConsumptions Should be generated by {@link RecipeAssemblyLine#getItemConsumptionAmountArray}.
          * @Return The number of parallel recipes, or 0 if recipe is not satisfied at all. 0 < number < 1 means that
          *         inputs are found but not enough.
          */
-        public static double maxParallelCalculatedByInputItems(ArrayList<GT_MetaTileEntity_Hatch_InputBus> inputBusses,
-            int maxParallel, int[] itemConsumptions, Map<GT_Utility.ItemId, ItemStack> inputsFromME) {
+        public static double maxParallelCalculatedByInputItems(ArrayList<MTEHatchInputBus> inputBusses, int maxParallel,
+            int[] itemConsumptions, Map<GTUtility.ItemId, ItemStack> inputsFromME) {
             // Recipe item matching is done in the generation of itemConsumptions.
 
-            Map<GT_Utility.ItemId, Long> itemConsumptionsFromME = new Object2LongOpenHashMap<>();
+            Map<GTUtility.ItemId, Long> itemConsumptionsFromME = new Object2LongOpenHashMap<>();
             double currentParallel = maxParallel;
 
             // Calculate the amount of each item to consume from ME
             for (int i = 0; i < itemConsumptions.length; i++) {
-                GT_MetaTileEntity_Hatch_InputBus inputBus = inputBusses.get(i);
+                MTEHatchInputBus inputBus = inputBusses.get(i);
                 if (!inputBus.isValid()) return 0;
-                if (inputBus instanceof GT_MetaTileEntity_Hatch_InputBus_ME meBus) {
+                if (inputBus instanceof MTEHatchInputBusME meBus) {
                     ItemStack item = meBus.getShadowItemStack(0);
                     if (item == null) return 0;
-                    GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(item);
+                    GTUtility.ItemId id = GTUtility.ItemId.createNoCopy(item);
                     itemConsumptionsFromME.merge(id, (long) itemConsumptions[i], Long::sum);
                 }
             }
             // Calculate parallel from ME input busses
-            for (Entry<GT_Utility.ItemId, Long> entry : itemConsumptionsFromME.entrySet()) {
+            for (Entry<GTUtility.ItemId, Long> entry : itemConsumptionsFromME.entrySet()) {
                 if (!inputsFromME.containsKey(entry.getKey())) return 0;
                 long consume = entry.getValue();
                 // For non-consumed inputs
@@ -1182,9 +1182,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
 
             // Calculate parallel from regular input busses
             for (int i = 0; i < itemConsumptions.length; i++) {
-                GT_MetaTileEntity_Hatch_InputBus inputBus = inputBusses.get(i);
+                MTEHatchInputBus inputBus = inputBusses.get(i);
                 if (!inputBus.isValid()) return 0;
-                if (inputBus instanceof GT_MetaTileEntity_Hatch_InputBus_ME) continue;
+                if (inputBus instanceof MTEHatchInputBusME) continue;
 
                 ItemStack item = inputBus.getStackInSlot(0);
                 if (item == null) return 0;
@@ -1202,19 +1202,19 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
          * @return The number of parallel recipes, or 0 if recipe is not satisfied at all. 0 < number < 1 means that
          *         fluids are found but not enough.
          */
-        public static double maxParallelCalculatedByInputFluids(ArrayList<GT_MetaTileEntity_Hatch_Input> inputHatches,
-            int maxParallel, FluidStack[] fluidConsumptions, Map<Fluid, FluidStack> fluidsFromME) {
+        public static double maxParallelCalculatedByInputFluids(ArrayList<MTEHatchInput> inputHatches, int maxParallel,
+            FluidStack[] fluidConsumptions, Map<Fluid, FluidStack> fluidsFromME) {
             Map<Fluid, Long> fluidConsumptionsFromME = new Reference2LongOpenHashMap<>();
             double currentParallel = maxParallel;
 
             // Calculate the amount of each fluid to consume from ME
             for (int i = 0; i < fluidConsumptions.length; i++) {
-                GT_MetaTileEntity_Hatch_Input inputHatch = inputHatches.get(i);
+                MTEHatchInput inputHatch = inputHatches.get(i);
                 if (!inputHatch.isValid()) return 0;
-                if (inputHatch instanceof GT_MetaTileEntity_Hatch_Input_ME meHatch) {
+                if (inputHatch instanceof MTEHatchInputME meHatch) {
                     FluidStack fluid = meHatch.getShadowFluidStack(0);
                     if (fluid == null) return 0;
-                    if (!GT_Utility.areFluidsEqual(fluid, fluidConsumptions[i])) return 0;
+                    if (!GTUtility.areFluidsEqual(fluid, fluidConsumptions[i])) return 0;
                     fluidConsumptionsFromME.merge(fluid.getFluid(), (long) fluidConsumptions[i].amount, Long::sum);
                 }
             }
@@ -1229,18 +1229,18 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
 
             // Calculate parallel from regular input hatches
             for (int i = 0; i < fluidConsumptions.length; i++) {
-                GT_MetaTileEntity_Hatch_Input inputHatch = inputHatches.get(i);
+                MTEHatchInput inputHatch = inputHatches.get(i);
                 if (!inputHatch.isValid()) return 0;
-                if (inputHatch instanceof GT_MetaTileEntity_Hatch_Input_ME) continue;
+                if (inputHatch instanceof MTEHatchInputME) continue;
 
                 FluidStack fluid;
-                if (inputHatch instanceof GT_MetaTileEntity_Hatch_MultiInput multiInput) {
+                if (inputHatch instanceof MTEHatchMultiInput multiInput) {
                     fluid = multiInput.getFluid(0);
                 } else {
                     fluid = inputHatch.getFillableStack();
                 }
                 if (fluid == null) return 0;
-                if (!GT_Utility.areFluidsEqual(fluid, fluidConsumptions[i])) return 0;
+                if (!GTUtility.areFluidsEqual(fluid, fluidConsumptions[i])) return 0;
                 currentParallel = Math.min(currentParallel, (double) fluid.amount / fluidConsumptions[i].amount);
                 if (currentParallel <= 0) return 0;
             }
@@ -1249,19 +1249,19 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
 
         /**
          * WARNING: Ensure that item inputs are enough to be consumed with
-         * {@link GT_Recipe_AssemblyLine#maxParallelCalculatedByInputItems} before calling this method!
+         * {@link RecipeAssemblyLine#maxParallelCalculatedByInputItems} before calling this method!
          *
          * @param inputBusses      Input bus list to check. Usually the input bus list of multi.
-         * @param itemConsumptions Should be generated by {@link GT_Recipe_AssemblyLine#getItemConsumptionAmountArray}.
+         * @param itemConsumptions Should be generated by {@link RecipeAssemblyLine#getItemConsumptionAmountArray}.
          */
-        public static void consumeInputItems(ArrayList<GT_MetaTileEntity_Hatch_InputBus> inputBusses,
-            int amountMultiplier, int[] itemConsumptions, Map<GT_Utility.ItemId, ItemStack> inputsFromME) {
+        public static void consumeInputItems(ArrayList<MTEHatchInputBus> inputBusses, int amountMultiplier,
+            int[] itemConsumptions, Map<GTUtility.ItemId, ItemStack> inputsFromME) {
             for (int i = 0; i < itemConsumptions.length; i++) {
-                GT_MetaTileEntity_Hatch_InputBus inputBus = inputBusses.get(i);
+                MTEHatchInputBus inputBus = inputBusses.get(i);
                 if (!inputBus.isValid()) continue;
                 ItemStack item;
-                if (inputBus instanceof GT_MetaTileEntity_Hatch_InputBus_ME meBus) {
-                    item = inputsFromME.get(GT_Utility.ItemId.createNoCopy(meBus.getShadowItemStack(0)));
+                if (inputBus instanceof MTEHatchInputBusME meBus) {
+                    item = inputsFromME.get(GTUtility.ItemId.createNoCopy(meBus.getShadowItemStack(0)));
                 } else {
                     item = inputBus.getStackInSlot(0);
                 }
@@ -1271,22 +1271,22 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
 
         /**
          * WARNING: Ensure that fluid inputs are enough to be consumed with
-         * {@link GT_Recipe_AssemblyLine#maxParallelCalculatedByInputFluids} before calling this method!
+         * {@link RecipeAssemblyLine#maxParallelCalculatedByInputFluids} before calling this method!
          *
          * @param inputHatches      Input hatch list to check. Usually the input hatch list of multi.
          * @param fluidConsumptions Fluid inputs of the recipe.
          */
-        public static void consumeInputFluids(ArrayList<GT_MetaTileEntity_Hatch_Input> inputHatches,
-            int amountMultiplier, FluidStack[] fluidConsumptions, Map<Fluid, FluidStack> fluidsFromME) {
+        public static void consumeInputFluids(ArrayList<MTEHatchInput> inputHatches, int amountMultiplier,
+            FluidStack[] fluidConsumptions, Map<Fluid, FluidStack> fluidsFromME) {
             for (int i = 0; i < fluidConsumptions.length; i++) {
-                GT_MetaTileEntity_Hatch_Input inputHatch = inputHatches.get(i);
+                MTEHatchInput inputHatch = inputHatches.get(i);
                 if (!inputHatch.isValid()) continue;
                 FluidStack fluid;
-                if (inputHatch instanceof GT_MetaTileEntity_Hatch_Input_ME meHatch) {
+                if (inputHatch instanceof MTEHatchInputME meHatch) {
                     fluid = fluidsFromME.get(
                         meHatch.getShadowFluidStack(0)
                             .getFluid());
-                } else if (inputHatch instanceof GT_MetaTileEntity_Hatch_MultiInput multiInput) {
+                } else if (inputHatch instanceof MTEHatchMultiInput multiInput) {
                     fluid = multiInput.getFluid(0);
                 } else {
                     fluid = inputHatch.getFillableStack();
@@ -1296,14 +1296,14 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         }
     }
 
-    public static class GT_Recipe_WithAlt extends GT_Recipe {
+    public static class GTRecipe_WithAlt extends GTRecipe {
 
         public ItemStack[][] mOreDictAlt;
 
         /**
-         * Only for {@link GT_RecipeBuilder}.
+         * Only for {@link GTRecipeBuilder}.
          */
-        GT_Recipe_WithAlt(ItemStack[] mInputs, ItemStack[] mOutputs, FluidStack[] mFluidInputs,
+        GTRecipe_WithAlt(ItemStack[] mInputs, ItemStack[] mOutputs, FluidStack[] mFluidInputs,
             FluidStack[] mFluidOutputs, int[] mChances, Object mSpecialItems, int mDuration, int mEUt,
             int mSpecialValue, boolean mEnabled, boolean mHidden, boolean mFakeRecipe, boolean mCanBeBuffered,
             boolean mNeedsEmptyOutput, boolean nbtSensitive, String[] neiDesc,
@@ -1331,7 +1331,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
             this.mOreDictAlt = mOreDictAlt;
         }
 
-        public GT_Recipe_WithAlt(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
+        public GTRecipe_WithAlt(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
             int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt,
             int aSpecialValue, ItemStack[][] aAlt) {
             super(
@@ -1354,13 +1354,13 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
                 if (mOreDictAlt[aIndex] != null && mOreDictAlt[aIndex].length > 0) {
                     ItemStack[] rStacks = new ItemStack[mOreDictAlt[aIndex].length];
                     for (int i = 0; i < mOreDictAlt[aIndex].length; i++) {
-                        rStacks[i] = GT_Utility.copyOrNull(mOreDictAlt[aIndex][i]);
+                        rStacks[i] = GTUtility.copyOrNull(mOreDictAlt[aIndex][i]);
                     }
                     return rStacks;
                 }
             }
             if (aIndex >= mInputs.length) return null;
-            return GT_Utility.copyOrNull(mInputs[aIndex]);
+            return GTUtility.copyOrNull(mInputs[aIndex]);
         }
     }
 }
diff --git a/src/main/java/gregtech/api/util/GT_RecipeBuilder.java b/src/main/java/gregtech/api/util/GTRecipeBuilder.java
index 137b7d6c86..6f8acfb2dc 100644
--- a/src/main/java/gregtech/api/util/GT_RecipeBuilder.java
+++ b/src/main/java/gregtech/api/util/GTRecipeBuilder.java
@@ -1,8 +1,8 @@
 package gregtech.api.util;
 
-import static gregtech.api.util.GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES;
-import static gregtech.api.util.GT_Utility.copyFluidArray;
-import static gregtech.api.util.GT_Utility.copyItemArray;
+import static gregtech.api.util.GTRecipeMapUtil.SPECIAL_VALUE_ALIASES;
+import static gregtech.api.util.GTUtility.copyFluidArray;
+import static gregtech.api.util.GTUtility.copyItemArray;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,8 +22,8 @@ import net.minecraftforge.fluids.FluidStack;
 
 import org.jetbrains.annotations.Contract;
 
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Mods;
 import gregtech.api.interfaces.IRecipeMap;
 import gregtech.api.recipe.RecipeCategory;
@@ -33,7 +33,7 @@ import gregtech.api.recipe.metadata.RecipeMetadataStorage;
 import gregtech.api.util.extensions.ArrayExt;
 
 @SuppressWarnings({ "unused", "UnusedReturnValue" })
-public class GT_RecipeBuilder {
+public class GTRecipeBuilder {
 
     // debug mode expose problems. panic mode help you check nothing is wrong-ish without you actively monitoring
     private static final boolean DEBUG_MODE_NULL;
@@ -117,9 +117,9 @@ public class GT_RecipeBuilder {
     protected boolean skip = false;
     protected boolean valid = true;
 
-    GT_RecipeBuilder() {}
+    GTRecipeBuilder() {}
 
-    private GT_RecipeBuilder(ItemStack[] inputsBasic, Object[] inputsOreDict, ItemStack[] outputs, ItemStack[][] alts,
+    private GTRecipeBuilder(ItemStack[] inputsBasic, Object[] inputsOreDict, ItemStack[] outputs, ItemStack[][] alts,
         FluidStack[] fluidInputs, FluidStack[] fluidOutputs, int[] chances, Object special, int duration, int eut,
         int specialValue, boolean enabled, boolean hidden, boolean fakeRecipe, boolean mCanBeBuffered,
         boolean mNeedsEmptyOutput, boolean nbtSensitive, String[] neiDesc, RecipeCategory recipeCategory,
@@ -164,18 +164,18 @@ public class GT_RecipeBuilder {
     }
 
     private static ItemStack[] fix(ItemStack[] inputs) {
-        return GT_OreDictUnificator.setStackArray(true, ArrayExt.withoutTrailingNulls(inputs, ItemStack[]::new));
+        return GTOreDictUnificator.setStackArray(true, ArrayExt.withoutTrailingNulls(inputs, ItemStack[]::new));
     }
 
-    public static GT_RecipeBuilder builder() {
-        return new GT_RecipeBuilder();
+    public static GTRecipeBuilder builder() {
+        return new GTRecipeBuilder();
     }
 
     /**
      * Creates empty builder where only duration and EU/t are set to 0.
      */
-    public static GT_RecipeBuilder empty() {
-        return new GT_RecipeBuilder().duration(0)
+    public static GTRecipeBuilder empty() {
+        return new GTRecipeBuilder().duration(0)
             .eut(0);
     }
 
@@ -186,9 +186,9 @@ public class GT_RecipeBuilder {
 
     private static void handleNullRecipeComponents(String componentType) {
         // place a breakpoint here to catch all these issues
-        GT_Log.err.print("null detected in ");
-        GT_Log.err.println(componentType);
-        new NullPointerException().printStackTrace(GT_Log.err);
+        GTLog.err.print("null detected in ");
+        GTLog.err.println(componentType);
+        new NullPointerException().printStackTrace(GTLog.err);
         if (PANIC_MODE_NULL) {
             throw new IllegalArgumentException("null in argument");
         }
@@ -203,8 +203,8 @@ public class GT_RecipeBuilder {
             return;
         }
         // place a breakpoint here to catch all these issues
-        GT_Log.err.print("invalid recipe");
-        new IllegalArgumentException().printStackTrace(GT_Log.err);
+        GTLog.err.print("invalid recipe");
+        new IllegalArgumentException().printStackTrace(GTLog.err);
         if (PANIC_MODE_INVALID) {
             throw new IllegalArgumentException("invalid recipe");
         }
@@ -214,18 +214,18 @@ public class GT_RecipeBuilder {
         if (!DEBUG_MODE_COLLISION && !PANIC_MODE_COLLISION) {
             return;
         }
-        GT_Log.err.print("Recipe collision resulting in recipe loss detected with ");
-        GT_Log.err.println(details);
+        GTLog.err.print("Recipe collision resulting in recipe loss detected with ");
+        GTLog.err.println(details);
         if (PANIC_MODE_COLLISION) {
             throw new IllegalArgumentException("Recipe Collision");
         } else {
             // place a breakpoint here to catch all these issues
-            new IllegalArgumentException().printStackTrace(GT_Log.err);
+            new IllegalArgumentException().printStackTrace(GTLog.err);
         }
     }
 
     public static void onConfigLoad() {
-        PANIC_MODE_NULL |= GT_Mod.gregtechproxy.crashOnNullRecipeInput;
+        PANIC_MODE_NULL |= GTMod.gregtechproxy.crashOnNullRecipeInput;
     }
 
     // endregion
@@ -235,7 +235,7 @@ public class GT_RecipeBuilder {
     /**
      * Non-OreDicted item inputs. Assumes input is unified.
      */
-    public GT_RecipeBuilder itemInputsUnified(ItemStack... inputs) {
+    public GTRecipeBuilder itemInputsUnified(ItemStack... inputs) {
         if (skip) return this;
         if (debugNull() && containsNull(inputs)) handleNullRecipeComponents("itemInputUnified");
         inputsBasic = ArrayExt.withoutTrailingNulls(inputs, ItemStack[]::new);
@@ -247,7 +247,7 @@ public class GT_RecipeBuilder {
     /**
      * Non-OreDicted item inputs. Assumes input is not unified.
      */
-    public GT_RecipeBuilder itemInputs(ItemStack... inputs) {
+    public GTRecipeBuilder itemInputs(ItemStack... inputs) {
         if (skip) return this;
         if (debugNull() && containsNull(inputs)) handleNullRecipeComponents("itemInputs");
         inputsBasic = fix(inputs);
@@ -259,7 +259,7 @@ public class GT_RecipeBuilder {
     /**
      * OreDicted item inputs. Currently only used for assline recipes adder.
      */
-    public GT_RecipeBuilder itemInputs(Object... inputs) {
+    public GTRecipeBuilder itemInputs(Object... inputs) {
         if (skip) return this;
         inputsOreDict = inputs;
         alts = new ItemStack[inputs.length][];
@@ -271,12 +271,12 @@ public class GT_RecipeBuilder {
                 alts[i] = ((ItemStack[]) input).clone();
             } else if (input instanceof Object[]arr) {
                 if (arr.length != 2) continue;
-                List<ItemStack> ores = GT_OreDictUnificator.getOres(arr[0]);
+                List<ItemStack> ores = GTOreDictUnificator.getOres(arr[0]);
                 if (ores.isEmpty()) continue;
                 int size = ((Number) arr[1]).intValue();
                 alts[i] = ores.stream()
-                    .map(s -> GT_Utility.copyAmount(size, s))
-                    .filter(GT_Utility::isStackValid)
+                    .map(s -> GTUtility.copyAmount(size, s))
+                    .filter(GTUtility::isStackValid)
                     .toArray(ItemStack[]::new);
             } else if (input == null) {
                 handleNullRecipeComponents("recipe oredict input");
@@ -292,7 +292,7 @@ public class GT_RecipeBuilder {
         return noOptimize();
     }
 
-    public GT_RecipeBuilder itemOutputs(ItemStack... outputs) {
+    public GTRecipeBuilder itemOutputs(ItemStack... outputs) {
         if (skip) return this;
         if (debugNull() && containsNull(outputs)) handleNullRecipeComponents("itemOutputs");
         this.outputs = outputs;
@@ -306,7 +306,7 @@ public class GT_RecipeBuilder {
      * Not intended to be used by recipe authors.
      * Intended for recipe rewrite middlewares.
      */
-    public GT_RecipeBuilder itemOutputs(ItemStack[] outputs, int[] chances) {
+    public GTRecipeBuilder itemOutputs(ItemStack[] outputs, int[] chances) {
         if (skip) return this;
         if (debugNull() && containsNull(outputs)) handleNullRecipeComponents("itemOutputs");
         this.outputs = outputs;
@@ -317,21 +317,21 @@ public class GT_RecipeBuilder {
         return this;
     }
 
-    public GT_RecipeBuilder fluidInputs(FluidStack... fluidInputs) {
+    public GTRecipeBuilder fluidInputs(FluidStack... fluidInputs) {
         if (skip) return this;
         if (debugNull() && containsNull(fluidInputs)) handleNullRecipeComponents("fluidInputs");
         this.fluidInputs = fix(fluidInputs);
         return this;
     }
 
-    public GT_RecipeBuilder fluidOutputs(FluidStack... fluidOutputs) {
+    public GTRecipeBuilder fluidOutputs(FluidStack... fluidOutputs) {
         if (skip) return this;
         if (debugNull() && containsNull(fluidOutputs)) handleNullRecipeComponents("fluidOutputs");
         this.fluidOutputs = fix(fluidOutputs);
         return this;
     }
 
-    public GT_RecipeBuilder outputChances(int... chances) {
+    public GTRecipeBuilder outputChances(int... chances) {
         if (skip) return this;
         if (outputs != null && chances.length != outputs.length) {
             throw new IllegalArgumentException("Output chances array and items array length differs");
@@ -340,29 +340,29 @@ public class GT_RecipeBuilder {
         return this;
     }
 
-    public GT_RecipeBuilder special(Object special) {
+    public GTRecipeBuilder special(Object special) {
         this.special = special;
         return this;
     }
 
-    public GT_RecipeBuilder duration(int duration) {
+    public GTRecipeBuilder duration(int duration) {
         this.duration = duration;
         return this;
     }
 
-    public GT_RecipeBuilder duration(long duration) {
+    public GTRecipeBuilder duration(long duration) {
         this.duration = (int) duration;
         return this;
     }
 
-    public GT_RecipeBuilder eut(int eut) {
+    public GTRecipeBuilder eut(int eut) {
         if (DEBUG_MODE_FULL_ENERGY) {
             // Ignores ULV voltage
-            for (int i = 1; i < GT_Values.VP.length; i++) {
-                if (eut <= GT_Values.V[i] && eut > GT_Values.VP[i]) {
-                    GT_Log.err.println(
-                        "EUt > Practical Voltage detected. EUt: " + eut + ", Practical Voltage: " + GT_Values.VP[i]);
-                    new IllegalArgumentException().printStackTrace(GT_Log.err);
+            for (int i = 1; i < GTValues.VP.length; i++) {
+                if (eut <= GTValues.V[i] && eut > GTValues.VP[i]) {
+                    GTLog.err.println(
+                        "EUt > Practical Voltage detected. EUt: " + eut + ", Practical Voltage: " + GTValues.VP[i]);
+                    new IllegalArgumentException().printStackTrace(GTLog.err);
                     break;
                 }
             }
@@ -371,7 +371,7 @@ public class GT_RecipeBuilder {
         return this;
     }
 
-    public GT_RecipeBuilder eut(long eut) {
+    public GTRecipeBuilder eut(long eut) {
         return eut((int) eut);
     }
 
@@ -379,48 +379,48 @@ public class GT_RecipeBuilder {
      * prefer to use metadata over this. should only use when the target recipe map does not yet support metadata
      * system, or it's to bridge legacy code and modern code.
      */
-    public GT_RecipeBuilder specialValue(int specialValue) {
+    public GTRecipeBuilder specialValue(int specialValue) {
         this.specialValue = specialValue;
         return this;
     }
 
     // I don't expect anyone to actually call this...
-    public GT_RecipeBuilder disabled() {
+    public GTRecipeBuilder disabled() {
         this.enabled = false;
         return this;
     }
 
-    public GT_RecipeBuilder hidden() {
+    public GTRecipeBuilder hidden() {
         this.hidden = true;
         return this;
     }
 
-    public GT_RecipeBuilder fake() {
+    public GTRecipeBuilder fake() {
         this.fakeRecipe = true;
         return this;
     }
 
-    public GT_RecipeBuilder noBuffer() {
+    public GTRecipeBuilder noBuffer() {
         this.mCanBeBuffered = false;
         return this;
     }
 
-    public GT_RecipeBuilder needsEmptyOutput() {
+    public GTRecipeBuilder needsEmptyOutput() {
         this.mNeedsEmptyOutput = true;
         return this;
     }
 
-    public GT_RecipeBuilder nbtSensitive() {
+    public GTRecipeBuilder nbtSensitive() {
         this.nbtSensitive = true;
         return this;
     }
 
-    public GT_RecipeBuilder setNEIDesc(String... neiDesc) {
+    public GTRecipeBuilder setNEIDesc(String... neiDesc) {
         this.neiDesc = neiDesc;
         return this;
     }
 
-    public GT_RecipeBuilder recipeCategory(RecipeCategory recipeCategory) {
+    public GTRecipeBuilder recipeCategory(RecipeCategory recipeCategory) {
         this.recipeCategory = recipeCategory;
         return this;
     }
@@ -428,7 +428,7 @@ public class GT_RecipeBuilder {
     /**
      * Prevent the resulting recipe from optimizing recipe, which is a process that reduce recipe batch size.
      */
-    public GT_RecipeBuilder noOptimize() {
+    public GTRecipeBuilder noOptimize() {
         this.optimize = false;
         return this;
     }
@@ -436,7 +436,7 @@ public class GT_RecipeBuilder {
     /**
      * Prevents checking collision with existing recipes when adding the built recipe.
      */
-    public GT_RecipeBuilder ignoreCollision() {
+    public GTRecipeBuilder ignoreCollision() {
         this.checkForCollision = false;
         return this;
     }
@@ -445,9 +445,9 @@ public class GT_RecipeBuilder {
      * Sets metadata of the recipe. It can be used for recipe emitter to do special things, or for being stored in the
      * built recipe and used for actual recipe processing.
      * <p>
-     * {@link GT_RecipeConstants} has a series of metadata keys. Or you can create one by yourself.
+     * {@link GTRecipeConstants} has a series of metadata keys. Or you can create one by yourself.
      */
-    public <T> GT_RecipeBuilder metadata(RecipeMetadataKey<T> key, T value) {
+    public <T> GTRecipeBuilder metadata(RecipeMetadataKey<T> key, T value) {
         if (skip) return this;
         if (metadataStorage == null) {
             metadataStorage = new RecipeMetadataStorage();
@@ -487,18 +487,18 @@ public class GT_RecipeBuilder {
      *
      * @param mods Mod(s) required for the recipe.
      */
-    public GT_RecipeBuilder requireMods(Mods... mods) {
+    public GTRecipeBuilder requireMods(Mods... mods) {
         skip = Stream.of(mods)
             .anyMatch(mod -> !mod.isModLoaded());
         return this;
     }
 
-    public GT_RecipeBuilder requiresCleanRoom() {
-        return metadata(GT_RecipeConstants.CLEANROOM, true);
+    public GTRecipeBuilder requiresCleanRoom() {
+        return metadata(GTRecipeConstants.CLEANROOM, true);
     }
 
-    public GT_RecipeBuilder requiresLowGravity() {
-        return metadata(GT_RecipeConstants.LOW_GRAVITY, true);
+    public GTRecipeBuilder requiresLowGravity() {
+        return metadata(GTRecipeConstants.LOW_GRAVITY, true);
     }
 
     // endregion
@@ -517,8 +517,8 @@ public class GT_RecipeBuilder {
      * <p>
      * checkout docs/RecipeBuilder.md for more info on whether to copy or not.
      */
-    public GT_RecipeBuilder copy() {
-        return new GT_RecipeBuilder(
+    public GTRecipeBuilder copy() {
+        return new GTRecipeBuilder(
             copyItemArray(inputsBasic),
             copy(inputsOreDict),
             copyItemArray(outputs),
@@ -548,8 +548,8 @@ public class GT_RecipeBuilder {
     /**
      * produce a deep copy of current values. anything unset will remain unset. discard all existing metadata
      */
-    public GT_RecipeBuilder copyNoMetadata() {
-        return new GT_RecipeBuilder(
+    public GTRecipeBuilder copyNoMetadata() {
+        return new GTRecipeBuilder(
             copyItemArray(inputsBasic),
             copy(inputsOreDict),
             copyItemArray(outputs),
@@ -646,12 +646,12 @@ public class GT_RecipeBuilder {
 
     // region validator
 
-    public GT_RecipeBuilder clearInvalid() {
+    public GTRecipeBuilder clearInvalid() {
         valid = true;
         return this;
     }
 
-    public GT_RecipeBuilder invalidate() {
+    public GTRecipeBuilder invalidate() {
         valid = false;
         return this;
     }
@@ -672,43 +672,43 @@ public class GT_RecipeBuilder {
      * Validate if input item match requirement. Return as invalidated if fails prereq. Specify -1 as min to allow
      * unset. Both bound inclusive. Only supposed to be called by IRecipeMap and not client code.
      */
-    public GT_RecipeBuilder validateNoInput() {
+    public GTRecipeBuilder validateNoInput() {
         if (skip) return this;
-        return GT_Utility.isArrayEmptyOrNull(inputsBasic) ? this : invalidate();
+        return GTUtility.isArrayEmptyOrNull(inputsBasic) ? this : invalidate();
     }
 
     /**
      * Validate if input fluid match requirement. Return as invalidated if fails prereq. Specify -1 as min to allow
      * unset. Both bound inclusive. Only supposed to be called by IRecipeMap and not client code.
      */
-    public GT_RecipeBuilder validateNoInputFluid() {
+    public GTRecipeBuilder validateNoInputFluid() {
         if (skip) return this;
-        return GT_Utility.isArrayEmptyOrNull(fluidInputs) ? this : invalidate();
+        return GTUtility.isArrayEmptyOrNull(fluidInputs) ? this : invalidate();
     }
 
     /**
      * Validate if output item match requirement. Return as invalidated if fails prereq. Specify -1 as min to allow
      * unset. Both bound inclusive. Only supposed to be called by IRecipeMap and not client code.
      */
-    public GT_RecipeBuilder validateNoOutput() {
+    public GTRecipeBuilder validateNoOutput() {
         if (skip) return this;
-        return GT_Utility.isArrayEmptyOrNull(outputs) ? this : invalidate();
+        return GTUtility.isArrayEmptyOrNull(outputs) ? this : invalidate();
     }
 
     /**
      * Validate if output fluid match requirement. Return as invalidated if fails prereq. Specify -1 as min to allow
      * unset. Both bound inclusive. Only supposed to be called by IRecipeMap and not client code.
      */
-    public GT_RecipeBuilder validateNoOutputFluid() {
+    public GTRecipeBuilder validateNoOutputFluid() {
         if (skip) return this;
-        return GT_Utility.isArrayEmptyOrNull(fluidOutputs) ? this : invalidate();
+        return GTUtility.isArrayEmptyOrNull(fluidOutputs) ? this : invalidate();
     }
 
     /**
      * Validate if input item match requirement. Return as invalidated if fails prereq. Specify -1 as min to allow
      * unset. Both bound inclusive. Only supposed to be called by IRecipeMap and not client code.
      */
-    public GT_RecipeBuilder validateInputCount(int min, int max) {
+    public GTRecipeBuilder validateInputCount(int min, int max) {
         if (skip) return this;
         if (inputsBasic == null) return min < 0 ? this : invalidate();
         return isArrayValid(inputsBasic, min, max) ? this : invalidate();
@@ -718,7 +718,7 @@ public class GT_RecipeBuilder {
      * Validate if input fluid match requirement. Return as invalidated if fails prereq. Specify -1 as min to allow
      * unset. Both bound inclusive. Only supposed to be called by IRecipeMap and not client code.
      */
-    public GT_RecipeBuilder validateInputFluidCount(int min, int max) {
+    public GTRecipeBuilder validateInputFluidCount(int min, int max) {
         if (skip) return this;
         if (fluidInputs == null) return min < 0 ? this : invalidate();
         return isArrayValid(fluidInputs, min, max) ? this : invalidate();
@@ -728,7 +728,7 @@ public class GT_RecipeBuilder {
      * Validate if output item match requirement. Return as invalidated if fails prereq. Specify -1 as min to allow
      * unset. Both bound inclusive. Only supposed to be called by IRecipeMap and not client code.
      */
-    public GT_RecipeBuilder validateOutputCount(int min, int max) {
+    public GTRecipeBuilder validateOutputCount(int min, int max) {
         if (skip) return this;
         if (outputs == null) return min < 0 ? this : invalidate();
         return isArrayValid(outputs, min, max) ? this : invalidate();
@@ -738,13 +738,13 @@ public class GT_RecipeBuilder {
      * Validate if output fluid match requirement. Return as invalidated if fails prereq. Specify -1 as min to allow
      * unset. Both bound inclusive. Only supposed to be called by IRecipeMap and not client code.
      */
-    public GT_RecipeBuilder validateOutputFluidCount(int min, int max) {
+    public GTRecipeBuilder validateOutputFluidCount(int min, int max) {
         if (skip) return this;
         if (fluidOutputs == null) return min < 0 ? this : invalidate();
         return isArrayValid(fluidOutputs, min, max) ? this : invalidate();
     }
 
-    public GT_RecipeBuilder validateAnyInput() {
+    public GTRecipeBuilder validateAnyInput() {
         if (skip) return this;
         if (fluidInputs != null && isArrayValid(fluidInputs, 1, Integer.MAX_VALUE)) {
             return this;
@@ -755,7 +755,7 @@ public class GT_RecipeBuilder {
         return invalidate();
     }
 
-    public GT_RecipeBuilder validateAnyOutput() {
+    public GTRecipeBuilder validateAnyOutput() {
         if (skip) return this;
         if (fluidOutputs != null && isArrayValid(fluidOutputs, 1, Integer.MAX_VALUE)) {
             return this;
@@ -774,7 +774,7 @@ public class GT_RecipeBuilder {
      *
      * @return Built recipe. Returns empty if failed to build.
      */
-    public Optional<GT_Recipe> build() {
+    public Optional<GTRecipe> build() {
         if (skip) {
             return Optional.empty();
         }
@@ -786,7 +786,7 @@ public class GT_RecipeBuilder {
         optimize();
         return Optional.of(
             decorate(
-                new GT_Recipe(
+                new GTRecipe(
                     inputsBasic,
                     outputs,
                     fluidInputs,
@@ -807,12 +807,12 @@ public class GT_RecipeBuilder {
                     recipeCategory)));
     }
 
-    public GT_RecipeBuilder forceOreDictInput() {
+    public GTRecipeBuilder forceOreDictInput() {
         if (inputsOreDict != null || inputsBasic == null) return this;
         return itemInputs((Object[]) inputsBasic);
     }
 
-    public Optional<GT_Recipe.GT_Recipe_WithAlt> buildWithAlt() {
+    public Optional<GTRecipe.GTRecipe_WithAlt> buildWithAlt() {
         if (skip) {
             return Optional.empty();
         }
@@ -827,7 +827,7 @@ public class GT_RecipeBuilder {
         // no optimize.
         return Optional.of(
             decorate(
-                new GT_Recipe.GT_Recipe_WithAlt(
+                new GTRecipe.GTRecipe_WithAlt(
                     inputsBasic,
                     outputs,
                     fluidInputs,
@@ -882,7 +882,7 @@ public class GT_RecipeBuilder {
         }
     }
 
-    private <T extends GT_Recipe> T decorate(T r) {
+    private <T extends GTRecipe> T decorate(T r) {
         r.mHidden = hidden;
         r.mCanBeBuffered = mCanBeBuffered;
         r.mNeedsEmptyOutput = mNeedsEmptyOutput;
@@ -894,12 +894,12 @@ public class GT_RecipeBuilder {
         return r;
     }
 
-    private void applyDefaultSpecialValues(GT_Recipe recipe) {
+    private void applyDefaultSpecialValues(GTRecipe recipe) {
         if (recipe.mSpecialValue != 0) return;
 
         int specialValue = 0;
-        if (getMetadataOrDefault(GT_RecipeConstants.LOW_GRAVITY, false)) specialValue -= 100;
-        if (getMetadataOrDefault(GT_RecipeConstants.CLEANROOM, false)) specialValue -= 200;
+        if (getMetadataOrDefault(GTRecipeConstants.LOW_GRAVITY, false)) specialValue -= 100;
+        if (getMetadataOrDefault(GTRecipeConstants.CLEANROOM, false)) specialValue -= 200;
         for (RecipeMetadataKey<Integer> ident : SPECIAL_VALUE_ALIASES) {
             Integer metadata = getMetadataOrDefault(ident, null);
             if (metadata != null) {
@@ -910,14 +910,14 @@ public class GT_RecipeBuilder {
         recipe.mSpecialValue = specialValue;
     }
 
-    public Collection<GT_Recipe> addTo(IRecipeMap recipeMap) {
+    public Collection<GTRecipe> addTo(IRecipeMap recipeMap) {
         if (skip) {
             return Collections.emptyList();
         }
         return recipeMap.doAdd(this);
     }
 
-    public GT_RecipeBuilder reset() {
+    public GTRecipeBuilder reset() {
         metadataStorage = null;
         alts = null;
         chances = null;
diff --git a/src/main/java/gregtech/api/util/GT_RecipeConstants.java b/src/main/java/gregtech/api/util/GTRecipeConstants.java
index c8a002c6c2..82a477756a 100644
--- a/src/main/java/gregtech/api/util/GT_RecipeConstants.java
+++ b/src/main/java/gregtech/api/util/GTRecipeConstants.java
@@ -1,7 +1,7 @@
 package gregtech.api.util;
 
 import static gregtech.api.recipe.RecipeMaps.scannerFakeRecipes;
-import static gregtech.api.util.GT_RecipeMapUtil.convertCellToFluid;
+import static gregtech.api.util.GTRecipeMapUtil.convertCellToFluid;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -14,12 +14,8 @@ import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import com.elisis.gtnhlanth.common.item.MaskList;
-import com.elisis.gtnhlanth.common.item.PhotolithographicMask;
-import com.elisis.gtnhlanth.common.register.LanthItemList;
-
 import cpw.mods.fml.common.registry.GameRegistry;
-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;
@@ -30,12 +26,15 @@ import gregtech.api.recipe.RecipeCategories;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.RecipeMetadataKey;
 import gregtech.api.recipe.metadata.SimpleRecipeMetadataKey;
-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;
+import gtnhlanth.common.item.ItemPhotolithographicMask;
+import gtnhlanth.common.item.MaskList;
+import gtnhlanth.common.register.LanthItemList;
 
 // this class is intended to be import-static-ed on every recipe script
 // so take care to not put unrelated stuff here!
-public class GT_RecipeConstants {
+public class GTRecipeConstants {
 
     /**
      * Set to true to signal the recipe require low gravity. do nothing if recipe set specialValue explicitly. Can
@@ -222,18 +221,18 @@ public class GT_RecipeConstants {
      * Will override the fluid input with oxygen/plasma for the respective recipe maps, so there is no point setting it.
      */
     public static final IRecipeMap UniversalArcFurnace = IRecipeMap.newRecipeMap(builder -> {
-        if (!GT_Utility.isArrayOfLength(builder.getItemInputsBasic(), 1)
-            || GT_Utility.isArrayEmptyOrNull(builder.getItemOutputs())) return Collections.emptyList();
+        if (!GTUtility.isArrayOfLength(builder.getItemInputsBasic(), 1)
+            || GTUtility.isArrayEmptyOrNull(builder.getItemOutputs())) return Collections.emptyList();
         int aDuration = builder.getDuration();
         if (aDuration <= 0) {
             return Collections.emptyList();
         }
         builder.duration(aDuration);
         boolean recycle = builder.getMetadataOrDefault(RECYCLE, false);
-        Collection<GT_Recipe> ret = new ArrayList<>();
+        Collection<GTRecipe> ret = new ArrayList<>();
         for (Materials mat : new Materials[] { Materials.Argon, Materials.Nitrogen }) {
             int tPlasmaAmount = (int) Math.max(1L, aDuration / (mat.getMass() * 16L));
-            GT_RecipeBuilder plasmaBuilder = builder.copy()
+            GTRecipeBuilder plasmaBuilder = builder.copy()
                 .fluidInputs(mat.getPlasma(tPlasmaAmount))
                 .fluidOutputs(mat.getGas(tPlasmaAmount));
             if (recycle) {
@@ -241,7 +240,7 @@ public class GT_RecipeConstants {
             }
             ret.addAll(RecipeMaps.plasmaArcFurnaceRecipes.doAdd(plasmaBuilder));
         }
-        GT_RecipeBuilder arcBuilder = builder.copy()
+        GTRecipeBuilder arcBuilder = builder.copy()
             .fluidInputs(Materials.Oxygen.getGas(aDuration));
         if (recycle) {
             arcBuilder.recipeCategory(RecipeCategories.arcFurnaceRecycling);
@@ -257,11 +256,11 @@ public class GT_RecipeConstants {
         for (ItemStack input : builder.getItemInputsBasic()) {
             // config >= 10 -> this is a special chemical recipe that output fluid/canned fluid variant.
             // it doesn't belong to multiblocks
-            if (GT_Utility.isAnyIntegratedCircuit(input) && input.getItemDamage() >= 10) {
+            if (GTUtility.isAnyIntegratedCircuit(input) && input.getItemDamage() >= 10) {
                 return builder.addTo(RecipeMaps.chemicalReactorRecipes);
             }
         }
-        return GT_Utility.concat(
+        return GTUtility.concat(
             builder.copy()
                 .addTo(RecipeMaps.chemicalReactorRecipes),
             convertCellToFluid(builder, false)
@@ -288,20 +287,20 @@ public class GT_RecipeConstants {
         // spotless:on
         // Find the wafer used
         Wafer wafer = null;
-        PhotolithographicMask t1Item = (PhotolithographicMask) LanthItemList.maskMap.get(MaskList.BLANK1);
-        PhotolithographicMask t2Item = (PhotolithographicMask) LanthItemList.maskMap.get(MaskList.BLANK2);
-        PhotolithographicMask t3Item = (PhotolithographicMask) LanthItemList.maskMap.get(MaskList.BLANK3);
+        ItemPhotolithographicMask t1Item = (ItemPhotolithographicMask) LanthItemList.maskMap.get(MaskList.BLANK1);
+        ItemPhotolithographicMask t2Item = (ItemPhotolithographicMask) LanthItemList.maskMap.get(MaskList.BLANK2);
+        ItemPhotolithographicMask t3Item = (ItemPhotolithographicMask) LanthItemList.maskMap.get(MaskList.BLANK3);
         for (ItemStack input : builder.getItemInputsBasic()) {
-            if (input.getItem() instanceof GT_MetaGenerated_Item_03) {
+            if (input.getItem() instanceof MetaGeneratedItem03) {
                 int meta = input.getItemDamage() - 32000;
                 // Check if this input item is indicating a wafer recipe we want to modify
-                if (meta == ID_MetaItem_03.Circuit_Silicon_Wafer3.ID) wafer = Wafer.Naquadah;
-                else if (meta == ID_MetaItem_03.Circuit_Silicon_Wafer4.ID) wafer = Wafer.Europium;
-                else if (meta == ID_MetaItem_03.Circuit_Silicon_Wafer5.ID) wafer = Wafer.Americium;
+                if (meta == IDMetaItem03.Circuit_Silicon_Wafer3.ID) wafer = Wafer.Naquadah;
+                else if (meta == IDMetaItem03.Circuit_Silicon_Wafer4.ID) wafer = Wafer.Europium;
+                else if (meta == IDMetaItem03.Circuit_Silicon_Wafer5.ID) wafer = Wafer.Americium;
             }
 
             // Now look for beamline masks
-            if (input.getItem() instanceof PhotolithographicMask mask) {
+            if (input.getItem() instanceof ItemPhotolithographicMask mask) {
                 String spectrum = mask.getDescSpectrum();
                 if (spectrum.equals(t1Item.getDescSpectrum())) wafer = Wafer.MaskT1;
                 else if (spectrum.equals(t2Item.getDescSpectrum())) wafer = Wafer.MaskT2;
@@ -326,10 +325,10 @@ public class GT_RecipeConstants {
                 // Naquadah wafers can use grade 1-2 purified water for a bonus, otherwise use distilled so we don't
                 // have to
                 // deal with circuits
-                return GT_Utility.concat(
+                return GTUtility.concat(
                     builder.copy()
                         .itemInputs(itemInputs)
-                        .fluidInputs(GT_ModHandler.getDistilledWater(100L))
+                        .fluidInputs(GTModHandler.getDistilledWater(100L))
                         .addTo(RecipeMaps.laserEngraverRecipes),
                     builder.copy()
                         .itemInputs(itemInputs)
@@ -344,7 +343,7 @@ public class GT_RecipeConstants {
             }
             case Europium -> {
                 // Require purified water for europium wafers, at least grade 3
-                return GT_Utility.concat(
+                return GTUtility.concat(
                     builder.copy()
                         .fluidInputs(Materials.Grade3PurifiedWater.getFluid(100L))
                         .duration(recipeTime)
@@ -356,7 +355,7 @@ public class GT_RecipeConstants {
             }
             case Americium -> {
                 // Require purified water for americium wafers, at least grade 5
-                return GT_Utility.concat(
+                return GTUtility.concat(
                     builder.copy()
                         .fluidInputs(Materials.Grade5PurifiedWater.getFluid(100L))
                         .duration(recipeTime)
@@ -369,7 +368,7 @@ public class GT_RecipeConstants {
             // Masks require much more purified water because they can make many wafers at once
             case MaskT1 -> {
                 // T1 masks require grade 1, 2 or 3 purified water
-                return GT_Utility.concat(
+                return GTUtility.concat(
                     builder.copy()
                         .fluidInputs(Materials.Grade1PurifiedWater.getFluid(32000L))
                         .duration(recipeTime)
@@ -385,7 +384,7 @@ public class GT_RecipeConstants {
             }
             case MaskT2 -> {
                 // T2 masks require grade 4 or 5 purified water
-                return GT_Utility.concat(
+                return GTUtility.concat(
                     builder.copy()
                         .fluidInputs(Materials.Grade4PurifiedWater.getFluid(32000L))
                         .duration(recipeTime)
@@ -397,7 +396,7 @@ public class GT_RecipeConstants {
             }
             case MaskT3 -> {
                 // T3 masks require grade 6, 7 or 8 purified water
-                return GT_Utility.concat(
+                return GTUtility.concat(
                     builder.copy()
                         .fluidInputs(Materials.Grade6PurifiedWater.getFluid(32000L))
                         .duration(recipeTime)
@@ -422,7 +421,7 @@ public class GT_RecipeConstants {
      * in ticks.
      */
     public static final IRecipeMap AssemblyLine = IRecipeMap.newRecipeMap(builder -> {
-        Optional<GT_Recipe.GT_Recipe_WithAlt> rr = builder.forceOreDictInput()
+        Optional<GTRecipe.GTRecipe_WithAlt> rr = builder.forceOreDictInput()
             .validateInputCount(4, 16)
             .validateOutputCount(1, 1)
             .validateOutputFluidCount(-1, 0)
@@ -430,7 +429,7 @@ public class GT_RecipeConstants {
             .buildWithAlt();
         // noinspection SimplifyOptionalCallChains
         if (!rr.isPresent()) return Collections.emptyList();
-        GT_Recipe.GT_Recipe_WithAlt r = rr.get();
+        GTRecipe.GTRecipe_WithAlt r = rr.get();
         ItemStack[][] mOreDictAlt = r.mOreDictAlt;
         Object[] inputs = builder.getItemInputsOreDict();
         ItemStack aResearchItem = builder.getMetadata(RESEARCH_ITEM);
@@ -443,19 +442,19 @@ public class GT_RecipeConstants {
             ItemStack[] alts = mOreDictAlt[i];
             Object input = inputs[i];
             if (input == null) {
-                GT_Log.err.println(
+                GTLog.err.println(
                     "addAssemblingLineRecipe " + aResearchItem.getDisplayName()
                         + " --> "
                         + aOutput.getUnlocalizedName()
                         + " there is some null item in that recipe");
             }
             if (input instanceof ItemStack) {
-                tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash((ItemStack) input, true, false);
+                tPersistentHash = tPersistentHash * 31 + GTUtility.persistentHash((ItemStack) input, true, false);
             } else if (input instanceof ItemStack[]) {
                 for (ItemStack alt : ((ItemStack[]) input)) {
-                    tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(alt, true, false);
+                    tPersistentHash = tPersistentHash * 31 + GTUtility.persistentHash(alt, true, false);
                     if (alt == null) {
-                        GT_Log.err.println(
+                        GTLog.err.println(
                             "addAssemblingLineRecipe " + aResearchItem.getDisplayName()
                                 + " --> "
                                 + aOutput.getUnlocalizedName()
@@ -476,18 +475,18 @@ public class GT_RecipeConstants {
                 tPersistentHash = tPersistentHash * 31 + ((Number) objs[1]).intValue();
             }
         }
-        tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(aResearchItem, true, false);
-        tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(aOutput, true, false);
+        tPersistentHash = tPersistentHash * 31 + GTUtility.persistentHash(aResearchItem, true, false);
+        tPersistentHash = tPersistentHash * 31 + GTUtility.persistentHash(aOutput, true, false);
         for (FluidStack fluidInput : r.mFluidInputs) {
             if (fluidInput == null) continue;
-            tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(fluidInput, true, false);
+            tPersistentHash = tPersistentHash * 31 + GTUtility.persistentHash(fluidInput, true, false);
         }
         int aResearchTime = builder.getMetadataOrDefault(RESEARCH_TIME, 0);
         tPersistentHash = tPersistentHash * 31 + aResearchTime;
         tPersistentHash = tPersistentHash * 31 + r.mDuration;
         tPersistentHash = tPersistentHash * 31 + r.mEUt;
 
-        GT_Recipe.GT_Recipe_AssemblyLine tRecipe = new GT_Recipe.GT_Recipe_AssemblyLine(
+        GTRecipe.RecipeAssemblyLine tRecipe = new GTRecipe.RecipeAssemblyLine(
             aResearchItem,
             aResearchTime,
             r.mInputs,
@@ -497,14 +496,14 @@ public class GT_RecipeConstants {
             r.mEUt,
             r.mOreDictAlt);
         tRecipe.setPersistentHash(tPersistentHash);
-        GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(tRecipe);
-        GT_AssemblyLineUtils.addRecipeToCache(tRecipe);
+        GTRecipe.RecipeAssemblyLine.sAssemblylineRecipes.add(tRecipe);
+        AssemblyLineUtils.addRecipeToCache(tRecipe);
 
         ItemStack writesDataStick = ItemList.Tool_DataStick.getWithName(1L, "Writes Research result");
-        GT_AssemblyLineUtils.setAssemblyLineRecipeOnDataStick(writesDataStick, tRecipe, false);
-        Collection<GT_Recipe> ret = new ArrayList<>(3);
+        AssemblyLineUtils.setAssemblyLineRecipeOnDataStick(writesDataStick, tRecipe, false);
+        Collection<GTRecipe> ret = new ArrayList<>(3);
         ret.addAll(
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(aResearchItem)
                 .itemOutputs(aOutput)
                 .special(writesDataStick)
@@ -517,7 +516,7 @@ public class GT_RecipeConstants {
                 .addTo(scannerFakeRecipes));
 
         ItemStack readsDataStick = ItemList.Tool_DataStick.getWithName(1L, "Reads Research result");
-        GT_AssemblyLineUtils.setAssemblyLineRecipeOnDataStick(readsDataStick, tRecipe, false);
+        AssemblyLineUtils.setAssemblyLineRecipeOnDataStick(readsDataStick, tRecipe, false);
         ret.add(
             RecipeMaps.assemblylineVisualRecipes.addFakeRecipe(
                 false,
@@ -539,13 +538,13 @@ public class GT_RecipeConstants {
      * Adds an Electric Blast Furnace recipe that might use gas.
      */
     public static final IRecipeMap BlastFurnaceWithGas = IRecipeMap.newRecipeMap(builder -> {
-        Collection<GT_Recipe> ret = new ArrayList<>();
+        Collection<GTRecipe> ret = new ArrayList<>();
         int basicGasAmount = builder.getMetadataOrDefault(ADDITIVE_AMOUNT, 1000);
         double durationBase = builder.getDuration();
         ArrayList<ItemStack> items = new ArrayList<>(Arrays.asList(builder.getItemInputsBasic()));
         int circuitConfig = 1;
         if (items.size() == 1) {// Set circuit config if it is a dust -> ingot recipe.
-            ItemData data = GT_OreDictUnificator.getAssociation(items.get(0));
+            ItemData data = GTOreDictUnificator.getAssociation(items.get(0));
             if (data != null) {
                 OrePrefixes prefix = data.mPrefix;
                 if (OrePrefixes.dust.equals(prefix)) {
@@ -558,7 +557,7 @@ public class GT_RecipeConstants {
             }
         } else { // Set circuit config if there is an integrated circuit
             for (int i = 0; i < items.size(); i++) {
-                if (GT_Utility.isAnyIntegratedCircuit(items.get(i))) {
+                if (GTUtility.isAnyIntegratedCircuit(items.get(i))) {
                     circuitConfig = items.get(i)
                         .getItemDamage();
                     items.remove(i--);
@@ -567,7 +566,7 @@ public class GT_RecipeConstants {
         }
 
         if (builder.getMetadataOrDefault(NO_GAS, false)) {
-            items.add(GT_Utility.getIntegratedCircuit(circuitConfig));
+            items.add(GTUtility.getIntegratedCircuit(circuitConfig));
             ret.addAll(
                 builder.copy()
                     .itemInputs(items.toArray(new ItemStack[0]))
@@ -578,7 +577,7 @@ public class GT_RecipeConstants {
             circuitConfig += 10;
         }
 
-        items.add(GT_Utility.getIntegratedCircuit(circuitConfig));
+        items.add(GTUtility.getIntegratedCircuit(circuitConfig));
         boolean nobleGases = builder.getMetadataOrDefault(NOBLE_GASES, false);
         boolean anaerobeGases = builder.getMetadataOrDefault(ANAEROBE_GASES, false);
         Collection<BlastFurnaceGasStat> gases = new ArrayList<>();
@@ -596,7 +595,7 @@ public class GT_RecipeConstants {
             ret.addAll(
                 builder.copy()
                     .itemInputs(items.toArray(new ItemStack[0]))
-                    .fluidInputs(GT_Utility.copyAmount(gasAmount, gas.gas))
+                    .fluidInputs(GTUtility.copyAmount(gasAmount, gas.gas))
                     .duration(duration)
                     .addTo(RecipeMaps.blastFurnaceRecipes));
         }
@@ -608,11 +607,11 @@ public class GT_RecipeConstants {
      * oredict via {@link #OREDICT_INPUT}. It will be used along all other item inputs as input of this recipe.
      */
     public static IRecipeMap AssemblerOD = IRecipeMap.newRecipeMap(builder -> {
-        Collection<GT_Recipe> ret = new ArrayList<>();
-        for (ItemStack input : GT_OreDictUnificator.getOresImmutable(builder.getMetadata(OREDICT_INPUT))) {
+        Collection<GTRecipe> ret = new ArrayList<>();
+        for (ItemStack input : GTOreDictUnificator.getOresImmutable(builder.getMetadata(OREDICT_INPUT))) {
             ret.addAll(
                 builder.copy()
-                    .itemInputs(GT_RecipeMapUtil.appendArray(builder.getItemInputsBasic(), input))
+                    .itemInputs(GTRecipeMapUtil.appendArray(builder.getItemInputsBasic(), input))
                     .addTo(RecipeMaps.assemblerRecipes));
         }
         return ret;
@@ -667,26 +666,26 @@ public class GT_RecipeConstants {
     }
 
     static {
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(COIL_HEAT);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(FUSION_THRESHOLD);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(FUEL_VALUE);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(NANO_FORGE_TIER);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(FOG_EXOTIC_TIER);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(FOG_PLASMA_TIER);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(DEFC_CASING_TIER);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(CHEMPLANT_CASING_TIER);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(QFT_FOCUS_TIER);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(DISSOLUTION_TANK_RATIO);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(RTG_DURATION_IN_DAYS);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(LNG_BASIC_OUTPUT);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(NFR_COIL_TIER);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(NKE_RANGE);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(PRECISE_ASSEMBLER_CASING_TIER);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(COAL_CASING_TIER);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(COMPRESSION_TIER);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(RESEARCH_STATION_DATA);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(SIEVERTS);
-        GT_RecipeMapUtil.SPECIAL_VALUE_ALIASES.add(DECAY_TICKS);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(COIL_HEAT);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(FUSION_THRESHOLD);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(FUEL_VALUE);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(NANO_FORGE_TIER);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(FOG_EXOTIC_TIER);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(FOG_PLASMA_TIER);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(DEFC_CASING_TIER);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(CHEMPLANT_CASING_TIER);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(QFT_FOCUS_TIER);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(DISSOLUTION_TANK_RATIO);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(RTG_DURATION_IN_DAYS);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(LNG_BASIC_OUTPUT);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(NFR_COIL_TIER);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(NKE_RANGE);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(PRECISE_ASSEMBLER_CASING_TIER);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(COAL_CASING_TIER);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(COMPRESSION_TIER);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(RESEARCH_STATION_DATA);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(SIEVERTS);
+        GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(DECAY_TICKS);
 
     }
 }
diff --git a/src/main/java/gregtech/api/util/GT_RecipeMapUtil.java b/src/main/java/gregtech/api/util/GTRecipeMapUtil.java
index 67d50188fe..86ef5b4031 100644
--- a/src/main/java/gregtech/api/util/GT_RecipeMapUtil.java
+++ b/src/main/java/gregtech/api/util/GTRecipeMapUtil.java
@@ -30,9 +30,9 @@ import gregtech.api.recipe.RecipeMetadataKey;
 /**
  * Define helpers useful in the creation of recipe maps.
  */
-public class GT_RecipeMapUtil {
+public class GTRecipeMapUtil {
 
-    public static final Function<GT_Recipe, GT_Recipe> ALL_FAKE_RECIPE = r -> {
+    public static final Function<GTRecipe, GTRecipe> ALL_FAKE_RECIPE = r -> {
         r.mFakeRecipe = true;
         return r;
     };
@@ -51,24 +51,24 @@ public class GT_RecipeMapUtil {
         return newArr;
     }
 
-    public static GT_RecipeTemplate asTemplate(GT_Recipe r) {
+    public static GTRecipeTemplate asTemplate(GTRecipe r) {
         return asTemplate(r, false);
     }
 
-    public static GT_RecipeTemplate asTemplate(GT_Recipe r, boolean includeTemplate) {
-        return new GT_RecipeTemplate(r, includeTemplate);
+    public static GTRecipeTemplate asTemplate(GTRecipe r, boolean includeTemplate) {
+        return new GTRecipeTemplate(r, includeTemplate);
     }
 
-    public static List<GT_Recipe> buildRecipeForMultiblock(GT_RecipeBuilder b) {
+    public static List<GTRecipe> buildRecipeForMultiblock(GTRecipeBuilder b) {
         return buildOrEmpty(convertCellToFluid(b, true));
 
     }
 
-    public static List<GT_Recipe> buildRecipeForMultiblockNoCircuit(GT_RecipeBuilder b) {
+    public static List<GTRecipe> buildRecipeForMultiblockNoCircuit(GTRecipeBuilder b) {
         return buildOrEmpty(convertCellToFluid(b, false));
     }
 
-    public static GT_RecipeBuilder convertCellToFluid(GT_RecipeBuilder b, boolean removeIntegratedCircuit) {
+    public static GTRecipeBuilder convertCellToFluid(GTRecipeBuilder b, boolean removeIntegratedCircuit) {
         List<ItemStack> itemInputs = new ArrayList<>(Arrays.asList(b.getItemInputsBasic()));
         List<ItemStack> itemOutputs = new ArrayList<>(Arrays.asList(b.getItemOutputs()));
         List<FluidStack> fluidInputs = new ArrayList<>(Arrays.asList(b.getFluidInputs()));
@@ -93,16 +93,16 @@ public class GT_RecipeMapUtil {
         TIntList chances) {
         for (int i = items.size() - 1; i >= 0; i--) {
             ItemStack item = items.get(i);
-            if (GT_Utility.getFluidForFilledItem(item, true) != null || GT_Utility.isCellEmpty(item)
-                || (removeIntegratedCircuit && GT_Utility.isAnyIntegratedCircuit(item))) {
-                fluids.add(GT_Utility.convertCellToFluid(item));
+            if (GTUtility.getFluidForFilledItem(item, true) != null || GTUtility.isCellEmpty(item)
+                || (removeIntegratedCircuit && GTUtility.isAnyIntegratedCircuit(item))) {
+                fluids.add(GTUtility.convertCellToFluid(item));
                 items.remove(i);
                 if (chances != null) chances.removeAt(i);
             }
         }
     }
 
-    public static List<GT_Recipe> buildOrEmpty(GT_RecipeBuilder builder) {
+    public static List<GTRecipe> buildOrEmpty(GTRecipeBuilder builder) {
         return builder.build()
             .map(Collections::singletonList)
             .orElse(Collections.emptyList());
@@ -134,7 +134,7 @@ public class GT_RecipeMapUtil {
     /**
      * Use this to register recipes for a recipe map in addon not present at compile time.
      * <p>
-     * Do not use this for recipes maps already in {@link GT_RecipeConstants}. None of them will be available via this
+     * Do not use this for recipes maps already in {@link GTRecipeConstants}. None of them will be available via this
      * interface!
      *
      * @param identifier     recipe map id
@@ -148,26 +148,26 @@ public class GT_RecipeMapUtil {
         else registerAction.accept(map);
     }
 
-    public static final class GT_RecipeTemplate {
+    public static final class GTRecipeTemplate {
 
-        private final GT_Recipe template;
-        private final List<GT_Recipe> derivatives = new ArrayList<>();
+        private final GTRecipe template;
+        private final List<GTRecipe> derivatives = new ArrayList<>();
 
-        private GT_RecipeTemplate(GT_Recipe template, boolean includeTemplate) {
+        private GTRecipeTemplate(GTRecipe template, boolean includeTemplate) {
             this.template = template;
             if (includeTemplate) derivatives.add(template);
         }
 
-        public GT_Recipe derive() {
-            GT_Recipe derived = template.copyShallow();
+        public GTRecipe derive() {
+            GTRecipe derived = template.copyShallow();
             derivatives.add(derived);
             return derived;
         }
 
-        public List<GT_Recipe> getAll() {
+        public List<GTRecipe> getAll() {
             // fix shallow references
             Set<Object> references = Collections.newSetFromMap(new IdentityHashMap<>());
-            for (GT_Recipe r : derivatives) {
+            for (GTRecipe r : derivatives) {
                 if (!references.add(r.mInputs)) r.mInputs = r.mInputs.clone();
                 if (!references.add(r.mOutputs)) r.mOutputs = r.mOutputs.clone();
                 if (!references.add(r.mFluidInputs)) r.mFluidInputs = r.mFluidInputs.clone();
diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GTRecipeRegistrator.java
index 5acb15b242..919b37e7d9 100644
--- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java
+++ b/src/main/java/gregtech/api/util/GTRecipeRegistrator.java
@@ -1,9 +1,9 @@
 package gregtech.api.util;
 
-import static gregtech.api.enums.GT_Values.L;
-import static gregtech.api.enums.GT_Values.M;
-import static gregtech.api.enums.GT_Values.RA;
-import static gregtech.api.enums.GT_Values.VP;
+import static gregtech.api.enums.GTValues.L;
+import static gregtech.api.enums.GTValues.M;
+import static gregtech.api.enums.GTValues.RA;
+import static gregtech.api.enums.GTValues.VP;
 import static gregtech.api.enums.Materials.Bronze;
 import static gregtech.api.enums.Materials.Cobalt;
 import static gregtech.api.enums.Materials.DarkSteel;
@@ -24,12 +24,12 @@ import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
 import static gregtech.api.recipe.RecipeMaps.wiremillRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.RECYCLE;
-import static gregtech.api.util.GT_RecipeConstants.UniversalArcFurnace;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
-import static gregtech.api.util.GT_Utility.getTier;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.RECYCLE;
+import static gregtech.api.util.GTRecipeConstants.UniversalArcFurnace;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
+import static gregtech.api.util.GTUtility.getTier;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -54,8 +54,8 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.SetMultimap;
 
 import cpw.mods.fml.relauncher.ReflectionHelper;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
@@ -68,7 +68,7 @@ import ic2.api.reactor.IReactorComponent;
 /**
  * Class for Automatic Recipe registering.
  */
-public class GT_RecipeRegistrator {
+public class GTRecipeRegistrator {
 
     /**
      * List of Materials, which are used in the Creation of Sticks. All Rod Materials are automatically added to this
@@ -159,42 +159,42 @@ public class GT_RecipeRegistrator {
 
     static {
         // flush the cache on post load finish
-        GregTech_API.sAfterGTPostload.add(() -> indexedRecipeListCache = null);
+        GregTechAPI.sAfterGTPostload.add(() -> indexedRecipeListCache = null);
     }
 
     public static void registerMaterialRecycling(ItemStack aStack, Materials aMaterial, long aMaterialAmount,
         MaterialStack aByproduct) {
-        if (GT_Utility.isStackInvalid(aStack)) return;
+        if (GTUtility.isStackInvalid(aStack)) return;
         if (aByproduct != null) {
             aByproduct = aByproduct.clone();
             aByproduct.mAmount /= aStack.stackSize;
         }
-        GT_OreDictUnificator.addItemData(
-            GT_Utility.copyAmount(1, aStack),
+        GTOreDictUnificator.addItemData(
+            GTUtility.copyAmount(1, aStack),
             new ItemData(aMaterial, aMaterialAmount / aStack.stackSize, aByproduct));
     }
 
     public static void registerMaterialRecycling(ItemStack aStack, ItemData aData) {
-        if (GT_Utility.isStackInvalid(aStack) || GT_Utility.areStacksEqual(new ItemStack(Items.blaze_rod), aStack)
+        if (GTUtility.isStackInvalid(aStack) || GTUtility.areStacksEqual(new ItemStack(Items.blaze_rod), aStack)
             || aData == null
             || !aData.hasValidMaterialData()
             || !aData.mMaterial.mMaterial.mAutoGenerateRecycleRecipes
             || aData.mMaterial.mAmount <= 0
-            || GT_Utility.getFluidForFilledItem(aStack, false) != null
+            || GTUtility.getFluidForFilledItem(aStack, false) != null
             || aData.mMaterial.mMaterial.mSubTags.contains(SubTag.NO_RECIPES)) return;
-        registerReverseMacerating(GT_Utility.copyAmount(1, aStack), aData, aData.mPrefix == null);
-        if (!GT_Utility.areStacksEqual(GT_ModHandler.getIC2Item("iridiumOre", 1L), aStack)) {
+        registerReverseMacerating(GTUtility.copyAmount(1, aStack), aData, aData.mPrefix == null);
+        if (!GTUtility.areStacksEqual(GTModHandler.getIC2Item("iridiumOre", 1L), aStack)) {
             registerReverseSmelting(
-                GT_Utility.copyAmount(1, aStack),
+                GTUtility.copyAmount(1, aStack),
                 aData.mMaterial.mMaterial,
                 aData.mMaterial.mAmount,
                 true);
             registerReverseFluidSmelting(
-                GT_Utility.copyAmount(1, aStack),
+                GTUtility.copyAmount(1, aStack),
                 aData.mMaterial.mMaterial,
                 aData.mMaterial.mAmount,
                 aData.getByProduct(0));
-            registerReverseArcSmelting(GT_Utility.copyAmount(1, aStack), aData);
+            registerReverseArcSmelting(GTUtility.copyAmount(1, aStack), aData);
         }
     }
 
@@ -213,14 +213,14 @@ public class GT_RecipeRegistrator {
         ItemStack recipeOutput = aByproduct == null ? null
             : aByproduct.mMaterial.contains(SubTag.NO_SMELTING) || !aByproduct.mMaterial.contains(SubTag.METAL)
                 ? aByproduct.mMaterial.contains(SubTag.FLAMMABLE)
-                    ? GT_OreDictUnificator.getDust(Materials.Ash, aByproduct.mAmount / 2)
+                    ? GTOreDictUnificator.getDust(Materials.Ash, aByproduct.mAmount / 2)
                     : aByproduct.mMaterial.contains(SubTag.UNBURNABLE)
-                        ? GT_OreDictUnificator.getDustOrIngot(aByproduct.mMaterial.mSmeltInto, aByproduct.mAmount)
+                        ? GTOreDictUnificator.getDustOrIngot(aByproduct.mMaterial.mSmeltInto, aByproduct.mAmount)
                         : null
-                : GT_OreDictUnificator.getIngotOrDust(aByproduct.mMaterial.mSmeltInto, aByproduct.mAmount);
+                : GTOreDictUnificator.getIngotOrDust(aByproduct.mMaterial.mSmeltInto, aByproduct.mAmount);
 
-        GT_RecipeBuilder builder = RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack));
+        GTRecipeBuilder builder = RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, aStack));
         if (recipeOutput != null) {
             builder.itemOutputs(recipeOutput);
         }
@@ -254,13 +254,13 @@ public class GT_RecipeRegistrator {
 
         aMaterialAmount /= aStack.stackSize;
 
-        if (aAllowAlloySmelter) GT_ModHandler.addSmeltingAndAlloySmeltingRecipe(
-            GT_Utility.copyAmount(1, aStack),
-            GT_OreDictUnificator.getIngot(aMaterial.mSmeltInto, aMaterialAmount),
+        if (aAllowAlloySmelter) GTModHandler.addSmeltingAndAlloySmeltingRecipe(
+            GTUtility.copyAmount(1, aStack),
+            GTOreDictUnificator.getIngot(aMaterial.mSmeltInto, aMaterialAmount),
             false);
-        else GT_ModHandler.addSmeltingRecipe(
-            GT_Utility.copyAmount(1, aStack),
-            GT_OreDictUnificator.getIngot(aMaterial.mSmeltInto, aMaterialAmount));
+        else GTModHandler.addSmeltingRecipe(
+            GTUtility.copyAmount(1, aStack),
+            GTOreDictUnificator.getIngot(aMaterial.mSmeltInto, aMaterialAmount));
     }
 
     public static void registerReverseArcSmelting(ItemStack aStack, Materials aMaterial, long aMaterialAmount,
@@ -285,7 +285,7 @@ public class GT_RecipeRegistrator {
             if (tMaterial.mMaterial == Materials.Iron || tMaterial.mMaterial == Materials.Copper
                 || tMaterial.mMaterial == Materials.WroughtIron
                 || tMaterial.mMaterial == Materials.AnnealedCopper) {
-                ItemData stackData = GT_OreDictUnificator.getItemData(aStack);
+                ItemData stackData = GTOreDictUnificator.getItemData(aStack);
                 if (stackData != null
                     && (stackData.mPrefix == OrePrefixes.ingot || stackData.mPrefix == OrePrefixes.dust)) {
                     // iron ingot/dust -> wrought iron, copper ingot/dust -> annealed copper
@@ -333,16 +333,16 @@ public class GT_RecipeRegistrator {
             tAmount += tMaterial.mAmount * tMaterial.mMaterial.getMass();
 
         ArrayList<ItemStack> outputs = new ArrayList<>();
-        if (GT_OreDictUnificator.getIngotOrDust(aData.mMaterial) != null) {
-            outputs.add(GT_OreDictUnificator.getIngotOrDust(aData.mMaterial));
+        if (GTOreDictUnificator.getIngotOrDust(aData.mMaterial) != null) {
+            outputs.add(GTOreDictUnificator.getIngotOrDust(aData.mMaterial));
         }
         for (int i = 0; i < 8; i++) {
-            if (GT_OreDictUnificator.getIngotOrDust(aData.getByProduct(i)) != null) {
-                outputs.add(GT_OreDictUnificator.getIngotOrDust(aData.getByProduct(i)));
+            if (GTOreDictUnificator.getIngotOrDust(aData.getByProduct(i)) != null) {
+                outputs.add(GTOreDictUnificator.getIngotOrDust(aData.getByProduct(i)));
             }
         }
         if (!outputs.isEmpty()) {
-            GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+            GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder();
             recipeBuilder.itemInputs(aStack)
                 .itemOutputs(outputs.toArray(new ItemStack[0]))
                 .fluidInputs(Materials.Oxygen.getGas((int) Math.max(16, tAmount / M)))
@@ -386,17 +386,17 @@ public class GT_RecipeRegistrator {
 
         {
             ArrayList<ItemStack> outputs = new ArrayList<>();
-            if (GT_OreDictUnificator.getDust(aData.mMaterial) != null) {
-                outputs.add(GT_OreDictUnificator.getDust(aData.mMaterial));
+            if (GTOreDictUnificator.getDust(aData.mMaterial) != null) {
+                outputs.add(GTOreDictUnificator.getDust(aData.mMaterial));
             }
             for (int i = 0; i < 3; i++) {
-                if (GT_OreDictUnificator.getDust(aData.getByProduct(i)) != null) {
-                    outputs.add(GT_OreDictUnificator.getDust(aData.getByProduct(i)));
+                if (GTOreDictUnificator.getDust(aData.getByProduct(i)) != null) {
+                    outputs.add(GTOreDictUnificator.getDust(aData.getByProduct(i)));
                 }
             }
             if (!outputs.isEmpty()) {
                 ItemStack[] outputsArray = outputs.toArray(new ItemStack[0]);
-                GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+                GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder();
                 recipeBuilder.itemInputs(aStack)
                     .itemOutputs(outputsArray)
                     .duration(
@@ -414,10 +414,10 @@ public class GT_RecipeRegistrator {
         for (MaterialStack tMaterial : aData.getAllMaterialStacks()) {
             if (tMaterial.mMaterial.contains(SubTag.CRYSTAL) && !tMaterial.mMaterial.contains(SubTag.METAL)
                 && tMaterial.mMaterial != Materials.Glass
-                && GT_OreDictUnificator.getDust(aData.mMaterial) != null) {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.getDust(aData.mMaterial))
+                && GTOreDictUnificator.getDust(aData.mMaterial) != null) {
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.getDust(aData.mMaterial))
                     .duration(10 * SECONDS)
                     .eut(TierEU.RECIPE_LV)
                     .recipeCategory(RecipeCategories.forgeHammerRecycling)
@@ -445,13 +445,13 @@ public class GT_RecipeRegistrator {
     public static synchronized void registerUsagesForMaterials(String aPlate, boolean aRecipeReplacing,
         ItemStack... aMats) {
         for (ItemStack aMat : aMats) {
-            aMat = GT_Utility.copyOrNull(aMat);
+            aMat = GTUtility.copyOrNull(aMat);
 
             if (aMat == null) continue;
 
-            ItemData aItemData = GT_OreDictUnificator.getItemData(aMat);
+            ItemData aItemData = GTOreDictUnificator.getItemData(aMat);
             if (aItemData == null || aItemData.mPrefix != OrePrefixes.ingot) aPlate = null;
-            if (aPlate != null && GT_OreDictUnificator.getFirstOre(aPlate, 1) == null) aPlate = null;
+            if (aPlate != null && GTOreDictUnificator.getFirstOre(aPlate, 1) == null) aPlate = null;
 
             sMt1.func_150996_a(aMat.getItem());
             sMt1.stackSize = 1;
@@ -463,19 +463,19 @@ public class GT_RecipeRegistrator {
 
             if (aItemData != null && aItemData.hasValidPrefixMaterialData()) {
                 for (RecipeShape tRecipe : sShapes) {
-                    for (ItemStack tCrafted : GT_ModHandler.getRecipeOutputsBuffered(tRecipe.shape)) {
-                        GT_OreDictUnificator.addItemData(
+                    for (ItemStack tCrafted : GTModHandler.getRecipeOutputsBuffered(tRecipe.shape)) {
+                        GTOreDictUnificator.addItemData(
                             tCrafted,
                             new ItemData(aItemData.mMaterial.mMaterial, aItemData.mMaterial.mAmount * tRecipe.amount1));
                         //
-                        // GT_Log.out.println("###################################################################################");
-                        // GT_Log.out.println("registerUsagesForMaterials used aPlate: "+aPlate);
-                        // GT_Log.out.println("registerUsagesForMaterials used aPlate:
+                        // GTLog.out.println("###################################################################################");
+                        // GTLog.out.println("registerUsagesForMaterials used aPlate: "+aPlate);
+                        // GTLog.out.println("registerUsagesForMaterials used aPlate:
                         // "+aMat.getUnlocalizedName());
-                        // GT_Log.out.println("registerUsagesForMaterials used aPlate:
+                        // GTLog.out.println("registerUsagesForMaterials used aPlate:
                         // "+aMat.getDisplayName());
                         //
-                        // GT_Log.out.println("###################################################################################");
+                        // GTLog.out.println("###################################################################################");
                     }
                 }
             }
@@ -484,9 +484,9 @@ public class GT_RecipeRegistrator {
     }
 
     private static List<IRecipe> getRecipeList(RecipeShape shape) {
-        boolean force = !GregTech_API.sPostloadStarted || GregTech_API.sPostloadFinished;
+        boolean force = !GregTechAPI.sPostloadStarted || GregTechAPI.sPostloadFinished;
         if (force || indexedRecipeListCache == null) {
-            synchronized (GT_RecipeRegistrator.class) {
+            synchronized (GTRecipeRegistrator.class) {
                 if (indexedRecipeListCache == null || force) {
                     indexedRecipeListCache = createIndexedRecipeListCache();
                 }
@@ -515,12 +515,12 @@ public class GT_RecipeRegistrator {
             }
             buffer.clear();
             ItemStack tStack = tRecipe.getRecipeOutput();
-            if (GT_Utility.isStackValid(tStack) && tStack.getMaxStackSize() == 1
+            if (GTUtility.isStackValid(tStack) && tStack.getMaxStackSize() == 1
                 && tStack.getMaxDamage() > 0
                 && !(tStack.getItem() instanceof ItemBlock)
                 && !(tStack.getItem() instanceof IReactorComponent)
-                && !GT_ModHandler.isElectricItem(tStack)
-                && !GT_Utility.isStackInList(tStack, GT_ModHandler.sNonReplaceableItems)) {
+                && !GTModHandler.isElectricItem(tStack)
+                && !GTUtility.isStackInList(tStack, GTModHandler.sNonReplaceableItems)) {
                 if (tRecipe instanceof ShapedOreRecipe tShapedRecipe) {
                     if (checkRecipeShape(
                         buffer,
@@ -586,7 +586,7 @@ public class GT_RecipeRegistrator {
     private static synchronized void registerStickStuff(String aPlate, ItemData aItemData, boolean aRecipeReplacing) {
         ItemStack tStack;
         for (Materials tMaterial : sRodMaterialList) {
-            ItemStack tMt2 = GT_OreDictUnificator.get(OrePrefixes.stick, tMaterial, 1);
+            ItemStack tMt2 = GTOreDictUnificator.get(OrePrefixes.stick, tMaterial, 1);
             if (tMt2 != null) {
                 sMt2.func_150996_a(tMt2.getItem());
                 sMt2.stackSize = 1;
@@ -595,10 +595,10 @@ public class GT_RecipeRegistrator {
                 for (int i = 0; i < sShapes.length; i++) {
                     RecipeShape tRecipe = sShapes[i];
 
-                    for (ItemStack tCrafted : GT_ModHandler
+                    for (ItemStack tCrafted : GTModHandler
                         .getRecipeOutputs(getRecipeList(tRecipe), true, tRecipe.shape)) {
                         if (aItemData != null && aItemData.hasValidPrefixMaterialData())
-                            GT_OreDictUnificator.addItemData(
+                            GTOreDictUnificator.addItemData(
                                 tCrafted,
                                 new ItemData(
                                     aItemData.mMaterial.mMaterial,
@@ -608,22 +608,22 @@ public class GT_RecipeRegistrator {
                         if (aRecipeReplacing && aPlate != null && sShapesA[i] != null && sShapesA[i].length > 1) {
                             assert aItemData != null;
 
-                            if (null != (tStack = GT_ModHandler.removeRecipe(tRecipe.shape))) {
+                            if (null != (tStack = GTModHandler.removeRecipe(tRecipe.shape))) {
                                 switch (sShapesA[i].length) {
-                                    case 2 -> GT_ModHandler.addCraftingRecipe(
+                                    case 2 -> GTModHandler.addCraftingRecipe(
                                         tStack,
-                                        GT_ModHandler.RecipeBits.BUFFERED,
+                                        GTModHandler.RecipeBits.BUFFERED,
                                         new Object[] { sShapesA[i][1], s_P.charAt(0), aPlate, s_R.charAt(0),
                                             OrePrefixes.stick.get(tMaterial), s_I.charAt(0), aItemData });
-                                    case 3 -> GT_ModHandler.addCraftingRecipe(
+                                    case 3 -> GTModHandler.addCraftingRecipe(
                                         tStack,
-                                        GT_ModHandler.RecipeBits.BUFFERED,
+                                        GTModHandler.RecipeBits.BUFFERED,
                                         new Object[] { sShapesA[i][1], sShapesA[i][2], s_P.charAt(0), aPlate,
                                             s_R.charAt(0), OrePrefixes.stick.get(tMaterial), s_I.charAt(0),
                                             aItemData });
-                                    default -> GT_ModHandler.addCraftingRecipe(
+                                    default -> GTModHandler.addCraftingRecipe(
                                         tStack,
-                                        GT_ModHandler.RecipeBits.BUFFERED,
+                                        GTModHandler.RecipeBits.BUFFERED,
                                         new Object[] { sShapesA[i][1], sShapesA[i][2], sShapesA[i][3], s_P.charAt(0),
                                             aPlate, s_R.charAt(0), OrePrefixes.stick.get(tMaterial), s_I.charAt(0),
                                             aItemData });
@@ -666,119 +666,119 @@ public class GT_RecipeRegistrator {
      */
     public static void registerWiremillRecipes(Materials aMaterial, int baseDuration, int aEUt, OrePrefixes prefix1,
         OrePrefixes prefix2, int multiplier) {
-        if (GT_OreDictUnificator.get(prefix1, aMaterial, 1L) != null
-            && GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L) != null) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(prefix1, aMaterial, 1L), GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, multiplier))
+        if (GTOreDictUnificator.get(prefix1, aMaterial, 1L) != null
+            && GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L) != null) {
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(prefix1, aMaterial, 1L), GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, multiplier))
                 .duration(baseDuration * TICKS)
                 .eut(aEUt)
                 .addTo(wiremillRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(prefix1, aMaterial, 2L / multiplier),
-                    GT_Utility.getIntegratedCircuit(2))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L))
+                    GTOreDictUnificator.get(prefix1, aMaterial, 2L / multiplier),
+                    GTUtility.getIntegratedCircuit(2))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L))
                 .duration(((int) (baseDuration * 1.5f)) * TICKS)
                 .eut(aEUt)
                 .addTo(wiremillRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(prefix1, aMaterial, 4L / multiplier),
-                    GT_Utility.getIntegratedCircuit(4))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L))
+                    GTOreDictUnificator.get(prefix1, aMaterial, 4L / multiplier),
+                    GTUtility.getIntegratedCircuit(4))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L))
                 .duration(baseDuration * 2 * TICKS)
                 .eut(aEUt)
                 .addTo(wiremillRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(prefix1, aMaterial, 8L / multiplier),
-                    GT_Utility.getIntegratedCircuit(8))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L))
+                    GTOreDictUnificator.get(prefix1, aMaterial, 8L / multiplier),
+                    GTUtility.getIntegratedCircuit(8))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L))
                 .duration(((int) (baseDuration * 2.5f)) * TICKS)
                 .eut(aEUt)
                 .addTo(wiremillRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(prefix1, aMaterial, 12L / multiplier),
-                    GT_Utility.getIntegratedCircuit(12))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L))
+                    GTOreDictUnificator.get(prefix1, aMaterial, 12L / multiplier),
+                    GTUtility.getIntegratedCircuit(12))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L))
                 .duration(baseDuration * 3 * TICKS)
                 .eut(aEUt)
                 .addTo(wiremillRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(prefix1, aMaterial, 16L / multiplier),
-                    GT_Utility.getIntegratedCircuit(16))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L))
+                    GTOreDictUnificator.get(prefix1, aMaterial, 16L / multiplier),
+                    GTUtility.getIntegratedCircuit(16))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L))
                 .duration(((int) (baseDuration * 3.5f)) * TICKS)
                 .eut(aEUt)
                 .addTo(wiremillRecipes);
         }
 
-        if (GT_OreDictUnificator.get(prefix2, aMaterial, 1L) != null
-            && GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L) != null) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(prefix2, aMaterial, 1L), GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L / multiplier))
+        if (GTOreDictUnificator.get(prefix2, aMaterial, 1L) != null
+            && GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L) != null) {
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(prefix2, aMaterial, 1L), GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L / multiplier))
                 .duration(((int) (baseDuration * 0.5f)) * TICKS)
                 .eut(aEUt)
                 .addTo(wiremillRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(prefix2, aMaterial, 4L / multiplier),
-                    GT_Utility.getIntegratedCircuit(2))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L))
+                    GTOreDictUnificator.get(prefix2, aMaterial, 4L / multiplier),
+                    GTUtility.getIntegratedCircuit(2))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L))
                 .duration(baseDuration * TICKS)
                 .eut(aEUt)
                 .addTo(wiremillRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(prefix2, aMaterial, 8L / multiplier),
-                    GT_Utility.getIntegratedCircuit(4))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L))
+                    GTOreDictUnificator.get(prefix2, aMaterial, 8L / multiplier),
+                    GTUtility.getIntegratedCircuit(4))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L))
                 .duration(((int) (baseDuration * 1.5f)) * TICKS)
                 .eut(aEUt)
                 .addTo(wiremillRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(prefix2, aMaterial, 16L / multiplier),
-                    GT_Utility.getIntegratedCircuit(8))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L))
+                    GTOreDictUnificator.get(prefix2, aMaterial, 16L / multiplier),
+                    GTUtility.getIntegratedCircuit(8))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L))
                 .duration(baseDuration * 2 * TICKS)
                 .eut(aEUt)
                 .addTo(wiremillRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(prefix2, aMaterial, 24L / multiplier),
-                    GT_Utility.getIntegratedCircuit(12))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L))
+                    GTOreDictUnificator.get(prefix2, aMaterial, 24L / multiplier),
+                    GTUtility.getIntegratedCircuit(12))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L))
                 .duration(((int) (baseDuration * 2.5f)) * TICKS)
                 .eut(aEUt)
                 .addTo(wiremillRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(prefix2, aMaterial, 32L / multiplier),
-                    GT_Utility.getIntegratedCircuit(16))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L))
+                    GTOreDictUnificator.get(prefix2, aMaterial, 32L / multiplier),
+                    GTUtility.getIntegratedCircuit(16))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L))
                 .duration(baseDuration * 3 * TICKS)
                 .eut(aEUt)
                 .addTo(wiremillRecipes);
         }
-        if (GT_OreDictUnificator.get(prefix1, aMaterial, 1L) != null
-            && GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 1L) != null) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(prefix1, aMaterial, 1L), GT_Utility.getIntegratedCircuit(3))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 4L * multiplier))
+        if (GTOreDictUnificator.get(prefix1, aMaterial, 1L) != null
+            && GTOreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 1L) != null) {
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(prefix1, aMaterial, 1L), GTUtility.getIntegratedCircuit(3))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 4L * multiplier))
                 .duration(baseDuration * TICKS)
                 .eut(aEUt)
                 .addTo(wiremillRecipes);
         }
-        if (GT_OreDictUnificator.get(prefix2, aMaterial, 1L) != null
-            && GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 1L) != null) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(prefix2, aMaterial, 1L), GT_Utility.getIntegratedCircuit(3))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 2L * multiplier))
+        if (GTOreDictUnificator.get(prefix2, aMaterial, 1L) != null
+            && GTOreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 1L) != null) {
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(prefix2, aMaterial, 1L), GTUtility.getIntegratedCircuit(3))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 2L * multiplier))
                 .duration(((int) (baseDuration * 0.5f)) * TICKS)
                 .eut(aEUt)
                 .addTo(wiremillRecipes);
diff --git a/src/main/java/gregtech/api/util/GT_RenderingWorld.java b/src/main/java/gregtech/api/util/GTRenderingWorld.java
index 7220b921a5..ace0e9cd8d 100644
--- a/src/main/java/gregtech/api/util/GT_RenderingWorld.java
+++ b/src/main/java/gregtech/api/util/GTRenderingWorld.java
@@ -26,9 +26,9 @@ import cpw.mods.fml.common.gameevent.TickEvent;
 /**
  * Provide a fake IBlockAccess to support CTM. Facade are supposed to set these when they are placed/received by client.
  */
-public class GT_RenderingWorld implements IBlockAccess {
+public class GTRenderingWorld implements IBlockAccess {
 
-    private static final GT_RenderingWorld INSTANCE = new GT_RenderingWorld();
+    private static final GTRenderingWorld INSTANCE = new GTRenderingWorld();
     /*
      * I do not think this map would ever grow too huge, so I won't go too overcomplicated on this one
      */
@@ -36,16 +36,16 @@ public class GT_RenderingWorld implements IBlockAccess {
     private final Map<ChunkCoordIntPair, Set<ChunkPosition>> index = new HashMap<>();
     private IBlockAccess mWorld = Minecraft.getMinecraft().theWorld;
 
-    private GT_RenderingWorld() {
+    private GTRenderingWorld() {
         new FMLEventHandler();
         new ForgeEventHandler();
     }
 
-    public static GT_RenderingWorld getInstance() {
+    public static GTRenderingWorld getInstance() {
         return INSTANCE;
     }
 
-    public static GT_RenderingWorld getInstance(IBlockAccess aWorld) {
+    public static GTRenderingWorld getInstance(IBlockAccess aWorld) {
         if (aWorld == INSTANCE) return INSTANCE;
         if (aWorld == null) INSTANCE.mWorld = Minecraft.getMinecraft().theWorld;
         else INSTANCE.mWorld = aWorld;
diff --git a/src/main/java/gregtech/api/util/GT_Shaped_Recipe.java b/src/main/java/gregtech/api/util/GTShapedRecipe.java
index 95a1a0bb66..587f3fa852 100644
--- a/src/main/java/gregtech/api/util/GT_Shaped_Recipe.java
+++ b/src/main/java/gregtech/api/util/GTShapedRecipe.java
@@ -8,15 +8,15 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 
-import gregtech.api.interfaces.internal.IGT_CraftingRecipe;
+import gregtech.api.interfaces.internal.IGTCraftingRecipe;
 
-public class GT_Shaped_Recipe extends ShapedOreRecipe implements IGT_CraftingRecipe {
+public class GTShapedRecipe extends ShapedOreRecipe implements IGTCraftingRecipe {
 
     public final boolean mRemovableByGT, mKeepingNBT;
     private final Enchantment[] mEnchantmentsAdded;
     private final int[] mEnchantmentLevelsAdded;
 
-    public GT_Shaped_Recipe(ItemStack aResult, boolean aDismantleAble, boolean aRemovableByGT, boolean aKeepingNBT,
+    public GTShapedRecipe(ItemStack aResult, boolean aDismantleAble, boolean aRemovableByGT, boolean aKeepingNBT,
         Enchantment[] aEnchantmentsAdded, int[] aEnchantmentLevelsAdded, Object... aRecipe) {
         super(aResult, aRecipe);
         mEnchantmentsAdded = aEnchantmentsAdded;
@@ -52,7 +52,7 @@ public class GT_Shaped_Recipe extends ShapedOreRecipe implements IGT_CraftingRec
         ItemStack rStack = super.getCraftingResult(aGrid);
         if (rStack != null) {
             // Update the Stack
-            GT_Utility.updateItemStack(rStack);
+            GTUtility.updateItemStack(rStack);
 
             // Keeping NBT
             if (mKeepingNBT) for (int i = 0; i < aGrid.getSizeInventory(); i++) {
@@ -67,28 +67,28 @@ public class GT_Shaped_Recipe extends ShapedOreRecipe implements IGT_CraftingRec
             }
 
             // Charge Values
-            if (GT_ModHandler.isElectricItem(rStack)) {
-                GT_ModHandler.dischargeElectricItem(rStack, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false, true);
+            if (GTModHandler.isElectricItem(rStack)) {
+                GTModHandler.dischargeElectricItem(rStack, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false, true);
                 int tCharge = 0;
-                for (int i = 0; i < aGrid.getSizeInventory(); i++) tCharge += GT_ModHandler.dischargeElectricItem(
+                for (int i = 0; i < aGrid.getSizeInventory(); i++) tCharge += GTModHandler.dischargeElectricItem(
                     aGrid.getStackInSlot(i),
                     Integer.MAX_VALUE,
                     Integer.MAX_VALUE,
                     true,
                     true,
                     true);
-                if (tCharge > 0) GT_ModHandler.chargeElectricItem(rStack, tCharge, Integer.MAX_VALUE, true, false);
+                if (tCharge > 0) GTModHandler.chargeElectricItem(rStack, tCharge, Integer.MAX_VALUE, true, false);
             }
 
             // Add Enchantments
-            for (int i = 0; i < mEnchantmentsAdded.length; i++) GT_Utility.ItemNBT.addEnchantment(
+            for (int i = 0; i < mEnchantmentsAdded.length; i++) GTUtility.ItemNBT.addEnchantment(
                 rStack,
                 mEnchantmentsAdded[i],
                 EnchantmentHelper.getEnchantmentLevel(mEnchantmentsAdded[i].effectId, rStack)
                     + mEnchantmentLevelsAdded[i]);
 
             // Update the Stack again
-            GT_Utility.updateItemStack(rStack);
+            GTUtility.updateItemStack(rStack);
         }
         return rStack;
     }
diff --git a/src/main/java/gregtech/api/util/GT_Shapeless_Recipe.java b/src/main/java/gregtech/api/util/GTShapelessRecipe.java
index 582dd7cc10..20c1d361be 100644
--- a/src/main/java/gregtech/api/util/GT_Shapeless_Recipe.java
+++ b/src/main/java/gregtech/api/util/GTShapelessRecipe.java
@@ -8,15 +8,15 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
-import gregtech.api.interfaces.internal.IGT_CraftingRecipe;
+import gregtech.api.interfaces.internal.IGTCraftingRecipe;
 
-public class GT_Shapeless_Recipe extends ShapelessOreRecipe implements IGT_CraftingRecipe {
+public class GTShapelessRecipe extends ShapelessOreRecipe implements IGTCraftingRecipe {
 
     public final boolean mRemovableByGT, mKeepingNBT;
     private final Enchantment[] mEnchantmentsAdded;
     private final int[] mEnchantmentLevelsAdded;
 
-    public GT_Shapeless_Recipe(ItemStack aResult, boolean aDismantleAble, boolean aRemovableByGT, boolean aKeepingNBT,
+    public GTShapelessRecipe(ItemStack aResult, boolean aDismantleAble, boolean aRemovableByGT, boolean aKeepingNBT,
         Enchantment[] aEnchantmentsAdded, int[] aEnchantmentLevelsAdded, Object... aRecipe) {
         super(aResult, aRecipe);
         mEnchantmentsAdded = aEnchantmentsAdded;
@@ -52,7 +52,7 @@ public class GT_Shapeless_Recipe extends ShapelessOreRecipe implements IGT_Craft
         ItemStack rStack = super.getCraftingResult(aGrid);
         if (rStack != null) {
             // Update the Stack
-            GT_Utility.updateItemStack(rStack);
+            GTUtility.updateItemStack(rStack);
 
             // Keeping NBT
             if (mKeepingNBT) for (int i = 0; i < aGrid.getSizeInventory(); i++) {
@@ -67,28 +67,28 @@ public class GT_Shapeless_Recipe extends ShapelessOreRecipe implements IGT_Craft
             }
 
             // Charge Values
-            if (GT_ModHandler.isElectricItem(rStack)) {
-                GT_ModHandler.dischargeElectricItem(rStack, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false, true);
+            if (GTModHandler.isElectricItem(rStack)) {
+                GTModHandler.dischargeElectricItem(rStack, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false, true);
                 int tCharge = 0;
-                for (int i = 0; i < aGrid.getSizeInventory(); i++) tCharge += GT_ModHandler.dischargeElectricItem(
+                for (int i = 0; i < aGrid.getSizeInventory(); i++) tCharge += GTModHandler.dischargeElectricItem(
                     aGrid.getStackInSlot(i),
                     Integer.MAX_VALUE,
                     Integer.MAX_VALUE,
                     true,
                     true,
                     true);
-                if (tCharge > 0) GT_ModHandler.chargeElectricItem(rStack, tCharge, Integer.MAX_VALUE, true, false);
+                if (tCharge > 0) GTModHandler.chargeElectricItem(rStack, tCharge, Integer.MAX_VALUE, true, false);
             }
 
             // Add Enchantments
-            for (int i = 0; i < mEnchantmentsAdded.length; i++) GT_Utility.ItemNBT.addEnchantment(
+            for (int i = 0; i < mEnchantmentsAdded.length; i++) GTUtility.ItemNBT.addEnchantment(
                 rStack,
                 mEnchantmentsAdded[i],
                 EnchantmentHelper.getEnchantmentLevel(mEnchantmentsAdded[i].effectId, rStack)
                     + mEnchantmentLevelsAdded[i]);
 
             // Update the Stack again
-            GT_Utility.updateItemStack(rStack);
+            GTUtility.updateItemStack(rStack);
         }
         return rStack;
     }
diff --git a/src/main/java/gregtech/api/util/GT_SpawnEventHandler.java b/src/main/java/gregtech/api/util/GTSpawnEventHandler.java
index ebdba1144b..2e86fef136 100644
--- a/src/main/java/gregtech/api/util/GT_SpawnEventHandler.java
+++ b/src/main/java/gregtech/api/util/GTSpawnEventHandler.java
@@ -11,18 +11,18 @@ import net.minecraftforge.event.entity.living.LivingSpawnEvent.CheckSpawn;
 
 import cpw.mods.fml.common.eventhandler.Event;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_MonsterRepellent;
+import gregtech.common.tileentities.machines.basic.MTEMonsterRepellent;
 
-public class GT_SpawnEventHandler {
+public class GTSpawnEventHandler {
 
     public static volatile List<int[]> mobReps = new CopyOnWriteArrayList<>();
     // Future Optimiztation ideas, if this isn't sufficient
     // 1: Keep a weakref list of mob repellents so we already have the tile
     // 2: Have the tick method update a HashMap of (int[], range) so we don't have to load the tile at all
 
-    public GT_SpawnEventHandler() {
+    public GTSpawnEventHandler() {
         MinecraftForge.EVENT_BUS.register(this);
     }
 
@@ -50,7 +50,7 @@ public class GT_SpawnEventHandler {
         }
 
         if (event.entityLiving.isCreatureType(EnumCreatureType.monster, false)) {
-            final double maxRangeCheck = Math.pow(getPoweredRepellentRange(GT_Values.V.length - 1), 2);
+            final double maxRangeCheck = Math.pow(getPoweredRepellentRange(GTValues.V.length - 1), 2);
             for (int[] rep : mobReps) {
                 if (rep[3] == event.entity.worldObj.provider.dimensionId) {
                     // If the chunk isn't loaded, we ignore this Repellent
@@ -65,7 +65,7 @@ public class GT_SpawnEventHandler {
 
                     final TileEntity tTile = event.entity.worldObj.getTileEntity(rep[0], rep[1], rep[2]);
                     if (tTile instanceof BaseMetaTileEntity metaTile
-                        && metaTile.getMetaTileEntity() instanceof GT_MetaTileEntity_MonsterRepellent repellent
+                        && metaTile.getMetaTileEntity() instanceof MTEMonsterRepellent repellent
                         && check <= Math.pow(repellent.mRange, 2)) {
                         if (event.entityLiving instanceof EntitySlime slime) {
                             slime.setCustomNameTag("DoNotSpawnSlimes");
diff --git a/src/main/java/gregtech/api/util/GT_StreamUtil.java b/src/main/java/gregtech/api/util/GTStreamUtil.java
index c29e611c4e..4b71fe5ee8 100644
--- a/src/main/java/gregtech/api/util/GT_StreamUtil.java
+++ b/src/main/java/gregtech/api/util/GTStreamUtil.java
@@ -9,7 +9,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-public final class GT_StreamUtil {
+public final class GTStreamUtil {
 
     /**
      * Backport of {@link Stream#ofNullable}.
diff --git a/src/main/java/gregtech/api/util/GT_StructureUtility.java b/src/main/java/gregtech/api/util/GTStructureUtility.java
index 6bbb3e1223..2109a7e75b 100644
--- a/src/main/java/gregtech/api/util/GT_StructureUtility.java
+++ b/src/main/java/gregtech/api/util/GTStructureUtility.java
@@ -34,26 +34,25 @@ import com.gtnewhorizon.structurelib.structure.AutoPlaceEnvironment;
 import com.gtnewhorizon.structurelib.structure.IItemSource;
 import com.gtnewhorizon.structurelib.structure.IStructureElement;
 import com.gtnewhorizon.structurelib.structure.IStructureElementNoPlacement;
-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.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IHeatingCoil;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.common.blocks.GT_Block_Casings5;
-import gregtech.common.blocks.GT_Block_FrameBox;
-import gregtech.common.blocks.GT_Cyclotron_Coils;
-import gregtech.common.blocks.GT_Item_Machines;
+import gregtech.api.metatileentity.implementations.MTETieredMachineBlock;
+import gregtech.common.blocks.BlockCasings5;
+import gregtech.common.blocks.BlockCyclotronCoils;
+import gregtech.common.blocks.BlockFrameBox;
+import gregtech.common.blocks.ItemMachines;
 
-public class GT_StructureUtility {
+public class GTStructureUtility {
 
     // private static final Map<Class<?>, String> customNames = new HashMap<>();
-    private GT_StructureUtility() {
+    private GTStructureUtility() {
         throw new AssertionError("Not instantiable");
     }
 
@@ -61,7 +60,7 @@ public class GT_StructureUtility {
         return aTile != null && clazz.isInstance(aTile.getMetaTileEntity());
     }
 
-    public static <T> IStructureElementNoPlacement<T> ofHatchAdder(IGT_HatchAdder<T> aHatchAdder, int aTextureIndex,
+    public static <T> IStructureElementNoPlacement<T> ofHatchAdder(IGTHatchAdder<T> aHatchAdder, int aTextureIndex,
         int aDots) {
         return ofHatchAdder(aHatchAdder, aTextureIndex, StructureLibAPI.getBlockHint(), aDots - 1);
     }
@@ -75,7 +74,7 @@ public class GT_StructureUtility {
             @Override
             public boolean check(T t, World world, int x, int y, int z) {
                 Block block = world.getBlock(x, y, z);
-                if (block instanceof GT_Block_FrameBox frameBox) {
+                if (block instanceof BlockFrameBox frameBox) {
                     int meta = world.getBlockMetadata(x, y, z);
                     Materials material = frameBox.getMaterial(meta);
                     return aFrameMaterial == material;
@@ -96,21 +95,21 @@ public class GT_StructureUtility {
             @Override
             public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
                 ItemStack tFrameStack = getFrameStack();
-                if (!GT_Utility.isStackValid(tFrameStack)
+                if (!GTUtility.isStackValid(tFrameStack)
                     || !(tFrameStack.getItem() instanceof ItemBlock tFrameStackItem)) return false;
                 return tFrameStackItem
                     .placeBlockAt(tFrameStack, null, world, x, y, z, 6, 0, 0, 0, Items.feather.getDamage(tFrameStack));
             }
 
             private ItemStack getFrameStack() {
-                return GT_OreDictUnificator.get(OrePrefixes.frameGt, aFrameMaterial, 1);
+                return GTOreDictUnificator.get(OrePrefixes.frameGt, aFrameMaterial, 1);
             }
 
             @Override
             public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, ItemStack trigger,
                 AutoPlaceEnvironment env) {
                 ItemStack tFrameStack = getFrameStack();
-                if (!GT_Utility.isStackValid(tFrameStack) || !(tFrameStack.getItem() instanceof ItemBlock))
+                if (!GTUtility.isStackValid(tFrameStack) || !(tFrameStack.getItem() instanceof ItemBlock))
                     return BlocksToPlace.errored;
                 return BlocksToPlace.create(tFrameStack);
             }
@@ -133,9 +132,9 @@ public class GT_StructureUtility {
                 AutoPlaceEnvironment env) {
                 if (check(t, world, x, y, z)) return SKIP;
                 ItemStack tFrameStack = getFrameStack();
-                if (!GT_Utility.isStackValid(tFrameStack) || !(tFrameStack.getItem() instanceof ItemBlock))
+                if (!GTUtility.isStackValid(tFrameStack) || !(tFrameStack.getItem() instanceof ItemBlock))
                     return REJECT; // honestly, this is more like a programming error or pack issue
-                return StructureUtility.survivalPlaceBlock(
+                return com.gtnewhorizon.structurelib.structure.StructureUtility.survivalPlaceBlock(
                     tFrameStack,
                     ItemStackPredicate.NBTMode.IGNORE_KNOWN_INSIGNIFICANT_TAGS,
                     null,
@@ -151,19 +150,19 @@ public class GT_StructureUtility {
         };
     }
 
-    public static <T> GT_HatchElementBuilder<T> buildHatchAdder() {
-        return GT_HatchElementBuilder.builder();
+    public static <T> HatchElementBuilder<T> buildHatchAdder() {
+        return HatchElementBuilder.builder();
     }
 
     /**
      * Completely equivalent to {@link #buildHatchAdder()}, except it plays nicer with type inference when statically
      * imported
      */
-    public static <T> GT_HatchElementBuilder<T> buildHatchAdder(Class<T> typeToken) {
-        return GT_HatchElementBuilder.builder();
+    public static <T> HatchElementBuilder<T> buildHatchAdder(Class<T> typeToken) {
+        return HatchElementBuilder.builder();
     }
 
-    public static <T> IStructureElementNoPlacement<T> ofHatchAdder(IGT_HatchAdder<T> aHatchAdder, int aTextureIndex,
+    public static <T> IStructureElementNoPlacement<T> ofHatchAdder(IGTHatchAdder<T> aHatchAdder, int aTextureIndex,
         Block aHintBlock, int aHintMeta) {
         if (aHatchAdder == null || aHintBlock == null) {
             throw new IllegalArgumentException();
@@ -185,7 +184,7 @@ public class GT_StructureUtility {
         };
     }
 
-    public static <T> IStructureElement<T> ofHatchAdder(IGT_HatchAdder<T> aHatchAdder, int aTextureIndex,
+    public static <T> IStructureElement<T> ofHatchAdder(IGTHatchAdder<T> aHatchAdder, int aTextureIndex,
         Block aHintBlock, int aHintMeta, BiPredicate<T, IGregTechTileEntity> shouldSkip,
         Function<T, Class<? extends IMetaTileEntity>> aMetaId, final IStructureElement.PlaceResult acceptType) {
         if (aHatchAdder == null) {
@@ -217,7 +216,7 @@ public class GT_StructureUtility {
                 AutoPlaceEnvironment env) {
                 Class<? extends IMetaTileEntity> clazz = aMetaId.apply(t);
                 if (clazz == null) return BlocksToPlace.createEmpty();
-                return BlocksToPlace.create(is -> clazz.isInstance(GT_Item_Machines.getMetaTileEntity(is)));
+                return BlocksToPlace.create(is -> clazz.isInstance(ItemMachines.getMetaTileEntity(is)));
             }
 
             @Override
@@ -245,8 +244,8 @@ public class GT_StructureUtility {
                 Class<? extends IMetaTileEntity> clazz = aMetaId.apply(t);
                 if (clazz == null) return REJECT;
                 ItemStack taken = env.getSource()
-                    .takeOne(is -> clazz.isInstance(GT_Item_Machines.getMetaTileEntity(is)), true);
-                if (GT_Utility.isStackInvalid(taken)) {
+                    .takeOne(is -> clazz.isInstance(ItemMachines.getMetaTileEntity(is)), true);
+                if (GTUtility.isStackInvalid(taken)) {
                     env.getChatter()
                         .accept(
                             new ChatComponentTranslation(
@@ -254,7 +253,7 @@ public class GT_StructureUtility {
                                 clazz.getSimpleName()));
                     return REJECT;
                 }
-                if (StructureUtility
+                if (com.gtnewhorizon.structurelib.structure.StructureUtility
                     .survivalPlaceBlock(taken, EXACT, null, true, world, x, y, z, env.getSource(), env.getActor())
                     == ACCEPT) return acceptType;
                 return REJECT;
@@ -262,7 +261,7 @@ public class GT_StructureUtility {
         };
     }
 
-    public static <T> IStructureElement<T> ofHatchAdder(IGT_HatchAdder<T> aHatchAdder, int aTextureIndex,
+    public static <T> IStructureElement<T> ofHatchAdder(IGTHatchAdder<T> aHatchAdder, int aTextureIndex,
         Block aHintBlock, int aHintMeta, BiPredicate<T, IGregTechTileEntity> shouldSkip, ToIntFunction<T> aMetaId) {
         if (aHatchAdder == null) {
             throw new IllegalArgumentException();
@@ -291,7 +290,7 @@ public class GT_StructureUtility {
             @Override
             public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, ItemStack trigger,
                 AutoPlaceEnvironment env) {
-                GT_Item_Machines item = (GT_Item_Machines) Item.getItemFromBlock(GregTech_API.sBlockMachines);
+                ItemMachines item = (ItemMachines) Item.getItemFromBlock(GregTechAPI.sBlockMachines);
                 int meta = aMetaId.applyAsInt(t);
                 if (meta < 0) return BlocksToPlace.createEmpty();
                 return BlocksToPlace.create(
@@ -321,7 +320,7 @@ public class GT_StructureUtility {
                         && shouldSkip.test(t, (IGregTechTileEntity) tileEntity)) return SKIP;
                 }
                 if (!StructureLibAPI.isBlockTriviallyReplaceable(world, x, y, z, env.getActor())) return REJECT;
-                GT_Item_Machines item = (GT_Item_Machines) Item.getItemFromBlock(GregTech_API.sBlockMachines);
+                ItemMachines item = (ItemMachines) Item.getItemFromBlock(GregTechAPI.sBlockMachines);
                 int meta = aMetaId.applyAsInt(t);
                 if (meta < 0) return REJECT;
                 ItemStack taken = env.getSource()
@@ -329,19 +328,19 @@ public class GT_StructureUtility {
                         ItemStackPredicate.from(item)
                             .setMeta(meta),
                         true);
-                if (GT_Utility.isStackInvalid(taken)) {
+                if (GTUtility.isStackInvalid(taken)) {
                     env.getChatter()
                         .accept(new ChatComponentTranslation("GT5U.autoplace.error.no_mte.id", meta));
                     return REJECT;
                 }
-                return StructureUtility
+                return com.gtnewhorizon.structurelib.structure.StructureUtility
                     .survivalPlaceBlock(taken, EXACT, null, true, world, x, y, z, env.getSource(), env.getActor())
                     == ACCEPT ? ACCEPT_STOP : REJECT;
             }
         };
     }
 
-    public static <T> IStructureElement<T> ofHatchAdderOptional(IGT_HatchAdder<T> aHatchAdder, int textureIndex,
+    public static <T> IStructureElement<T> ofHatchAdderOptional(IGTHatchAdder<T> aHatchAdder, int textureIndex,
         int dots, Block placeCasing, int placeCasingMeta) {
         return ofHatchAdderOptional(
             aHatchAdder,
@@ -352,7 +351,7 @@ public class GT_StructureUtility {
             placeCasingMeta);
     }
 
-    public static <T> IStructureElement<T> ofHatchAdderOptional(IGT_HatchAdder<T> aHatchAdder, int aTextureIndex,
+    public static <T> IStructureElement<T> ofHatchAdderOptional(IGTHatchAdder<T> aHatchAdder, int aTextureIndex,
         Block aHintBlock, int hintMeta, Block placeCasing, int placeCasingMeta) {
         if (aHatchAdder == null || aHintBlock == null) {
             throw new IllegalArgumentException();
@@ -384,7 +383,7 @@ public class GT_StructureUtility {
             public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger,
                 IItemSource s, EntityPlayerMP actor, Consumer<IChatComponent> chatter) {
                 if (check(t, world, x, y, z)) return SKIP;
-                return StructureUtility
+                return com.gtnewhorizon.structurelib.structure.StructureUtility
                     .survivalPlaceBlock(placeCasing, placeCasingMeta, world, x, y, z, s, actor, chatter);
             }
         };
@@ -433,12 +432,12 @@ public class GT_StructureUtility {
 
             @Override
             public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                StructureLibAPI.hintParticle(world, x, y, z, GregTech_API.sBlockCasings5, getMetaFromHint(trigger));
+                StructureLibAPI.hintParticle(world, x, y, z, GregTechAPI.sBlockCasings5, getMetaFromHint(trigger));
                 return true;
             }
 
             private int getMetaFromHint(ItemStack trigger) {
-                return GT_Block_Casings5.getMetaFromCoilHeat(getHeatFromHint(trigger));
+                return BlockCasings5.getMetaFromCoilHeat(getHeatFromHint(trigger));
             }
 
             private HeatingCoilLevel getHeatFromHint(ItemStack trigger) {
@@ -448,13 +447,13 @@ public class GT_StructureUtility {
 
             @Override
             public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return world.setBlock(x, y, z, GregTech_API.sBlockCasings5, getMetaFromHint(trigger), 3);
+                return world.setBlock(x, y, z, GregTechAPI.sBlockCasings5, getMetaFromHint(trigger), 3);
             }
 
             @Override
             public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, ItemStack trigger,
                 AutoPlaceEnvironment env) {
-                return BlocksToPlace.create(GregTech_API.sBlockCasings5, getMetaFromHint(trigger));
+                return BlocksToPlace.create(GregTechAPI.sBlockCasings5, getMetaFromHint(trigger));
             }
 
             @Override
@@ -477,8 +476,8 @@ public class GT_StructureUtility {
                 boolean isCoil = block instanceof IHeatingCoil
                     && ((IHeatingCoil) block).getCoilHeat(world.getBlockMetadata(x, y, z)) == getHeatFromHint(trigger);
                 if (isCoil) return SKIP;
-                return StructureUtility.survivalPlaceBlock(
-                    GregTech_API.sBlockCasings5,
+                return com.gtnewhorizon.structurelib.structure.StructureUtility.survivalPlaceBlock(
+                    GregTechAPI.sBlockCasings5,
                     getMetaFromHint(trigger),
                     world,
                     x,
@@ -524,9 +523,9 @@ public class GT_StructureUtility {
             public boolean check(T t, World world, int x, int y, int z) {
                 Block block = world.getBlock(x, y, z);
 
-                if (block != GregTech_API.sSolenoidCoilCasings) return false;
+                if (block != GregTechAPI.sSolenoidCoilCasings) return false;
 
-                var coils = ((GT_Cyclotron_Coils) GregTech_API.sSolenoidCoilCasings);
+                var coils = ((BlockCyclotronCoils) GregTechAPI.sSolenoidCoilCasings);
 
                 Byte existingLevel = aSolenoidTierGetter.apply(t);
                 byte newLevel = (byte) (coils.getVoltageTier(world.getBlockMetadata(x, y, z)));
@@ -541,7 +540,7 @@ public class GT_StructureUtility {
             @Override
             public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
                 StructureLibAPI
-                    .hintParticle(world, x, y, z, GregTech_API.sSolenoidCoilCasings, getMetaFromHint(trigger));
+                    .hintParticle(world, x, y, z, GregTechAPI.sSolenoidCoilCasings, getMetaFromHint(trigger));
                 return true;
             }
 
@@ -551,13 +550,13 @@ public class GT_StructureUtility {
 
             @Override
             public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return world.setBlock(x, y, z, GregTech_API.sSolenoidCoilCasings, getMetaFromHint(trigger), 3);
+                return world.setBlock(x, y, z, GregTechAPI.sSolenoidCoilCasings, getMetaFromHint(trigger), 3);
             }
 
             @Override
             public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, ItemStack trigger,
                 AutoPlaceEnvironment env) {
-                return BlocksToPlace.create(GregTech_API.sSolenoidCoilCasings, getMetaFromHint(trigger));
+                return BlocksToPlace.create(GregTechAPI.sSolenoidCoilCasings, getMetaFromHint(trigger));
             }
 
             @Override
@@ -578,13 +577,13 @@ public class GT_StructureUtility {
                 AutoPlaceEnvironment env) {
                 Block block = world.getBlock(x, y, z);
 
-                boolean isCoil = block == GregTech_API.sSolenoidCoilCasings
+                boolean isCoil = block == GregTechAPI.sSolenoidCoilCasings
                     && world.getBlockMetadata(x, y, z) == getMetaFromHint(trigger);
 
                 if (isCoil) return SKIP;
 
-                return StructureUtility.survivalPlaceBlock(
-                    GregTech_API.sSolenoidCoilCasings,
+                return com.gtnewhorizon.structurelib.structure.StructureUtility.survivalPlaceBlock(
+                    GregTechAPI.sSolenoidCoilCasings,
                     getMetaFromHint(trigger),
                     world,
                     x,
@@ -600,7 +599,7 @@ public class GT_StructureUtility {
     @Nonnull
     public static Predicate<ItemStack> filterByMTEClass(List<? extends Class<? extends IMetaTileEntity>> list) {
         return is -> {
-            IMetaTileEntity tile = GT_Item_Machines.getMetaTileEntity(is);
+            IMetaTileEntity tile = ItemMachines.getMetaTileEntity(is);
             return tile != null && list.stream()
                 .anyMatch(c -> c.isInstance(tile));
         };
@@ -609,10 +608,9 @@ public class GT_StructureUtility {
     @Nonnull
     public static Predicate<ItemStack> filterByMTETier(int aMinTier, int aMaxTier) {
         return is -> {
-            IMetaTileEntity tile = GT_Item_Machines.getMetaTileEntity(is);
-            return tile instanceof GT_MetaTileEntity_TieredMachineBlock
-                && ((GT_MetaTileEntity_TieredMachineBlock) tile).mTier <= aMaxTier
-                && ((GT_MetaTileEntity_TieredMachineBlock) tile).mTier >= aMinTier;
+            IMetaTileEntity tile = ItemMachines.getMetaTileEntity(is);
+            return tile instanceof MTETieredMachineBlock && ((MTETieredMachineBlock) tile).mTier <= aMaxTier
+                && ((MTETieredMachineBlock) tile).mTier >= aMinTier;
         };
     }
 }
diff --git a/src/main/java/gregtech/api/util/GT_ToolHarvestHelper.java b/src/main/java/gregtech/api/util/GTToolHarvestHelper.java
index 4263b77be6..8dd5d6b93c 100644
--- a/src/main/java/gregtech/api/util/GT_ToolHarvestHelper.java
+++ b/src/main/java/gregtech/api/util/GTToolHarvestHelper.java
@@ -10,7 +10,7 @@ import ic2.core.block.machine.BlockMiningTip;
 import ic2.core.block.wiring.BlockCable;
 import ic2.core.crop.BlockCrop;
 
-public class GT_ToolHarvestHelper {
+public class GTToolHarvestHelper {
 
     public static boolean isAppropriateTool(Block aBlock, byte aMetaData, String... tTools) {
 
diff --git a/src/main/java/gregtech/api/util/GTTooltipDataCache.java b/src/main/java/gregtech/api/util/GTTooltipDataCache.java
new file mode 100644
index 0000000000..a26f7a84d8
--- /dev/null
+++ b/src/main/java/gregtech/api/util/GTTooltipDataCache.java
@@ -0,0 +1,104 @@
+package gregtech.api.util;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.minecraft.util.StatCollector;
+
+import gregtech.GTMod;
+
+public class GTTooltipDataCache {
+
+    public static class TooltipData {
+
+        public List<String> text;
+        public List<String> shiftText;
+
+        public TooltipData(List<String> text, List<String> shiftText) {
+            this.text = text;
+            this.shiftText = shiftText;
+        }
+    }
+
+    private final Map<String, TooltipData> fetchedTooltipData = new HashMap<>();
+
+    /**
+     * Returns tooltip data respecting the user's configured verbosity levels, applying any formatting arguments.
+     *
+     * @param key  the key to lookup
+     * @param args arguments for string formatting (prefer using positional arguments)
+     * @return The tooltip data the user asked for
+     */
+    public TooltipData getData(String key, Object... args) {
+        TooltipData tooltipData = fetchedTooltipData.get(key);
+        if (tooltipData == null) {
+            tooltipData = getUncachedTooltipData(key, args);
+            fetchedTooltipData.put(key, tooltipData);
+        }
+        return tooltipData;
+    }
+
+    /**
+     * Builds tooltip data respecting the user's configured verbosity levels, applying any formatting arguments.
+     *
+     * @param key  the key to lookup
+     * @param args arguments for string formatting (prefer using positional arguments)
+     * @return The tooltip data the user asked for
+     */
+    public TooltipData getUncachedTooltipData(String key, Object... args) {
+        List<String> lines = getAllLines(key, args);
+        int normalLines = lines.size();
+        if (Math.max(GTMod.gregtechproxy.mTooltipVerbosity, GTMod.gregtechproxy.mTooltipShiftVerbosity) >= 3) {
+            lines.addAll(getAllLines(key + ".extended", args)); // Are extended lines enabled? If so add them to the
+                                                                // lines
+        }
+        if (lines.size() == 0) {
+            lines.add(key); // Fallback in case no lines could be found at all
+        }
+        return new TooltipData(
+            lines.subList(0, getVerbosityIndex(GTMod.gregtechproxy.mTooltipVerbosity, normalLines, lines.size())),
+            lines.subList(0, getVerbosityIndex(GTMod.gregtechproxy.mTooltipShiftVerbosity, normalLines, lines.size())));
+    }
+
+    /**
+     * Gets all the lines for the given key and every other subsequent consecutive key with a .n suffix, n in {1,2,3...}
+     *
+     * @param key  the key to lookup
+     * @param args arguments for string formatting (prefer using positional arguments)
+     * @return The lines for the key and all of it's subkeys
+     */
+    private List<String> getAllLines(String key, Object... args) {
+        List<String> lines = new ArrayList<>();
+        String keyToLookup = key;
+        int i = 1; // First loop has no .number postfix
+        while (StatCollector.canTranslate(keyToLookup)) {
+            lines.add(StatCollector.translateToLocalFormatted(keyToLookup, args));
+            keyToLookup = key + "." + i++;
+        }
+        return lines;
+    }
+
+    /**
+     * Determines how many lines from a tooltip to include from the full line list to respect a given verbosity level.
+     *
+     * @param tooltipVerbosity the verbosity level we're applying
+     * @param defaultIndex     return if tooltipVerbosity is 2
+     * @param maxIndex         return if tooltipVerbosity is greater than 2
+     * @return verbosity appropriate index
+     */
+    private static int getVerbosityIndex(int tooltipVerbosity, int defaultIndex, int maxIndex) {
+        int index;
+        if (tooltipVerbosity < 1) {
+            index = 0;
+        } else if (tooltipVerbosity == 1) {
+            index = 1;
+        } else if (tooltipVerbosity == 2) {
+            index = defaultIndex;
+        } else {
+            index = maxIndex;
+        }
+        return index;
+    }
+}
diff --git a/src/main/java/gregtech/api/util/GT_Util.java b/src/main/java/gregtech/api/util/GTUtil.java
index cdca6a1b9e..db2a628bbe 100644
--- a/src/main/java/gregtech/api/util/GT_Util.java
+++ b/src/main/java/gregtech/api/util/GTUtil.java
@@ -1,6 +1,6 @@
 package gregtech.api.util;
 
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.List;
 
@@ -20,12 +20,12 @@ import net.minecraftforge.common.util.Constants;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.interfaces.IDataCopyable;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEMultiBlockBase;
 import gregtech.api.multitileentity.interfaces.IMultiTileEntity;
-import gregtech.common.items.behaviors.Behaviour_DataOrb;
+import gregtech.common.items.behaviors.BehaviourDataOrb;
 
-public class GT_Util {
+public class GTUtil {
 
     // Last broken tile entity
     public static final ThreadLocal<TileEntity> LAST_BROKEN_TILEENTITY = new ThreadLocal<>();
@@ -153,7 +153,7 @@ public class GT_Util {
             world.getBlockMetadata(x, 0, z);
             aChunk = world.getChunkFromBlockCoords(x, z);
             if (aChunk == null) {
-                GT_Log.err.println(
+                GTLog.err.println(
                     "Some important Chunk does not exist for some reason at Coordinates X: " + x + " and Z: " + z);
                 return false;
             }
@@ -217,11 +217,10 @@ public class GT_Util {
         return (short) ((aColors >>> 24) & 255);
     }
 
-    public static boolean saveMultiblockInputConfiguration(GT_MetaTileEntity_MultiBlockBase controller,
-        EntityPlayer player) {
+    public static boolean saveMultiblockInputConfiguration(MTEMultiBlockBase controller, EntityPlayer player) {
         NBTTagCompound newTag = new NBTTagCompound();
         ItemStack dataOrb = player.getHeldItem();
-        if (GT_Utility.isStackInvalid(dataOrb) || !ItemList.Tool_DataOrb.isStackEqual(dataOrb, false, true)) {
+        if (GTUtility.isStackInvalid(dataOrb) || !ItemList.Tool_DataOrb.isStackEqual(dataOrb, false, true)) {
             return false;
         }
         if (!controller.saveOtherHatchConfiguration(player)) {
@@ -245,21 +244,20 @@ public class GT_Util {
         // TODO this doesn't work for now
         // newTag.setTag("mDualInputHatches", saveToDataStick(player, controller.mDualInputHatches));
         dataOrb.setTagCompound(newTag);
-        Behaviour_DataOrb.setDataTitle(dataOrb, "Multiblock Hatch Configuration");
-        Behaviour_DataOrb.setDataName(dataOrb, String.format("%s configuration saved", count));
+        BehaviourDataOrb.setDataTitle(dataOrb, "Multiblock Hatch Configuration");
+        BehaviourDataOrb.setDataName(dataOrb, String.format("%s configuration saved", count));
         return true;
     }
 
     public static boolean hasMultiblockInputConfiguration(ItemStack dataOrb) {
-        return !GT_Utility.isStackInvalid(dataOrb) && ItemList.Tool_DataOrb.isStackEqual(dataOrb, false, true)
+        return !GTUtility.isStackInvalid(dataOrb) && ItemList.Tool_DataOrb.isStackEqual(dataOrb, false, true)
             && dataOrb.getTagCompound() != null
             && "MultiblockConfiguration".equals(
                 dataOrb.getTagCompound()
                     .getString("type"));
     }
 
-    public static boolean loadMultiblockInputConfiguration(GT_MetaTileEntity_MultiBlockBase controller,
-        EntityPlayer player) {
+    public static boolean loadMultiblockInputConfiguration(MTEMultiBlockBase controller, EntityPlayer player) {
         ItemStack dataOrb = player.getHeldItem();
         if (!hasMultiblockInputConfiguration(dataOrb)) {
             return false;
@@ -297,10 +295,9 @@ public class GT_Util {
         return true;
     }
 
-    private static NBTTagList saveConfigurationToDataStick(EntityPlayer player,
-        List<? extends GT_MetaTileEntity_Hatch> hatches) {
+    private static NBTTagList saveConfigurationToDataStick(EntityPlayer player, List<? extends MTEHatch> hatches) {
         NBTTagList list = new NBTTagList();
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(hatches)) {
+        for (MTEHatch tHatch : filterValidMTEs(hatches)) {
             if (!(tHatch instanceof IDataCopyable copyable)) {
                 list.appendTag(new NBTTagCompound());
                 continue;
@@ -313,12 +310,12 @@ public class GT_Util {
     }
 
     private static boolean loadConfigurationFromDataStick(NBTTagList list, EntityPlayer player,
-        List<? extends GT_MetaTileEntity_Hatch> hatches) {
+        List<? extends MTEHatch> hatches) {
         if (list == null || list.tagList.isEmpty()) return false;
-        List<? extends GT_MetaTileEntity_Hatch> validMTEs = filterValidMTEs(hatches);
+        List<? extends MTEHatch> validMTEs = filterValidMTEs(hatches);
         int end = Math.min(validMTEs.size(), list.tagCount());
         for (int i = 0; i < end; i++) {
-            GT_MetaTileEntity_Hatch tHatch = validMTEs.get(i);
+            MTEHatch tHatch = validMTEs.get(i);
             NBTTagCompound tag = list.getCompoundTagAt(i);
             if (!(tHatch instanceof IDataCopyable copyable)) {
                 if (tag.hasNoTags()) continue;
@@ -331,12 +328,12 @@ public class GT_Util {
     }
 
     private static boolean checkCanLoadConfigurationFromDataStick(NBTTagList list, EntityPlayer player,
-        List<? extends GT_MetaTileEntity_Hatch> hatches) {
+        List<? extends MTEHatch> hatches) {
         if (list == null || list.tagList.isEmpty()) return false;
-        List<? extends GT_MetaTileEntity_Hatch> validMTEs = filterValidMTEs(hatches);
+        List<? extends MTEHatch> validMTEs = filterValidMTEs(hatches);
         int end = Math.min(validMTEs.size(), list.tagCount());
         for (int i = 0; i < end; i++) {
-            GT_MetaTileEntity_Hatch tHatch = validMTEs.get(i);
+            MTEHatch tHatch = validMTEs.get(i);
             NBTTagCompound tag = list.getCompoundTagAt(i);
             if (tag.hasNoTags()) continue;
             if (!(tHatch instanceof IDataCopyable copyable) || !copyable.getCopiedDataIdentifier(player)
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GTUtility.java
index 84e67ab728..08a1711b97 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GTUtility.java
@@ -1,18 +1,18 @@
 package gregtech.api.util;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
-import static gregtech.api.enums.GT_Values.COMPASS_DIRECTIONS;
-import static gregtech.api.enums.GT_Values.D1;
-import static gregtech.api.enums.GT_Values.E;
-import static gregtech.api.enums.GT_Values.GT;
-import static gregtech.api.enums.GT_Values.L;
-import static gregtech.api.enums.GT_Values.M;
-import static gregtech.api.enums.GT_Values.NW;
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.enums.GT_Values.W;
+import static gregtech.GTMod.GT_FML_LOGGER;
+import static gregtech.api.enums.GTValues.COMPASS_DIRECTIONS;
+import static gregtech.api.enums.GTValues.D1;
+import static gregtech.api.enums.GTValues.E;
+import static gregtech.api.enums.GTValues.GT;
+import static gregtech.api.enums.GTValues.L;
+import static gregtech.api.enums.GTValues.M;
+import static gregtech.api.enums.GTValues.NW;
+import static gregtech.api.enums.GTValues.V;
+import static gregtech.api.enums.GTValues.W;
 import static gregtech.api.enums.Materials.FLUID_MAP;
 import static gregtech.api.enums.Mods.Translocator;
-import static gregtech.common.GT_UndergroundOil.undergroundOilReadInformation;
+import static gregtech.common.UndergroundOil.undergroundOilReadInformation;
 import static net.minecraftforge.common.util.ForgeDirection.DOWN;
 import static net.minecraftforge.common.util.ForgeDirection.EAST;
 import static net.minecraftforge.common.util.ForgeDirection.NORTH;
@@ -130,12 +130,12 @@ import cofh.api.energy.IEnergyReceiver;
 import cofh.api.transport.IItemDuct;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
-import gregtech.api.damagesources.GT_DamageSources;
-import gregtech.api.damagesources.GT_DamageSources.DamageSourceHotItem;
-import gregtech.api.enchants.Enchantment_Hazmat;
-import gregtech.api.enchants.Enchantment_Radioactivity;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.damagesources.GTDamageSources;
+import gregtech.api.damagesources.GTDamageSources.DamageSourceHotItem;
+import gregtech.api.enchants.EnchantmentHazmat;
+import gregtech.api.enchants.EnchantmentRadioactivity;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Mods;
@@ -156,20 +156,20 @@ import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
 import gregtech.api.interfaces.tileentity.IUpgradableMachine;
-import gregtech.api.items.GT_EnergyArmor_Item;
-import gregtech.api.items.GT_Generic_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.GTGenericItem;
+import gregtech.api.items.ItemEnergyArmor;
+import gregtech.api.items.MetaGeneratedTool;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.net.GT_Packet_Sound;
+import gregtech.api.net.GTPacketSound;
 import gregtech.api.objects.CollectorUtils;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_ItemStack2;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.objects.GTItemStack2;
 import gregtech.api.objects.ItemData;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.threads.GT_Runnable_Sound;
+import gregtech.api.threads.RunnableSound;
 import gregtech.api.util.extensions.ArrayExt;
-import gregtech.common.GT_Pollution;
-import gregtech.common.blocks.GT_Block_Ores_Abstract;
+import gregtech.common.Pollution;
+import gregtech.common.blocks.BlockOresAbstract;
 import ic2.api.recipe.IRecipeInput;
 import ic2.api.recipe.RecipeInputItemStack;
 import ic2.api.recipe.RecipeInputOreDict;
@@ -182,7 +182,7 @@ import it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap;
  * <p/>
  * Just a few Utility Functions I use.
  */
-public class GT_Utility {
+public class GTUtility {
 
     /**
      * Formats a number with group separator and at most 2 fraction digits.
@@ -195,8 +195,8 @@ public class GT_Utility {
      */
     private static final List<FluidContainerData> sFluidContainerList = new ArrayList<>();
 
-    private static final Map<GT_ItemStack, FluidContainerData> sFilledContainerToData = new /* Concurrent */ HashMap<>();
-    private static final Map<GT_ItemStack, Map<String, FluidContainerData>> sEmptyContainerToFluidToData = new HashMap<>();
+    private static final Map<GTItemStack, FluidContainerData> sFilledContainerToData = new /* Concurrent */ HashMap<>();
+    private static final Map<GTItemStack, Map<String, FluidContainerData>> sEmptyContainerToFluidToData = new HashMap<>();
     private static final Map<String, List<ItemStack>> sFluidToContainers = new HashMap<>();
     /**
      * Must use {@code Supplier} here because the ore prefixes have not yet been registered at class load time.
@@ -205,19 +205,19 @@ public class GT_Utility {
 
     private static final Map<Integer, Boolean> sOreTable = new HashMap<>();
     public static boolean TE_CHECK = false, BC_CHECK = false, CHECK_ALL = true, RF_CHECK = false;
-    public static Map<GT_PlayedSound, Integer> sPlayedSoundMap = new /* Concurrent */ HashMap<>();
+    public static Map<GTPlayedSound, Integer> sPlayedSoundMap = new /* Concurrent */ HashMap<>();
     private static int sBookCount = 0;
     public static UUID defaultUuid = null; // maybe default non-null?
     // UUID.fromString("00000000-0000-0000-0000-000000000000");
 
     static {
-        GregTech_API.sItemStackMappings.add(sFilledContainerToData);
-        GregTech_API.sItemStackMappings.add(sEmptyContainerToFluidToData);
+        GregTechAPI.sItemStackMappings.add(sFilledContainerToData);
+        GregTechAPI.sItemStackMappings.add(sEmptyContainerToFluidToData);
 
         // 1 is the magic index to get the cobblestone block.
         // See: GT_Block_Stones.java, GT_Block_Granites.java
         Function<Materials, Supplier<ItemStack>> materialToCobble = m -> Suppliers.memoize(
-            () -> GT_OreDictUnificator.getOres(OrePrefixes.stone, m)
+            () -> GTOreDictUnificator.getOres(OrePrefixes.stone, m)
                 .get(1))::get;
         sOreToCobble.put(OrePrefixes.oreBlackgranite, materialToCobble.apply(Materials.GraniteBlack));
         sOreToCobble.put(OrePrefixes.oreRedgranite, materialToCobble.apply(Materials.GraniteRed));
@@ -303,7 +303,7 @@ public class GT_Utility {
             if (aPrivate) tField.setAccessible(true);
             return tField;
         } catch (Throwable e) {
-            if (aLogErrors) e.printStackTrace(GT_Log.err);
+            if (aLogErrors) e.printStackTrace(GTLog.err);
         }
         return null;
     }
@@ -318,7 +318,7 @@ public class GT_Utility {
             if (aPrivate) tField.setAccessible(true);
             return tField.get(aObject instanceof Class || aObject instanceof String ? null : aObject);
         } catch (Throwable e) {
-            if (aLogErrors) e.printStackTrace(GT_Log.err);
+            if (aLogErrors) e.printStackTrace(GTLog.err);
         }
         return null;
     }
@@ -359,7 +359,7 @@ public class GT_Utility {
             if (aPrivate) tMethod.setAccessible(true);
             return tMethod.invoke(aObject, aParameters);
         } catch (Throwable e) {
-            if (aLogErrors) e.printStackTrace(GT_Log.err);
+            if (aLogErrors) e.printStackTrace(GTLog.err);
         }
         return null;
     }
@@ -374,7 +374,7 @@ public class GT_Utility {
                 aLogErrors,
                 aParameters);
         } catch (Throwable e) {
-            if (aLogErrors) e.printStackTrace(GT_Log.err);
+            if (aLogErrors) e.printStackTrace(GTLog.err);
         }
         return aReplacementObject;
     }
@@ -389,13 +389,13 @@ public class GT_Utility {
                     } catch (Throwable ignored) {}
                 }
             } catch (Throwable e) {
-                if (aLogErrors) e.printStackTrace(GT_Log.err);
+                if (aLogErrors) e.printStackTrace(GTLog.err);
             }
         } else {
             try {
                 return aClass.getConstructors()[aConstructorIndex].newInstance(aParameters);
             } catch (Throwable e) {
-                if (aLogErrors) e.printStackTrace(GT_Log.err);
+                if (aLogErrors) e.printStackTrace(GTLog.err);
             }
         }
         return aReplacementObject;
@@ -423,7 +423,7 @@ public class GT_Utility {
 
             if (tPotionHashmap != null) return ((HashMap<?, ?>) tPotionHashmap.get(aPlayer)).get(aPotionIndex) != null;
         } catch (Throwable e) {
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return false;
     }
@@ -454,7 +454,7 @@ public class GT_Utility {
 
             if (tPotionHashmap != null) ((HashMap<?, ?>) tPotionHashmap.get(aPlayer)).remove(aPotionIndex);
         } catch (Throwable e) {
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
     }
 
@@ -463,10 +463,10 @@ public class GT_Utility {
             if (aPlayer.isInvisible()) {
                 for (int i = 0; i < 4; i++) {
                     if (aPlayer.inventory.armorInventory[i] != null) {
-                        if (aPlayer.inventory.armorInventory[i].getItem() instanceof GT_EnergyArmor_Item) {
-                            if ((((GT_EnergyArmor_Item) aPlayer.inventory.armorInventory[i].getItem()).mSpecials & 512)
+                        if (aPlayer.inventory.armorInventory[i].getItem() instanceof ItemEnergyArmor) {
+                            if ((((ItemEnergyArmor) aPlayer.inventory.armorInventory[i].getItem()).mSpecials & 512)
                                 != 0) {
-                                if (GT_ModHandler.canUseElectricItem(aPlayer.inventory.armorInventory[i], 10000)) {
+                                if (GTModHandler.canUseElectricItem(aPlayer.inventory.armorInventory[i], 10000)) {
                                     return true;
                                 }
                             }
@@ -475,7 +475,7 @@ public class GT_Utility {
                 }
             }
         } catch (Throwable e) {
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return false;
     }
@@ -506,7 +506,7 @@ public class GT_Utility {
     }
 
     public static long getAmperageForTier(long voltage, byte tier) {
-        return ceilDiv(voltage, GT_Values.V[tier]);
+        return ceilDiv(voltage, GTValues.V[tier]);
     }
 
     /**
@@ -516,7 +516,7 @@ public class GT_Utility {
         if (voltage > V[V.length - 1]) {
             return voltage;
         }
-        return V[GT_Utility.getTier(voltage)];
+        return V[GTUtility.getTier(voltage)];
     }
 
     public static String getColoredTierNameFromVoltage(long voltage) {
@@ -524,7 +524,7 @@ public class GT_Utility {
     }
 
     public static String getColoredTierNameFromTier(byte tier) {
-        return GT_Values.TIER_COLORS[tier] + GT_Values.VN[tier] + EnumChatFormatting.RESET;
+        return GTValues.TIER_COLORS[tier] + GTValues.VN[tier] + EnumChatFormatting.RESET;
     }
 
     /**
@@ -536,11 +536,11 @@ public class GT_Utility {
         if (tier < 0) {
             return "";
         } else if (tier == 0) {
-            return " (" + GT_Values.VN[1] + ")";
-        } else if (tier >= GT_Values.VN.length - 1) {
+            return " (" + GTValues.VN[1] + ")";
+        } else if (tier >= GTValues.VN.length - 1) {
             return " (MAX+)";
         }
-        return " (" + GT_Values.VN[tier] + ")";
+        return " (" + GTValues.VN[tier] + ")";
     }
 
     public static void sendChatToPlayer(EntityPlayer aPlayer, String aChatMessage) {
@@ -1786,7 +1786,7 @@ public class GT_Utility {
     }
 
     public static boolean areStacksEqualOrNull(ItemStack stack1, ItemStack stack2) {
-        return (stack1 == null && stack2 == null) || GT_Utility.areStacksEqual(stack1, stack2);
+        return (stack1 == null && stack2 == null) || GTUtility.areStacksEqual(stack1, stack2);
     }
 
     /**
@@ -1820,8 +1820,8 @@ public class GT_Utility {
 
     public static boolean areUnificationsEqual(ItemStack aStack1, ItemStack aStack2, boolean aIgnoreNBT) {
         return areStacksEqual(
-            GT_OreDictUnificator.get_nocopy(aStack1),
-            GT_OreDictUnificator.get_nocopy(aStack2),
+            GTOreDictUnificator.get_nocopy(aStack1),
+            GTOreDictUnificator.get_nocopy(aStack2),
             aIgnoreNBT);
     }
 
@@ -1846,13 +1846,13 @@ public class GT_Utility {
         for (FluidContainerData tData : sFluidContainerList) {
             String fluidName = tData.fluid.getFluid()
                 .getName();
-            sFilledContainerToData.put(new GT_ItemStack(tData.filledContainer), tData);
+            sFilledContainerToData.put(new GTItemStack(tData.filledContainer), tData);
             Map<String, FluidContainerData> tFluidToContainer = sEmptyContainerToFluidToData
-                .get(new GT_ItemStack(tData.emptyContainer));
+                .get(new GTItemStack(tData.emptyContainer));
             List<ItemStack> tContainers = sFluidToContainers.get(fluidName);
             if (tFluidToContainer == null) {
                 sEmptyContainerToFluidToData
-                    .put(new GT_ItemStack(tData.emptyContainer), tFluidToContainer = new /* Concurrent */ HashMap<>());
+                    .put(new GTItemStack(tData.emptyContainer), tFluidToContainer = new /* Concurrent */ HashMap<>());
             }
             tFluidToContainer.put(fluidName, tData);
             if (tContainers == null) {
@@ -1867,13 +1867,13 @@ public class GT_Utility {
         String fluidName = aData.fluid.getFluid()
             .getName();
         sFluidContainerList.add(aData);
-        sFilledContainerToData.put(new GT_ItemStack(aData.filledContainer), aData);
+        sFilledContainerToData.put(new GTItemStack(aData.filledContainer), aData);
         Map<String, FluidContainerData> tFluidToContainer = sEmptyContainerToFluidToData
-            .get(new GT_ItemStack(aData.emptyContainer));
+            .get(new GTItemStack(aData.emptyContainer));
         List<ItemStack> tContainers = sFluidToContainers.get(fluidName);
         if (tFluidToContainer == null) {
             sEmptyContainerToFluidToData
-                .put(new GT_ItemStack(aData.emptyContainer), tFluidToContainer = new /* Concurrent */ HashMap<>());
+                .put(new GTItemStack(aData.emptyContainer), tFluidToContainer = new /* Concurrent */ HashMap<>());
         }
         tFluidToContainer.put(fluidName, aData);
         if (tContainers == null) {
@@ -1897,7 +1897,7 @@ public class GT_Utility {
     public static ItemStack fillFluidContainer(FluidStack aFluid, ItemStack aStack, boolean aRemoveFluidDirectly,
         boolean aCheckIFluidContainerItems) {
         if (isStackInvalid(aStack) || aFluid == null) return null;
-        if (GT_ModHandler.isWater(aFluid) && ItemList.Bottle_Empty.isStackEqual(aStack)) {
+        if (GTModHandler.isWater(aFluid) && ItemList.Bottle_Empty.isStackEqual(aStack)) {
             if (aFluid.amount >= 1000) {
                 return new ItemStack(Items.potionitem, 1, 0);
             }
@@ -1911,7 +1911,7 @@ public class GT_Utility {
             else((IFluidContainerItem) aStack.getItem()).fill(aStack = copyAmount(1, aStack), aFluid, true);
             return aStack;
         }
-        Map<String, FluidContainerData> tFluidToContainer = sEmptyContainerToFluidToData.get(new GT_ItemStack(aStack));
+        Map<String, FluidContainerData> tFluidToContainer = sEmptyContainerToFluidToData.get(new GTItemStack(aStack));
         if (tFluidToContainer == null) return null;
         FluidContainerData tData = tFluidToContainer.get(
             aFluid.getFluid()
@@ -1980,7 +1980,7 @@ public class GT_Utility {
             && ((IFluidContainerItem) aStack.getItem()).getCapacity(aStack) > 0)
             return aFluid
                 .isFluidEqual(((IFluidContainerItem) aStack.getItem()).getFluid(aStack = copyAmount(1, aStack)));
-        FluidContainerData tData = sFilledContainerToData.get(new GT_ItemStack(aStack));
+        FluidContainerData tData = sFilledContainerToData.get(new GTItemStack(aStack));
         return tData != null && tData.fluid.isFluidEqual(aFluid);
     }
 
@@ -1989,7 +1989,7 @@ public class GT_Utility {
         if (aCheckIFluidContainerItems && aStack.getItem() instanceof IFluidContainerItem
             && ((IFluidContainerItem) aStack.getItem()).getCapacity(aStack) > 0)
             return ((IFluidContainerItem) aStack.getItem()).drain(copyAmount(1, aStack), Integer.MAX_VALUE, true);
-        FluidContainerData tData = sFilledContainerToData.get(new GT_ItemStack(aStack));
+        FluidContainerData tData = sFilledContainerToData.get(new GTItemStack(aStack));
         return tData == null ? null : tData.fluid.copy();
     }
 
@@ -1998,7 +1998,7 @@ public class GT_Utility {
      */
     public static ItemStack getContainerForFilledItem(ItemStack aStack, boolean aCheckIFluidContainerItems) {
         if (isStackInvalid(aStack)) return null;
-        FluidContainerData tData = sFilledContainerToData.get(new GT_ItemStack(aStack));
+        FluidContainerData tData = sFilledContainerToData.get(new GTItemStack(aStack));
         if (tData != null) return copyAmount(1, tData.emptyContainer);
         if (aCheckIFluidContainerItems && aStack.getItem() instanceof IFluidContainerItem
             && ((IFluidContainerItem) aStack.getItem()).getCapacity(aStack) > 0) {
@@ -2036,7 +2036,7 @@ public class GT_Utility {
             return null;
         }
 
-        int tCapsuleCount = GT_ModHandler.getCapsuleCellContainerCount(aStack);
+        int tCapsuleCount = GTModHandler.getCapsuleCellContainerCount(aStack);
         if (tCapsuleCount > 0) return ItemList.Cell_Empty.get(tCapsuleCount);
 
         if (ItemList.IC2_ForgeHammer.isStackEqual(aStack) || ItemList.IC2_WireCutter.isStackEqual(aStack))
@@ -2045,9 +2045,9 @@ public class GT_Utility {
     }
 
     public static FluidStack getFluidFromContainerOrFluidDisplay(ItemStack stack) {
-        FluidStack fluidStack = GT_Utility.getFluidForFilledItem(stack, true);
+        FluidStack fluidStack = GTUtility.getFluidForFilledItem(stack, true);
         if (fluidStack == null) {
-            fluidStack = GT_Utility.getFluidFromDisplayStack(stack);
+            fluidStack = GTUtility.getFluidFromDisplayStack(stack);
         }
         return fluidStack;
     }
@@ -2060,14 +2060,14 @@ public class GT_Utility {
         Iterator<Map.Entry<ic2.api.recipe.ICannerBottleRecipeManager.Input, RecipeOutput>> tIterator = aRecipeList
             .entrySet()
             .iterator();
-        aOutput = GT_OreDictUnificator.get(aOutput);
+        aOutput = GTOreDictUnificator.get(aOutput);
         while (tIterator.hasNext()) {
             Map.Entry<ic2.api.recipe.ICannerBottleRecipeManager.Input, RecipeOutput> tEntry = tIterator.next();
             if (aInput == null || tEntry.getKey()
                 .matches(aContainer, aInput)) {
                 List<ItemStack> tList = tEntry.getValue().items;
                 if (tList != null) for (ItemStack tOutput : tList)
-                    if (aOutput == null || areStacksEqual(GT_OreDictUnificator.get(tOutput), aOutput)) {
+                    if (aOutput == null || areStacksEqual(GTOreDictUnificator.get(tOutput), aOutput)) {
                         tIterator.remove();
                         rReturn = true;
                         break;
@@ -2083,14 +2083,14 @@ public class GT_Utility {
         boolean rReturn = false;
         Iterator<Map.Entry<IRecipeInput, RecipeOutput>> tIterator = aRecipeList.entrySet()
             .iterator();
-        aOutput = GT_OreDictUnificator.get(aOutput);
+        aOutput = GTOreDictUnificator.get(aOutput);
         while (tIterator.hasNext()) {
             Map.Entry<IRecipeInput, RecipeOutput> tEntry = tIterator.next();
             if (aInput == null || tEntry.getKey()
                 .matches(aInput)) {
                 List<ItemStack> tList = tEntry.getValue().items;
                 if (tList != null) for (ItemStack tOutput : tList)
-                    if (aOutput == null || areStacksEqual(GT_OreDictUnificator.get(tOutput), aOutput)) {
+                    if (aOutput == null || areStacksEqual(GTOreDictUnificator.get(tOutput), aOutput)) {
                         tIterator.remove();
                         rReturn = true;
                         break;
@@ -2105,8 +2105,7 @@ public class GT_Utility {
         if (aRecipeList == null || aRecipeList.isEmpty()) return;
         toRemove.entrySet()
             .removeIf(aEntry -> (isStackInvalid(aEntry.getKey()) && isStackInvalid(aEntry.getValue())));
-        final Map<ItemStack, ItemStack> finalToRemove = Maps
-            .transformValues(toRemove, GT_OreDictUnificator::get_nocopy);
+        final Map<ItemStack, ItemStack> finalToRemove = Maps.transformValues(toRemove, GTOreDictUnificator::get_nocopy);
 
         aRecipeList.entrySet()
             .removeIf(
@@ -2123,21 +2122,21 @@ public class GT_Utility {
                         return tList.stream()
                             .anyMatch(
                                 tOutput -> (aOutput == null
-                                    || areStacksEqual(GT_OreDictUnificator.get(tOutput), aOutput)));
+                                    || areStacksEqual(GTOreDictUnificator.get(tOutput), aOutput)));
                     }));
     }
 
     public static boolean addSimpleIC2MachineRecipe(ItemStack aInput, Map<IRecipeInput, RecipeOutput> aRecipeList,
         NBTTagCompound aNBT, Object... aOutput) {
         if (isStackInvalid(aInput) || aOutput.length == 0 || aRecipeList == null) return false;
-        ItemData tOreName = GT_OreDictUnificator.getAssociation(aInput);
+        ItemData tOreName = GTOreDictUnificator.getAssociation(aInput);
         for (Object o : aOutput) {
             if (o == null) {
                 GT_FML_LOGGER.info("EmptyIC2Output!" + aInput.getUnlocalizedName());
                 return false;
             }
         }
-        ItemStack[] tStack = GT_OreDictUnificator.getStackArray(true, aOutput);
+        ItemStack[] tStack = GTOreDictUnificator.getStackArray(true, aOutput);
         if (tStack.length > 0 && areStacksEqual(aInput, tStack[0])) return false;
         if (tOreName != null) {
             if (tOreName.toString()
@@ -2156,7 +2155,7 @@ public class GT_Utility {
 
     public static ItemStack getWrittenBook(String aMapping, ItemStack aStackToPutNBT) {
         if (isStringInvalid(aMapping)) return null;
-        ItemStack rStack = GregTech_API.sBookList.get(aMapping);
+        ItemStack rStack = GregTechAPI.sBookList.get(aMapping);
         if (rStack == null) return aStackToPutNBT;
         if (aStackToPutNBT != null) {
             aStackToPutNBT.setTagCompound(rStack.getTagCompound());
@@ -2167,23 +2166,23 @@ public class GT_Utility {
 
     public static ItemStack getWrittenBook(String aMapping, String aTitle, String aAuthor, String... aPages) {
         if (isStringInvalid(aMapping)) return null;
-        ItemStack rStack = GregTech_API.sBookList.get(aMapping);
+        ItemStack rStack = GregTechAPI.sBookList.get(aMapping);
         if (rStack != null) return copyAmount(1, rStack);
         if (isStringInvalid(aTitle) || isStringInvalid(aAuthor) || aPages.length == 0) return null;
         sBookCount++;
         rStack = new ItemStack(Items.written_book, 1);
         NBTTagCompound tNBT = new NBTTagCompound();
-        tNBT.setString("title", GT_LanguageManager.addStringLocalization("Book." + aTitle + ".Name", aTitle));
+        tNBT.setString("title", GTLanguageManager.addStringLocalization("Book." + aTitle + ".Name", aTitle));
         tNBT.setString("author", aAuthor);
         NBTTagList tNBTList = new NBTTagList();
         for (byte i = 0; i < aPages.length; i++) {
-            aPages[i] = GT_LanguageManager
+            aPages[i] = GTLanguageManager
                 .addStringLocalization("Book." + aTitle + ".Page" + ((i < 10) ? "0" + i : i), aPages[i]);
             if (i < 48) {
                 if (aPages[i].length() < 256) tNBTList.appendTag(new NBTTagString(aPages[i]));
-                else GT_Log.err.println("WARNING: String for written Book too long! -> " + aPages[i]);
+                else GTLog.err.println("WARNING: String for written Book too long! -> " + aPages[i]);
             } else {
-                GT_Log.err.println("WARNING: Too much Pages for written Book! -> " + aTitle);
+                GTLog.err.println("WARNING: Too much Pages for written Book! -> " + aTitle);
                 break;
             }
         }
@@ -2195,14 +2194,14 @@ public class GT_Utility {
                     + " at its creation. Gotta get 'em all!"));
         tNBT.setTag("pages", tNBTList);
         rStack.setTagCompound(tNBT);
-        GT_Log.out.println(
-            "GT_Mod: Added Book to Book List  -  Mapping: '" + aMapping
+        GTLog.out.println(
+            "GTMod: Added Book to Book List  -  Mapping: '" + aMapping
                 + "'  -  Name: '"
                 + aTitle
                 + "'  -  Author: '"
                 + aAuthor
                 + "'");
-        GregTech_API.sBookList.put(aMapping, rStack);
+        GregTechAPI.sBookList.put(aMapping, rStack);
         return copyOrNull(rStack);
     }
 
@@ -2289,8 +2288,8 @@ public class GT_Utility {
         if (!FMLCommonHandler.instance()
             .getEffectiveSide()
             .isClient() || GT.getThePlayer() == null || !GT.getThePlayer().worldObj.isRemote) return false;
-        if (GregTech_API.sMultiThreadedSounds) new Thread(
-            new GT_Runnable_Sound(
+        if (GregTechAPI.sMultiThreadedSounds) new Thread(
+            new RunnableSound(
                 GT.getThePlayer().worldObj,
                 aX,
                 aY,
@@ -2300,7 +2299,7 @@ public class GT_Utility {
                 aSoundStrength,
                 aSoundModulation),
             "Sound Effect").start();
-        else new GT_Runnable_Sound(
+        else new RunnableSound(
             GT.getThePlayer().worldObj,
             aX,
             aY,
@@ -2317,7 +2316,7 @@ public class GT_Utility {
         if (isStringInvalid(aSoundName) || aWorld == null || aWorld.isRemote) return false;
         NW.sendPacketToAllPlayersInRange(
             aWorld,
-            new GT_Packet_Sound(aSoundName, aSoundStrength, aSoundModulation, aX, (short) aY, aZ),
+            new GTPacketSound(aSoundName, aSoundStrength, aSoundModulation, aX, (short) aY, aZ),
             aX,
             aZ);
         return true;
@@ -2328,13 +2327,7 @@ public class GT_Utility {
         if (aWorld == null || aWorld.isRemote) return false;
         NW.sendPacketToAllPlayersInRange(
             aWorld,
-            new GT_Packet_Sound(
-                sound.resourceLocation.toString(),
-                aSoundStrength,
-                aSoundModulation,
-                aX,
-                (short) aY,
-                aZ),
+            new GTPacketSound(sound.resourceLocation.toString(), aSoundStrength, aSoundModulation, aX, (short) aY, aZ),
             aX,
             aZ);
         return true;
@@ -2453,14 +2446,14 @@ public class GT_Utility {
 
     public static boolean isDebugItem(ItemStack aStack) {
         return /* ItemList.Armor_Cheat.isStackEqual(aStack, T, T) || */ areStacksEqual(
-            GT_ModHandler.getIC2Item("debug", 1),
+            GTModHandler.getIC2Item("debug", 1),
             aStack,
             true);
     }
 
     public static ItemStack updateItemStack(ItemStack aStack) {
-        if (isStackValid(aStack) && aStack.getItem() instanceof GT_Generic_Item)
-            ((GT_Generic_Item) aStack.getItem()).isItemStackUsable(aStack);
+        if (isStackValid(aStack) && aStack.getItem() instanceof GTGenericItem)
+            ((GTGenericItem) aStack.getItem()).isItemStackUsable(aStack);
         return aStack;
     }
 
@@ -2678,7 +2671,7 @@ public class GT_Utility {
         for (byte i = 1; i < 5; i++) {
             ItemStack tStack = aEntity.getEquipmentInSlot(i);
 
-            if (!isStackInList(tStack, GregTech_API.sFrostHazmatList) && !hasHazmatEnchant(tStack)) {
+            if (!isStackInList(tStack, GregTechAPI.sFrostHazmatList) && !hasHazmatEnchant(tStack)) {
                 return false;
             }
         }
@@ -2689,7 +2682,7 @@ public class GT_Utility {
         for (byte i = 1; i < 5; i++) {
             ItemStack tStack = aEntity.getEquipmentInSlot(i);
 
-            if (!isStackInList(tStack, GregTech_API.sHeatHazmatList) && !hasHazmatEnchant(tStack)) {
+            if (!isStackInList(tStack, GregTechAPI.sHeatHazmatList) && !hasHazmatEnchant(tStack)) {
                 return false;
             }
         }
@@ -2701,7 +2694,7 @@ public class GT_Utility {
         for (byte i = 1; i < 5; i++) {
             ItemStack tStack = aEntity.getEquipmentInSlot(i);
 
-            if (!isStackInList(tStack, GregTech_API.sBioHazmatList) && !hasHazmatEnchant(tStack)) {
+            if (!isStackInList(tStack, GregTechAPI.sBioHazmatList) && !hasHazmatEnchant(tStack)) {
                 return false;
             }
         }
@@ -2712,7 +2705,7 @@ public class GT_Utility {
         for (byte i = 1; i < 5; i++) {
             ItemStack tStack = aEntity.getEquipmentInSlot(i);
 
-            if (!isStackInList(tStack, GregTech_API.sRadioHazmatList) && !hasHazmatEnchant(tStack)) {
+            if (!isStackInList(tStack, GregTechAPI.sRadioHazmatList) && !hasHazmatEnchant(tStack)) {
                 return false;
             }
         }
@@ -2723,7 +2716,7 @@ public class GT_Utility {
         for (byte i = 1; i < 5; i++) {
             ItemStack tStack = aEntity.getEquipmentInSlot(i);
 
-            if (!isStackInList(tStack, GregTech_API.sElectroHazmatList) && !hasHazmatEnchant(tStack)) {
+            if (!isStackInList(tStack, GregTechAPI.sElectroHazmatList) && !hasHazmatEnchant(tStack)) {
                 return false;
             }
         }
@@ -2734,7 +2727,7 @@ public class GT_Utility {
         for (byte i = 1; i < 5; i++) {
             ItemStack tStack = aEntity.getEquipmentInSlot(i);
 
-            if (!isStackInList(tStack, GregTech_API.sGasHazmatList) && !hasHazmatEnchant(tStack)) {
+            if (!isStackInList(tStack, GregTechAPI.sGasHazmatList) && !hasHazmatEnchant(tStack)) {
                 return false;
             }
         }
@@ -2744,27 +2737,27 @@ public class GT_Utility {
     public static boolean hasHazmatEnchant(ItemStack aStack) {
         if (aStack == null) return false;
         Map<Integer, Integer> tEnchantments = EnchantmentHelper.getEnchantments(aStack);
-        Integer tLevel = tEnchantments.get(Enchantment_Hazmat.INSTANCE.effectId);
+        Integer tLevel = tEnchantments.get(EnchantmentHazmat.INSTANCE.effectId);
 
         return tLevel != null && tLevel >= 1;
     }
 
     public static float getHeatDamageFromItem(ItemStack aStack) {
-        ItemData tData = GT_OreDictUnificator.getItemData(aStack);
+        ItemData tData = GTOreDictUnificator.getItemData(aStack);
         return tData == null ? 0
             : (tData.mPrefix == null ? 0 : tData.mPrefix.mHeatDamage)
                 + (tData.hasValidMaterialData() ? tData.mMaterial.mMaterial.mHeatDamage : 0);
     }
 
     public static int getRadioactivityLevel(ItemStack aStack) {
-        ItemData tData = GT_OreDictUnificator.getItemData(aStack);
+        ItemData tData = GTOreDictUnificator.getItemData(aStack);
         if (tData != null && tData.hasValidMaterialData()) {
-            if (tData.mMaterial.mMaterial.mEnchantmentArmors instanceof Enchantment_Radioactivity)
+            if (tData.mMaterial.mMaterial.mEnchantmentArmors instanceof EnchantmentRadioactivity)
                 return tData.mMaterial.mMaterial.mEnchantmentArmorsLevel;
-            if (tData.mMaterial.mMaterial.mEnchantmentTools instanceof Enchantment_Radioactivity)
+            if (tData.mMaterial.mMaterial.mEnchantmentTools instanceof EnchantmentRadioactivity)
                 return tData.mMaterial.mMaterial.mEnchantmentToolsLevel;
         }
-        return EnchantmentHelper.getEnchantmentLevel(Enchantment_Radioactivity.INSTANCE.effectId, aStack);
+        return EnchantmentHelper.getEnchantmentLevel(EnchantmentRadioactivity.INSTANCE.effectId, aStack);
     }
 
     public static boolean isImmuneToBreathingGasses(EntityLivingBase aEntity) {
@@ -2772,7 +2765,7 @@ public class GT_Utility {
     }
 
     public static boolean applyHeatDamage(EntityLivingBase entity, float damage) {
-        return applyHeatDamage(entity, damage, GT_DamageSources.getHeatDamage());
+        return applyHeatDamage(entity, damage, GTDamageSources.getHeatDamage());
     }
 
     public static boolean applyHeatDamageFromItem(EntityLivingBase entity, float damage, ItemStack item) {
@@ -2788,7 +2781,7 @@ public class GT_Utility {
 
     public static boolean applyFrostDamage(EntityLivingBase aEntity, float aDamage) {
         if (aDamage > 0 && aEntity != null && !isWearingFullFrostHazmat(aEntity)) {
-            return aEntity.attackEntityFrom(GT_DamageSources.getFrostDamage(), aDamage);
+            return aEntity.attackEntityFrom(GTDamageSources.getFrostDamage(), aDamage);
         }
         return false;
     }
@@ -2796,7 +2789,7 @@ public class GT_Utility {
     public static boolean applyElectricityDamage(EntityLivingBase aEntity, long aVoltage, long aAmperage) {
         long aDamage = getTier(aVoltage) * aAmperage * 4;
         if (aDamage > 0 && aEntity != null && !isWearingFullElectroHazmat(aEntity)) {
-            return aEntity.attackEntityFrom(GT_DamageSources.getElectricDamage(), aDamage);
+            return aEntity.attackEntityFrom(GTDamageSources.getElectricDamage(), aDamage);
         }
         return false;
     }
@@ -3019,7 +3012,7 @@ public class GT_Utility {
         } else if (tRawStack != null) {
             tRealStackSize = tRawStack.stackSize;
         }
-        ItemStack tRet = GT_OreDictUnificator.get(true, tRawStack);
+        ItemStack tRet = GTOreDictUnificator.get(true, tRawStack);
         if (tRet != null) tRet.stackSize = tRealStackSize;
         return tRet;
     }
@@ -3063,31 +3056,31 @@ public class GT_Utility {
         if (aStack == null) return false;
         if (aSet.contains(aStack)) return true;
 
-        return aSet.contains(GT_ItemStack.internalCopyStack(aStack, true));
+        return aSet.contains(GTItemStack.internalCopyStack(aStack, true));
     }
 
-    public static boolean isStackInList(ItemStack aStack, Collection<GT_ItemStack> aList) {
+    public static boolean isStackInList(ItemStack aStack, Collection<GTItemStack> aList) {
         if (aStack == null) {
             return false;
         }
-        return isStackInList(new GT_ItemStack(aStack), aList);
+        return isStackInList(new GTItemStack(aStack), aList);
     }
 
-    public static boolean isStackInList(ItemStack aStack, Set<GT_ItemStack2> aList) {
+    public static boolean isStackInList(ItemStack aStack, Set<GTItemStack2> aList) {
         if (aStack == null) {
             return false;
         }
-        return isStackInList(new GT_ItemStack2(aStack), aList);
+        return isStackInList(new GTItemStack2(aStack), aList);
     }
 
-    public static boolean isStackInList(GT_ItemStack aStack, Collection<GT_ItemStack> aList) {
+    public static boolean isStackInList(GTItemStack aStack, Collection<GTItemStack> aList) {
         return aStack != null
-            && (aList.contains(aStack) || aList.contains(new GT_ItemStack(aStack.mItem, aStack.mStackSize, W)));
+            && (aList.contains(aStack) || aList.contains(new GTItemStack(aStack.mItem, aStack.mStackSize, W)));
     }
 
-    public static boolean isStackInList(GT_ItemStack2 aStack, Set<GT_ItemStack2> aList) {
+    public static boolean isStackInList(GTItemStack2 aStack, Set<GTItemStack2> aList) {
         return aStack != null
-            && (aList.contains(aStack) || aList.contains(new GT_ItemStack2(aStack.mItem, aStack.mStackSize, W)));
+            && (aList.contains(aStack) || aList.contains(new GTItemStack2(aStack.mItem, aStack.mStackSize, W)));
     }
 
     /**
@@ -3104,8 +3097,8 @@ public class GT_Utility {
                     .getMethod("clone")
                     .invoke(aMap);
             } catch (Throwable e) {
-                GT_Log.err.println("Failed to clone Map of type " + aMap.getClass());
-                e.printStackTrace(GT_Log.err);
+                GTLog.err.println("Failed to clone Map of type " + aMap.getClass());
+                e.printStackTrace(GTLog.err);
             }
         }
 
@@ -3175,9 +3168,9 @@ public class GT_Utility {
      * This checks if the Dimension is really a Dimension and not another Planet or something. Used for my Teleporter.
      */
     public static boolean isRealDimension(int aDimensionID) {
-        if (aDimensionID <= 1 && aDimensionID >= -1 && !GregTech_API.sDimensionalList.contains(aDimensionID))
+        if (aDimensionID <= 1 && aDimensionID >= -1 && !GregTechAPI.sDimensionalList.contains(aDimensionID))
             return true;
-        return !GregTech_API.sDimensionalList.contains(aDimensionID)
+        return !GregTechAPI.sDimensionalList.contains(aDimensionID)
             && DimensionManager.isDimensionRegistered(aDimensionID);
     }
 
@@ -3314,7 +3307,7 @@ public class GT_Utility {
                     tTileEntity = (TileEntity) chamber.getReactor();
                 }
             } catch (Throwable e) {
-                if (D1) e.printStackTrace(GT_Log.err);
+                if (D1) e.printStackTrace(GTLog.err);
             }
             rEUAmount += addReactorInfo(tList, tTileEntity);
             rEUAmount += addAlignmentInfo(tList, tTileEntity);
@@ -3380,28 +3373,28 @@ public class GT_Utility {
                 + " -----");
         try {
             tList.add(
-                GT_Utility.trans("162", "Name: ") + EnumChatFormatting.BLUE
+                GTUtility.trans("162", "Name: ") + EnumChatFormatting.BLUE
                     + ((tTileEntity instanceof IInventory inv) ? inv.getInventoryName() : tBlock.getUnlocalizedName())
                     + EnumChatFormatting.RESET
-                    + GT_Utility.trans("163", " MetaData: ")
+                    + GTUtility.trans("163", " MetaData: ")
                     + EnumChatFormatting.AQUA
                     + aWorld.getBlockMetadata(aX, aY, aZ)
                     + EnumChatFormatting.RESET);
             tList.add(
-                GT_Utility.trans("164", "Hardness: ") + EnumChatFormatting.YELLOW
+                GTUtility.trans("164", "Hardness: ") + EnumChatFormatting.YELLOW
                     + tBlock.getBlockHardness(aWorld, aX, aY, aZ)
                     + EnumChatFormatting.RESET
-                    + GT_Utility.trans("165", " Blast Resistance: ")
+                    + GTUtility.trans("165", " Blast Resistance: ")
                     + EnumChatFormatting.YELLOW
                     + tBlock
                         .getExplosionResistance(aPlayer, aWorld, aX, aY, aZ, aPlayer.posX, aPlayer.posY, aPlayer.posZ)
                     + EnumChatFormatting.RESET);
             if (tBlock.isBeaconBase(aWorld, aX, aY, aZ, aX, aY + 1, aZ)) tList.add(
-                EnumChatFormatting.GOLD + GT_Utility.trans("166", "Is valid Beacon Pyramid Material")
+                EnumChatFormatting.GOLD + GTUtility.trans("166", "Is valid Beacon Pyramid Material")
                     + EnumChatFormatting.RESET);
         } catch (Throwable e) {
             tList.add(String.format("§cAn exception was thrown while fetching this block's info.§r"));
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
     }
 
@@ -3413,7 +3406,7 @@ public class GT_Utility {
                 final FluidTankInfo[] tTanks = fluidHandler.getTankInfo(side);
                 if (tTanks != null) for (byte i = 0; i < tTanks.length; i++) {
                     tList.add(
-                        GT_Utility.trans("167", "Tank ") + i
+                        GTUtility.trans("167", "Tank ") + i
                             + ": "
                             + EnumChatFormatting.GREEN
                             + formatNumbers((tTanks[i].fluid == null ? 0 : tTanks[i].fluid.amount))
@@ -3430,7 +3423,7 @@ public class GT_Utility {
             }
         } catch (Throwable e) {
             tList.add(String.format("§cAn exception was thrown while fetching this tile's fluid tank info.§r"));
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return rEUAmount;
     }
@@ -3446,21 +3439,21 @@ public class GT_Utility {
             }
         } catch (Throwable e) {
             tList.add(String.format("§cAn exception was thrown while fetching this block's debug info.§r"));
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return rEUAmount;
     }
 
     private static void addPollutionInfo(ArrayList<String> tList, Chunk currentChunk) {
-        if (GT_Pollution.hasPollution(currentChunk)) {
+        if (Pollution.hasPollution(currentChunk)) {
             tList.add(
-                GT_Utility.trans("202", "Pollution in Chunk: ") + EnumChatFormatting.RED
-                    + formatNumbers(GT_Pollution.getPollution(currentChunk))
+                GTUtility.trans("202", "Pollution in Chunk: ") + EnumChatFormatting.RED
+                    + formatNumbers(Pollution.getPollution(currentChunk))
                     + EnumChatFormatting.RESET
-                    + GT_Utility.trans("203", " gibbl"));
+                    + GTUtility.trans("203", " gibbl"));
         } else {
             tList.add(
-                EnumChatFormatting.GREEN + GT_Utility.trans("204", "No Pollution in Chunk! HAYO!")
+                EnumChatFormatting.GREEN + GTUtility.trans("204", "No Pollution in Chunk! HAYO!")
                     + EnumChatFormatting.RESET);
         }
     }
@@ -3477,7 +3470,7 @@ public class GT_Utility {
                     + EnumChatFormatting.RESET
                     + " L");
             else tList.add(
-                EnumChatFormatting.GOLD + GT_Utility.trans("201", "Nothing")
+                EnumChatFormatting.GOLD + GTUtility.trans("201", "Nothing")
                     + EnumChatFormatting.RESET
                     + ": "
                     + EnumChatFormatting.YELLOW
@@ -3501,7 +3494,7 @@ public class GT_Utility {
             }
         } catch (Throwable e) {
             tList.add(String.format("§cAn exception was thrown while fetching this leaves' info.§r"));
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return rEUAmount;
     }
@@ -3514,28 +3507,28 @@ public class GT_Utility {
                 if (crop.getScanLevel() < 4) crop.setScanLevel((byte) 4);
                 if (crop.getCrop() != null) {
                     tList.add(
-                        GT_Utility.trans("187", "Type -- Crop-Name: ") + crop.getCrop()
+                        GTUtility.trans("187", "Type -- Crop-Name: ") + crop.getCrop()
                             .name()
-                            + GT_Utility.trans("188", "  Growth: ")
+                            + GTUtility.trans("188", "  Growth: ")
                             + crop.getGrowth()
-                            + GT_Utility.trans("189", "  Gain: ")
+                            + GTUtility.trans("189", "  Gain: ")
                             + crop.getGain()
-                            + GT_Utility.trans("190", "  Resistance: ")
+                            + GTUtility.trans("190", "  Resistance: ")
                             + crop.getResistance());
                 }
                 tList.add(
-                    GT_Utility.trans("191", "Plant -- Fertilizer: ") + crop.getNutrientStorage()
-                        + GT_Utility.trans("192", "  Water: ")
+                    GTUtility.trans("191", "Plant -- Fertilizer: ") + crop.getNutrientStorage()
+                        + GTUtility.trans("192", "  Water: ")
                         + crop.getHydrationStorage()
-                        + GT_Utility.trans("193", "  Weed-Ex: ")
+                        + GTUtility.trans("193", "  Weed-Ex: ")
                         + crop.getWeedExStorage()
-                        + GT_Utility.trans("194", "  Scan-Level: ")
+                        + GTUtility.trans("194", "  Scan-Level: ")
                         + crop.getScanLevel());
                 tList.add(
-                    GT_Utility.trans("195", "Environment -- Nutrients: ") + crop.getNutrients()
-                        + GT_Utility.trans("196", "  Humidity: ")
+                    GTUtility.trans("195", "Environment -- Nutrients: ") + crop.getNutrients()
+                        + GTUtility.trans("196", "  Humidity: ")
                         + crop.getHumidity()
-                        + GT_Utility.trans("197", "  Air-Quality: ")
+                        + GTUtility.trans("197", "  Air-Quality: ")
                         + crop.getAirQuality());
                 if (crop.getCrop() != null) {
                     final StringBuilder tStringB = new StringBuilder();
@@ -3545,15 +3538,15 @@ public class GT_Utility {
                             .append(tAttribute);
                     }
                     final String tString = tStringB.toString();
-                    tList.add(GT_Utility.trans("198", "Attributes:") + tString.replaceFirst(",", E));
+                    tList.add(GTUtility.trans("198", "Attributes:") + tString.replaceFirst(",", E));
                     tList.add(
-                        GT_Utility.trans("199", "Discovered by: ") + crop.getCrop()
+                        GTUtility.trans("199", "Discovered by: ") + crop.getCrop()
                             .discoveredBy());
                 }
             }
         } catch (Throwable e) {
             tList.add(String.format("§cAn exception was thrown while fetching this crop's info.§r"));
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return rEUAmount;
     }
@@ -3565,7 +3558,7 @@ public class GT_Utility {
             }
         } catch (Throwable e) {
             tList.add(String.format("§cAn exception was thrown while fetching this device's info.§r"));
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
     }
 
@@ -3573,13 +3566,13 @@ public class GT_Utility {
         try {
             if (tTileEntity instanceof IGregTechTileEntity gtTE) {
                 tList.add(
-                    GT_Utility.trans("186", "Owned by: ") + EnumChatFormatting.BLUE
+                    GTUtility.trans("186", "Owned by: ") + EnumChatFormatting.BLUE
                         + gtTE.getOwnerName()
                         + EnumChatFormatting.RESET);
             }
         } catch (Throwable e) {
             tList.add(String.format("§cAn exception was thrown while fetching this device's owner.§r"));
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
     }
 
@@ -3587,31 +3580,31 @@ public class GT_Utility {
         try {
             if (tTileEntity instanceof IBasicEnergyContainer energyContainer && energyContainer.getEUCapacity() > 0) {
                 tList.add(
-                    GT_Utility.trans("179", "Max IN: ") + EnumChatFormatting.RED
+                    GTUtility.trans("179", "Max IN: ") + EnumChatFormatting.RED
                         + formatNumbers(energyContainer.getInputVoltage())
                         + " ("
-                        + GT_Values.VN[getTier(energyContainer.getInputVoltage())]
+                        + GTValues.VN[getTier(energyContainer.getInputVoltage())]
                         + ") "
                         + EnumChatFormatting.RESET
-                        + GT_Utility.trans("182", " EU at ")
+                        + GTUtility.trans("182", " EU at ")
                         + EnumChatFormatting.RED
                         + formatNumbers(energyContainer.getInputAmperage())
                         + EnumChatFormatting.RESET
-                        + GT_Utility.trans("183", " A"));
+                        + GTUtility.trans("183", " A"));
                 tList.add(
-                    GT_Utility.trans("181", "Max OUT: ") + EnumChatFormatting.RED
+                    GTUtility.trans("181", "Max OUT: ") + EnumChatFormatting.RED
                         + formatNumbers(energyContainer.getOutputVoltage())
                         + " ("
-                        + GT_Values.VN[getTier(energyContainer.getOutputVoltage())]
+                        + GTValues.VN[getTier(energyContainer.getOutputVoltage())]
                         + ") "
                         + EnumChatFormatting.RESET
-                        + GT_Utility.trans("182", " EU at ")
+                        + GTUtility.trans("182", " EU at ")
                         + EnumChatFormatting.RED
                         + formatNumbers(energyContainer.getOutputAmperage())
                         + EnumChatFormatting.RESET
-                        + GT_Utility.trans("183", " A"));
+                        + GTUtility.trans("183", " A"));
                 tList.add(
-                    GT_Utility.trans("184", "Energy: ") + EnumChatFormatting.GREEN
+                    GTUtility.trans("184", "Energy: ") + EnumChatFormatting.GREEN
                         + formatNumbers(energyContainer.getStoredEU())
                         + EnumChatFormatting.RESET
                         + " EU / "
@@ -3622,7 +3615,7 @@ public class GT_Utility {
             }
         } catch (Throwable e) {
             tList.add(String.format("§cAn exception was thrown while fetching this device's energy info.§r"));
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
     }
 
@@ -3637,7 +3630,7 @@ public class GT_Utility {
             }
         } catch (Throwable e) {
             tList.add(String.format("§cAn exception was thrown while fetching this device's covers.§r"));
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return rEUAmount;
     }
@@ -3659,7 +3652,7 @@ public class GT_Utility {
                 rEUAmount += 400;
                 int tValue = 0;
                 if (0 < (tValue = progress.getMaxProgress())) tList.add(
-                    GT_Utility.trans("178", "Progress/Load: ") + EnumChatFormatting.GREEN
+                    GTUtility.trans("178", "Progress/Load: ") + EnumChatFormatting.GREEN
                         + formatNumbers(progress.getProgress())
                         + EnumChatFormatting.RESET
                         + " / "
@@ -3669,7 +3662,7 @@ public class GT_Utility {
             }
         } catch (Throwable e) {
             tList.add(String.format("§cAn exception was thrown while fetching this device's progress.§r"));
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return rEUAmount;
     }
@@ -3680,12 +3673,12 @@ public class GT_Utility {
             if (tTileEntity instanceof IUpgradableMachine upgradableMachine) {
                 rEUAmount += 500;
                 if (upgradableMachine.hasMufflerUpgrade()) tList.add(
-                    EnumChatFormatting.GREEN + GT_Utility.trans("177", "Has Muffler Upgrade")
+                    EnumChatFormatting.GREEN + GTUtility.trans("177", "Has Muffler Upgrade")
                         + EnumChatFormatting.RESET);
             }
         } catch (Throwable e) {
             tList.add(String.format("§cAn exception was thrown while fetching this device's upgrades.§r"));
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return rEUAmount;
     }
@@ -3696,7 +3689,7 @@ public class GT_Utility {
             if (tTileEntity instanceof ic2.api.tile.IEnergyStorage storage) {
                 rEUAmount += 200;
                 tList.add(
-                    GT_Utility.trans("176", "Contained Energy: ") + EnumChatFormatting.YELLOW
+                    GTUtility.trans("176", "Contained Energy: ") + EnumChatFormatting.YELLOW
                         + formatNumbers(storage.getStored())
                         + EnumChatFormatting.RESET
                         + " EU / "
@@ -3707,7 +3700,7 @@ public class GT_Utility {
             }
         } catch (Throwable e) {
             tList.add(String.format("§cAn exception was thrown while fetching this device's IC2 energy info.§r"));
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return rEUAmount;
     }
@@ -3718,13 +3711,13 @@ public class GT_Utility {
             if (tTileEntity instanceof ic2.api.energy.tile.IEnergyConductor conductor) {
                 rEUAmount += 200;
                 tList.add(
-                    GT_Utility.trans("175", "Conduction Loss: ") + EnumChatFormatting.YELLOW
+                    GTUtility.trans("175", "Conduction Loss: ") + EnumChatFormatting.YELLOW
                         + conductor.getConductionLoss()
                         + EnumChatFormatting.RESET);
             }
         } catch (Throwable e) {
             tList.add(String.format("§cAn exception was thrown while fetching this device's EU conduction info.§r"));
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return rEUAmount;
     }
@@ -3735,24 +3728,24 @@ public class GT_Utility {
             if (tTileEntity instanceof ic2.api.tile.IWrenchable wrenchable) {
                 rEUAmount += 100;
                 tList.add(
-                    GT_Utility.trans("171", "Facing: ") + EnumChatFormatting.GREEN
+                    GTUtility.trans("171", "Facing: ") + EnumChatFormatting.GREEN
                         + wrenchable.getFacing()
                         + EnumChatFormatting.RESET
-                        + GT_Utility.trans("172", " / Chance: ")
+                        + GTUtility.trans("172", " / Chance: ")
                         + EnumChatFormatting.YELLOW
                         + (wrenchable.getWrenchDropRate() * 100)
                         + EnumChatFormatting.RESET
                         + "%");
                 tList.add(
                     wrenchable.wrenchCanRemove(aPlayer)
-                        ? EnumChatFormatting.GREEN + GT_Utility.trans("173", "You can remove this with a Wrench")
+                        ? EnumChatFormatting.GREEN + GTUtility.trans("173", "You can remove this with a Wrench")
                             + EnumChatFormatting.RESET
-                        : EnumChatFormatting.RED + GT_Utility.trans("174", "You can NOT remove this with a Wrench")
+                        : EnumChatFormatting.RED + GTUtility.trans("174", "You can NOT remove this with a Wrench")
                             + EnumChatFormatting.RESET);
             }
         } catch (Throwable e) {
             tList.add(String.format("§cAn exception was thrown while fetching this device's IC@ wrenchability.§r"));
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return rEUAmount;
     }
@@ -3765,14 +3758,14 @@ public class GT_Utility {
                 if (tAlignment != null) {
                     rEUAmount += 100;
                     tList.add(
-                        GT_Utility.trans("219", "Extended Facing: ") + EnumChatFormatting.GREEN
+                        GTUtility.trans("219", "Extended Facing: ") + EnumChatFormatting.GREEN
                             + tAlignment.getExtendedFacing()
                             + EnumChatFormatting.RESET);
                 }
             }
         } catch (Throwable e) {
             tList.add(String.format("§cAn exception was thrown while fetching this device's alignment info.§r"));
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return rEUAmount;
     }
@@ -3783,7 +3776,7 @@ public class GT_Utility {
             if (tTileEntity instanceof ic2.api.reactor.IReactor reactor) {
                 rEUAmount += 500;
                 tList.add(
-                    GT_Utility.trans("168", "Heat: ") + EnumChatFormatting.GREEN
+                    GTUtility.trans("168", "Heat: ") + EnumChatFormatting.GREEN
                         + formatNumbers(reactor.getHeat())
                         + EnumChatFormatting.RESET
                         + " / "
@@ -3791,23 +3784,23 @@ public class GT_Utility {
                         + formatNumbers(reactor.getMaxHeat())
                         + EnumChatFormatting.RESET);
                 tList.add(
-                    GT_Utility.trans("169", "HEM: ") + EnumChatFormatting.YELLOW
+                    GTUtility.trans("169", "HEM: ") + EnumChatFormatting.YELLOW
                         + reactor.getHeatEffectModifier()
                         + EnumChatFormatting.RESET);
             }
         } catch (Throwable e) {
             tList.add(String.format("§cAn exception was thrown while fetching this reactor's info.§r"));
-            if (D1) e.printStackTrace(GT_Log.err);
+            if (D1) e.printStackTrace(GTLog.err);
         }
         return rEUAmount;
     }
 
     public static String trans(String aKey, String aEnglish) {
-        return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_" + aKey, aEnglish);
+        return GTLanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_" + aKey, aEnglish);
     }
 
     public static String getTrans(String aKey) {
-        return GT_LanguageManager.getTranslation("Interaction_DESCRIPTION_Index_" + aKey);
+        return GTLanguageManager.getTranslation("Interaction_DESCRIPTION_Index_" + aKey);
     }
 
     /**
@@ -3925,7 +3918,7 @@ public class GT_Utility {
      */
     public static boolean consumeItems(EntityPlayer player, ItemStack stack, gregtech.api.enums.Materials mat,
         int count) {
-        if (stack != null && GT_OreDictUnificator.getItemData(stack).mMaterial.mMaterial == mat
+        if (stack != null && GTOreDictUnificator.getItemData(stack).mMaterial.mMaterial == mat
             && stack.stackSize >= count) {
             if ((!player.capabilities.isCreativeMode) && (stack.stackSize != 111)) stack.stackSize -= count;
             return true;
@@ -4007,11 +4000,11 @@ public class GT_Utility {
         return -1;
     }
 
-    public static Map<GT_Utility.ItemId, Long> convertItemListToMap(Collection<ItemStack> itemStacks) {
-        Map<GT_Utility.ItemId, Long> result = new Object2LongOpenHashMap<>();
+    public static Map<GTUtility.ItemId, Long> convertItemListToMap(Collection<ItemStack> itemStacks) {
+        Map<GTUtility.ItemId, Long> result = new Object2LongOpenHashMap<>();
         for (ItemStack itemStack : itemStacks) {
             if (itemStack != null && itemStack.stackSize > 0) {
-                GT_Utility.ItemId itemId = GT_Utility.ItemId.createNoCopy(itemStack);
+                GTUtility.ItemId itemId = GTUtility.ItemId.createNoCopy(itemStack);
                 result.merge(itemId, (long) itemStack.stackSize, Long::sum);
             }
         }
@@ -4361,29 +4354,29 @@ public class GT_Utility {
     }
 
     public static boolean isPartOfMaterials(ItemStack aStack, Materials aMaterials) {
-        return GT_OreDictUnificator.getAssociation(aStack) != null
-            && GT_OreDictUnificator.getAssociation(aStack).mMaterial.mMaterial.equals(aMaterials);
+        return GTOreDictUnificator.getAssociation(aStack) != null
+            && GTOreDictUnificator.getAssociation(aStack).mMaterial.mMaterial.equals(aMaterials);
     }
 
     public static boolean isPartOfOrePrefix(ItemStack aStack, OrePrefixes aPrefix) {
-        return GT_OreDictUnificator.getAssociation(aStack) != null
-            && GT_OreDictUnificator.getAssociation(aStack).mPrefix.equals(aPrefix);
+        return GTOreDictUnificator.getAssociation(aStack) != null
+            && GTOreDictUnificator.getAssociation(aStack).mPrefix.equals(aPrefix);
     }
 
     public static final ImmutableSet<String> ORE_BLOCK_CLASSES = ImmutableSet.of(
-        "com.github.bartimaeusnek.bartworks.system.material.BW_MetaGenerated_Ores",
-        "com.github.bartimaeusnek.bartworks.system.material.BW_MetaGenerated_SmallOres",
+        "bartworks.system.material.BWMetaGeneratedOres",
+        "bartworks.system.material.BWMetaGeneratedSmallOres",
         "gtPlusPlus.core.block.base.BlockBaseOre");
 
     public static boolean isOre(Block aBlock, int aMeta) {
-        return (aBlock instanceof GT_Block_Ores_Abstract) || isOre(new ItemStack(aBlock, 1, aMeta))
+        return (aBlock instanceof BlockOresAbstract) || isOre(new ItemStack(aBlock, 1, aMeta))
             || ORE_BLOCK_CLASSES.contains(
                 aBlock.getClass()
                     .getName());
     }
 
     public static boolean isOre(ItemStack aStack) {
-        int tItem = GT_Utility.stackToInt(aStack);
+        int tItem = GTUtility.stackToInt(aStack);
         if (sOreTable.containsKey(tItem)) {
             return sOreTable.get(tItem);
         }
@@ -4407,7 +4400,7 @@ public class GT_Utility {
         // We take the modulus of the metadata by 16000 because that is the magic number to convert small ores to
         // regular ores.
         // See: GT_TileEntity_Ores.java
-        ItemData association = GT_OreDictUnificator
+        ItemData association = GTOreDictUnificator
             .getAssociation(new ItemStack(Item.getItemFromBlock(ore), 1, metaData % 16000));
         if (association != null) {
             Supplier<ItemStack> supplier = sOreToCobble.get(association.mPrefix);
@@ -4418,7 +4411,7 @@ public class GT_Utility {
         return new ItemStack(Blocks.cobblestone);
     }
 
-    public static Optional<GT_Recipe> reverseShapelessRecipe(ItemStack output, Object... aRecipe) {
+    public static Optional<GTRecipe> reverseShapelessRecipe(ItemStack output, Object... aRecipe) {
         if (output == null) {
             return Optional.empty();
         }
@@ -4430,7 +4423,7 @@ public class GT_Utility {
                 ItemStack toAdd = ((ItemStack) o).copy();
                 inputs.add(toAdd);
             } else if (o instanceof String) {
-                ItemStack stack = GT_OreDictUnificator.get(o, 1);
+                ItemStack stack = GTOreDictUnificator.get(o, 1);
                 if (stack == null) {
                     Optional<ItemStack> oStack = OreDictionary.getOres((String) o)
                         .stream()
@@ -4449,10 +4442,10 @@ public class GT_Utility {
             else throw new IllegalStateException("A Recipe contains an invalid input! Output: " + output);
         }
 
-        inputs.removeIf(x -> x.getItem() instanceof GT_MetaGenerated_Tool);
+        inputs.removeIf(x -> x.getItem() instanceof MetaGeneratedTool);
 
         return Optional.of(
-            new GT_Recipe(
+            new GTRecipe(
                 false,
                 new ItemStack[] { output },
                 inputs.toArray(new ItemStack[0]),
@@ -4465,7 +4458,7 @@ public class GT_Utility {
                 0));
     }
 
-    public static Optional<GT_Recipe> reverseShapedRecipe(ItemStack output, Object... aRecipe) {
+    public static Optional<GTRecipe> reverseShapedRecipe(ItemStack output, Object... aRecipe) {
         if (output == null) {
             return Optional.empty();
         }
@@ -4499,7 +4492,7 @@ public class GT_Utility {
             } else if (o.getKey() instanceof String dictName) {
                 // Do not register tools dictName in inputs
                 if (ToolDictNames.contains(dictName)) continue;
-                ItemStack stack = GT_OreDictUnificator.get(dictName, null, amount, false, true);
+                ItemStack stack = GTOreDictUnificator.get(dictName, null, amount, false, true);
                 if (stack == null) {
                     Optional<ItemStack> oStack = OreDictionary.getOres(dictName)
                         .stream()
@@ -4521,10 +4514,10 @@ public class GT_Utility {
         }
 
         // Remove tools from inputs in case a recipe has one as a direct Item or ItemStack reference
-        inputs.removeIf(x -> x.getItem() instanceof GT_MetaGenerated_Tool);
+        inputs.removeIf(x -> x.getItem() instanceof MetaGeneratedTool);
 
         return Optional.of(
-            new GT_Recipe(
+            new GTRecipe(
                 false,
                 new ItemStack[] { output },
                 inputs.toArray(new ItemStack[0]),
@@ -4603,7 +4596,7 @@ public class GT_Utility {
         if (itemStack == null) return false;
         ItemStack tStack = ItemList.Cell_Empty.get(1);
         tStack.stackSize = itemStack.stackSize;
-        return GT_Utility.areStacksEqual(itemStack, tStack);
+        return GTUtility.areStacksEqual(itemStack, tStack);
     }
 
     /**
@@ -4745,7 +4738,7 @@ public class GT_Utility {
     public abstract static class ItemId {
 
         public static ItemId create(NBTTagCompound tag) {
-            return new AutoValue_GT_Utility_ItemId(
+            return new AutoValue_GTUtility_ItemId(
                 Item.getItemById(tag.getShort("item")),
                 tag.getShort("meta"),
                 tag.hasKey("tag", Constants.NBT.TAG_COMPOUND) ? tag.getCompoundTag("tag") : null);
@@ -4760,7 +4753,7 @@ public class GT_Utility {
                 nbt = (NBTTagCompound) nbt.copy();
             }
 
-            return new AutoValue_GT_Utility_ItemId(itemStack.getItem(), Items.feather.getDamage(itemStack), nbt);
+            return new AutoValue_GTUtility_ItemId(itemStack.getItem(), Items.feather.getDamage(itemStack), nbt);
         }
 
         /**
@@ -4770,28 +4763,28 @@ public class GT_Utility {
             if (nbt != null) {
                 nbt = (NBTTagCompound) nbt.copy();
             }
-            return new AutoValue_GT_Utility_ItemId(item, metaData, nbt);
+            return new AutoValue_GTUtility_ItemId(item, metaData, nbt);
         }
 
         /**
          * This method stores metadata as wildcard and NBT as null.
          */
         public static ItemId createAsWildcard(ItemStack itemStack) {
-            return new AutoValue_GT_Utility_ItemId(itemStack.getItem(), W, null);
+            return new AutoValue_GTUtility_ItemId(itemStack.getItem(), W, null);
         }
 
         /**
          * This method stores NBT as null.
          */
         public static ItemId createWithoutNBT(ItemStack itemStack) {
-            return new AutoValue_GT_Utility_ItemId(itemStack.getItem(), Items.feather.getDamage(itemStack), null);
+            return new AutoValue_GTUtility_ItemId(itemStack.getItem(), Items.feather.getDamage(itemStack), null);
         }
 
         /**
          * This method does not copy NBT in order to save time. Make sure not to mutate it!
          */
         public static ItemId createNoCopy(ItemStack itemStack) {
-            return new AutoValue_GT_Utility_ItemId(
+            return new AutoValue_GTUtility_ItemId(
                 itemStack.getItem(),
                 Items.feather.getDamage(itemStack),
                 itemStack.getTagCompound());
@@ -4801,7 +4794,7 @@ public class GT_Utility {
          * This method does not copy NBT in order to save time. Make sure not to mutate it!
          */
         public static ItemId createNoCopy(Item item, int metaData, @Nullable NBTTagCompound nbt) {
-            return new AutoValue_GT_Utility_ItemId(item, metaData, nbt);
+            return new AutoValue_GTUtility_ItemId(item, metaData, nbt);
         }
 
         protected abstract Item item();
@@ -4833,7 +4826,7 @@ public class GT_Utility {
 
     public static int getPlasmaFuelValueInEUPerLiterFromFluid(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;
diff --git a/src/main/java/gregtech/api/util/GT_UtilityClient.java b/src/main/java/gregtech/api/util/GTUtilityClient.java
index 398c1f6b41..a6039e10d3 100644
--- a/src/main/java/gregtech/api/util/GT_UtilityClient.java
+++ b/src/main/java/gregtech/api/util/GTUtilityClient.java
@@ -13,7 +13,7 @@ import com.google.common.collect.Lists;
 
 import cpw.mods.fml.relauncher.ReflectionHelper;
 
-public class GT_UtilityClient {
+public class GTUtilityClient {
 
     private static final Field isDrawingField = ReflectionHelper
         .findField(Tessellator.class, "isDrawing", "field_78415_z");
diff --git a/src/main/java/gregtech/api/util/GT_Waila.java b/src/main/java/gregtech/api/util/GTWaila.java
index aaa68ba4c7..a52dd2e459 100644
--- a/src/main/java/gregtech/api/util/GT_Waila.java
+++ b/src/main/java/gregtech/api/util/GTWaila.java
@@ -1,6 +1,6 @@
 package gregtech.api.util;
 
-public abstract class GT_Waila {
+public abstract class GTWaila {
 
     public static String getMachineProgressString(boolean isActive, int maxProgresstime, int progresstime) {
         return getMachineProgressString(isActive, (long) maxProgresstime, (long) progresstime);
@@ -15,7 +15,7 @@ public abstract class GT_Waila {
             .append("s / ")
             .append(String.format("%,.2f", (double) maxProgresstime / 20))
             .append("s (")
-            .append(GT_Utility.formatNumbers((Math.round((double) progresstime / maxProgresstime * 1000) / 10.0)))
+            .append(GTUtility.formatNumbers((Math.round((double) progresstime / maxProgresstime * 1000) / 10.0)))
             .append("%)");
 
         return ret.toString();
diff --git a/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java b/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java
deleted file mode 100644
index d59796b251..0000000000
--- a/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package gregtech.api.util;
-
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-
-public class GT_ExoticEnergyInputHelper {
-
-    /**
-     * The Valid Types of TecTech Hatch List.
-     */
-    private static final List<Class<? extends GT_MetaTileEntity_Hatch>> sExoticEnergyHatchType = new ArrayList<>();
-
-    static {
-        tryRegister("com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti");
-        tryRegister("com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel");
-    }
-
-    public static void register(Class<? extends GT_MetaTileEntity_Hatch> clazz) {
-        if (!GT_MetaTileEntity_Hatch.class.isAssignableFrom(clazz)) throw new IllegalArgumentException(
-            clazz.getName() + " is not a subclass of " + GT_MetaTileEntity_Hatch.class.getName());
-        sExoticEnergyHatchType.add(clazz);
-    }
-
-    @SuppressWarnings("unchecked")
-    public static void tryRegister(String className) {
-        Class<?> clazz;
-        try {
-            clazz = Class.forName(className);
-        } catch (ClassNotFoundException e) {
-            return;
-        }
-        if (!GT_MetaTileEntity_Hatch.class.isAssignableFrom(clazz)) throw new IllegalArgumentException(
-            clazz.getName() + " is not a subclass of " + GT_MetaTileEntity_Hatch.class.getName());
-        sExoticEnergyHatchType.add((Class<? extends GT_MetaTileEntity_Hatch>) clazz);
-    }
-
-    public static boolean drainEnergy(long aEU, Collection<? extends GT_MetaTileEntity_Hatch> hatches) {
-        for (GT_MetaTileEntity_Hatch tHatch : hatches) {
-            long tDrain = Math.min(
-                tHatch.getBaseMetaTileEntity()
-                    .getStoredEU(),
-                aEU);
-            tHatch.getBaseMetaTileEntity()
-                .decreaseStoredEnergyUnits(tDrain, false);
-            aEU -= tDrain;
-        }
-        return aEU <= 0;
-    }
-
-    public static boolean isExoticEnergyInput(IMetaTileEntity aHatch) {
-        for (Class<?> clazz : sExoticEnergyHatchType) {
-            if (clazz.isInstance(aHatch)) return true;
-        }
-        return false;
-    }
-
-    public static long getTotalEuMulti(Collection<? extends GT_MetaTileEntity_Hatch> hatches) {
-        long rEU = 0L;
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(hatches)) {
-            rEU += tHatch.getBaseMetaTileEntity()
-                .getInputVoltage() * tHatch.maxWorkingAmperesIn();
-        }
-        return rEU;
-    }
-
-    public static long getMaxInputVoltageMulti(Collection<? extends GT_MetaTileEntity_Hatch> hatches) {
-        long rVoltage = 0;
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(hatches)) {
-            rVoltage += tHatch.getBaseMetaTileEntity()
-                .getInputVoltage();
-        }
-        return rVoltage;
-    }
-
-    public static long getAverageInputVoltageMulti(Collection<? extends GT_MetaTileEntity_Hatch> hatches) {
-        long rVoltage = 0;
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(hatches)) {
-            rVoltage += tHatch.getBaseMetaTileEntity()
-                .getInputVoltage();
-        }
-        if (hatches.isEmpty()) {
-            return 0;
-        }
-        return rVoltage / hatches.size();
-    }
-
-    public static long getMaxInputAmpsMulti(Collection<? extends GT_MetaTileEntity_Hatch> hatches) {
-        long rAmp = 0;
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(hatches)) {
-            rAmp += tHatch.getBaseMetaTileEntity()
-                .getInputAmperage();
-        }
-        return rAmp;
-    }
-
-    public static long getMaxWorkingInputAmpsMulti(Collection<? extends GT_MetaTileEntity_Hatch> hatches) {
-        long rAmp = 0;
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(hatches)) {
-            rAmp += tHatch.maxWorkingAmperesIn();
-        }
-        return rAmp;
-    }
-
-    public static List<Class<? extends GT_MetaTileEntity_Hatch>> getAllClasses() {
-        return Collections.unmodifiableList(sExoticEnergyHatchType);
-    }
-}
diff --git a/src/main/java/gregtech/api/util/GT_StructureUtilityMuTE.java b/src/main/java/gregtech/api/util/GT_StructureUtilityMuTE.java
index a4c4630209..3efbebdcbf 100644
--- a/src/main/java/gregtech/api/util/GT_StructureUtilityMuTE.java
+++ b/src/main/java/gregtech/api/util/GT_StructureUtilityMuTE.java
@@ -1,6 +1,6 @@
 package gregtech.api.util;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.*;
 import static gregtech.api.multitileentity.enums.GT_MultiTileUpgradeCasing.*;
 import static gregtech.loaders.preload.GT_Loader_MultiTileEntities.*;
@@ -16,7 +16,7 @@ import net.minecraft.world.World;
 import com.gtnewhorizon.structurelib.StructureLibAPI;
 import com.gtnewhorizon.structurelib.structure.IStructureElement;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TextureSet;
 import gregtech.api.multitileentity.MultiTileEntityBlock;
@@ -220,7 +220,7 @@ public class GT_StructureUtilityMuTE {
     public static class MuTEStructureCasing {
 
         private String registryName;
-        private int registryId = GT_Values.W;
+        private int registryId = GTValues.W;
         private final int defaultMeta;
         private final Integer[] validIds;
 
@@ -253,7 +253,7 @@ public class GT_StructureUtilityMuTE {
         public int getRegistryId() {
             // TODO: MuTE registry seems to somehow shift, probably due to NBT shenanigans. Lazy init circumvents this
             // but it should be properly fixed in the future
-            if (registryId == GT_Values.W) {
+            if (registryId == GTValues.W) {
                 MultiTileEntityRegistry registry = MultiTileEntityRegistry.getRegistry(registryName);
                 registryId = Block.getIdFromBlock(registry.getBlock());
             }
diff --git a/src/main/java/gregtech/api/util/GT_TooltipDataCache.java b/src/main/java/gregtech/api/util/GT_TooltipDataCache.java
index 431ef34fa4..6b42a8e7fa 100644
--- a/src/main/java/gregtech/api/util/GT_TooltipDataCache.java
+++ b/src/main/java/gregtech/api/util/GT_TooltipDataCache.java
@@ -7,7 +7,7 @@ import java.util.Map;
 
 import net.minecraft.util.StatCollector;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 
 public class GT_TooltipDataCache {
 
@@ -50,7 +50,7 @@ public class GT_TooltipDataCache {
     public TooltipData getUncachedTooltipData(String key, Object... args) {
         List<String> lines = getAllLines(key, args);
         int normalLines = lines.size();
-        if (Math.max(GT_Mod.gregtechproxy.mTooltipVerbosity, GT_Mod.gregtechproxy.mTooltipShiftVerbosity) >= 3) {
+        if (Math.max(GTMod.gregtechproxy.mTooltipVerbosity, GTMod.gregtechproxy.mTooltipShiftVerbosity) >= 3) {
             lines.addAll(getAllLines(key + ".extended", args)); // Are extended lines enabled? If so add them to the
                                                                 // lines
         }
@@ -58,9 +58,8 @@ public class GT_TooltipDataCache {
             lines.add(key); // Fallback in case no lines could be found at all
         }
         return new TooltipData(
-            lines.subList(0, getVerbosityIndex(GT_Mod.gregtechproxy.mTooltipVerbosity, normalLines, lines.size())),
-            lines
-                .subList(0, getVerbosityIndex(GT_Mod.gregtechproxy.mTooltipShiftVerbosity, normalLines, lines.size())));
+            lines.subList(0, getVerbosityIndex(GTMod.gregtechproxy.mTooltipVerbosity, normalLines, lines.size())),
+            lines.subList(0, getVerbosityIndex(GTMod.gregtechproxy.mTooltipShiftVerbosity, normalLines, lines.size())));
     }
 
     /**
diff --git a/src/main/java/gregtech/api/util/GT_HatchElementBuilder.java b/src/main/java/gregtech/api/util/HatchElementBuilder.java
index 416edc9c11..8b93861114 100644
--- a/src/main/java/gregtech/api/util/GT_HatchElementBuilder.java
+++ b/src/main/java/gregtech/api/util/HatchElementBuilder.java
@@ -33,7 +33,6 @@ import com.gtnewhorizon.structurelib.structure.IItemSource;
 import com.gtnewhorizon.structurelib.structure.IStructureElement;
 import com.gtnewhorizon.structurelib.structure.IStructureElementChain;
 import com.gtnewhorizon.structurelib.structure.IStructureElementNoPlacement;
-import com.gtnewhorizon.structurelib.structure.StructureUtility;
 import com.gtnewhorizon.structurelib.util.ItemStackPredicate;
 
 import gnu.trove.TIntCollection;
@@ -42,14 +41,14 @@ import gnu.trove.set.hash.TIntHashSet;
 import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.common.blocks.GT_Item_Machines;
+import gregtech.common.blocks.ItemMachines;
 
-public class GT_HatchElementBuilder<T> {
+public class HatchElementBuilder<T> {
 
     private interface Builtin {
     }
 
-    private IGT_HatchAdder<? super T> mAdder;
+    private IGTHatchAdder<? super T> mAdder;
     private int mCasingIndex = -1;
     private int mDot = -1;
     private BiPredicate<? super T, ? super IGregTechTileEntity> mShouldSkip;
@@ -61,10 +60,10 @@ public class GT_HatchElementBuilder<T> {
     private boolean mExclusive;
     private EnumSet<ForgeDirection> mDisallowedDirection = EnumSet.noneOf(ForgeDirection.class);
 
-    private GT_HatchElementBuilder() {}
+    private HatchElementBuilder() {}
 
-    public static <T> GT_HatchElementBuilder<T> builder() {
-        return new GT_HatchElementBuilder<>();
+    public static <T> HatchElementBuilder<T> builder() {
+        return new HatchElementBuilder<>();
     }
 
     // region composite
@@ -73,14 +72,14 @@ public class GT_HatchElementBuilder<T> {
      * Set all of adder, hint and hatchItemFilter. Provide a reasonable default for shouldSkip. TODO add doc
      */
     @SafeVarargs
-    public final GT_HatchElementBuilder<T> anyOf(IHatchElement<? super T>... elements) {
+    public final HatchElementBuilder<T> anyOf(IHatchElement<? super T>... elements) {
         if (elements == null || elements.length == 0) throw new IllegalArgumentException();
         return adder(
             Arrays.stream(elements)
                 .map(
                     e -> e.adder()
                         .rebrand())
-                .reduce(IGT_HatchAdder::orElse)
+                .reduce(IGTHatchAdder::orElse)
                 .get()).hatchClasses(
                     Arrays.stream(elements)
                         .map(IHatchElement::mteClasses)
@@ -99,7 +98,7 @@ public class GT_HatchElementBuilder<T> {
      * Will rotate through all elements TODO add doc
      */
     @SafeVarargs
-    public final GT_HatchElementBuilder<T> atLeast(IHatchElement<? super T>... elements) {
+    public final HatchElementBuilder<T> atLeast(IHatchElement<? super T>... elements) {
         if (elements == null || elements.length == 0) throw new IllegalArgumentException();
         return atLeast(
             Arrays.stream(elements)
@@ -111,7 +110,7 @@ public class GT_HatchElementBuilder<T> {
      * <p>
      * Will rotate through all elements TODO add doc
      */
-    public final GT_HatchElementBuilder<T> atLeastList(List<IHatchElement<? super T>> elements) {
+    public final HatchElementBuilder<T> atLeastList(List<IHatchElement<? super T>> elements) {
         if (elements == null || elements.isEmpty()) throw new IllegalArgumentException();
         return atLeast(
             elements.stream()
@@ -121,7 +120,7 @@ public class GT_HatchElementBuilder<T> {
     /**
      * Set all of adder, hint and hatchItemFilter. Provide a reasonable default for shouldSkip. TODO add doc
      */
-    public final GT_HatchElementBuilder<T> atLeast(Map<IHatchElement<? super T>, ? extends Number> elements) {
+    public final HatchElementBuilder<T> atLeast(Map<IHatchElement<? super T>, ? extends Number> elements) {
         if (elements == null || elements.isEmpty() || elements.containsKey(null) || elements.containsValue(null))
             throw new IllegalArgumentException();
         List<Class<? extends IMetaTileEntity>> list = elements.keySet()
@@ -136,10 +135,10 @@ public class GT_HatchElementBuilder<T> {
                 .map(
                     e -> e.adder()
                         .rebrand())
-                .reduce(IGT_HatchAdder::orElse)
+                .reduce(IGTHatchAdder::orElse)
                 .orElseThrow(AssertionError::new))
                     .hatchItemFilter(
-                        obj -> GT_StructureUtility.filterByMTEClass(
+                        obj -> GTStructureUtility.filterByMTEClass(
                             elements.entrySet()
                                 .stream()
                                 .filter(
@@ -183,30 +182,30 @@ public class GT_HatchElementBuilder<T> {
      * element
      * to be non-exclusive.
      */
-    public GT_HatchElementBuilder<T> exclusive() {
+    public HatchElementBuilder<T> exclusive() {
         mExclusive = true;
         return this;
     }
 
-    public GT_HatchElementBuilder<T> adder(IGT_HatchAdder<? super T> aAdder) {
+    public HatchElementBuilder<T> adder(IGTHatchAdder<? super T> aAdder) {
         if (aAdder == null) throw new IllegalArgumentException();
         mAdder = aAdder;
         return this;
     }
 
-    public GT_HatchElementBuilder<T> casingIndex(int aCasingIndex) {
+    public HatchElementBuilder<T> casingIndex(int aCasingIndex) {
         if (aCasingIndex <= 0) throw new IllegalArgumentException();
         mCasingIndex = aCasingIndex;
         return this;
     }
 
-    public GT_HatchElementBuilder<T> dot(int aDot) {
+    public HatchElementBuilder<T> dot(int aDot) {
         if (aDot <= 0) throw new IllegalArgumentException();
         mDot = aDot;
         return this;
     }
 
-    public GT_HatchElementBuilder<T> shouldSkip(BiPredicate<? super T, ? super IGregTechTileEntity> aShouldSkip) {
+    public HatchElementBuilder<T> shouldSkip(BiPredicate<? super T, ? super IGregTechTileEntity> aShouldSkip) {
         if (!(aShouldSkip instanceof Builtin) || mShouldSkip != null) {
             if (!(mShouldSkip instanceof Builtin) && mShouldSkip != null) throw new IllegalStateException();
             if (aShouldSkip == null) throw new IllegalArgumentException();
@@ -215,20 +214,20 @@ public class GT_HatchElementBuilder<T> {
         return this;
     }
 
-    public GT_HatchElementBuilder<T> shouldReject(Predicate<? super T> aShouldReject) {
+    public HatchElementBuilder<T> shouldReject(Predicate<? super T> aShouldReject) {
         if (aShouldReject == null) throw new IllegalArgumentException();
         mReject = aShouldReject;
         return this;
     }
 
-    public GT_HatchElementBuilder<T> hatchItemFilter(
+    public HatchElementBuilder<T> hatchItemFilter(
         Function<? super T, ? extends Predicate<ItemStack>> aHatchItemFilter) {
         if (aHatchItemFilter == null) throw new IllegalArgumentException();
         mHatchItemFilter = (t, s) -> aHatchItemFilter.apply(t);
         return this;
     }
 
-    public GT_HatchElementBuilder<T> hatchItemFilterAnd(
+    public HatchElementBuilder<T> hatchItemFilterAnd(
         Function<? super T, ? extends Predicate<ItemStack>> aHatchItemFilter) {
         if (aHatchItemFilter == null) throw new IllegalArgumentException();
         BiFunction<? super T, ItemStack, ? extends Predicate<ItemStack>> tOldFilter = mHatchItemFilter;
@@ -237,14 +236,14 @@ public class GT_HatchElementBuilder<T> {
         return this;
     }
 
-    public GT_HatchElementBuilder<T> hatchItemFilter(
+    public HatchElementBuilder<T> hatchItemFilter(
         BiFunction<? super T, ItemStack, ? extends Predicate<ItemStack>> aHatchItemFilter) {
         if (aHatchItemFilter == null) throw new IllegalArgumentException();
         mHatchItemFilter = aHatchItemFilter;
         return this;
     }
 
-    public GT_HatchElementBuilder<T> hatchItemFilterAnd(
+    public HatchElementBuilder<T> hatchItemFilterAnd(
         BiFunction<? super T, ItemStack, ? extends Predicate<ItemStack>> aHatchItemFilter) {
         if (aHatchItemFilter == null) throw new IllegalArgumentException();
         BiFunction<? super T, ItemStack, ? extends Predicate<ItemStack>> tOldFilter = mHatchItemFilter;
@@ -254,33 +253,33 @@ public class GT_HatchElementBuilder<T> {
     }
 
     // region hint
-    public GT_HatchElementBuilder<T> hint(Supplier<String> aSupplier) {
+    public HatchElementBuilder<T> hint(Supplier<String> aSupplier) {
         if (aSupplier == null) throw new IllegalArgumentException();
         mHatchItemType = aSupplier;
         mCacheHint = false;
         return this;
     }
 
-    public GT_HatchElementBuilder<T> cacheHint(Supplier<String> aSupplier) {
+    public HatchElementBuilder<T> cacheHint(Supplier<String> aSupplier) {
         if (aSupplier == null) throw new IllegalArgumentException();
         mHatchItemType = aSupplier;
         mCacheHint = true;
         return this;
     }
 
-    public GT_HatchElementBuilder<T> cacheHint() {
+    public HatchElementBuilder<T> cacheHint() {
         if (mHatchItemType == null) throw new IllegalStateException();
         mCacheHint = true;
         return this;
     }
     // endregion
 
-    public GT_HatchElementBuilder<T> continueIfSuccess() {
+    public HatchElementBuilder<T> continueIfSuccess() {
         mNoStop = true;
         return this;
     }
 
-    public GT_HatchElementBuilder<T> stopIfSuccess() {
+    public HatchElementBuilder<T> stopIfSuccess() {
         mNoStop = false;
         return this;
     }
@@ -295,7 +294,7 @@ public class GT_HatchElementBuilder<T> {
      *
      * @param facings disallowed direction in ABC coordinate system
      */
-    public GT_HatchElementBuilder<T> disallowOnly(ForgeDirection... facings) {
+    public HatchElementBuilder<T> disallowOnly(ForgeDirection... facings) {
         if (facings == null) throw new IllegalArgumentException();
         mDisallowedDirection = EnumSet.copyOf(Arrays.asList(facings));
         return this;
@@ -311,7 +310,7 @@ public class GT_HatchElementBuilder<T> {
      *
      * @param facings allowed direction in ABC coordinate system
      */
-    public GT_HatchElementBuilder<T> allowOnly(ForgeDirection... facings) {
+    public HatchElementBuilder<T> allowOnly(ForgeDirection... facings) {
         if (facings == null) throw new IllegalArgumentException();
         mDisallowedDirection = EnumSet.complementOf(EnumSet.copyOf(Arrays.asList(facings)));
         mDisallowedDirection.remove(ForgeDirection.UNKNOWN);
@@ -320,8 +319,8 @@ public class GT_HatchElementBuilder<T> {
     // endregion
 
     // region intermediate
-    public GT_HatchElementBuilder<T> hatchClass(Class<? extends IMetaTileEntity> clazz) {
-        return hatchItemFilter(c -> is -> clazz.isInstance(GT_Item_Machines.getMetaTileEntity(is)))
+    public HatchElementBuilder<T> hatchClass(Class<? extends IMetaTileEntity> clazz) {
+        return hatchItemFilter(c -> is -> clazz.isInstance(ItemMachines.getMetaTileEntity(is)))
             .cacheHint(() -> "of class " + clazz.getSimpleName())
             .shouldSkip(
                 (BiPredicate<? super T, ? super IGregTechTileEntity> & Builtin) (c, t) -> clazz
@@ -329,13 +328,13 @@ public class GT_HatchElementBuilder<T> {
     }
 
     @SafeVarargs
-    public final GT_HatchElementBuilder<T> hatchClasses(Class<? extends IMetaTileEntity>... classes) {
+    public final HatchElementBuilder<T> hatchClasses(Class<? extends IMetaTileEntity>... classes) {
         return hatchClasses(Arrays.asList(classes));
     }
 
-    public final GT_HatchElementBuilder<T> hatchClasses(List<? extends Class<? extends IMetaTileEntity>> classes) {
+    public final HatchElementBuilder<T> hatchClasses(List<? extends Class<? extends IMetaTileEntity>> classes) {
         List<? extends Class<? extends IMetaTileEntity>> list = new ArrayList<>(classes);
-        return hatchItemFilter(obj -> GT_StructureUtility.filterByMTEClass(list)).cacheHint(
+        return hatchItemFilter(obj -> GTStructureUtility.filterByMTEClass(list)).cacheHint(
             () -> list.stream()
                 .map(Class::getSimpleName)
                 .sorted()
@@ -345,21 +344,21 @@ public class GT_HatchElementBuilder<T> {
                     .anyMatch(clazz -> clazz.isInstance(t.getMetaTileEntity())));
     }
 
-    public GT_HatchElementBuilder<T> hatchId(int aId) {
+    public HatchElementBuilder<T> hatchId(int aId) {
         return hatchItemFilter(
-            c -> is -> GT_Utility.isStackValid(is) && is.getItem() instanceof GT_Item_Machines
-                && is.getItemDamage() == aId).cacheHint(() -> "of id " + aId)
-                    .shouldSkip(
-                        (BiPredicate<? super T, ? super IGregTechTileEntity> & Builtin) (c, t) -> t != null
-                            && t.getMetaTileID() == aId);
+            c -> is -> GTUtility.isStackValid(is) && is.getItem() instanceof ItemMachines && is.getItemDamage() == aId)
+                .cacheHint(() -> "of id " + aId)
+                .shouldSkip(
+                    (BiPredicate<? super T, ? super IGregTechTileEntity> & Builtin) (c, t) -> t != null
+                        && t.getMetaTileID() == aId);
     }
 
-    public GT_HatchElementBuilder<T> hatchIds(int... aIds) {
+    public HatchElementBuilder<T> hatchIds(int... aIds) {
         if (aIds == null || aIds.length == 0) throw new IllegalArgumentException();
         if (aIds.length == 1) return hatchId(aIds[0]);
         TIntCollection coll = aIds.length < 16 ? new TIntArrayList(aIds) : new TIntHashSet(aIds);
         return hatchItemFilter(
-            c -> is -> GT_Utility.isStackValid(is) && is.getItem() instanceof GT_Item_Machines
+            c -> is -> GTUtility.isStackValid(is) && is.getItem() instanceof ItemMachines
                 && coll.contains(is.getItemDamage())).cacheHint(
                     () -> Arrays.stream(coll.toArray())
                         .sorted()
@@ -438,7 +437,7 @@ public class GT_HatchElementBuilder<T> {
                 String tHint = mHatchItemType.get();
                 if (tHint == null) return "?";
                 // TODO move this to some .lang instead of half ass it into the crappy gt lang file
-                tHint = GT_LanguageManager.addStringLocalization("Hatch_Type_" + tHint.replace(' ', '_'), tHint);
+                tHint = GTLanguageManager.addStringLocalization("Hatch_Type_" + tHint.replace(' ', '_'), tHint);
                 if (mCacheHint) {
                     mHint = tHint;
                     if (mHint != null)
@@ -487,13 +486,13 @@ public class GT_HatchElementBuilder<T> {
                 }
                 ItemStack taken = env.getSource()
                     .takeOne(mHatchItemFilter.apply(t, trigger), true);
-                if (GT_Utility.isStackInvalid(taken)) {
+                if (GTUtility.isStackInvalid(taken)) {
                     String type = getHint();
                     env.getChatter()
                         .accept(new ChatComponentTranslation("GT5U.autoplace.error.no_hatch", type));
                     return PlaceResult.REJECT;
                 }
-                if (StructureUtility.survivalPlaceBlock(
+                if (com.gtnewhorizon.structurelib.structure.StructureUtility.survivalPlaceBlock(
                     taken,
                     ItemStackPredicate.NBTMode.IGNORE,
                     null,
diff --git a/src/main/java/gregtech/api/util/IGT_HatchAdder.java b/src/main/java/gregtech/api/util/IGTHatchAdder.java
index 21796f172e..35a30ad7de 100644
--- a/src/main/java/gregtech/api/util/IGT_HatchAdder.java
+++ b/src/main/java/gregtech/api/util/IGTHatchAdder.java
@@ -2,7 +2,7 @@ package gregtech.api.util;
 
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
-public interface IGT_HatchAdder<T> {
+public interface IGTHatchAdder<T> {
 
     /**
      * Callback to add hatch, needs to check if hatch is valid (and add it)
@@ -17,12 +17,12 @@ public interface IGT_HatchAdder<T> {
      * hack to work around java generic issues.
      */
     @SuppressWarnings("unchecked")
-    default <T2 extends T> IGT_HatchAdder<T2> rebrand() {
-        return (IGT_HatchAdder<T2>) this;
+    default <T2 extends T> IGTHatchAdder<T2> rebrand() {
+        return (IGTHatchAdder<T2>) this;
     }
 
-    default IGT_HatchAdder<T> orElse(IGT_HatchAdder<? super T> fallback) {
-        return (t, iGregTechTileEntity, aShort) -> IGT_HatchAdder.this.apply(t, iGregTechTileEntity, aShort)
+    default IGTHatchAdder<T> orElse(IGTHatchAdder<? super T> fallback) {
+        return (t, iGregTechTileEntity, aShort) -> IGTHatchAdder.this.apply(t, iGregTechTileEntity, aShort)
             || fallback.apply(t, iGregTechTileEntity, aShort);
     }
 }
diff --git a/src/main/java/gregtech/api/util/GT_JubilanceMegaApiary.java b/src/main/java/gregtech/api/util/JubilanceMegaApiary.java
index f20a58c34a..e24cad6778 100644
--- a/src/main/java/gregtech/api/util/GT_JubilanceMegaApiary.java
+++ b/src/main/java/gregtech/api/util/JubilanceMegaApiary.java
@@ -5,11 +5,11 @@ import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.apiculture.IJubilanceProvider;
 
-public class GT_JubilanceMegaApiary implements IJubilanceProvider {
+public class JubilanceMegaApiary implements IJubilanceProvider {
 
-    public static final GT_JubilanceMegaApiary instance = new GT_JubilanceMegaApiary();
+    public static final JubilanceMegaApiary instance = new JubilanceMegaApiary();
 
-    protected GT_JubilanceMegaApiary() {}
+    protected JubilanceMegaApiary() {}
 
     @Override
     public boolean isJubilant(IAlleleBeeSpecies species, IBeeGenome genome, IBeeHousing housing) {
diff --git a/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java b/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java
index 2d6712788a..e51f3a0524 100644
--- a/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java
+++ b/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java
@@ -36,7 +36,7 @@ import com.gtnewhorizon.structurelib.StructureLibAPI;
  * <br>
  * Originally created by kekzdealer
  */
-public class GT_Multiblock_Tooltip_Builder {
+public class MultiblockTooltipBuilder {
 
     private static final String TAB = "   ";
     private static final String COLON = ": ";
@@ -78,7 +78,7 @@ public class GT_Multiblock_Tooltip_Builder {
         .mapToObj(i -> StatCollector.translateToLocal("structurelib.blockhint." + i + ".name"))
         .toArray(String[]::new);
 
-    public GT_Multiblock_Tooltip_Builder() {
+    public MultiblockTooltipBuilder() {
         iLines = new LinkedList<>();
         sLines = new LinkedList<>();
         hLines = new LinkedList<>();
@@ -94,7 +94,7 @@ public class GT_Multiblock_Tooltip_Builder {
      *
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addMachineType(String machine) {
+    public MultiblockTooltipBuilder addMachineType(String machine) {
         iLines.add(TT_machineType + COLON + EnumChatFormatting.YELLOW + machine + EnumChatFormatting.RESET);
         return this;
     }
@@ -105,7 +105,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param info The line to be added.
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addInfo(String info) {
+    public MultiblockTooltipBuilder addInfo(String info) {
         iLines.add(info);
         return this;
     }
@@ -117,7 +117,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @return Instance this method was called on.
      */
 
-    public GT_Multiblock_Tooltip_Builder addInfoAll(String... infoStrings) {
+    public MultiblockTooltipBuilder addInfoAll(String... infoStrings) {
         for (String str : infoStrings) {
             iLines.add(str);
         }
@@ -130,7 +130,7 @@ public class GT_Multiblock_Tooltip_Builder {
      *
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addSeparator() {
+    public MultiblockTooltipBuilder addSeparator() {
         iLines.add("-----------------------------------------");
         return this;
     }
@@ -142,7 +142,7 @@ public class GT_Multiblock_Tooltip_Builder {
      *
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addPollutionAmount(int pollution) {
+    public MultiblockTooltipBuilder addPollutionAmount(int pollution) {
         iLines.add(
             TT_causes + COLON + EnumChatFormatting.DARK_PURPLE + pollution + " " + EnumChatFormatting.GRAY + TT_pps);
         return this;
@@ -158,7 +158,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param hollow T/F, adds a (hollow) comment if true
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder beginStructureBlock(int w, int h, int l, boolean hollow) {
+    public MultiblockTooltipBuilder beginStructureBlock(int w, int h, int l, boolean hollow) {
         sLines.add(
             EnumChatFormatting.WHITE + TT_dimensions
                 + COLON
@@ -205,7 +205,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param hollow T/F, adds a (hollow) comment if true
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder beginVariableStructureBlock(int wmin, int wmax, int hmin, int hmax, int lmin,
+    public MultiblockTooltipBuilder beginVariableStructureBlock(int wmin, int wmax, int hmin, int hmax, int lmin,
         int lmax, boolean hollow) {
         sLines.add(
             EnumChatFormatting.WHITE + TT_dimensions
@@ -249,7 +249,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param info Positional information.
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addController(String info) {
+    public MultiblockTooltipBuilder addController(String info) {
         sLines.add(TAB + EnumChatFormatting.WHITE + TT_controller + COLON + EnumChatFormatting.GRAY + info);
         return this;
     }
@@ -266,7 +266,7 @@ public class GT_Multiblock_Tooltip_Builder {
      *
      */
     @Deprecated
-    public GT_Multiblock_Tooltip_Builder addCasingInfo(String casingName, int minCount) {
+    public MultiblockTooltipBuilder addCasingInfo(String casingName, int minCount) {
         return addCasingInfoMin(casingName, minCount, false);
     }
 
@@ -278,7 +278,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param isTiered   Flag if this casing accepts multiple tiers (e.g. coils)
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addCasingInfoExactly(String casingName, int count, boolean isTiered) {
+    public MultiblockTooltipBuilder addCasingInfoExactly(String casingName, int count, boolean isTiered) {
         return addCasingInfoExactlyColored(
             casingName,
             EnumChatFormatting.GRAY,
@@ -297,7 +297,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param textColor  Color of the casing name text
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addCasingInfoExactlyColored(String casingName, EnumChatFormatting textColor,
+    public MultiblockTooltipBuilder addCasingInfoExactlyColored(String casingName, EnumChatFormatting textColor,
         int count, EnumChatFormatting countColor, boolean isTiered) {
         sLines.add(
             countColor + TAB
@@ -319,7 +319,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param isTiered   Flag if this casing accepts multiple tiers (e.g. coils)
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addCasingInfoMin(String casingName, int minCount, boolean isTiered) {
+    public MultiblockTooltipBuilder addCasingInfoMin(String casingName, int minCount, boolean isTiered) {
         return addCasingInfoMinColored(
             casingName,
             EnumChatFormatting.GRAY,
@@ -339,7 +339,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param textColor  Color of the casing name text
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addCasingInfoMinColored(String casingName, EnumChatFormatting textColor,
+    public MultiblockTooltipBuilder addCasingInfoMinColored(String casingName, EnumChatFormatting textColor,
         int minCount, EnumChatFormatting countColor, boolean isTiered) {
         sLines.add(
             countColor + TAB
@@ -364,7 +364,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param isTiered   Flag if this casing accepts multiple tiers (e.g. coils)
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addCasingInfoRange(String casingName, int minCount, int maxCount,
+    public MultiblockTooltipBuilder addCasingInfoRange(String casingName, int minCount, int maxCount,
         boolean isTiered) {
         return addCasingInfoRangeColored(
             casingName,
@@ -387,7 +387,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param textColor  Color of the casing name text
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addCasingInfoRangeColored(String casingName, EnumChatFormatting textColor,
+    public MultiblockTooltipBuilder addCasingInfoRangeColored(String casingName, EnumChatFormatting textColor,
         int minCount, int maxCount, EnumChatFormatting countColor, boolean isTiered) {
         sLines.add(
             countColor + TAB
@@ -413,7 +413,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param info Positional information.
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addOtherStructurePart(String name, String info) {
+    public MultiblockTooltipBuilder addOtherStructurePart(String name, String info) {
         sLines.add(EnumChatFormatting.WHITE + TAB + name + COLON + EnumChatFormatting.GRAY + info);
         return this;
     }
@@ -425,7 +425,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param info Positional information.
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addMaintenanceHatch(String info) {
+    public MultiblockTooltipBuilder addMaintenanceHatch(String info) {
         sLines.add(EnumChatFormatting.WHITE + TAB + TT_maintenancehatch + COLON + EnumChatFormatting.GRAY + info);
         return this;
     }
@@ -437,7 +437,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param info Location where the hatch goes
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addMufflerHatch(String info) {
+    public MultiblockTooltipBuilder addMufflerHatch(String info) {
         sLines.add(EnumChatFormatting.WHITE + TAB + TT_mufflerhatch + COLON + EnumChatFormatting.GRAY + info);
         return this;
     }
@@ -449,7 +449,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param info Positional information.
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addEnergyHatch(String info) {
+    public MultiblockTooltipBuilder addEnergyHatch(String info) {
         sLines.add(EnumChatFormatting.WHITE + TAB + TT_energyhatch + COLON + EnumChatFormatting.GRAY + info);
         return this;
     }
@@ -461,7 +461,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param info Positional information.
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addDynamoHatch(String info) {
+    public MultiblockTooltipBuilder addDynamoHatch(String info) {
         sLines.add(EnumChatFormatting.WHITE + TAB + TT_dynamohatch + COLON + EnumChatFormatting.GRAY + info);
         return this;
     }
@@ -473,7 +473,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param info Location where the bus goes
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addInputBus(String info) {
+    public MultiblockTooltipBuilder addInputBus(String info) {
         sLines.add(EnumChatFormatting.WHITE + TAB + TT_inputbus + COLON + EnumChatFormatting.GRAY + info);
         return this;
     }
@@ -485,7 +485,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param info Location where the hatch goes
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addInputHatch(String info) {
+    public MultiblockTooltipBuilder addInputHatch(String info) {
         sLines.add(EnumChatFormatting.WHITE + TAB + TT_inputhatch + COLON + EnumChatFormatting.GRAY + info);
         return this;
     }
@@ -497,7 +497,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param info Location where the bus goes
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addOutputBus(String info) {
+    public MultiblockTooltipBuilder addOutputBus(String info) {
         sLines.add(EnumChatFormatting.WHITE + TAB + TT_outputbus + COLON + EnumChatFormatting.GRAY + info);
         return this;
     }
@@ -509,7 +509,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param info Location where the bus goes
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addOutputHatch(String info) {
+    public MultiblockTooltipBuilder addOutputHatch(String info) {
         sLines.add(EnumChatFormatting.WHITE + TAB + TT_outputhatch + COLON + EnumChatFormatting.GRAY + info);
         return this;
     }
@@ -523,7 +523,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param dots The valid locations for this part when asked to display hints
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addOtherStructurePart(String name, String info, int... dots) {
+    public MultiblockTooltipBuilder addOtherStructurePart(String name, String info, int... dots) {
         sLines.add(EnumChatFormatting.WHITE + TAB + name + COLON + EnumChatFormatting.GRAY + info);
         for (int dot : dots) hBlocks.put(dot, name);
         return this;
@@ -537,7 +537,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param dots The valid locations for this part when asked to display hints
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addMaintenanceHatch(String info, int... dots) {
+    public MultiblockTooltipBuilder addMaintenanceHatch(String info, int... dots) {
         sLines.add(EnumChatFormatting.WHITE + TAB + TT_maintenancehatch + COLON + EnumChatFormatting.GRAY + info);
         for (int dot : dots) hBlocks.put(dot, TT_maintenancehatch);
         return this;
@@ -551,7 +551,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param dots The valid locations for this part when asked to display hints
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addMufflerHatch(String info, int... dots) {
+    public MultiblockTooltipBuilder addMufflerHatch(String info, int... dots) {
         sLines.add(EnumChatFormatting.WHITE + TAB + TT_mufflerhatch + COLON + EnumChatFormatting.GRAY + info);
         for (int dot : dots) hBlocks.put(dot, TT_mufflerhatch);
         return this;
@@ -565,7 +565,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param dots The valid locations for this part when asked to display hints
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addEnergyHatch(String info, int... dots) {
+    public MultiblockTooltipBuilder addEnergyHatch(String info, int... dots) {
         sLines.add(EnumChatFormatting.WHITE + TAB + TT_energyhatch + COLON + EnumChatFormatting.GRAY + info);
         for (int dot : dots) hBlocks.put(dot, TT_energyhatch);
         return this;
@@ -579,7 +579,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param dots The valid locations for this part when asked to display hints
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addDynamoHatch(String info, int... dots) {
+    public MultiblockTooltipBuilder addDynamoHatch(String info, int... dots) {
         sLines.add(EnumChatFormatting.WHITE + TAB + TT_dynamohatch + COLON + EnumChatFormatting.GRAY + info);
         for (int dot : dots) hBlocks.put(dot, TT_dynamohatch);
         return this;
@@ -593,7 +593,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param dots The valid locations for this part when asked to display hints
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addInputBus(String info, int... dots) {
+    public MultiblockTooltipBuilder addInputBus(String info, int... dots) {
         sLines.add(EnumChatFormatting.WHITE + TAB + TT_inputbus + COLON + EnumChatFormatting.GRAY + info);
         for (int dot : dots) hBlocks.put(dot, TT_inputbus);
         return this;
@@ -607,7 +607,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param dots The valid locations for this part when asked to display hints
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addInputHatch(String info, int... dots) {
+    public MultiblockTooltipBuilder addInputHatch(String info, int... dots) {
         sLines.add(EnumChatFormatting.WHITE + TAB + TT_inputhatch + COLON + EnumChatFormatting.GRAY + info);
         for (int dot : dots) hBlocks.put(dot, TT_inputhatch);
         return this;
@@ -621,7 +621,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param dots The valid locations for this part when asked to display hints
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addOutputBus(String info, int... dots) {
+    public MultiblockTooltipBuilder addOutputBus(String info, int... dots) {
         sLines.add(EnumChatFormatting.WHITE + TAB + TT_outputbus + COLON + EnumChatFormatting.GRAY + info);
         for (int dot : dots) hBlocks.put(dot, TT_outputbus);
         return this;
@@ -635,7 +635,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param dots The valid locations for this part when asked to display hints
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addOutputHatch(String info, int... dots) {
+    public MultiblockTooltipBuilder addOutputHatch(String info, int... dots) {
         sLines.add(EnumChatFormatting.WHITE + TAB + TT_outputhatch + COLON + EnumChatFormatting.GRAY + info);
         for (int dot : dots) hBlocks.put(dot, TT_outputhatch);
         return this;
@@ -648,7 +648,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param info The line to be added.
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addStructureInfo(String info) {
+    public MultiblockTooltipBuilder addStructureInfo(String info) {
         sLines.add(TAB + info);
         return this;
     }
@@ -661,7 +661,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param purpose the purpose of subchannel
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addSubChannelUsage(String channel, String purpose) {
+    public MultiblockTooltipBuilder addSubChannelUsage(String channel, String purpose) {
         sLines.add(TAB + StatCollector.translateToLocalFormatted("GT5U.MBTT.subchannel", channel, purpose));
         return this;
     }
@@ -672,7 +672,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param info The line to be added. This should be an entry into minecraft's localization system.
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addStructureHint(String info) {
+    public MultiblockTooltipBuilder addStructureHint(String info) {
         hLines.add(StatCollector.translateToLocal(info));
         return this;
     }
@@ -685,7 +685,7 @@ public class GT_Multiblock_Tooltip_Builder {
      * @param dots Possible locations of this block
      * @return Instance this method was called on.
      */
-    public GT_Multiblock_Tooltip_Builder addStructureHint(String name, int... dots) {
+    public MultiblockTooltipBuilder addStructureHint(String name, int... dots) {
         for (int dot : dots) hBlocks.put(dot, StatCollector.translateToLocal(name));
         return this;
     }
@@ -697,7 +697,7 @@ public class GT_Multiblock_Tooltip_Builder {
      *
      * @param mod Name of the mod that adds this multiblock machine
      */
-    public GT_Multiblock_Tooltip_Builder toolTipFinisher(String mod) {
+    public MultiblockTooltipBuilder toolTipFinisher(String mod) {
         iLines.add(
             TT_hold + " "
                 + EnumChatFormatting.BOLD
diff --git a/src/main/java/gregtech/api/util/OutputHatchWrapper.java b/src/main/java/gregtech/api/util/OutputHatchWrapper.java
index b2e74d24cf..55f467198a 100644
--- a/src/main/java/gregtech/api/util/OutputHatchWrapper.java
+++ b/src/main/java/gregtech/api/util/OutputHatchWrapper.java
@@ -8,17 +8,17 @@ import net.minecraftforge.fluids.FluidTankInfo;
 import org.jetbrains.annotations.NotNull;
 
 import gregtech.api.interfaces.fluid.IFluidStore;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
+import gregtech.api.metatileentity.implementations.MTEHatchOutput;
 
 /**
  * Wrapper for output hatch to allow multiblocks to apply specific filter.
  */
 public class OutputHatchWrapper implements IFluidStore {
 
-    private final GT_MetaTileEntity_Hatch_Output outputHatch;
+    private final MTEHatchOutput outputHatch;
     private final Predicate<FluidStack> filter;
 
-    public OutputHatchWrapper(GT_MetaTileEntity_Hatch_Output outputHatch, Predicate<FluidStack> filter) {
+    public OutputHatchWrapper(MTEHatchOutput outputHatch, Predicate<FluidStack> filter) {
         this.outputHatch = outputHatch;
         this.filter = filter;
     }
diff --git a/src/main/java/gregtech/api/util/GT_OverclockCalculator.java b/src/main/java/gregtech/api/util/OverclockCalculator.java
index 5dda0b5c01..0b27942355 100644
--- a/src/main/java/gregtech/api/util/GT_OverclockCalculator.java
+++ b/src/main/java/gregtech/api/util/OverclockCalculator.java
@@ -5,7 +5,7 @@ import java.util.function.Supplier;
 
 import javax.annotation.Nonnull;
 
-public class GT_OverclockCalculator {
+public class OverclockCalculator {
 
     // region variables
     // region basic properties
@@ -146,15 +146,15 @@ public class GT_OverclockCalculator {
     /**
      * Creates calculator that doesn't do OC at all. Will use recipe duration.
      */
-    public static GT_OverclockCalculator ofNoOverclock(@Nonnull GT_Recipe recipe) {
+    public static OverclockCalculator ofNoOverclock(@Nonnull GTRecipe recipe) {
         return ofNoOverclock(recipe.mEUt, recipe.mDuration);
     }
 
     /**
      * Creates calculator that doesn't do OC at all, with set duration.
      */
-    public static GT_OverclockCalculator ofNoOverclock(long eut, int duration) {
-        return new GT_OverclockCalculator().setRecipeEUt(eut)
+    public static OverclockCalculator ofNoOverclock(long eut, int duration) {
+        return new OverclockCalculator().setRecipeEUt(eut)
             .setDuration(duration)
             .setEUt(eut)
             .setNoOverclock(true);
@@ -163,14 +163,14 @@ public class GT_OverclockCalculator {
     /**
      * An Overclock helper for calculating overclocks in many different situations
      */
-    public GT_OverclockCalculator() {}
+    public OverclockCalculator() {}
 
     // region setters
     /**
      * @param recipeEUt Sets the Recipe's starting voltage
      */
     @Nonnull
-    public GT_OverclockCalculator setRecipeEUt(long recipeEUt) {
+    public OverclockCalculator setRecipeEUt(long recipeEUt) {
         this.recipeEUt = recipeEUt;
         return this;
     }
@@ -179,7 +179,7 @@ public class GT_OverclockCalculator {
      * @param machineVoltage Sets the EUt that the machine can use. This is the voltage of the machine
      */
     @Nonnull
-    public GT_OverclockCalculator setEUt(long machineVoltage) {
+    public OverclockCalculator setEUt(long machineVoltage) {
         this.machineVoltage = machineVoltage;
         return this;
     }
@@ -188,7 +188,7 @@ public class GT_OverclockCalculator {
      * @param duration Sets the duration of the recipe
      */
     @Nonnull
-    public GT_OverclockCalculator setDuration(int duration) {
+    public OverclockCalculator setDuration(int duration) {
         this.duration = duration;
         return this;
     }
@@ -197,7 +197,7 @@ public class GT_OverclockCalculator {
      * @param machineAmperage Sets the Amperage that the machine can support
      */
     @Nonnull
-    public GT_OverclockCalculator setAmperage(long machineAmperage) {
+    public OverclockCalculator setAmperage(long machineAmperage) {
         this.machineAmperage = machineAmperage;
         return this;
     }
@@ -206,7 +206,7 @@ public class GT_OverclockCalculator {
      * Enables Perfect OC in calculation
      */
     @Nonnull
-    public GT_OverclockCalculator enablePerfectOC() {
+    public OverclockCalculator enablePerfectOC() {
         this.durationDecreasePerOC = 4;
         return this;
     }
@@ -215,7 +215,7 @@ public class GT_OverclockCalculator {
      * Set if we should be calculating overclocking using EBF's perfectOC
      */
     @Nonnull
-    public GT_OverclockCalculator setHeatOC(boolean heatOC) {
+    public OverclockCalculator setHeatOC(boolean heatOC) {
         this.heatOC = heatOC;
         return this;
     }
@@ -224,7 +224,7 @@ public class GT_OverclockCalculator {
      * Sets if we should add a heat discount at the end of calculating an overclock, just like the EBF
      */
     @Nonnull
-    public GT_OverclockCalculator setHeatDiscount(boolean heatDiscount) {
+    public OverclockCalculator setHeatDiscount(boolean heatDiscount) {
         this.heatDiscount = heatDiscount;
         return this;
     }
@@ -233,7 +233,7 @@ public class GT_OverclockCalculator {
      * Sets the starting heat of the recipe
      */
     @Nonnull
-    public GT_OverclockCalculator setRecipeHeat(int recipeHeat) {
+    public OverclockCalculator setRecipeHeat(int recipeHeat) {
         this.recipeHeat = recipeHeat;
         return this;
     }
@@ -242,7 +242,7 @@ public class GT_OverclockCalculator {
      * Sets the heat of the coils on the machine
      */
     @Nonnull
-    public GT_OverclockCalculator setMachineHeat(int machineHeat) {
+    public OverclockCalculator setMachineHeat(int machineHeat) {
         this.machineHeat = machineHeat;
         return this;
     }
@@ -251,7 +251,7 @@ public class GT_OverclockCalculator {
      * Sets an EUtDiscount. 0.9 is 10% less energy. 1.1 is 10% more energy
      */
     @Nonnull
-    public GT_OverclockCalculator setEUtDiscount(float aEUtDiscount) {
+    public OverclockCalculator setEUtDiscount(float aEUtDiscount) {
         this.eutDiscount = aEUtDiscount;
         return this;
     }
@@ -260,7 +260,7 @@ public class GT_OverclockCalculator {
      * Sets a Speed Boost for the multiblock. 0.9 is 10% faster. 1.1 is 10% slower
      */
     @Nonnull
-    public GT_OverclockCalculator setSpeedBoost(float aSpeedBoost) {
+    public OverclockCalculator setSpeedBoost(float aSpeedBoost) {
         this.speedBoost = aSpeedBoost;
         return this;
     }
@@ -269,7 +269,7 @@ public class GT_OverclockCalculator {
      * Sets the parallel that the multiblock uses
      */
     @Nonnull
-    public GT_OverclockCalculator setParallel(int aParallel) {
+    public OverclockCalculator setParallel(int aParallel) {
         this.parallel = aParallel;
         return this;
     }
@@ -279,7 +279,7 @@ public class GT_OverclockCalculator {
      * Discount
      */
     @Nonnull
-    public GT_OverclockCalculator setHeatDiscountMultiplier(float heatDiscountExponent) {
+    public OverclockCalculator setHeatDiscountMultiplier(float heatDiscountExponent) {
         this.heatDiscountExponent = heatDiscountExponent;
         return this;
     }
@@ -288,7 +288,7 @@ public class GT_OverclockCalculator {
      * Sets the Overclock that should be calculated when a heat OC is applied.
      */
     @Nonnull
-    public GT_OverclockCalculator setHeatPerfectOC(double heatPerfectOC) {
+    public OverclockCalculator setHeatPerfectOC(double heatPerfectOC) {
         if (heatPerfectOC <= 0) throw new IllegalArgumentException("Heat OC can't be a negative number or zero");
         this.durationDecreasePerHeatOC = heatPerfectOC;
         return this;
@@ -299,7 +299,7 @@ public class GT_OverclockCalculator {
      * is also 1(ONE)!
      */
     @Nonnull
-    public GT_OverclockCalculator setEUtIncreasePerOC(double eutIncreasePerOC) {
+    public OverclockCalculator setEUtIncreasePerOC(double eutIncreasePerOC) {
         if (eutIncreasePerOC <= 0)
             throw new IllegalArgumentException("EUt increase can't be a negative number or zero");
         this.eutIncreasePerOC = eutIncreasePerOC;
@@ -311,7 +311,7 @@ public class GT_OverclockCalculator {
      * also 1(ONE)!
      */
     @Nonnull
-    public GT_OverclockCalculator setDurationDecreasePerOC(double durationDecreasePerOC) {
+    public OverclockCalculator setDurationDecreasePerOC(double durationDecreasePerOC) {
         if (durationDecreasePerOC <= 0)
             throw new IllegalArgumentException("Duration decrease can't be a negative number or zero");
         this.durationDecreasePerOC = durationDecreasePerOC;
@@ -322,7 +322,7 @@ public class GT_OverclockCalculator {
      * Set One Tick Discount on EUt based on Duration Decrease Per Overclock. This functions the same as single blocks.
      */
     @Nonnull
-    public GT_OverclockCalculator setOneTickDiscount(boolean oneTickDiscount) {
+    public OverclockCalculator setOneTickDiscount(boolean oneTickDiscount) {
         this.oneTickDiscount = oneTickDiscount;
         return this;
     }
@@ -332,14 +332,14 @@ public class GT_OverclockCalculator {
      * fusion reactors.
      */
     @Nonnull
-    public GT_OverclockCalculator limitOverclockCount(int maxOverclocks) {
+    public OverclockCalculator limitOverclockCount(int maxOverclocks) {
         this.limitOverclocks = true;
         this.maxOverclocks = maxOverclocks;
         return this;
     }
 
     @Nonnull
-    public GT_OverclockCalculator setAmperageOC(boolean amperageOC) {
+    public OverclockCalculator setAmperageOC(boolean amperageOC) {
         this.amperageOC = amperageOC;
         return this;
     }
@@ -348,7 +348,7 @@ public class GT_OverclockCalculator {
      * Set a supplier for calculating custom duration for when its needed under one tick
      */
     @Nonnull
-    public GT_OverclockCalculator setDurationUnderOneTickSupplier(Supplier<Double> supplier) {
+    public OverclockCalculator setDurationUnderOneTickSupplier(Supplier<Double> supplier) {
         this.durationUnderOneTickSupplier = supplier;
         return this;
     }
@@ -357,7 +357,7 @@ public class GT_OverclockCalculator {
      * Sets if we should do overclocking or not
      */
     @Nonnull
-    public GT_OverclockCalculator setNoOverclock(boolean noOverclock) {
+    public OverclockCalculator setNoOverclock(boolean noOverclock) {
         this.noOverclock = noOverclock;
         return this;
     }
@@ -365,7 +365,7 @@ public class GT_OverclockCalculator {
     /**
      * Set a supplier for calculating custom EUt increase multipliers for every overclock
      */
-    public GT_OverclockCalculator setEutIncreasePerOCSupplier(Function<Integer, Double> eutIncreasePerOCSupplier) {
+    public OverclockCalculator setEutIncreasePerOCSupplier(Function<Integer, Double> eutIncreasePerOCSupplier) {
         this.eutIncreasePerOCSupplier = eutIncreasePerOCSupplier;
         this.hasAtLeastOneSupplierBeenSet = true;
         return this;
@@ -374,7 +374,7 @@ public class GT_OverclockCalculator {
     /**
      * Set a supplier for calculating custom duration decrease multipliers for every overclock
      */
-    public GT_OverclockCalculator setDurationDecreasePerOCSupplier(
+    public OverclockCalculator setDurationDecreasePerOCSupplier(
         Function<Integer, Double> durationDecreasePerOCSupplier) {
         this.durationDecreasePerOCSupplier = durationDecreasePerOCSupplier;
         this.hasAtLeastOneSupplierBeenSet = true;
@@ -384,7 +384,7 @@ public class GT_OverclockCalculator {
     /**
      * Set actually performed parallel
      */
-    public GT_OverclockCalculator setCurrentParallel(int currentParallel) {
+    public OverclockCalculator setCurrentParallel(int currentParallel) {
         this.currentParallel = currentParallel;
         // Sets parallel to the actually performed one if machine's parallel is underused.
         this.parallel = Math.min(parallel, currentParallel);
@@ -397,7 +397,7 @@ public class GT_OverclockCalculator {
      * Call this when all values have been put it.
      */
     @Nonnull
-    public GT_OverclockCalculator calculate() {
+    public OverclockCalculator calculate() {
         if (calculated) {
             throw new IllegalStateException("Tried to calculate overclocks twice");
         }
diff --git a/src/main/java/gregtech/api/util/GT_PCBFactoryManager.java b/src/main/java/gregtech/api/util/PCBFactoryManager.java
index 990e9bd174..2d3efa29d4 100644
--- a/src/main/java/gregtech/api/util/GT_PCBFactoryManager.java
+++ b/src/main/java/gregtech/api/util/PCBFactoryManager.java
@@ -4,7 +4,7 @@ import com.google.common.collect.HashBiMap;
 
 import gregtech.api.enums.Materials;
 
-public class GT_PCBFactoryManager {
+public class PCBFactoryManager {
 
     private static final HashBiMap<Materials, Integer> mPlasticTiers = HashBiMap.create();
     public static int mTiersOfPlastics = 0;
diff --git a/src/main/java/gregtech/api/util/GT_ParallelHelper.java b/src/main/java/gregtech/api/util/ParallelHelper.java
index 157488a8ca..0c995cba7d 100644
--- a/src/main/java/gregtech/api/util/GT_ParallelHelper.java
+++ b/src/main/java/gregtech/api/util/ParallelHelper.java
@@ -22,7 +22,7 @@ import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SingleRecipeCheck;
 
 @SuppressWarnings({ "unused", "UnusedReturnValue" })
-public class GT_ParallelHelper {
+public class ParallelHelper {
 
     private static final double MAX_BATCH_MODE_TICK_TIME = 128;
     /**
@@ -40,7 +40,7 @@ public class GT_ParallelHelper {
     /**
      * Recipe used when trying to calculate parallels
      */
-    private GT_Recipe recipe;
+    private GTRecipe recipe;
     /**
      * EUt available to the multiblock (This should be the total eut available)
      */
@@ -133,16 +133,16 @@ public class GT_ParallelHelper {
     /**
      * Method for calculating max parallel from given inputs.
      */
-    private MaxParallelCalculator maxParallelCalculator = GT_Recipe::maxParallelCalculatedByInputs;
+    private MaxParallelCalculator maxParallelCalculator = GTRecipe::maxParallelCalculatedByInputs;
     /**
      * Method for consuming inputs after determining how many parallels it can execute.
      */
-    private InputConsumer inputConsumer = GT_Recipe::consumeInput;
+    private InputConsumer inputConsumer = GTRecipe::consumeInput;
 
     /**
      * Calculator to use for overclocking
      */
-    private GT_OverclockCalculator calculator;
+    private OverclockCalculator calculator;
     @Nonnull
     private CheckRecipeResult result = CheckRecipeResultRegistry.NONE;
 
@@ -156,13 +156,13 @@ public class GT_ParallelHelper {
      */
     private boolean muteMode = false;
 
-    public GT_ParallelHelper() {}
+    public ParallelHelper() {}
 
     /**
      * Sets machine, with current configuration for void protection mode.
      */
     @Nonnull
-    public GT_ParallelHelper setMachine(IVoidable machine) {
+    public ParallelHelper setMachine(IVoidable machine) {
         return setMachine(machine, machine.protectsExcessItem(), machine.protectsExcessFluid());
     }
 
@@ -170,7 +170,7 @@ public class GT_ParallelHelper {
      * Sets machine, with void protection mode forcibly.
      */
     @Nonnull
-    public GT_ParallelHelper setMachine(IVoidable machine, boolean protectExcessItem, boolean protectExcessFluid) {
+    public ParallelHelper setMachine(IVoidable machine, boolean protectExcessItem, boolean protectExcessFluid) {
         this.protectExcessItem = protectExcessItem;
         this.protectExcessFluid = protectExcessFluid;
         this.machine = machine;
@@ -181,13 +181,13 @@ public class GT_ParallelHelper {
      * Sets the recipe, which will be used for the parallel calculation
      */
     @Nonnull
-    public GT_ParallelHelper setRecipe(@Nonnull GT_Recipe aRecipe) {
+    public ParallelHelper setRecipe(@Nonnull GTRecipe aRecipe) {
         recipe = Objects.requireNonNull(aRecipe);
         return this;
     }
 
     @Nonnull
-    public GT_ParallelHelper setRecipeLocked(IRecipeLockable singleRecipeMachine, boolean isRecipeLocked) {
+    public ParallelHelper setRecipeLocked(IRecipeLockable singleRecipeMachine, boolean isRecipeLocked) {
         this.singleRecipeMachine = singleRecipeMachine;
         this.isRecipeLocked = isRecipeLocked;
         return this;
@@ -197,7 +197,7 @@ public class GT_ParallelHelper {
      * Sets the items available for the recipe check
      */
     @Nonnull
-    public GT_ParallelHelper setItemInputs(ItemStack... aItemInputs) {
+    public ParallelHelper setItemInputs(ItemStack... aItemInputs) {
         this.itemInputs = aItemInputs;
         return this;
     }
@@ -206,7 +206,7 @@ public class GT_ParallelHelper {
      * Sets the fluid inputs available for the recipe check
      */
     @Nonnull
-    public GT_ParallelHelper setFluidInputs(FluidStack... aFluidInputs) {
+    public ParallelHelper setFluidInputs(FluidStack... aFluidInputs) {
         this.fluidInputs = aFluidInputs;
         return this;
     }
@@ -215,7 +215,7 @@ public class GT_ParallelHelper {
      * Sets the available eut when trying for more parallels
      */
     @Nonnull
-    public GT_ParallelHelper setAvailableEUt(long aAvailableEUt) {
+    public ParallelHelper setAvailableEUt(long aAvailableEUt) {
         this.availableEUt = aAvailableEUt;
         return this;
     }
@@ -224,7 +224,7 @@ public class GT_ParallelHelper {
      * Sets the modifier for recipe eut. 1 does nothing 0.9 is 10% less. 1.1 is 10% more
      */
     @Nonnull
-    public GT_ParallelHelper setEUtModifier(float aEUtModifier) {
+    public ParallelHelper setEUtModifier(float aEUtModifier) {
         this.eutModifier = aEUtModifier;
         return this;
     }
@@ -234,7 +234,7 @@ public class GT_ParallelHelper {
      * Only useful for item outputs for sure.
      */
     @Nonnull
-    public GT_ParallelHelper setChanceMultiplier(double chanceMultiplier) {
+    public ParallelHelper setChanceMultiplier(double chanceMultiplier) {
         this.chanceMultiplier = chanceMultiplier;
         return this;
     }
@@ -243,13 +243,13 @@ public class GT_ParallelHelper {
      * Sets the item/fluid output multiplier. 1 does nothing. 2 doubles the item and fluid outputs.
      */
     @Nonnull
-    public GT_ParallelHelper setOutputMultiplier(int outputMultiplier) {
+    public ParallelHelper setOutputMultiplier(int outputMultiplier) {
         this.outputMultiplier = outputMultiplier;
         return this;
     }
 
     @Nonnull
-    public GT_ParallelHelper setCalculator(GT_OverclockCalculator calculator) {
+    public ParallelHelper setCalculator(OverclockCalculator calculator) {
         this.calculator = calculator;
         return this;
     }
@@ -260,7 +260,7 @@ public class GT_ParallelHelper {
      * @param consume Should we consume inputs
      */
     @Nonnull
-    public GT_ParallelHelper setConsumption(boolean consume) {
+    public ParallelHelper setConsumption(boolean consume) {
         this.consume = consume;
         return this;
     }
@@ -269,7 +269,7 @@ public class GT_ParallelHelper {
      * Sets the MaxParallel a multi can handle
      */
     @Nonnull
-    public GT_ParallelHelper setMaxParallel(int maxParallel) {
+    public ParallelHelper setMaxParallel(int maxParallel) {
         this.maxParallel = maxParallel;
         return this;
     }
@@ -279,7 +279,7 @@ public class GT_ParallelHelper {
      * modifier of 1 does nothing
      */
     @Nonnull
-    public GT_ParallelHelper enableBatchMode(int batchModifier) {
+    public ParallelHelper enableBatchMode(int batchModifier) {
         this.batchMode = batchModifier > 1;
         this.batchModifier = batchModifier;
         return this;
@@ -291,7 +291,7 @@ public class GT_ParallelHelper {
      * @param calculateOutputs Should we calculate outputs with the helper or not
      */
     @Nonnull
-    public GT_ParallelHelper setOutputCalculation(boolean calculateOutputs) {
+    public ParallelHelper setOutputCalculation(boolean calculateOutputs) {
         this.calculateOutputs = calculateOutputs;
         return this;
     }
@@ -301,7 +301,7 @@ public class GT_ParallelHelper {
      * array
      */
     @Nonnull
-    public GT_ParallelHelper setCustomItemOutputCalculation(Function<Integer, ItemStack[]> custom) {
+    public ParallelHelper setCustomItemOutputCalculation(Function<Integer, ItemStack[]> custom) {
         customItemOutputCalculation = custom;
         return this;
     }
@@ -311,25 +311,25 @@ public class GT_ParallelHelper {
      * array
      */
     @Nonnull
-    public GT_ParallelHelper setCustomFluidOutputCalculation(Function<Integer, FluidStack[]> custom) {
+    public ParallelHelper setCustomFluidOutputCalculation(Function<Integer, FluidStack[]> custom) {
         customFluidOutputCalculation = custom;
         return this;
     }
 
     @Nonnull
-    public GT_ParallelHelper setMuTEMode(boolean muteMode) {
+    public ParallelHelper setMuTEMode(boolean muteMode) {
         this.muteMode = muteMode;
         return this;
     }
 
     @Nonnull
-    public GT_ParallelHelper setItemInputInventory(ItemInventoryLogic itemInputInventory) {
+    public ParallelHelper setItemInputInventory(ItemInventoryLogic itemInputInventory) {
         this.itemInputInventory = itemInputInventory;
         return this;
     }
 
     @Nonnull
-    public GT_ParallelHelper setFluidInputInventory(FluidInventoryLogic fluidInputInventory) {
+    public ParallelHelper setFluidInputInventory(FluidInventoryLogic fluidInputInventory) {
         this.fluidInputInventory = fluidInputInventory;
         return this;
     }
@@ -337,7 +337,7 @@ public class GT_ParallelHelper {
     /**
      * Sets method for calculating max parallel from given inputs.
      */
-    public GT_ParallelHelper setMaxParallelCalculator(MaxParallelCalculator maxParallelCalculator) {
+    public ParallelHelper setMaxParallelCalculator(MaxParallelCalculator maxParallelCalculator) {
         this.maxParallelCalculator = maxParallelCalculator;
         return this;
     }
@@ -345,19 +345,19 @@ public class GT_ParallelHelper {
     /**
      * Sets method for consuming inputs after determining how many parallels it can execute.
      */
-    public GT_ParallelHelper setInputConsumer(InputConsumer inputConsumer) {
+    public ParallelHelper setInputConsumer(InputConsumer inputConsumer) {
         this.inputConsumer = inputConsumer;
         return this;
     }
 
     @Nonnull
-    public GT_ParallelHelper setItemOutputInventory(ItemInventoryLogic itemOutputInventory) {
+    public ParallelHelper setItemOutputInventory(ItemInventoryLogic itemOutputInventory) {
         this.itemOutputInventory = itemOutputInventory;
         return this;
     }
 
     @Nonnull
-    public GT_ParallelHelper setFluidOutputInventory(FluidInventoryLogic fluidOutputInventory) {
+    public ParallelHelper setFluidOutputInventory(FluidInventoryLogic fluidOutputInventory) {
         this.fluidOutputInventory = fluidOutputInventory;
         return this;
     }
@@ -366,7 +366,7 @@ public class GT_ParallelHelper {
      * Finishes the GT_ParallelHelper. Anything changed after this will not effect anything
      */
     @Nonnull
-    public GT_ParallelHelper build() {
+    public ParallelHelper build() {
         if (built) {
             throw new IllegalStateException("Tried to build twice");
         }
@@ -455,7 +455,7 @@ public class GT_ParallelHelper {
         }
 
         if (calculator == null) {
-            calculator = new GT_OverclockCalculator().setEUt(availableEUt)
+            calculator = new OverclockCalculator().setEUt(availableEUt)
                 .setRecipeEUt(recipe.mEUt)
                 .setDuration(recipe.mDuration)
                 .setEUtDiscount(eutModifier);
@@ -472,12 +472,12 @@ public class GT_ParallelHelper {
         calculator.setParallel(originalMaxParallel);
         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 (batchMode) {
-            maxParallel = GT_Utility.safeInt((long) maxParallel * batchModifier, 0);
+            maxParallel = GTUtility.safeInt((long) maxParallel * batchModifier, 0);
         }
 
         final ItemStack[] truncatedItemOutputs = recipe.mOutputs != null
@@ -702,12 +702,12 @@ public class GT_ParallelHelper {
     @FunctionalInterface
     public interface MaxParallelCalculator {
 
-        double calculate(GT_Recipe recipe, int maxParallel, FluidStack[] fluids, ItemStack[] items);
+        double calculate(GTRecipe recipe, int maxParallel, FluidStack[] fluids, ItemStack[] items);
     }
 
     @FunctionalInterface
     public interface InputConsumer {
 
-        void consume(GT_Recipe recipe, int amountMultiplier, FluidStack[] aFluidInputs, ItemStack[] aInputs);
+        void consume(GTRecipe recipe, int amountMultiplier, FluidStack[] aFluidInputs, ItemStack[] aInputs);
     }
 }
diff --git a/src/main/java/gregtech/api/util/GT_ProcessingArray_Manager.java b/src/main/java/gregtech/api/util/ProcessingArrayManager.java
index ead9393d0e..adbb8f76b8 100644
--- a/src/main/java/gregtech/api/util/GT_ProcessingArray_Manager.java
+++ b/src/main/java/gregtech/api/util/ProcessingArrayManager.java
@@ -8,7 +8,7 @@ import gregtech.api.enums.SoundResource;
 import gregtech.api.recipe.RecipeMap;
 
 @Deprecated
-public class GT_ProcessingArray_Manager {
+public class ProcessingArrayManager {
 
     private static final HashMap<String, RecipeMap<?>> mRecipeSaves = new HashMap<>();
     private static final HashMap<String, SoundResource> machineSounds = new HashMap<>();
diff --git a/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java b/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java
index aa983a5804..50cad72f9c 100644
--- a/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java
+++ b/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java
@@ -1,6 +1,6 @@
 package gregtech.api.util;
 
-import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
+import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.semiFluidFuels;
 
 import java.util.HashMap;
@@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.recipe.RecipeMaps;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.Pair;
@@ -23,9 +23,9 @@ public class SemiFluidFuelHandler {
         final FluidStack aHeavyOil = FluidUtils.getFluidStack("liquid_heavy_oil", 1000);
         final HashMap<Integer, Pair<FluidStack, Integer>> aFoundFluidsFromItems = new HashMap<>();
         // Find Fluids From items
-        for (final GT_Recipe r : RecipeMaps.denseLiquidFuels.getAllRecipes()) {
+        for (final GTRecipe r : RecipeMaps.denseLiquidFuels.getAllRecipes()) {
 
-            GT_Recipe g = r.copy();
+            GTRecipe g = r.copy();
 
             if (g != null && g.mEnabled && g.mInputs.length > 0 && g.mInputs[0] != null) {
                 for (ItemStack i : g.mInputs) {
@@ -71,7 +71,7 @@ public class SemiFluidFuelHandler {
 
             if (aFuelValue <= (128 * 3)) {
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .fluidInputs(p.getKey())
                     .duration(0)
                     .eut(0)
diff --git a/src/main/java/gregtech/api/util/VoidProtectionHelper.java b/src/main/java/gregtech/api/util/VoidProtectionHelper.java
index fdf47d06df..cf98e26b66 100644
--- a/src/main/java/gregtech/api/util/VoidProtectionHelper.java
+++ b/src/main/java/gregtech/api/util/VoidProtectionHelper.java
@@ -397,7 +397,7 @@ public class VoidProtectionHelper {
         int tSlotsFree = 0;
         int index = 0;
         for (ItemStack tItem : itemOutputs) {
-            // GT_RecipeBuilder doesn't handle null item output
+            // GTRecipeBuilder doesn't handle null item output
             if (tItem == null) continue;
             int itemStackSize = (int) (tItem.stackSize * outputMultiplier
                 * Math.ceil(chanceMultiplier * chanceGetter.apply(index++) / 10000));
diff --git a/src/main/java/gregtech/api/util/item/ItemHolder.java b/src/main/java/gregtech/api/util/item/ItemHolder.java
index 4675d0ba0e..51215c93cb 100644
--- a/src/main/java/gregtech/api/util/item/ItemHolder.java
+++ b/src/main/java/gregtech/api/util/item/ItemHolder.java
@@ -11,7 +11,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 public class ItemHolder {
 
@@ -67,7 +67,7 @@ public class ItemHolder {
 
     @Override
     public int hashCode() {
-        return GT_Utility.stackToInt(toStack());
+        return GTUtility.stackToInt(toStack());
     }
 
     @Nonnull
diff --git a/src/main/java/gregtech/api/util/recipe/RecipeInputRequirements.java b/src/main/java/gregtech/api/util/recipe/RecipeInputRequirements.java
index 590c104101..485ee991c5 100644
--- a/src/main/java/gregtech/api/util/recipe/RecipeInputRequirements.java
+++ b/src/main/java/gregtech/api/util/recipe/RecipeInputRequirements.java
@@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
 import gregtech.api.util.item.ItemHolder;
 
 public class RecipeInputRequirements {
@@ -24,7 +24,7 @@ public class RecipeInputRequirements {
     protected Set<Fluid> fluidInputsMet = new HashSet<>();
     protected boolean metAllFluid = false;
 
-    public RecipeInputRequirements(@Nonnull GT_Recipe recipe) {
+    public RecipeInputRequirements(@Nonnull GTRecipe recipe) {
         this(recipe.mInputs, recipe.mFluidInputs);
     }
 
@@ -42,7 +42,7 @@ public class RecipeInputRequirements {
     }
 
     /**
-     * 
+     *
      * @param itemInputs we have and want to fill this request
      * @return {@code true} when all item inputs are met
      */
@@ -59,7 +59,7 @@ public class RecipeInputRequirements {
     }
 
     /**
-     * 
+     *
      * @param fluidInputs we have and want to fill this request
      * @return {@code true} when all fluid inputs are met
      */
diff --git a/src/main/java/gregtech/api/util/shutdown/ReasonOutOfFluid.java b/src/main/java/gregtech/api/util/shutdown/ReasonOutOfFluid.java
index 0194afbc04..10684f5848 100644
--- a/src/main/java/gregtech/api/util/shutdown/ReasonOutOfFluid.java
+++ b/src/main/java/gregtech/api/util/shutdown/ReasonOutOfFluid.java
@@ -1,7 +1,7 @@
 package gregtech.api.util.shutdown;
 
-import static gregtech.api.util.GT_ModHandler.getWater;
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.util.GTModHandler.getWater;
+import static gregtech.api.util.GTUtility.formatNumbers;
 
 import java.util.Objects;
 
diff --git a/src/main/java/gregtech/api/util/shutdown/ReasonOutOfItem.java b/src/main/java/gregtech/api/util/shutdown/ReasonOutOfItem.java
index 8f51bd83b2..f512e2fa84 100644
--- a/src/main/java/gregtech/api/util/shutdown/ReasonOutOfItem.java
+++ b/src/main/java/gregtech/api/util/shutdown/ReasonOutOfItem.java
@@ -1,6 +1,6 @@
 package gregtech.api.util.shutdown;
 
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.util.GTUtility.formatNumbers;
 
 import java.util.Objects;
 
diff --git a/src/main/java/gregtech/api/util/shutdown/ReasonOutOfStuff.java b/src/main/java/gregtech/api/util/shutdown/ReasonOutOfStuff.java
index 72a75b062f..288c733a90 100644
--- a/src/main/java/gregtech/api/util/shutdown/ReasonOutOfStuff.java
+++ b/src/main/java/gregtech/api/util/shutdown/ReasonOutOfStuff.java
@@ -1,6 +1,6 @@
 package gregtech.api.util.shutdown;
 
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.util.GTUtility.formatNumbers;
 
 import java.util.Objects;
 
diff --git a/src/main/java/gregtech/api/util/shutdown/ShutDownReasonRegistry.java b/src/main/java/gregtech/api/util/shutdown/ShutDownReasonRegistry.java
index 298c5db237..1cdfb60ddb 100644
--- a/src/main/java/gregtech/api/util/shutdown/ShutDownReasonRegistry.java
+++ b/src/main/java/gregtech/api/util/shutdown/ShutDownReasonRegistry.java
@@ -1,6 +1,6 @@
 package gregtech.api.util.shutdown;
 
-import static gregtech.api.util.GT_ModHandler.getWater;
+import static gregtech.api.util.GTModHandler.getWater;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/gregtech/api/world/GT_Worldgen.java b/src/main/java/gregtech/api/world/GTWorldgen.java
index a3393324c2..da3a66ef7e 100644
--- a/src/main/java/gregtech/api/world/GT_Worldgen.java
+++ b/src/main/java/gregtech/api/world/GTWorldgen.java
@@ -9,17 +9,17 @@ import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraftforge.common.DimensionManager;
 
-import gregtech.common.GT_Worldgen_GT_Ore_Layer;
-import gregtech.common.GT_Worldgen_GT_Ore_SmallPieces;
+import gregtech.common.WorldgenGTOreLayer;
+import gregtech.common.WorldgenGTOreSmallPieces;
 
-public abstract class GT_Worldgen {
+public abstract class GTWorldgen {
 
     public final String mWorldGenName;
     public final boolean mEnabled;
     private final Map<String, Boolean> mDimensionMap = new ConcurrentHashMap<>();
 
     @SuppressWarnings({ "unchecked", "rawtypes" }) // The adding of "this" needs a List<this> which does not exist
-    public GT_Worldgen(String aName, List aList, boolean aDefault) {
+    public GTWorldgen(String aName, List aList, boolean aDefault) {
         mWorldGenName = aName;
         mEnabled = aDefault;
         if (mEnabled) aList.add(this);
@@ -103,13 +103,13 @@ public abstract class GT_Worldgen {
             }
 
             // ugly, but idk how to do it better without hard depping on tf provider in ore constructors
-            if (this instanceof GT_Worldgen_GT_Ore_SmallPieces ore) {
+            if (this instanceof WorldgenGTOreSmallPieces ore) {
                 if (ore.twilightForest && aWorld.provider.dimensionId == 7) {
                     value = true;
                 }
             }
 
-            if (this instanceof GT_Worldgen_GT_Ore_Layer ore) {
+            if (this instanceof WorldgenGTOreLayer ore) {
                 if (ore.twilightForest && aWorld.provider.dimensionId == 7) {
                     value = true;
                 }
diff --git a/src/main/java/gregtech/asm/GTCorePlugin.java b/src/main/java/gregtech/asm/GTCorePlugin.java
index 0f50b78f1d..1d44fb9017 100644
--- a/src/main/java/gregtech/asm/GTCorePlugin.java
+++ b/src/main/java/gregtech/asm/GTCorePlugin.java
@@ -7,21 +7,20 @@ import java.util.Set;
 
 import net.minecraftforge.common.config.Configuration;
 
-import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
 import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader;
 
+import bartworks.common.configs.ConfigHandler;
 import cpw.mods.fml.relauncher.FMLInjectionData;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 import gregtech.mixin.Mixin;
-import gtPlusPlus.preloader.CORE_Preloader;
+import gtPlusPlus.preloader.PreloaderCore;
 import gtPlusPlus.preloader.asm.AsmConfig;
-import gtPlusPlus.preloader.asm.Preloader_DummyContainer;
+import gtPlusPlus.preloader.asm.PreloaderDummyContainer;
 import gtPlusPlus.preloader.asm.transformers.Preloader_Transformer_Handler;
 
 @IFMLLoadingPlugin.SortingIndex(Integer.MAX_VALUE) // Load as late as possible (after fastcraft/OptiFine).
 @IFMLLoadingPlugin.MCVersion("1.7.10")
-@IFMLLoadingPlugin.TransformerExclusions({ "com.github.bartimaeusnek.bartworks.ASM", "gtPlusPlus.preloader",
-    "gregtech.asm" })
+@IFMLLoadingPlugin.TransformerExclusions({ "bartworks.ASM", "gtPlusPlus.preloader", "gregtech.asm" })
 @IFMLLoadingPlugin.Name("GregTech 5 Unofficial core plugin")
 @SuppressWarnings("unused") // loaded by FML
 public class GTCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {
@@ -44,7 +43,7 @@ public class GTCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {
 
     @Override
     public String getModContainerClass() {
-        return Preloader_DummyContainer.class.getName();
+        return PreloaderDummyContainer.class.getName();
     }
 
     @Override
@@ -55,12 +54,12 @@ public class GTCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {
     @Override
     public void injectData(Map<String, Object> data) {
         // GT++
-        CORE_Preloader.DEV_ENVIRONMENT = !(boolean) data.get("runtimeDeobfuscationEnabled");
+        PreloaderCore.DEV_ENVIRONMENT = !(boolean) data.get("runtimeDeobfuscationEnabled");
         File mcDir = (File) data.get("mcLocation");
         if (mcDir != null && mcDir.exists()) {
-            CORE_Preloader.setMinecraftDirectory(mcDir);
+            PreloaderCore.setMinecraftDirectory(mcDir);
         }
-        CORE_Preloader.DEBUG_MODE = AsmConfig.debugMode;
+        PreloaderCore.DEBUG_MODE = AsmConfig.debugMode;
     }
 
     @Override
diff --git a/src/main/java/gregtech/client/GT_GUI_ClientConfig.java b/src/main/java/gregtech/client/GTGUIClientConfig.java
index dfb4b2800c..e210f6f25f 100644
--- a/src/main/java/gregtech/client/GT_GUI_ClientConfig.java
+++ b/src/main/java/gregtech/client/GTGUIClientConfig.java
@@ -13,9 +13,9 @@ import gregtech.common.config.client.ConfigPreference;
 import gregtech.common.config.client.ConfigRender;
 import gregtech.common.config.client.ConfigWaila;
 
-public class GT_GUI_ClientConfig extends SimpleGuiConfig {
+public class GTGUIClientConfig extends SimpleGuiConfig {
 
-    public GT_GUI_ClientConfig(GuiScreen parentScreen) throws ConfigException {
+    public GTGUIClientConfig(GuiScreen parentScreen) throws ConfigException {
         super(
             parentScreen,
             GregTech.ID,
diff --git a/src/main/java/gregtech/client/GT_GuiFactory.java b/src/main/java/gregtech/client/GTGuiFactory.java
index ecf317a6fa..e8749f20d2 100644
--- a/src/main/java/gregtech/client/GT_GuiFactory.java
+++ b/src/main/java/gregtech/client/GTGuiFactory.java
@@ -4,10 +4,10 @@ import net.minecraft.client.gui.GuiScreen;
 
 import com.gtnewhorizon.gtnhlib.config.SimpleGuiFactory;
 
-public class GT_GuiFactory implements SimpleGuiFactory {
+public class GTGuiFactory implements SimpleGuiFactory {
 
     @Override
     public Class<? extends GuiScreen> mainConfigGuiClass() {
-        return GT_GUI_ClientConfig.class;
+        return GTGUIClientConfig.class;
     }
 }
diff --git a/src/main/java/gregtech/client/GT_SoundLoop.java b/src/main/java/gregtech/client/GTSoundLoop.java
index 905f2c20d3..23569a83e4 100644
--- a/src/main/java/gregtech/client/GT_SoundLoop.java
+++ b/src/main/java/gregtech/client/GTSoundLoop.java
@@ -12,7 +12,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.multitileentity.machine.MultiTileBasicMachine;
 
 @SideOnly(Side.CLIENT)
-public class GT_SoundLoop extends MovingSound {
+public class GTSoundLoop extends MovingSound {
 
     private static final float VOLUME_RAMP = 0.0625f;
     private final boolean whileActive;
@@ -20,7 +20,7 @@ public class GT_SoundLoop extends MovingSound {
     private final int worldID;
     private boolean fadeMe = false;
 
-    public GT_SoundLoop(ResourceLocation p_i45104_1_, IGregTechTileEntity base, boolean stopWhenActive,
+    public GTSoundLoop(ResourceLocation p_i45104_1_, IGregTechTileEntity base, boolean stopWhenActive,
         boolean stopWhenInactive) {
         super(p_i45104_1_);
         this.whileActive = stopWhenActive;
@@ -33,7 +33,7 @@ public class GT_SoundLoop extends MovingSound {
         volume = VOLUME_RAMP;
     }
 
-    public GT_SoundLoop(ResourceLocation sound, MultiTileBasicMachine base, boolean stopWhenActive,
+    public GTSoundLoop(ResourceLocation sound, MultiTileBasicMachine base, boolean stopWhenActive,
         boolean stopWhenInactive) {
         super(sound);
         this.whileActive = stopWhenActive;
diff --git a/src/main/java/gregtech/client/GT_TooltipHandler.java b/src/main/java/gregtech/client/GTTooltipHandler.java
index c527729abd..7236550058 100644
--- a/src/main/java/gregtech/client/GT_TooltipHandler.java
+++ b/src/main/java/gregtech/client/GTTooltipHandler.java
@@ -26,7 +26,7 @@ import java.util.function.Supplier;
 
 import net.minecraft.item.ItemStack;
 
-public class GT_TooltipHandler {
+public class GTTooltipHandler {
 
     public static void registerTieredTooltip(ItemStack item, Tier tier) {
         addItemTooltip(item, tier.tooltip);
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_Casings3.java b/src/main/java/gregtech/common/blocks/ItemCasings1.java
index 861774d96f..ad1c8c09e1 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings3.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_Casings3 extends GT_Item_Casings_Abstract {
+public class ItemCasings1 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings3(Block block) {
+    public ItemCasings1(Block block) {
         super(block);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java b/src/main/java/gregtech/common/blocks/ItemCasings10.java
index e2badca2cb..0931987cd4 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings4.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_Casings4 extends GT_Item_Casings_Abstract {
+public class ItemCasings10 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings4(Block block) {
+    public ItemCasings10(Block block) {
         super(block);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java b/src/main/java/gregtech/common/blocks/ItemCasings11.java
index af533acfa8..5cae92a55d 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings6.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_Casings6 extends GT_Item_Casings_Abstract {
+public class ItemCasings11 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings6(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_Casings1.java b/src/main/java/gregtech/common/blocks/ItemCasings3.java
index 1a86a2e534..737c9e5145 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.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_Casings1 extends GT_Item_Casings_Abstract {
+public class ItemCasings3 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings1(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));
     }
 }
diff --git a/src/main/java/gregtech/crossmod/holoinventory/GT_InventoryDecoder.java b/src/main/java/gregtech/crossmod/holoinventory/GTInventoryDecoder.java
index 7f3651990d..6774a32c6d 100644
--- a/src/main/java/gregtech/crossmod/holoinventory/GT_InventoryDecoder.java
+++ b/src/main/java/gregtech/crossmod/holoinventory/GTInventoryDecoder.java
@@ -13,9 +13,9 @@ import net.minecraft.nbt.NBTTagList;
 
 import gregtech.api.metatileentity.BaseTileEntity;
 
-public class GT_InventoryDecoder extends InventoryDecoder {
+public class GTInventoryDecoder extends InventoryDecoder {
 
-    public GT_InventoryDecoder() {
+    public GTInventoryDecoder() {
         super(BaseTileEntity.class);
     }
 
diff --git a/src/main/java/gregtech/crossmod/holoinventory/HoloInventory.java b/src/main/java/gregtech/crossmod/holoinventory/HoloInventory.java
index d7dcdcf4b5..ce3c1f74eb 100644
--- a/src/main/java/gregtech/crossmod/holoinventory/HoloInventory.java
+++ b/src/main/java/gregtech/crossmod/holoinventory/HoloInventory.java
@@ -5,6 +5,6 @@ import net.dries007.holoInventory.compat.InventoryDecoderRegistry;
 public class HoloInventory {
 
     public static void init() {
-        InventoryDecoderRegistry.register(new GT_InventoryDecoder());
+        InventoryDecoderRegistry.register(new GTInventoryDecoder());
     }
 }
diff --git a/src/main/java/gregtech/crossmod/visualprospecting/GT_VisualProspecting_Database.java b/src/main/java/gregtech/crossmod/visualprospecting/VisualProspectingDatabase.java
index f18700f9ea..775326cacf 100644
--- a/src/main/java/gregtech/crossmod/visualprospecting/GT_VisualProspecting_Database.java
+++ b/src/main/java/gregtech/crossmod/visualprospecting/VisualProspectingDatabase.java
@@ -6,7 +6,7 @@ import javax.annotation.Nullable;
 
 import net.minecraft.world.ChunkCoordIntPair;
 
-public class GT_VisualProspecting_Database {
+public class VisualProspectingDatabase {
 
     private static IDatabase database;
 
diff --git a/src/main/java/gregtech/loaders/load/CoverBehaviorLoader.java b/src/main/java/gregtech/loaders/load/CoverBehaviorLoader.java
new file mode 100644
index 0000000000..77fc7f4b30
--- /dev/null
+++ b/src/main/java/gregtech/loaders/load/CoverBehaviorLoader.java
@@ -0,0 +1,11 @@
+package gregtech.loaders.load;
+
+import gregtech.api.util.GTLog;
+
+public class CoverBehaviorLoader implements Runnable {
+
+    @Override
+    public void run() {
+        GTLog.out.println("GTMod: Adding Cover Behaviors");
+    }
+}
diff --git a/src/main/java/gregtech/loaders/load/FuelLoader.java b/src/main/java/gregtech/loaders/load/FuelLoader.java
new file mode 100644
index 0000000000..639b5359a3
--- /dev/null
+++ b/src/main/java/gregtech/loaders/load/FuelLoader.java
@@ -0,0 +1,146 @@
+package gregtech.loaders.load;
+
+import static gregtech.api.enums.Mods.BloodMagic;
+import static gregtech.api.enums.Mods.EnderIO;
+import static gregtech.api.enums.Mods.Thaumcraft;
+import static gregtech.api.recipe.RecipeMaps.extremeNaquadahReactorFuels;
+import static gregtech.api.recipe.RecipeMaps.hugeNaquadahReactorFuels;
+import static gregtech.api.recipe.RecipeMaps.largeNaquadahReactorFuels;
+import static gregtech.api.recipe.RecipeMaps.magicFuels;
+import static gregtech.api.recipe.RecipeMaps.smallNaquadahReactorFuels;
+import static gregtech.api.recipe.RecipeMaps.ultraHugeNaquadahReactorFuels;
+import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE;
+import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
+import gregtech.api.enums.FluidState;
+import gregtech.api.enums.GTValues;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.fluid.GTFluidFactory;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeConstants;
+
+public class FuelLoader implements Runnable {
+
+    @Override
+    public void run() {
+        GTLog.out.println("GTMod: Initializing various Fuels.");
+        ItemList.sBlueVitriol = GTFluidFactory
+            .of("solution.bluevitriol", "Blue Vitriol water solution", null, FluidState.LIQUID, 295);
+        ItemList.sNickelSulfate = GTFluidFactory
+            .of("solution.nickelsulfate", "Nickel sulfate water solution", null, FluidState.LIQUID, 295);
+        ItemList.sGreenVitriol = GTFluidFactory
+            .of("solution.greenvitriol", "Green Vitriol water solution", null, FluidState.LIQUID, 295);
+        ItemList.sIndiumConcentrate = GTFluidFactory
+            .of("indiumconcentrate", "Indium Concentrate", null, FluidState.LIQUID, 295); // TODO CHECK NEW x3
+        ItemList.sLeadZincSolution = GTFluidFactory
+            .of("leadzincsolution", "Lead-Zinc solution", null, FluidState.LIQUID, 295);
+        ItemList.sRocketFuel = GTFluidFactory.of("rocket_fuel", "Rocket Fuel", null, FluidState.LIQUID, 295);
+
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L))
+            .duration(0)
+            .eut(0)
+            .metadata(FUEL_VALUE, 50_000)
+            .addTo(smallNaquadahReactorFuels);
+
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahEnriched, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L))
+            .duration(0)
+            .eut(0)
+            .metadata(FUEL_VALUE, 250_000)
+            .addTo(largeNaquadahReactorFuels);
+
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L))
+            .duration(0)
+            .eut(0)
+            .metadata(FUEL_VALUE, 500_000)
+            .addTo(hugeNaquadahReactorFuels);
+
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L))
+            .duration(0)
+            .eut(0)
+            .metadata(FUEL_VALUE, 250_000)
+            .addTo(extremeNaquadahReactorFuels);
+
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L))
+            .duration(0)
+            .eut(0)
+            .metadata(FUEL_VALUE, 1_000_000)
+            .addTo(ultraHugeNaquadahReactorFuels);
+
+        // BloodMagic
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L))
+            .itemOutputs(GTModHandler.getModItem(BloodMagic.ID, "blankSlate", 1L))
+            .duration(0)
+            .eut(0)
+            .metadata(FUEL_VALUE, 400)
+            .addTo(magicFuels);
+
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L))
+            .itemOutputs(GTModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L))
+            .duration(0)
+            .eut(0)
+            .metadata(FUEL_VALUE, 1000)
+            .addTo(magicFuels);
+
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L))
+            .itemOutputs(GTModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L))
+            .duration(0)
+            .eut(0)
+            .metadata(FUEL_VALUE, 8000)
+            .addTo(magicFuels);
+
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getModItem(BloodMagic.ID, "bloodMagicBaseItems", 1L, 27))
+            .itemOutputs(GTModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L))
+            .duration(0)
+            .eut(0)
+            .metadata(FUEL_VALUE, 20000)
+            .addTo(magicFuels);
+
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 4))
+            .metadata(FUEL_VALUE, 4)
+            .metadata(FUEL_TYPE, 5)
+            .addTo(GTRecipeConstants.Fuel);
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.experience_bottle, 1))
+            .metadata(FUEL_VALUE, 10)
+            .metadata(FUEL_TYPE, 5)
+            .addTo(GTRecipeConstants.Fuel);
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.ghast_tear, 1))
+            .metadata(FUEL_VALUE, 50)
+            .metadata(FUEL_TYPE, 5)
+            .addTo(GTRecipeConstants.Fuel);
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.beacon, 1))
+            .metadata(FUEL_VALUE, Materials.NetherStar.mFuelPower * 2)
+            .metadata(FUEL_TYPE, Materials.NetherStar.mFuelType)
+            .addTo(GTRecipeConstants.Fuel);
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getModItem(EnderIO.ID, "bucketRocket_fuel", 1))
+            .metadata(FUEL_VALUE, 250)
+            .metadata(FUEL_TYPE, 1)
+            .addTo(GTRecipeConstants.Fuel);
+    }
+}
diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GTItemIterator.java
index a44b411ba0..63ac59b7c2 100644
--- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
+++ b/src/main/java/gregtech/loaders/load/GTItemIterator.java
@@ -2,10 +2,10 @@ package gregtech.loaders.load;
 
 import static gregtech.api.recipe.RecipeMaps.cannerRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.WILDCARD;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.WILDCARD;
+import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE;
+import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
@@ -16,153 +16,154 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
 
 import buildcraft.api.tools.IToolWrench;
-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.OreDictNames;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.items.GT_Generic_Item;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_RecipeConstants;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.GTGenericItem;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTRecipeConstants;
+import gregtech.api.util.GTUtility;
+import gregtech.common.tools.ToolScoop;
 import mods.railcraft.api.core.items.IToolCrowbar;
 
-public class GT_ItemIterator implements Runnable {
+public class GTItemIterator implements Runnable {
 
     @Override
     public void run() {
-        GT_Log.out.println("GT_Mod: Scanning for certain kinds of compatible Machineblocks.");
-        ItemStack tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L);
-        ItemStack tStack = GT_ModHandler
+        GTLog.out.println("GTMod: Scanning for certain kinds of compatible Machineblocks.");
+        ItemStack tStack2 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L);
+        ItemStack tStack = GTModHandler
             .getRecipeOutput(tStack2, tStack2, tStack2, tStack2, null, tStack2, tStack2, tStack2, tStack2);
 
         if (null != tStack) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(tStack)
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L))
                 .duration(20 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
 
-            GT_ModHandler.addSmeltingRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L));
+            GTModHandler.addSmeltingRecipe(tStack, GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L));
         }
-        tStack2 = GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1L);
-        tStack = GT_ModHandler
+        tStack2 = GTOreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1L);
+        tStack = GTModHandler
             .getRecipeOutput(tStack2, tStack2, tStack2, tStack2, null, tStack2, tStack2, tStack2, tStack2);
 
         if (null != tStack) {
-            GT_OreDictUnificator.registerOre(OreDictNames.craftingRawMachineTier00, tStack);
+            GTOreDictUnificator.registerOre(OreDictNames.craftingRawMachineTier00, tStack);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(tStack)
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L))
                 .duration(20 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
-            GT_ModHandler.addSmeltingRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L));
+            GTModHandler.addSmeltingRecipe(tStack, GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L));
         }
 
         ItemStack tStack3 = new ItemStack(Blocks.glass, 1, 0);
-        tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L);
-        tStack = GT_ModHandler.getRecipeOutput(
+        tStack2 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L);
+        tStack = GTModHandler.getRecipeOutput(
             tStack2,
             tStack3,
             tStack2,
             tStack3,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L),
             tStack3,
             tStack2,
             tStack3,
             tStack2);
 
         if (null != (tStack)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(tStack)
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L))
                 .outputChances(10000, 1000)
                 .duration(20 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
         }
 
-        tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L);
+        tStack2 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L);
         tStack3 = new ItemStack(Blocks.glass, 1, 0);
-        tStack = GT_ModHandler.getRecipeOutput(
+        tStack = GTModHandler.getRecipeOutput(
             tStack2,
             tStack3,
             tStack2,
             tStack3,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L),
             tStack3,
             tStack2,
             tStack3,
             tStack2);
         if (null != tStack) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(tStack)
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 4L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 4L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L))
                 .outputChances(10000, 1000)
                 .duration(20 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
         }
-        GT_Log.out.println("GT_Mod: Registering various Tools to be usable on GregTech Machines");
-        GregTech_API.registerScrewdriver(
-            GT_ModHandler
+        GTLog.out.println("GTMod: Registering various Tools to be usable on GregTech Machines");
+        GregTechAPI.registerScrewdriver(
+            GTModHandler
                 .getRecipeOutput(null, new ItemStack(Items.iron_ingot, 1), null, new ItemStack(Items.stick, 1)));
-        GregTech_API.registerScrewdriver(
-            GT_ModHandler
+        GregTechAPI.registerScrewdriver(
+            GTModHandler
                 .getRecipeOutput(new ItemStack(Items.iron_ingot, 1), null, null, null, new ItemStack(Items.stick, 1)));
 
-        GT_Log.out.println(
-            "GT_Mod: Adding Food Recipes to the Automatic Canning Machine. (also during the following Item Iteration)");
-        GT_Values.RA.stdBuilder()
+        GTLog.out.println(
+            "GTMod: Adding Food Recipes to the Automatic Canning Machine. (also during the following Item Iteration)");
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.rotten_flesh, 2, WILDCARD), ItemList.IC2_Food_Can_Empty.get(1L))
             .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L))
             .duration(10 * SECONDS)
             .eut(1)
             .addTo(cannerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.spider_eye, 2, WILDCARD), ItemList.IC2_Food_Can_Empty.get(1L))
             .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L))
             .duration(5 * SECONDS)
             .eut(1)
             .addTo(cannerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Food_Poisonous_Potato.get(2L), ItemList.IC2_Food_Can_Empty.get(1L))
             .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L))
             .duration(5 * SECONDS)
             .eut(1)
             .addTo(cannerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.cake, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(12L))
             .itemOutputs(ItemList.IC2_Food_Can_Filled.get(12L))
             .duration(30 * SECONDS)
             .eut(1)
             .addTo(cannerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.mushroom_stew, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(6L))
             .itemOutputs(ItemList.IC2_Food_Can_Filled.get(6L), new ItemStack(Items.bowl, 1))
             .duration(15 * SECONDS)
             .eut(1)
             .addTo(cannerRecipes);
 
-        GT_Log.out.println("GT_Mod: Scanning ItemList.");
+        GTLog.out.println("GTMod: Scanning ItemList.");
 
         try {
             /* (tName.equals("tile.sedimentaryStone")) || **/
             for (Object o : Item.itemRegistry) {
                 Object tObject;
 
-                if (!(((tObject = o) instanceof Item) && (!(tObject instanceof GT_Generic_Item)))) {
+                if (!(((tObject = o) instanceof Item) && (!(tObject instanceof GTGenericItem)))) {
                     continue;
                 }
 
@@ -173,29 +174,29 @@ public class GT_ItemIterator implements Runnable {
                 }
 
                 if ((tItem instanceof IToolCrowbar)) {
-                    if ((tItem.isDamageable()) || (GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) {
-                        if (GregTech_API.registerCrowbar(new ItemStack(tItem, 1, WILDCARD))) {
-                            GT_Log.out.println("GT_Mod: Registered valid RC Crowbar: " + tName);
+                    if ((tItem.isDamageable()) || (GTModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) {
+                        if (GregTechAPI.registerCrowbar(new ItemStack(tItem, 1, WILDCARD))) {
+                            GTLog.out.println("GTMod: Registered valid RC Crowbar: " + tName);
                         }
                     }
                 }
                 if ((tItem instanceof IToolWrench)) {
-                    if ((tItem.isDamageable()) || (GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) {
-                        if (GregTech_API.registerWrench(new ItemStack(tItem, 1, WILDCARD))) {
-                            GT_Log.out.println("GT_Mod: Registered valid BC Wrench: " + tName);
+                    if ((tItem.isDamageable()) || (GTModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) {
+                        if (GregTechAPI.registerWrench(new ItemStack(tItem, 1, WILDCARD))) {
+                            GTLog.out.println("GTMod: Registered valid BC Wrench: " + tName);
                         }
                     }
                 }
-                Block tBlock = GT_Utility.getBlockFromStack(new ItemStack(tItem, 1, 0));
+                Block tBlock = GTUtility.getBlockFromStack(new ItemStack(tItem, 1, 0));
                 if (tBlock != null) {
                     if (tName.endsWith("beehives")) {
                         tBlock.setHarvestLevel("scoop", 0);
-                        gregtech.common.tools.GT_Tool_Scoop.sBeeHiveMaterial = tBlock.getMaterial();
+                        ToolScoop.sBeeHiveMaterial = tBlock.getMaterial();
                     }
                     if (OrePrefixes.stone.mDefaultStackSize < tItem.getItemStackLimit(new ItemStack(tItem, 1, 0))) {
-                        if ((tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.stone))
-                            || (tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.netherrack))
-                            || (tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.end_stone))) {
+                        if ((tBlock.isReplaceableOreGen(GTValues.DW, 0, 0, 0, Blocks.stone))
+                            || (tBlock.isReplaceableOreGen(GTValues.DW, 0, 0, 0, Blocks.netherrack))
+                            || (tBlock.isReplaceableOreGen(GTValues.DW, 0, 0, 0, Blocks.end_stone))) {
                             tItem.setMaxStackSize(OrePrefixes.stone.mDefaultStackSize);
                         }
                     }
@@ -204,15 +205,15 @@ public class GT_ItemIterator implements Runnable {
                     && (tItem != ItemList.IC2_Food_Can_Spoiled.getItem())) {
                     int tFoodValue = ((ItemFood) tItem).func_150905_g(new ItemStack(tItem, 1, 0));
                     if (tFoodValue > 0) {
-                        GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+                        GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder();
                         recipeBuilder
                             .itemInputs(new ItemStack(tItem, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(tFoodValue));
-                        if (GT_Utility.getContainerItem(new ItemStack(tItem, 1, 0), true) == null) {
+                        if (GTUtility.getContainerItem(new ItemStack(tItem, 1, 0), true) == null) {
                             recipeBuilder.itemOutputs(ItemList.IC2_Food_Can_Filled.get(tFoodValue));
                         } else {
                             recipeBuilder.itemOutputs(
                                 ItemList.IC2_Food_Can_Filled.get(tFoodValue),
-                                GT_Utility.getContainerItem(new ItemStack(tItem, 1, 0), true));
+                                GTUtility.getContainerItem(new ItemStack(tItem, 1, 0), true));
                         }
                         recipeBuilder.duration(tFoodValue * 5 * SECONDS)
                             .eut(1)
@@ -220,80 +221,80 @@ public class GT_ItemIterator implements Runnable {
                     }
                 }
                 if ((tItem instanceof IFluidContainerItem)) {
-                    GT_OreDictUnificator.addToBlacklist(new ItemStack(tItem, 1, WILDCARD));
+                    GTOreDictUnificator.addToBlacklist(new ItemStack(tItem, 1, WILDCARD));
                 }
 
                 switch (tName) {
                     // twilight forest
-                    case "item.fieryBlood", "item.fieryTears" -> GT_Values.RA.stdBuilder()
+                    case "item.fieryBlood", "item.fieryTears" -> GTValues.RA.stdBuilder()
                         .itemInputs(new ItemStack(tItem, 1, 0))
                         .metadata(FUEL_VALUE, 2048)
                         .metadata(FUEL_TYPE, 5)
-                        .addTo(GT_RecipeConstants.Fuel);
+                        .addTo(GTRecipeConstants.Fuel);
 
                     // twilight forest
                     case "tile.TFRoots" -> {
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(new ItemStack(tItem, 1, 0))
                             .itemOutputs(new ItemStack(Items.stick, 2), new ItemStack(Items.stick, 1))
                             .outputChances(10000, 3000)
                             .duration(20 * SECONDS)
                             .eut(2)
                             .addTo(maceratorRecipes);
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(new ItemStack(tItem, 1, 1))
                             .itemOutputs(new ItemStack(Items.stick, 4))
                             .metadata(FUEL_VALUE, 32)
                             .metadata(FUEL_TYPE, 5)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                     }
 
                     // tinker construct
-                    case "item.tconstruct.manual" -> GT_OreDictUnificator
+                    case "item.tconstruct.manual" -> GTOreDictUnificator
                         .registerOre("bookTinkersManual", new ItemStack(tItem, 1, WILDCARD));
 
                     // buildcraft
-                    case "item.blueprintItem" -> GT_OreDictUnificator
+                    case "item.blueprintItem" -> GTOreDictUnificator
                         .registerOre("paperBlueprint", new ItemStack(tItem, 1, WILDCARD));
 
                     // Thaumcraft
-                    case "item.ItemThaumonomicon" -> GT_OreDictUnificator
+                    case "item.ItemThaumonomicon" -> GTOreDictUnificator
                         .registerOre("bookThaumonomicon", new ItemStack(tItem, 1, WILDCARD));
 
                     // BoP
                     case "tile.bop.redRocks" -> {
-                        GT_OreDictUnificator
+                        GTOreDictUnificator
                             .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 0));
-                        GT_OreDictUnificator
+                        GTOreDictUnificator
                             .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 1));
-                        GT_OreDictUnificator
+                        GTOreDictUnificator
                             .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 2));
                     }
 
                     // Thaumcraft
                     case "tile.blockCosmeticSolid" -> {
-                        GT_OreDictUnificator
+                        GTOreDictUnificator
                             .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 0));
-                        GT_OreDictUnificator
+                        GTOreDictUnificator
                             .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 1));
-                        GT_OreDictUnificator
+                        GTOreDictUnificator
                             .registerOre(OrePrefixes.block, Materials.Thaumium, new ItemStack(tItem, 1, 4));
                     }
 
                     // minecraft
-                    case "tile.enderchest" -> GT_OreDictUnificator
+                    case "tile.enderchest" -> GTOreDictUnificator
                         .registerOre(OreDictNames.enderChest, new ItemStack(tItem, 1, WILDCARD));
 
                     // buildcraft
-                    case "tile.autoWorkbenchBlock" -> GT_OreDictUnificator
+                    case "tile.autoWorkbenchBlock" -> GTOreDictUnificator
                         .registerOre(OreDictNames.craftingWorkBench, new ItemStack(tItem, 1, 0));
 
                     // buildcraft
-                    case "tile.pumpBlock" -> GT_OreDictUnificator
+                    case "tile.pumpBlock" -> GTOreDictUnificator
                         .registerOre(OreDictNames.craftingPump, new ItemStack(tItem, 1, 0));
 
                     // buildcraft
-                    case "tile.tankBlock" -> GT_OreDictUnificator
+                    case "tile.tankBlock" -> GTOreDictUnificator
                         .registerOre(OreDictNames.craftingTank, new ItemStack(tItem, 1, 0));
 
                 }
diff --git a/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java b/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java
deleted file mode 100644
index 37f626ef90..0000000000
--- a/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package gregtech.loaders.load;
-
-import gregtech.api.util.GT_Log;
-
-public class GT_CoverBehaviorLoader implements Runnable {
-
-    @Override
-    public void run() {
-        GT_Log.out.println("GT_Mod: Adding Cover Behaviors");
-    }
-}
diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
deleted file mode 100644
index bed97ca010..0000000000
--- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package gregtech.loaders.load;
-
-import static gregtech.api.enums.Mods.BloodMagic;
-import static gregtech.api.enums.Mods.EnderIO;
-import static gregtech.api.enums.Mods.Thaumcraft;
-import static gregtech.api.recipe.RecipeMaps.extremeNaquadahReactorFuels;
-import static gregtech.api.recipe.RecipeMaps.hugeNaquadahReactorFuels;
-import static gregtech.api.recipe.RecipeMaps.largeNaquadahReactorFuels;
-import static gregtech.api.recipe.RecipeMaps.magicFuels;
-import static gregtech.api.recipe.RecipeMaps.smallNaquadahReactorFuels;
-import static gregtech.api.recipe.RecipeMaps.ultraHugeNaquadahReactorFuels;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
-
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.FluidState;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.fluid.GT_FluidFactory;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeConstants;
-
-public class GT_FuelLoader implements Runnable {
-
-    @Override
-    public void run() {
-        GT_Log.out.println("GT_Mod: Initializing various Fuels.");
-        ItemList.sBlueVitriol = GT_FluidFactory
-            .of("solution.bluevitriol", "Blue Vitriol water solution", null, FluidState.LIQUID, 295);
-        ItemList.sNickelSulfate = GT_FluidFactory
-            .of("solution.nickelsulfate", "Nickel sulfate water solution", null, FluidState.LIQUID, 295);
-        ItemList.sGreenVitriol = GT_FluidFactory
-            .of("solution.greenvitriol", "Green Vitriol water solution", null, FluidState.LIQUID, 295);
-        ItemList.sIndiumConcentrate = GT_FluidFactory
-            .of("indiumconcentrate", "Indium Concentrate", null, FluidState.LIQUID, 295); // TODO CHECK NEW x3
-        ItemList.sLeadZincSolution = GT_FluidFactory
-            .of("leadzincsolution", "Lead-Zinc solution", null, FluidState.LIQUID, 295);
-        ItemList.sRocketFuel = GT_FluidFactory.of("rocket_fuel", "Rocket Fuel", null, FluidState.LIQUID, 295);
-
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L))
-            .duration(0)
-            .eut(0)
-            .metadata(FUEL_VALUE, 50_000)
-            .addTo(smallNaquadahReactorFuels);
-
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahEnriched, 1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L))
-            .duration(0)
-            .eut(0)
-            .metadata(FUEL_VALUE, 250_000)
-            .addTo(largeNaquadahReactorFuels);
-
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L))
-            .duration(0)
-            .eut(0)
-            .metadata(FUEL_VALUE, 500_000)
-            .addTo(hugeNaquadahReactorFuels);
-
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L))
-            .duration(0)
-            .eut(0)
-            .metadata(FUEL_VALUE, 250_000)
-            .addTo(extremeNaquadahReactorFuels);
-
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L))
-            .duration(0)
-            .eut(0)
-            .metadata(FUEL_VALUE, 1_000_000)
-            .addTo(ultraHugeNaquadahReactorFuels);
-
-        // BloodMagic
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L))
-            .itemOutputs(GT_ModHandler.getModItem(BloodMagic.ID, "blankSlate", 1L))
-            .duration(0)
-            .eut(0)
-            .metadata(FUEL_VALUE, 400)
-            .addTo(magicFuels);
-
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L))
-            .itemOutputs(GT_ModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L))
-            .duration(0)
-            .eut(0)
-            .metadata(FUEL_VALUE, 1000)
-            .addTo(magicFuels);
-
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L))
-            .itemOutputs(GT_ModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L))
-            .duration(0)
-            .eut(0)
-            .metadata(FUEL_VALUE, 8000)
-            .addTo(magicFuels);
-
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getModItem(BloodMagic.ID, "bloodMagicBaseItems", 1L, 27))
-            .itemOutputs(GT_ModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L))
-            .duration(0)
-            .eut(0)
-            .metadata(FUEL_VALUE, 20000)
-            .addTo(magicFuels);
-
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 4))
-            .metadata(FUEL_VALUE, 4)
-            .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.experience_bottle, 1))
-            .metadata(FUEL_VALUE, 10)
-            .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.ghast_tear, 1))
-            .metadata(FUEL_VALUE, 50)
-            .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Blocks.beacon, 1))
-            .metadata(FUEL_VALUE, Materials.NetherStar.mFuelPower * 2)
-            .metadata(FUEL_TYPE, Materials.NetherStar.mFuelType)
-            .addTo(GT_RecipeConstants.Fuel);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getModItem(EnderIO.ID, "bucketRocket_fuel", 1))
-            .metadata(FUEL_VALUE, 250)
-            .metadata(FUEL_TYPE, 1)
-            .addTo(GT_RecipeConstants.Fuel);
-    }
-}
diff --git a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java
deleted file mode 100644
index e5fb8042f7..0000000000
--- a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package gregtech.loaders.load;
-
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-
-import gregtech.GT_Mod;
-import gregtech.api.enums.SoundResource;
-import gregtech.api.util.GT_Log;
-
-public class GT_SonictronLoader implements Runnable {
-
-    @Override
-    public void run() {
-        GT_Log.out.println("GT_Mod: Loading Sonictron Sounds");
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.iron_block, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.NOTE_HARP.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(25);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.gold_block, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.NOTE_PLING.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(25);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.stone, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.NOTE_BD.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(25);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.log, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.NOTE_BASSATTACK.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(25);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.planks, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.NOTE_BASS.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(25);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.glass, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.NOTE_HAT.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(25);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.sand, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.NOTE_BASS.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(25);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.record_cat, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add("streaming.");
-        GT_Mod.gregtechproxy.mSoundCounts.add(12);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.tnt, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_EXPLODE.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(3);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.fire, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.FIRE_FIRE.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.flint_and_steel, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.FIRE_IGNITE.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.lava, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.LIQUID_LAVAPOP.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.water, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.LIQUID_WATER.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.water_bucket, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.LIQUID_SPLASH.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.lava_bucket, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_FIZZ.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.portal, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.PORTAL_PORTAL.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.end_portal, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.PORTAL_TRAVEL.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.end_portal_frame, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.PORTAL_TRIGGER.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.glass_pane, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_GLASS.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.ender_pearl, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_ORB.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.ender_eye, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_LEVELUP.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.stone_button, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_CLICK.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.cobblestone, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.DAMAGE_FALLBIG.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.dirt, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.DAMAGE_FALLSMALL.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.iron_sword, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.DAMAGE_HURTFLESH.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.diamond_sword, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_HURT.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.bow, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_BOW.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.arrow, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_DRR.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.fishing_rod, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_BOWHIT.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.iron_shovel, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_BREAK.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.bucket, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_BREATH.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.potionitem, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_DRINK.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.glass_bottle, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_BURP.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems
-            .add(new ItemStack(Blocks.ender_chest == null ? Blocks.obsidian : Blocks.ender_chest, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_CHESTOPEN.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.chest, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_CHESTCLOSED.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.iron_door, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_DOOR_OPEN.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.wooden_door, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_DOOR_CLOSE.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.porkchop, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_EAT.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.wool, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.STEP_CLOTH.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.grass, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.STEP_GRASS.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.gravel, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.STEP_GRAVEL.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.snow, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.STEP_SNOW.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.piston, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.TILE_PISTON_OUT.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.sticky_piston, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.TILE_PISTON_IN.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.mossy_cobblestone, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.AMBIENT_CAVE_CAVE.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.lapis_block, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.AMBIENT_WEATHER_RAIN.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-        GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.diamond_block, 1));
-        GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.AMBIENT_WEATHER_THUNDER.toString());
-        GT_Mod.gregtechproxy.mSoundCounts.add(1);
-    }
-}
diff --git a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java b/src/main/java/gregtech/loaders/load/MTERecipeLoader.java
index 1c90187ee2..3e638e7e60 100644
--- a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java
+++ b/src/main/java/gregtech/loaders/load/MTERecipeLoader.java
@@ -8,33 +8,33 @@ import static gregtech.api.enums.Mods.IndustrialCraft2;
 import static gregtech.api.enums.Mods.NotEnoughItems;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
 import codechicken.nei.api.API;
-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.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.TierEU;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe;
+import gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe;
 import gregtech.api.util.ExternalMaterials;
-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.loaders.postload.GT_PCBFactoryMaterialLoader;
-import gregtech.loaders.postload.GT_ProcessingArrayRecipeLoader;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.loaders.postload.PCBFactoryMaterialLoader;
+import gregtech.loaders.postload.ProcessingArrayRecipeLoader;
 import ic2.core.Ic2Items;
 
-public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
+public class MTERecipeLoader implements Runnable {
 
     private static final String aTextPlate = "PPP";
     private static final String aTextPlateWrench = "PwP";
@@ -46,9 +46,9 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
     private static final String aTextMotorWire = "EWE";
     private static final String aTextWirePump = "WPW";
 
-    private static final long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE
-        | GT_ModHandler.RecipeBits.BUFFERED;
-    private static final long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | bits;
+    private static final long bits = GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE
+        | GTModHandler.RecipeBits.BUFFERED;
+    private static final long bitsd = GTModHandler.RecipeBits.DISMANTLEABLE | bits;
 
     private static void registerMachineTypes() {
         registerAlloySmelter();
@@ -96,2564 +96,2275 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
     }
 
     private static void registerAlloySmelter() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_AlloySmelter.get(1),
             bitsd,
-            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE },
+            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'C',
+                MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_AlloySmelter.get(1),
             bitsd,
-            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE },
+            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'C',
+                MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_AlloySmelter.get(1),
             bitsd,
-            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE },
+            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'C',
+                MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_AlloySmelter.get(1),
             bitsd,
-            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE },
+            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'C',
+                MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_AlloySmelter.get(1),
             bitsd,
-            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE },
+            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'C',
+                MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE },
             5);
 
     }
 
     private static void registerArcFurnace() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_ArcFurnace.get(1),
             bitsd,
-            new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'G', OrePrefixes.cell.get(Materials.Graphite) },
+            new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PLATE, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE4, 'G', OrePrefixes.cell.get(Materials.Graphite) },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_ArcFurnace.get(1),
             bitsd,
-            new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'G', OrePrefixes.cell.get(Materials.Graphite) },
+            new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PLATE, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE4, 'G', OrePrefixes.cell.get(Materials.Graphite) },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_ArcFurnace.get(1),
             bitsd,
-            new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'G', OrePrefixes.cell.get(Materials.Graphite) },
+            new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PLATE, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE4, 'G', OrePrefixes.cell.get(Materials.Graphite) },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_ArcFurnace.get(1),
             bitsd,
-            new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'G', OrePrefixes.cell.get(Materials.Graphite) },
+            new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PLATE, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE4, 'G', OrePrefixes.cell.get(Materials.Graphite) },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_ArcFurnace.get(1),
             bitsd,
-            new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'G', OrePrefixes.cell.get(Materials.Graphite) },
+            new Object[] { "WGW", aTextCableHull, aTextPlate, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PLATE, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE4, 'G', OrePrefixes.cell.get(Materials.Graphite) },
             5);
 
     }
 
     private static void registerAssembler() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Assembler.get(1),
             bitsd,
-            new Object[] { "ACA", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "ACA", "VMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'A', MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Assembler.get(1),
             bitsd,
-            new Object[] { "ACA", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "ACA", "VMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'A', MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Assembler.get(1),
             bitsd,
-            new Object[] { "ACA", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "ACA", "VMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'A', MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Assembler.get(1),
             bitsd,
-            new Object[] { "ACA", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "ACA", "VMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'A', MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Assembler.get(1),
             bitsd,
-            new Object[] { "ACA", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "ACA", "VMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'A', MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             5);
     }
 
     private static void registerAutoclave() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Autoclave.get(1),
             bitsd,
-            new Object[] { "IGI", "IMI", "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE,
-                'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "IGI", "IMI", "CPC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'I', MTEBasicMachineWithRecipe.X.PLATE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Autoclave.get(1),
             bitsd,
-            new Object[] { "IGI", "IMI", "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE,
-                'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "IGI", "IMI", "CPC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'I', MTEBasicMachineWithRecipe.X.PLATE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Autoclave.get(1),
             bitsd,
-            new Object[] { "IGI", "IMI", "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE,
-                'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "IGI", "IMI", "CPC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'I', MTEBasicMachineWithRecipe.X.PLATE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Autoclave.get(1),
             bitsd,
-            new Object[] { "IGI", "IMI", "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE,
-                'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "IGI", "IMI", "CPC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'I', MTEBasicMachineWithRecipe.X.PLATE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Autoclave.get(1),
             bitsd,
-            new Object[] { "IGI", "IMI", "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE,
-                'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "IGI", "IMI", "CPC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'I', MTEBasicMachineWithRecipe.X.PLATE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             5);
 
     }
 
     private static void registerBendingMachine() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Bender.get(1),
             bitsd,
-            new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Bender.get(1),
             bitsd,
-            new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Bender.get(1),
             bitsd,
-            new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Bender.get(1),
             bitsd,
-            new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Bender.get(1),
             bitsd,
-            new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextPlateWrench, aTextCableHull, aTextMotorWire, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             5);
     }
 
     private static void registerCanner() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Canner.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Canner.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Canner.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Canner.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Canner.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { aTextWirePump, aTextCableHull, "GGG", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             5);
     }
 
     private static void registerCentrifuge() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Centrifuge.get(1),
             bitsd,
-            new Object[] { "CEC", aTextWireHull, "CEC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "CEC", aTextWireHull, "CEC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Centrifuge.get(1),
             bitsd,
-            new Object[] { "CEC", aTextWireHull, "CEC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "CEC", aTextWireHull, "CEC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Centrifuge.get(1),
             bitsd,
-            new Object[] { "CEC", aTextWireHull, "CEC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "CEC", aTextWireHull, "CEC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Centrifuge.get(1),
             bitsd,
-            new Object[] { "CEC", aTextWireHull, "CEC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "CEC", aTextWireHull, "CEC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Centrifuge.get(1),
             bitsd,
-            new Object[] { "CEC", aTextWireHull, "CEC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "CEC", aTextWireHull, "CEC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             5);
     }
 
     private static void registerChemicalBath() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_ChemicalBath.get(1),
             bitsd,
-            new Object[] { "VGW", "PGV", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "VGW", "PGV", aTextCableHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_ChemicalBath.get(1),
             bitsd,
-            new Object[] { "VGW", "PGV", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "VGW", "PGV", aTextCableHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_ChemicalBath.get(1),
             bitsd,
-            new Object[] { "VGW", "PGV", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "VGW", "PGV", aTextCableHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_ChemicalBath.get(1),
             bitsd,
-            new Object[] { "VGW", "PGV", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "VGW", "PGV", aTextCableHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_ChemicalBath.get(1),
             bitsd,
-            new Object[] { "VGW", "PGV", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "VGW", "PGV", aTextCableHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             5);
 
     }
 
     private static void registerChemicalReactor() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_ChemicalReactor.get(1),
             bitsd,
-            new Object[] { "GRG", "WEW", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GRG", "WEW", aTextCableHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROTOR, 'E', MTEBasicMachineWithRecipe.X.MOTOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_ChemicalReactor.get(1),
             bitsd,
-            new Object[] { "GRG", "WEW", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GRG", "WEW", aTextCableHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROTOR, 'E', MTEBasicMachineWithRecipe.X.MOTOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_ChemicalReactor.get(1),
             bitsd,
-            new Object[] { "GRG", "WEW", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OrePrefixes.pipeMedium.get(Materials.Plastic) },
+            new Object[] { "GRG", "WEW", aTextCableHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROTOR, 'E', MTEBasicMachineWithRecipe.X.MOTOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                OrePrefixes.pipeMedium.get(Materials.Plastic) },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_ChemicalReactor.get(1),
             bitsd,
-            new Object[] { "GRG", "WEW", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OrePrefixes.pipeLarge.get(Materials.Plastic) },
+            new Object[] { "GRG", "WEW", aTextCableHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROTOR, 'E', MTEBasicMachineWithRecipe.X.MOTOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                OrePrefixes.pipeLarge.get(Materials.Plastic) },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_ChemicalReactor.get(1),
             bitsd,
-            new Object[] { "GRG", "WEW", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OrePrefixes.pipeHuge.get(Materials.Plastic) },
+            new Object[] { "GRG", "WEW", aTextCableHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROTOR, 'E', MTEBasicMachineWithRecipe.X.MOTOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                OrePrefixes.pipeHuge.get(Materials.Plastic) },
             5);
     }
 
     private static void registerCircuitAssembler() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_CircuitAssembler.get(1),
             bitsd,
-            new Object[] { "ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER },
+            new Object[] { "ACE", "VMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'A', MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'C',
+                MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'E',
+                MTEBasicMachineWithRecipe.X.EMITTER },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_CircuitAssembler.get(1),
             bitsd,
-            new Object[] { "ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER },
+            new Object[] { "ACE", "VMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'A', MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'C',
+                MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'E',
+                MTEBasicMachineWithRecipe.X.EMITTER },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_CircuitAssembler.get(1),
             bitsd,
-            new Object[] { "ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER },
+            new Object[] { "ACE", "VMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'A', MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'C',
+                MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'E',
+                MTEBasicMachineWithRecipe.X.EMITTER },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_CircuitAssembler.get(1),
             bitsd,
-            new Object[] { "ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER },
+            new Object[] { "ACE", "VMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'A', MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'C',
+                MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'E',
+                MTEBasicMachineWithRecipe.X.EMITTER },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_CircuitAssembler.get(1),
             bitsd,
-            new Object[] { "ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER },
+            new Object[] { "ACE", "VMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'A', MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'C',
+                MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'E',
+                MTEBasicMachineWithRecipe.X.EMITTER },
             5);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LuV_CircuitAssembler.get(1),
             bitsd,
-            new Object[] { "ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER },
+            new Object[] { "ACE", "VMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'A', MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'C',
+                MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'E',
+                MTEBasicMachineWithRecipe.X.EMITTER },
             6);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_ZPM_CircuitAssembler.get(1),
             bitsd,
-            new Object[] { "ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER },
+            new Object[] { "ACE", "VMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'A', MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'C',
+                MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'E',
+                MTEBasicMachineWithRecipe.X.EMITTER },
             7);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_UV_CircuitAssembler.get(1),
             bitsd,
-            new Object[] { "ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER },
+            new Object[] { "ACE", "VMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'A', MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'C',
+                MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'E',
+                MTEBasicMachineWithRecipe.X.EMITTER },
             8);
 
     }
 
     private static void registerCompressor() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Compressor.get(1),
             bitsd,
-            new Object[] { aTextWireCoil, aTextPlateMotor, aTextWireCoil, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextWireCoil, aTextPlateMotor, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Compressor.get(1),
             bitsd,
-            new Object[] { aTextWireCoil, aTextPlateMotor, aTextWireCoil, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextWireCoil, aTextPlateMotor, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Compressor.get(1),
             bitsd,
-            new Object[] { aTextWireCoil, aTextPlateMotor, aTextWireCoil, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextWireCoil, aTextPlateMotor, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Compressor.get(1),
             bitsd,
-            new Object[] { aTextWireCoil, aTextPlateMotor, aTextWireCoil, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextWireCoil, aTextPlateMotor, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Compressor.get(1),
             bitsd,
-            new Object[] { aTextWireCoil, aTextPlateMotor, aTextWireCoil, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextWireCoil, aTextPlateMotor, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             5);
 
     }
 
     private static void registerCuttingMachine() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Cutter.get(1),
             bitsd,
-            new Object[] { "WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS,
-                'B', OreDictNames.craftingDiamondBlade },
+            new Object[] { "WCG", "VMB", "CWE", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Cutter.get(1),
             bitsd,
-            new Object[] { "WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS,
-                'B', OreDictNames.craftingDiamondBlade },
+            new Object[] { "WCG", "VMB", "CWE", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Cutter.get(1),
             bitsd,
-            new Object[] { "WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS,
-                'B', OreDictNames.craftingDiamondBlade },
+            new Object[] { "WCG", "VMB", "CWE", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Cutter.get(1),
             bitsd,
-            new Object[] { "WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS,
-                'B', OreDictNames.craftingDiamondBlade },
+            new Object[] { "WCG", "VMB", "CWE", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Cutter.get(1),
             bitsd,
-            new Object[] { "WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS,
-                'B', OreDictNames.craftingDiamondBlade },
+            new Object[] { "WCG", "VMB", "CWE", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade },
             5);
 
     }
 
     private static void registerDistillery() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Distillery.get(1),
             bitsd,
-            new Object[] { "GBG", aTextCableHull, aTextWirePump, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'B',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GBG", aTextCableHull, aTextWirePump, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'B', MTEBasicMachineWithRecipe.X.PIPE, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Distillery.get(1),
             bitsd,
-            new Object[] { "GBG", aTextCableHull, aTextWirePump, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'B',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GBG", aTextCableHull, aTextWirePump, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'B', MTEBasicMachineWithRecipe.X.PIPE, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Distillery.get(1),
             bitsd,
-            new Object[] { "GBG", aTextCableHull, aTextWirePump, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'B',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GBG", aTextCableHull, aTextWirePump, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'B', MTEBasicMachineWithRecipe.X.PIPE, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Distillery.get(1),
             bitsd,
-            new Object[] { "GBG", aTextCableHull, aTextWirePump, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'B',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GBG", aTextCableHull, aTextWirePump, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'B', MTEBasicMachineWithRecipe.X.PIPE, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Distillery.get(1),
             bitsd,
-            new Object[] { "GBG", aTextCableHull, aTextWirePump, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'B',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GBG", aTextCableHull, aTextWirePump, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'B', MTEBasicMachineWithRecipe.X.PIPE, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             5);
 
     }
 
     private static void registerElectricFurnace() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_E_Furnace.get(1),
             bitsd,
-            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING },
+            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'C',
+                MTEBasicMachineWithRecipe.X.COIL_HEATING },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_E_Furnace.get(1),
             bitsd,
-            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING },
+            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'C',
+                MTEBasicMachineWithRecipe.X.COIL_HEATING },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_E_Furnace.get(1),
             bitsd,
-            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING },
+            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'C',
+                MTEBasicMachineWithRecipe.X.COIL_HEATING },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_E_Furnace.get(1),
             bitsd,
-            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING },
+            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'C',
+                MTEBasicMachineWithRecipe.X.COIL_HEATING },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_E_Furnace.get(1),
             bitsd,
-            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING },
+            new Object[] { "ECE", aTextCableHull, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'C',
+                MTEBasicMachineWithRecipe.X.COIL_HEATING },
             5);
 
     }
 
     private static void registerElectrolyser() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Electrolyzer.get(1),
             bitsd,
-            new Object[] { "IGI", "IMI", "CWC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', OrePrefixes.wireGt01.get(Materials.Gold), 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "IGI", "IMI", "CWC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'I', OrePrefixes.wireGt01.get(Materials.Gold), 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Electrolyzer.get(1),
             bitsd,
-            new Object[] { "IGI", "IMI", "CWC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', OrePrefixes.wireGt01.get(Materials.Silver), 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "IGI", "IMI", "CWC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'I', OrePrefixes.wireGt01.get(Materials.Silver), 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Electrolyzer.get(1),
             bitsd,
-            new Object[] { "IGI", "IMI", "CWC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', OrePrefixes.wireGt01.get(Materials.Electrum), 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "IGI", "IMI", "CWC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'I', OrePrefixes.wireGt01.get(Materials.Electrum), 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Electrolyzer.get(1),
             bitsd,
-            new Object[] { "IGI", "IMI", "CWC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', OrePrefixes.wireGt01.get(Materials.Platinum), 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "IGI", "IMI", "CWC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'I', OrePrefixes.wireGt01.get(Materials.Platinum), 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Electrolyzer.get(1),
             bitsd,
-            new Object[] { "IGI", "IMI", "CWC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'I', OrePrefixes.wireGt01.get(Materials.HSSG), 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "IGI", "IMI", "CWC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'I', OrePrefixes.wireGt01.get(Materials.HSSG), 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             5);
 
     }
 
     private static void registerElectromagneticSeparator() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_ElectromagneticSeparator.get(1),
             bitsd,
-            new Object[] { "VWZ", "WMS", "CWZ", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "VWZ", "WMS", "CWZ", 'M', MTEBasicMachineWithRecipe.X.HULL, 'S',
+                MTEBasicMachineWithRecipe.X.STICK_ELECTROMAGNETIC, 'Z', MTEBasicMachineWithRecipe.X.COIL_ELECTRIC, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_ElectromagneticSeparator.get(1),
             bitsd,
-            new Object[] { "VWZ", "WMS", "CWZ", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "VWZ", "WMS", "CWZ", 'M', MTEBasicMachineWithRecipe.X.HULL, 'S',
+                MTEBasicMachineWithRecipe.X.STICK_ELECTROMAGNETIC, 'Z', MTEBasicMachineWithRecipe.X.COIL_ELECTRIC, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_ElectromagneticSeparator.get(1),
             bitsd,
-            new Object[] { "VWZ", "WMS", "CWZ", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "VWZ", "WMS", "CWZ", 'M', MTEBasicMachineWithRecipe.X.HULL, 'S',
+                MTEBasicMachineWithRecipe.X.STICK_ELECTROMAGNETIC, 'Z', MTEBasicMachineWithRecipe.X.COIL_ELECTRIC, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_ElectromagneticSeparator.get(1),
             bitsd,
-            new Object[] { "VWZ", "WMS", "CWZ", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "VWZ", "WMS", "CWZ", 'M', MTEBasicMachineWithRecipe.X.HULL, 'S',
+                MTEBasicMachineWithRecipe.X.STICK_ELECTROMAGNETIC, 'Z', MTEBasicMachineWithRecipe.X.COIL_ELECTRIC, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_ElectromagneticSeparator.get(1),
             bitsd,
-            new Object[] { "VWZ", "WMS", "CWZ", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "VWZ", "WMS", "CWZ", 'M', MTEBasicMachineWithRecipe.X.HULL, 'S',
+                MTEBasicMachineWithRecipe.X.STICK_ELECTROMAGNETIC, 'Z', MTEBasicMachineWithRecipe.X.COIL_ELECTRIC, 'V',
+                MTEBasicMachineWithRecipe.X.CONVEYOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             5);
 
     }
 
     private static void registerExtractor() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Extractor.get(1),
             bitsd,
-            new Object[] { "GCG", "EMP", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GCG", "EMP", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.PISTON, 'P', MTEBasicMachineWithRecipe.X.PUMP, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Extractor.get(1),
             bitsd,
-            new Object[] { "GCG", "EMP", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GCG", "EMP", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.PISTON, 'P', MTEBasicMachineWithRecipe.X.PUMP, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Extractor.get(1),
             bitsd,
-            new Object[] { "GCG", "EMP", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GCG", "EMP", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.PISTON, 'P', MTEBasicMachineWithRecipe.X.PUMP, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Extractor.get(1),
             bitsd,
-            new Object[] { "GCG", "EMP", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GCG", "EMP", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.PISTON, 'P', MTEBasicMachineWithRecipe.X.PUMP, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Extractor.get(1),
             bitsd,
-            new Object[] { "GCG", "EMP", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GCG", "EMP", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.PISTON, 'P', MTEBasicMachineWithRecipe.X.PUMP, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             5);
 
     }
 
     private static void registerExtruder() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Extruder.get(1),
             bitsd,
-            new Object[] { "CCE", "XMP", "CCE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'X',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE },
+            new Object[] { "CCE", "XMP", "CCE", 'M', MTEBasicMachineWithRecipe.X.HULL, 'X',
+                MTEBasicMachineWithRecipe.X.PISTON, 'E', MTEBasicMachineWithRecipe.X.CIRCUIT, 'P',
+                MTEBasicMachineWithRecipe.X.PIPE, 'C', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Extruder.get(1),
             bitsd,
-            new Object[] { "CCE", "XMP", "CCE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'X',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE },
+            new Object[] { "CCE", "XMP", "CCE", 'M', MTEBasicMachineWithRecipe.X.HULL, 'X',
+                MTEBasicMachineWithRecipe.X.PISTON, 'E', MTEBasicMachineWithRecipe.X.CIRCUIT, 'P',
+                MTEBasicMachineWithRecipe.X.PIPE, 'C', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Extruder.get(1),
             bitsd,
-            new Object[] { "CCE", "XMP", "CCE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'X',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE },
+            new Object[] { "CCE", "XMP", "CCE", 'M', MTEBasicMachineWithRecipe.X.HULL, 'X',
+                MTEBasicMachineWithRecipe.X.PISTON, 'E', MTEBasicMachineWithRecipe.X.CIRCUIT, 'P',
+                MTEBasicMachineWithRecipe.X.PIPE, 'C', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Extruder.get(1),
             bitsd,
-            new Object[] { "CCE", "XMP", "CCE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'X',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE },
+            new Object[] { "CCE", "XMP", "CCE", 'M', MTEBasicMachineWithRecipe.X.HULL, 'X',
+                MTEBasicMachineWithRecipe.X.PISTON, 'E', MTEBasicMachineWithRecipe.X.CIRCUIT, 'P',
+                MTEBasicMachineWithRecipe.X.PIPE, 'C', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Extruder.get(1),
             bitsd,
-            new Object[] { "CCE", "XMP", "CCE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'X',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE },
+            new Object[] { "CCE", "XMP", "CCE", 'M', MTEBasicMachineWithRecipe.X.HULL, 'X',
+                MTEBasicMachineWithRecipe.X.PISTON, 'E', MTEBasicMachineWithRecipe.X.CIRCUIT, 'P',
+                MTEBasicMachineWithRecipe.X.PIPE, 'C', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE },
             5);
 
     }
 
     private static void registerFermenter() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Fermenter.get(1),
             bitsd,
-            new Object[] { aTextWirePump, "GMG", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { aTextWirePump, "GMG", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Fermenter.get(1),
             bitsd,
-            new Object[] { aTextWirePump, "GMG", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { aTextWirePump, "GMG", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Fermenter.get(1),
             bitsd,
-            new Object[] { aTextWirePump, "GMG", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { aTextWirePump, "GMG", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Fermenter.get(1),
             bitsd,
-            new Object[] { aTextWirePump, "GMG", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { aTextWirePump, "GMG", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Fermenter.get(1),
             bitsd,
-            new Object[] { aTextWirePump, "GMG", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { aTextWirePump, "GMG", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             5);
 
     }
 
     private static void registerFluidCanner() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_FluidCanner.get(1),
             bitsd,
-            new Object[] { "GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GCG", "GMG", "WPW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_FluidCanner.get(1),
             bitsd,
-            new Object[] { "GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GCG", "GMG", "WPW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_FluidCanner.get(1),
             bitsd,
-            new Object[] { "GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GCG", "GMG", "WPW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_FluidCanner.get(1),
             bitsd,
-            new Object[] { "GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GCG", "GMG", "WPW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_FluidCanner.get(1),
             bitsd,
-            new Object[] { "GCG", "GMG", "WPW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GCG", "GMG", "WPW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             5);
 
     }
 
     private static void registerFluidExtractor() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_FluidExtractor.get(1),
             bitsd,
-            new Object[] { "GEG", "TPT", "CMC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'T',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GEG", "TPT", "CMC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.PISTON, 'P', MTEBasicMachineWithRecipe.X.PUMP, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'T', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_FluidExtractor.get(1),
             bitsd,
-            new Object[] { "GEG", "TPT", "CMC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'T',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GEG", "TPT", "CMC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.PISTON, 'P', MTEBasicMachineWithRecipe.X.PUMP, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'T', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_FluidExtractor.get(1),
             bitsd,
-            new Object[] { "GEG", "TPT", "CMC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'T',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GEG", "TPT", "CMC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.PISTON, 'P', MTEBasicMachineWithRecipe.X.PUMP, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'T', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_FluidExtractor.get(1),
             bitsd,
-            new Object[] { "GEG", "TPT", "CMC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'T',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GEG", "TPT", "CMC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.PISTON, 'P', MTEBasicMachineWithRecipe.X.PUMP, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'T', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_FluidExtractor.get(1),
             bitsd,
-            new Object[] { "GEG", "TPT", "CMC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'T',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GEG", "TPT", "CMC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.PISTON, 'P', MTEBasicMachineWithRecipe.X.PUMP, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'T', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             5);
 
     }
 
     private static void registerFluidHeater() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_FluidHeater.get(1),
             bitsd,
-            new Object[] { "OGO", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'O',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "OGO", aTextPlateMotor, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'O', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_FluidHeater.get(1),
             bitsd,
-            new Object[] { "OGO", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'O',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "OGO", aTextPlateMotor, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'O', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_FluidHeater.get(1),
             bitsd,
-            new Object[] { "OGO", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'O',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "OGO", aTextPlateMotor, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'O', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_FluidHeater.get(1),
             bitsd,
-            new Object[] { "OGO", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'O',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "OGO", aTextPlateMotor, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'O', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_FluidHeater.get(1),
             bitsd,
-            new Object[] { "OGO", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'O',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "OGO", aTextPlateMotor, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'O', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.GLASS },
             5);
     }
 
     private static void registerFluidSolidifier() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_FluidSolidifier.get(1),
             bitsd,
-            new Object[] { "PGP", aTextWireHull, "CBC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS,
-                'B', OreDictNames.craftingChest },
+            new Object[] { "PGP", aTextWireHull, "CBC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS, 'B',
+                OreDictNames.craftingChest },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_FluidSolidifier.get(1),
             bitsd,
-            new Object[] { "PGP", aTextWireHull, "CBC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS,
-                'B', OreDictNames.craftingChest },
+            new Object[] { "PGP", aTextWireHull, "CBC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS, 'B',
+                OreDictNames.craftingChest },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_FluidSolidifier.get(1),
             bitsd,
-            new Object[] { "PGP", aTextWireHull, "CBC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS,
-                'B', OreDictNames.craftingChest },
+            new Object[] { "PGP", aTextWireHull, "CBC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS, 'B',
+                OreDictNames.craftingChest },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_FluidSolidifier.get(1),
             bitsd,
-            new Object[] { "PGP", aTextWireHull, "CBC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS,
-                'B', OreDictNames.craftingChest },
+            new Object[] { "PGP", aTextWireHull, "CBC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS, 'B',
+                OreDictNames.craftingChest },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_FluidSolidifier.get(1),
             bitsd,
-            new Object[] { "PGP", aTextWireHull, "CBC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS,
-                'B', OreDictNames.craftingChest },
+            new Object[] { "PGP", aTextWireHull, "CBC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', MTEBasicMachineWithRecipe.X.GLASS, 'B',
+                OreDictNames.craftingChest },
             5);
 
     }
 
     private static void registerForgeHammer() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Hammer.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextCableHull, "WAW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'A', OreDictNames.craftingAnvil },
+            new Object[] { aTextWirePump, aTextCableHull, "WAW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'O', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE, 'A',
+                OreDictNames.craftingAnvil },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Hammer.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextCableHull, "WAW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'A', OreDictNames.craftingAnvil },
+            new Object[] { aTextWirePump, aTextCableHull, "WAW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'O', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE, 'A',
+                OreDictNames.craftingAnvil },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Hammer.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextCableHull, "WAW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'A', OreDictNames.craftingAnvil },
+            new Object[] { aTextWirePump, aTextCableHull, "WAW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'O', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE, 'A',
+                OreDictNames.craftingAnvil },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Hammer.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextCableHull, "WAW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'A', OreDictNames.craftingAnvil },
+            new Object[] { aTextWirePump, aTextCableHull, "WAW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'O', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE, 'A',
+                OreDictNames.craftingAnvil },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Hammer.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextCableHull, "WAW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE, 'A', OreDictNames.craftingAnvil },
+            new Object[] { aTextWirePump, aTextCableHull, "WAW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'O', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE, 'A',
+                OreDictNames.craftingAnvil },
             5);
 
     }
 
     private static void registerFormingPress() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Press.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextCableHull, aTextWirePump, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextWirePump, aTextCableHull, aTextWirePump, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Press.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextCableHull, aTextWirePump, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextWirePump, aTextCableHull, aTextWirePump, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Press.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextCableHull, aTextWirePump, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextWirePump, aTextCableHull, aTextWirePump, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Press.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextCableHull, aTextWirePump, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextWirePump, aTextCableHull, aTextWirePump, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Press.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextCableHull, aTextWirePump, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextWirePump, aTextCableHull, aTextWirePump, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             5);
     }
 
     private static void registerLaserEngraver() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_LaserEngraver.get(1),
             bitsd,
-            new Object[] { "PEP", aTextCableHull, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "PEP", aTextCableHull, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.EMITTER, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_LaserEngraver.get(1),
             bitsd,
-            new Object[] { "PEP", aTextCableHull, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "PEP", aTextCableHull, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.EMITTER, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_LaserEngraver.get(1),
             bitsd,
-            new Object[] { "PEP", aTextCableHull, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "PEP", aTextCableHull, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.EMITTER, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_LaserEngraver.get(1),
             bitsd,
-            new Object[] { "PEP", aTextCableHull, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "PEP", aTextCableHull, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.EMITTER, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_LaserEngraver.get(1),
             bitsd,
-            new Object[] { "PEP", aTextCableHull, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "PEP", aTextCableHull, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.EMITTER, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             5);
 
     }
 
     private static void registerLathe() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Lathe.get(1),
             bitsd,
-            new Object[] { aTextWireCoil, "EMD", "CWP", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'D', OrePrefixes.gem.get(Materials.Diamond) },
+            new Object[] { aTextWireCoil, "EMD", "CWP", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'D',
+                OrePrefixes.gem.get(Materials.Diamond) },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Lathe.get(1),
             bitsd,
-            new Object[] { aTextWireCoil, "EMD", "CWP", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'D', OrePrefixes.gemFlawless.get(Materials.Diamond) },
+            new Object[] { aTextWireCoil, "EMD", "CWP", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'D',
+                OrePrefixes.gemFlawless.get(Materials.Diamond) },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Lathe.get(1),
             bitsd,
-            new Object[] { aTextWireCoil, "EMD", "CWP", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'D', OreDictNames.craftingIndustrialDiamond },
+            new Object[] { aTextWireCoil, "EMD", "CWP", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'D',
+                OreDictNames.craftingIndustrialDiamond },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Lathe.get(1),
             bitsd,
-            new Object[] { aTextWireCoil, "EMD", "CWP", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'D', OreDictNames.craftingIndustrialDiamond },
+            new Object[] { aTextWireCoil, "EMD", "CWP", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'D',
+                OreDictNames.craftingIndustrialDiamond },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Lathe.get(1),
             bitsd,
-            new Object[] { aTextWireCoil, "EMD", "CWP", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'D', OreDictNames.craftingIndustrialDiamond },
+            new Object[] { aTextWireCoil, "EMD", "CWP", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'D',
+                OreDictNames.craftingIndustrialDiamond },
             5);
 
     }
 
     private static void registerMacerator() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Macerator.get(1),
             bitsd,
-            new Object[] { "PEG", "WWM", "CCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OrePrefixes.gem.get(Materials.Diamond) },
+            new Object[] { "PEG", "WWM", "CCW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                OrePrefixes.gem.get(Materials.Diamond) },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Macerator.get(1),
             bitsd,
-            new Object[] { "PEG", "WWM", "CCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OrePrefixes.gemFlawless.get(Materials.Diamond) },
+            new Object[] { "PEG", "WWM", "CCW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                OrePrefixes.gemFlawless.get(Materials.Diamond) },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Macerator.get(1),
             bitsd,
-            new Object[] { "PEG", "WWM", "CCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OreDictNames.craftingGrinder },
+            new Object[] { "PEG", "WWM", "CCW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                OreDictNames.craftingGrinder },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Macerator.get(1),
             bitsd,
-            new Object[] { "PEG", "WWM", "CCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OreDictNames.craftingGrinder },
+            new Object[] { "PEG", "WWM", "CCW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                OreDictNames.craftingGrinder },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Macerator.get(1),
             bitsd,
-            new Object[] { "PEG", "WWM", "CCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OreDictNames.craftingGrinder },
+            new Object[] { "PEG", "WWM", "CCW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'P', MTEBasicMachineWithRecipe.X.PISTON, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                OreDictNames.craftingGrinder },
             5);
 
     }
 
     private static void registerMatterAmplifier() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Amplifab.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextPlateMotor, "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 },
+            new Object[] { aTextWirePump, aTextPlateMotor, "CPC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE4 },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Amplifab.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextPlateMotor, "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 },
+            new Object[] { aTextWirePump, aTextPlateMotor, "CPC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE4 },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Amplifab.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextPlateMotor, "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 },
+            new Object[] { aTextWirePump, aTextPlateMotor, "CPC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE4 },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Amplifab.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextPlateMotor, "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 },
+            new Object[] { aTextWirePump, aTextPlateMotor, "CPC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE4 },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Amplifab.get(1),
             bitsd,
-            new Object[] { aTextWirePump, aTextPlateMotor, "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 },
+            new Object[] { aTextWirePump, aTextPlateMotor, "CPC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PUMP, 'C', MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE4 },
             5);
 
     }
 
     private static void registerMicrowave() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Microwave.get(1),
             bitsd,
-            new Object[] { "LWC", "LMR", "LEC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'L', OrePrefixes.plate.get(Materials.Lead) },
+            new Object[] { "LWC", "LMR", "LEC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'R', MTEBasicMachineWithRecipe.X.EMITTER, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'L',
+                OrePrefixes.plate.get(Materials.Lead) },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Microwave.get(1),
             bitsd,
-            new Object[] { "LWC", "LMR", "LEC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'L', OrePrefixes.plate.get(Materials.Lead) },
+            new Object[] { "LWC", "LMR", "LEC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'R', MTEBasicMachineWithRecipe.X.EMITTER, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'L',
+                OrePrefixes.plate.get(Materials.Lead) },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Microwave.get(1),
             bitsd,
-            new Object[] { "LWC", "LMR", "LEC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'L', OrePrefixes.plate.get(Materials.Lead) },
+            new Object[] { "LWC", "LMR", "LEC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'R', MTEBasicMachineWithRecipe.X.EMITTER, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'L',
+                OrePrefixes.plate.get(Materials.Lead) },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Microwave.get(1),
             bitsd,
-            new Object[] { "LWC", "LMR", "LEC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'L', OrePrefixes.plate.get(Materials.Lead) },
+            new Object[] { "LWC", "LMR", "LEC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'R', MTEBasicMachineWithRecipe.X.EMITTER, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'L',
+                OrePrefixes.plate.get(Materials.Lead) },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Microwave.get(1),
             bitsd,
-            new Object[] { "LWC", "LMR", "LEC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'L', OrePrefixes.plate.get(Materials.Lead) },
+            new Object[] { "LWC", "LMR", "LEC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'R', MTEBasicMachineWithRecipe.X.EMITTER, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'L',
+                OrePrefixes.plate.get(Materials.Lead) },
             5);
 
     }
 
     private static void registerMixer() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Mixer.get(1),
             bitsd,
-            new Object[] { "GRG", "GEG", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GRG", "GEG", aTextCableHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'R', MTEBasicMachineWithRecipe.X.ROTOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Mixer.get(1),
             bitsd,
-            new Object[] { "GRG", "GEG", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GRG", "GEG", aTextCableHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'R', MTEBasicMachineWithRecipe.X.ROTOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Mixer.get(1),
             bitsd,
-            new Object[] { "GRG", "GEG", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GRG", "GEG", aTextCableHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'R', MTEBasicMachineWithRecipe.X.ROTOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Mixer.get(1),
             bitsd,
-            new Object[] { "GRG", "GEG", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GRG", "GEG", aTextCableHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'R', MTEBasicMachineWithRecipe.X.ROTOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Mixer.get(1),
             bitsd,
-            new Object[] { "GRG", "GEG", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS },
+            new Object[] { "GRG", "GEG", aTextCableHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'R', MTEBasicMachineWithRecipe.X.ROTOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'G', MTEBasicMachineWithRecipe.X.GLASS },
             5);
     }
 
     private static void registerOreWasher() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_OreWasher.get(1),
             bitsd,
-            new Object[] { "RGR", "CEC", aTextWireHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP },
+            new Object[] { "RGR", "CEC", aTextWireHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROTOR, 'E', MTEBasicMachineWithRecipe.X.MOTOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.PUMP },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_OreWasher.get(1),
             bitsd,
-            new Object[] { "RGR", "CEC", aTextWireHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP },
+            new Object[] { "RGR", "CEC", aTextWireHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROTOR, 'E', MTEBasicMachineWithRecipe.X.MOTOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.PUMP },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_OreWasher.get(1),
             bitsd,
-            new Object[] { "RGR", "CEC", aTextWireHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP },
+            new Object[] { "RGR", "CEC", aTextWireHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROTOR, 'E', MTEBasicMachineWithRecipe.X.MOTOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.PUMP },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_OreWasher.get(1),
             bitsd,
-            new Object[] { "RGR", "CEC", aTextWireHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP },
+            new Object[] { "RGR", "CEC", aTextWireHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROTOR, 'E', MTEBasicMachineWithRecipe.X.MOTOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.PUMP },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_OreWasher.get(1),
             bitsd,
-            new Object[] { "RGR", "CEC", aTextWireHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP },
+            new Object[] { "RGR", "CEC", aTextWireHull, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROTOR, 'E', MTEBasicMachineWithRecipe.X.MOTOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'G',
+                MTEBasicMachineWithRecipe.X.PUMP },
             5);
 
     }
 
     private static void registerOven() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Oven.get(1),
             bitsd,
-            new Object[] { "CEC", aTextCableHull, "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING },
+            new Object[] { "CEC", aTextCableHull, "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'C',
+                MTEBasicMachineWithRecipe.X.COIL_HEATING },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Oven.get(1),
             bitsd,
-            new Object[] { "CEC", aTextCableHull, "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING },
+            new Object[] { "CEC", aTextCableHull, "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'C',
+                MTEBasicMachineWithRecipe.X.COIL_HEATING },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Oven.get(1),
             bitsd,
-            new Object[] { "CEC", aTextCableHull, "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING },
+            new Object[] { "CEC", aTextCableHull, "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'C',
+                MTEBasicMachineWithRecipe.X.COIL_HEATING },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Oven.get(1),
             bitsd,
-            new Object[] { "CEC", aTextCableHull, "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING },
+            new Object[] { "CEC", aTextCableHull, "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'C',
+                MTEBasicMachineWithRecipe.X.COIL_HEATING },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Oven.get(1),
             bitsd,
-            new Object[] { "CEC", aTextCableHull, "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING },
+            new Object[] { "CEC", aTextCableHull, "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'C',
+                MTEBasicMachineWithRecipe.X.COIL_HEATING },
             5);
 
     }
 
     private static void registerPlasmaArcFurnace() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_PlasmaArcFurnace.get(1),
             bitsd,
-            new Object[] { "WGW", aTextCableHull, "TPT", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'T', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP,
-                'G', OrePrefixes.cell.get(Materials.Graphite) },
+            new Object[] { "WGW", aTextCableHull, "TPT", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PLATE, 'C', MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE4, 'T', MTEBasicMachineWithRecipe.X.PUMP, 'G',
+                OrePrefixes.cell.get(Materials.Graphite) },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_PlasmaArcFurnace.get(1),
             bitsd,
-            new Object[] { "WGW", aTextCableHull, "TPT", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'T', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP,
-                'G', OrePrefixes.cell.get(Materials.Graphite) },
+            new Object[] { "WGW", aTextCableHull, "TPT", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PLATE, 'C', MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE4, 'T', MTEBasicMachineWithRecipe.X.PUMP, 'G',
+                OrePrefixes.cell.get(Materials.Graphite) },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_PlasmaArcFurnace.get(1),
             bitsd,
-            new Object[] { "WGW", aTextCableHull, "TPT", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'T', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP,
-                'G', OrePrefixes.cell.get(Materials.Graphite) },
+            new Object[] { "WGW", aTextCableHull, "TPT", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PLATE, 'C', MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE4, 'T', MTEBasicMachineWithRecipe.X.PUMP, 'G',
+                OrePrefixes.cell.get(Materials.Graphite) },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_PlasmaArcFurnace.get(1),
             bitsd,
-            new Object[] { "WGW", aTextCableHull, "TPT", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'T', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP,
-                'G', OrePrefixes.cell.get(Materials.Graphite) },
+            new Object[] { "WGW", aTextCableHull, "TPT", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PLATE, 'C', MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE4, 'T', MTEBasicMachineWithRecipe.X.PUMP, 'G',
+                OrePrefixes.cell.get(Materials.Graphite) },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_PlasmaArcFurnace.get(1),
             bitsd,
-            new Object[] { "WGW", aTextCableHull, "TPT", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4, 'T', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP,
-                'G', OrePrefixes.cell.get(Materials.Graphite) },
+            new Object[] { "WGW", aTextCableHull, "TPT", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PLATE, 'C', MTEBasicMachineWithRecipe.X.BETTER_CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE4, 'T', MTEBasicMachineWithRecipe.X.PUMP, 'G',
+                OrePrefixes.cell.get(Materials.Graphite) },
             5);
 
     }
 
     private static void registerPolarizer() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Polarizer.get(1),
             bitsd,
-            new Object[] { "ZSZ", aTextWireHull, "ZSZ", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "ZSZ", aTextWireHull, "ZSZ", 'M', MTEBasicMachineWithRecipe.X.HULL, 'S',
+                MTEBasicMachineWithRecipe.X.STICK_ELECTROMAGNETIC, 'Z', MTEBasicMachineWithRecipe.X.COIL_ELECTRIC, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Polarizer.get(1),
             bitsd,
-            new Object[] { "ZSZ", aTextWireHull, "ZSZ", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "ZSZ", aTextWireHull, "ZSZ", 'M', MTEBasicMachineWithRecipe.X.HULL, 'S',
+                MTEBasicMachineWithRecipe.X.STICK_ELECTROMAGNETIC, 'Z', MTEBasicMachineWithRecipe.X.COIL_ELECTRIC, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Polarizer.get(1),
             bitsd,
-            new Object[] { "ZSZ", aTextWireHull, "ZSZ", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "ZSZ", aTextWireHull, "ZSZ", 'M', MTEBasicMachineWithRecipe.X.HULL, 'S',
+                MTEBasicMachineWithRecipe.X.STICK_ELECTROMAGNETIC, 'Z', MTEBasicMachineWithRecipe.X.COIL_ELECTRIC, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Polarizer.get(1),
             bitsd,
-            new Object[] { "ZSZ", aTextWireHull, "ZSZ", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "ZSZ", aTextWireHull, "ZSZ", 'M', MTEBasicMachineWithRecipe.X.HULL, 'S',
+                MTEBasicMachineWithRecipe.X.STICK_ELECTROMAGNETIC, 'Z', MTEBasicMachineWithRecipe.X.COIL_ELECTRIC, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Polarizer.get(1),
             bitsd,
-            new Object[] { "ZSZ", aTextWireHull, "ZSZ", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'S',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'Z',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "ZSZ", aTextWireHull, "ZSZ", 'M', MTEBasicMachineWithRecipe.X.HULL, 'S',
+                MTEBasicMachineWithRecipe.X.STICK_ELECTROMAGNETIC, 'Z', MTEBasicMachineWithRecipe.X.COIL_ELECTRIC, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             5);
 
     }
 
     private static void registerPrinter() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Printer.get(1),
             bitsd,
-            new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Printer.get(1),
             bitsd,
-            new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Printer.get(1),
             bitsd,
-            new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Printer.get(1),
             bitsd,
-            new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Printer.get(1),
             bitsd,
-            new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             5);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LuV_Printer.get(1),
             bitsd,
-            new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             6);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_ZPM_Printer.get(1),
             bitsd,
-            new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             7);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_UV_Printer.get(1),
             bitsd,
-            new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextMotorWire, aTextCableHull, "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             8);
 
     }
 
     private static void registerRecycler() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Recycler.get(1),
             bitsd,
-            new Object[] { "GCG", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OrePrefixes.dust.get(Materials.Glowstone) },
+            new Object[] { "GCG", aTextPlateMotor, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', OrePrefixes.dust.get(Materials.Glowstone) },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Recycler.get(1),
             bitsd,
-            new Object[] { "GCG", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OrePrefixes.dust.get(Materials.Glowstone) },
+            new Object[] { "GCG", aTextPlateMotor, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', OrePrefixes.dust.get(Materials.Glowstone) },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Recycler.get(1),
             bitsd,
-            new Object[] { "GCG", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OrePrefixes.dust.get(Materials.Glowstone) },
+            new Object[] { "GCG", aTextPlateMotor, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', OrePrefixes.dust.get(Materials.Glowstone) },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Recycler.get(1),
             bitsd,
-            new Object[] { "GCG", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OrePrefixes.dust.get(Materials.Glowstone) },
+            new Object[] { "GCG", aTextPlateMotor, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', OrePrefixes.dust.get(Materials.Glowstone) },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Recycler.get(1),
             bitsd,
-            new Object[] { "GCG", aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OrePrefixes.dust.get(Materials.Glowstone) },
+            new Object[] { "GCG", aTextPlateMotor, aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'G', OrePrefixes.dust.get(Materials.Glowstone) },
             5);
 
     }
 
     private static void registerSifter() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Sifter.get(1),
             bitsd,
-            new Object[] { "WFW", aTextPlateMotor, "CFC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'F', OreDictNames.craftingFilter, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "WFW", aTextPlateMotor, "CFC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'F', OreDictNames.craftingFilter, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Sifter.get(1),
             bitsd,
-            new Object[] { "WFW", aTextPlateMotor, "CFC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'F', OreDictNames.craftingFilter, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "WFW", aTextPlateMotor, "CFC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'F', OreDictNames.craftingFilter, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Sifter.get(1),
             bitsd,
-            new Object[] { "WFW", aTextPlateMotor, "CFC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'F', OreDictNames.craftingFilter, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "WFW", aTextPlateMotor, "CFC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'F', OreDictNames.craftingFilter, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Sifter.get(1),
             bitsd,
-            new Object[] { "WFW", aTextPlateMotor, "CFC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'F', OreDictNames.craftingFilter, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "WFW", aTextPlateMotor, "CFC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'F', OreDictNames.craftingFilter, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Sifter.get(1),
             bitsd,
-            new Object[] { "WFW", aTextPlateMotor, "CFC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'F', OreDictNames.craftingFilter, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { "WFW", aTextPlateMotor, "CFC", 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'F', OreDictNames.craftingFilter, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             5);
 
     }
 
     private static void registerSlicer() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Slicer.get(1),
             bitsd,
-            new Object[] { aTextWireCoil, "PMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextWireCoil, "PMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Slicer.get(1),
             bitsd,
-            new Object[] { aTextWireCoil, "PMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextWireCoil, "PMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Slicer.get(1),
             bitsd,
-            new Object[] { aTextWireCoil, "PMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextWireCoil, "PMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Slicer.get(1),
             bitsd,
-            new Object[] { aTextWireCoil, "PMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextWireCoil, "PMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Slicer.get(1),
             bitsd,
-            new Object[] { aTextWireCoil, "PMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
-                'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextWireCoil, "PMV", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'P',
+                MTEBasicMachineWithRecipe.X.PISTON, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE },
             5);
 
     }
 
     private static void registerThermalCentrifuge() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_ThermalCentrifuge.get(1),
             bitsd,
-            new Object[] { "CEC", "OMO", "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE },
+            new Object[] { "CEC", "OMO", "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'O', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_ThermalCentrifuge.get(1),
             bitsd,
-            new Object[] { "CEC", "OMO", "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE },
+            new Object[] { "CEC", "OMO", "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'O', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_ThermalCentrifuge.get(1),
             bitsd,
-            new Object[] { "CEC", "OMO", "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE },
+            new Object[] { "CEC", "OMO", "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'O', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_ThermalCentrifuge.get(1),
             bitsd,
-            new Object[] { "CEC", "OMO", "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE },
+            new Object[] { "CEC", "OMO", "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'O', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_ThermalCentrifuge.get(1),
             bitsd,
-            new Object[] { "CEC", "OMO", "WEW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'O',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE },
+            new Object[] { "CEC", "OMO", "WEW", 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE, 'O', MTEBasicMachineWithRecipe.X.COIL_HEATING_DOUBLE },
             5);
 
     }
 
     private static void registerUnpackager() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Unboxinator.get(1),
             bitsd,
-            new Object[] { "BCB", "VMR", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest },
+            new Object[] { "BCB", "VMR", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'B',
+                OreDictNames.craftingChest },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Unboxinator.get(1),
             bitsd,
-            new Object[] { "BCB", "VMR", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest },
+            new Object[] { "BCB", "VMR", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'B',
+                OreDictNames.craftingChest },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Unboxinator.get(1),
             bitsd,
-            new Object[] { "BCB", "VMR", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest },
+            new Object[] { "BCB", "VMR", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'B',
+                OreDictNames.craftingChest },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Unboxinator.get(1),
             bitsd,
-            new Object[] { "BCB", "VMR", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest },
+            new Object[] { "BCB", "VMR", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'B',
+                OreDictNames.craftingChest },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Unboxinator.get(1),
             bitsd,
-            new Object[] { "BCB", "VMR", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest },
+            new Object[] { "BCB", "VMR", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'B',
+                OreDictNames.craftingChest },
             5);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LuV_Unboxinator.get(1),
             bitsd,
-            new Object[] { "BCB", "VMR", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest },
+            new Object[] { "BCB", "VMR", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'B',
+                OreDictNames.craftingChest },
             6);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_ZPM_Unboxinator.get(1),
             bitsd,
-            new Object[] { "BCB", "VMR", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest },
+            new Object[] { "BCB", "VMR", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'B',
+                OreDictNames.craftingChest },
             7);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_UV_Unboxinator.get(1),
             bitsd,
-            new Object[] { "BCB", "VMR", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest },
+            new Object[] { "BCB", "VMR", aTextWireCoil, 'M', MTEBasicMachineWithRecipe.X.HULL, 'R',
+                MTEBasicMachineWithRecipe.X.ROBOT_ARM, 'V', MTEBasicMachineWithRecipe.X.CONVEYOR, 'C',
+                MTEBasicMachineWithRecipe.X.CIRCUIT, 'W', MTEBasicMachineWithRecipe.X.WIRE, 'B',
+                OreDictNames.craftingChest },
             8);
     }
 
     private static void registerWiremill() {
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_LV_Wiremill.get(1),
             bitsd,
-            new Object[] { aTextMotorWire, aTextCableHull, aTextMotorWire, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextMotorWire, aTextCableHull, aTextMotorWire, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             1);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_MV_Wiremill.get(1),
             bitsd,
-            new Object[] { aTextMotorWire, aTextCableHull, aTextMotorWire, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextMotorWire, aTextCableHull, aTextMotorWire, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             2);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_HV_Wiremill.get(1),
             bitsd,
-            new Object[] { aTextMotorWire, aTextCableHull, aTextMotorWire, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextMotorWire, aTextCableHull, aTextMotorWire, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             3);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_EV_Wiremill.get(1),
             bitsd,
-            new Object[] { aTextMotorWire, aTextCableHull, aTextMotorWire, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextMotorWire, aTextCableHull, aTextMotorWire, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             4);
 
-        GT_ModHandler.addMachineCraftingRecipe(
+        GTModHandler.addMachineCraftingRecipe(
             ItemList.Machine_IV_Wiremill.get(1),
             bitsd,
-            new Object[] { aTextMotorWire, aTextCableHull, aTextMotorWire, 'M',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR,
-                'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE },
+            new Object[] { aTextMotorWire, aTextCableHull, aTextMotorWire, 'M', MTEBasicMachineWithRecipe.X.HULL, 'E',
+                MTEBasicMachineWithRecipe.X.MOTOR, 'C', MTEBasicMachineWithRecipe.X.CIRCUIT, 'W',
+                MTEBasicMachineWithRecipe.X.WIRE },
             5);
     }
 
     private static void registerShapedCraftingRecipes() {
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Pipe_Polytetrafluoroethylene.get(1L),
             bits,
             new Object[] { "PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Polytetrafluoroethylene), 'F',
                 OrePrefixes.frameGt.get(Materials.Polytetrafluoroethylene), 'I',
                 OrePrefixes.pipeMedium.get(Materials.Polytetrafluoroethylene) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Pipe_Polybenzimidazole.get(1L),
             bits,
             new Object[] { "PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Polybenzimidazole), 'F',
                 OrePrefixes.frameGt.get(Materials.Polybenzimidazole), 'I',
                 OrePrefixes.pipeMedium.get(Materials.Polybenzimidazole) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_ULV.get(1L),
             bits,
             new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P',
                 OrePrefixes.plate.get(Materials.WroughtIron) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_LV.get(1L),
             bits,
             new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_MV.get(1L),
             bits,
             new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_HV.get(1L),
             bits,
             new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P',
                 OrePrefixes.plate.get(Materials.StainlessSteel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_EV.get(1L),
             bits,
             new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Titanium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_IV.get(1L),
             bits,
             new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P',
                 OrePrefixes.plate.get(Materials.TungstenSteel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_LuV.get(1L),
             bits,
             new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P',
                 OrePrefixes.plate.get(ExternalMaterials.getRhodiumPlatedPalladium()) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_ZPM.get(1L),
             bits,
             new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Iridium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_UV.get(1L),
             bits,
             new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Osmium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_MAX.get(1L),
             bits,
             new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P',
                 OrePrefixes.plate.get(Materials.Neutronium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_BronzePlatedBricks.get(1L),
             bits,
             new Object[] { "PhP", "PBP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Bronze), 'B',
                 new ItemStack(Blocks.brick_block, 1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_SolidSteel.get(1L),
             bits,
             new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F',
                 OrePrefixes.frameGt.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_StableTitanium.get(1L),
             bits,
             new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Titanium), 'F',
                 OrePrefixes.frameGt.get(Materials.Titanium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_HeatProof.get(1L),
             bits,
             new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Invar), 'F',
                 OrePrefixes.frameGt.get(Materials.Invar) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_FrostProof.get(1L),
             bits,
             new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Aluminium), 'F',
                 OrePrefixes.frameGt.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_CleanStainlessSteel.get(1L),
             bits,
             new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'F',
                 OrePrefixes.frameGt.get(Materials.StainlessSteel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_RobustTungstenSteel.get(1L),
             bits,
             new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F',
                 OrePrefixes.frameGt.get(Materials.TungstenSteel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_MiningOsmiridium.get(1L),
             bits,
             new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Osmiridium), 'F',
                 OrePrefixes.frameGt.get(Materials.Osmiridium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_MiningNeutronium.get(1L),
             bits,
             new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Neutronium), 'F',
                 OrePrefixes.frameGt.get(Materials.Neutronium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_MiningBlackPlutonium.get(1L),
             bits,
             new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.BlackPlutonium), 'F',
                 OrePrefixes.frameGt.get(Materials.BlackPlutonium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Turbine.get(1L),
             bits,
             new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Magnalium), 'F',
                 OrePrefixes.frameGt.get(Materials.BlueSteel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Turbine1.get(1L),
             bits,
             new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'F',
                 ItemList.Casing_Turbine });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Turbine2.get(1L),
             bits,
             new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Titanium), 'F',
                 ItemList.Casing_Turbine });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Turbine3.get(1L),
             bits,
             new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F',
                 ItemList.Casing_Turbine });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_TurbineGasAdvanced.get(1L),
             bits,
             new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.HSSS), 'F',
                 ItemList.Casing_Turbine });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Pipe_Bronze.get(1L),
             bits,
             new Object[] { "PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Bronze), 'F',
                 OrePrefixes.frameGt.get(Materials.Bronze), 'I', OrePrefixes.pipeMedium.get(Materials.Bronze) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Pipe_Steel.get(1L),
             bits,
             new Object[] { "PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Steel), 'F',
                 OrePrefixes.frameGt.get(Materials.Steel), 'I', OrePrefixes.pipeMedium.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Pipe_Titanium.get(1L),
             bits,
             new Object[] { "PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Titanium), 'F',
                 OrePrefixes.frameGt.get(Materials.Titanium), 'I', OrePrefixes.pipeMedium.get(Materials.Titanium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Pipe_TungstenSteel.get(1L),
             bits,
             new Object[] { "PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F',
                 OrePrefixes.frameGt.get(Materials.TungstenSteel), 'I',
                 OrePrefixes.pipeMedium.get(Materials.TungstenSteel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Gearbox_Bronze.get(1L),
             bits,
             new Object[] { "PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Bronze), 'F',
                 OrePrefixes.frameGt.get(Materials.Bronze), 'G', OrePrefixes.gearGt.get(Materials.Bronze) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Gearbox_Steel.get(1L),
             bits,
             new Object[] { "PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F',
                 OrePrefixes.frameGt.get(Materials.Steel), 'G', OrePrefixes.gearGt.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Gearbox_Titanium.get(1L),
             bits,
             new Object[] { "PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F',
                 OrePrefixes.frameGt.get(Materials.Titanium), 'G', OrePrefixes.gearGt.get(Materials.Titanium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Gearbox_TungstenSteel.get(1L),
             bits,
             new Object[] { "PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F',
                 OrePrefixes.frameGt.get(Materials.TungstenSteel), 'G', ItemList.Robot_Arm_IV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Grate.get(1L),
             bits,
             new Object[] { "PVP", "PFP", aTextPlateMotor, 'P', new ItemStack(Blocks.iron_bars, 1), 'F',
                 OrePrefixes.frameGt.get(Materials.Steel), 'M', ItemList.Electric_Motor_MV, 'V',
                 OrePrefixes.rotor.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Assembler.get(1L),
             bits,
             new Object[] { "PVP", "PFP", aTextPlateMotor, 'P', OrePrefixes.circuit.get(Materials.ZPM), 'F',
                 OrePrefixes.frameGt.get(Materials.TungstenSteel), 'M', ItemList.Electric_Motor_IV, 'V',
                 OrePrefixes.circuit.get(Materials.LuV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Firebox_Bronze.get(1L),
             bits,
             new Object[] { "PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.Bronze), 'F',
                 OrePrefixes.frameGt.get(Materials.Bronze), 'S', OrePrefixes.stick.get(Materials.Bronze) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.WoodenCasing.get(1L),
             bits,
             new Object[] { "PSP", "PFP", "PSP", 'F', OrePrefixes.gear.get(Materials.Wood), 'P',
                 OrePrefixes.frameGt.get(Materials.Wood), 'S', OrePrefixes.screw.get(Materials.Wood) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hatch_Output_ULV.get(1L),
             bits,
-            new Object[] { "ASA", "AFA", "APA", 'S', GT_ModHandler.getModItem(BuildCraftFactory.ID, "tankBlock", 1L, 0),
+            new Object[] { "ASA", "AFA", "APA", 'S', GTModHandler.getModItem(BuildCraftFactory.ID, "tankBlock", 1L, 0),
                 'F', ItemList.Hull_ULV.get(1L), 'A', OrePrefixes.plate.get(Materials.Rubber), 'P',
                 OrePrefixes.ring.get(Materials.Rubber) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hatch_Input_ULV.get(1L),
             bits,
-            new Object[] { "ASA", "AFA", "APA", 'S', GT_ModHandler.getModItem(BuildCraftFactory.ID, "tankBlock", 1L, 0),
+            new Object[] { "ASA", "AFA", "APA", 'S', GTModHandler.getModItem(BuildCraftFactory.ID, "tankBlock", 1L, 0),
                 'F', ItemList.Hull_ULV.get(1L), 'A', OrePrefixes.plate.get(Materials.Rubber), 'P',
                 OrePrefixes.gear.get(Materials.Rubber) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Firebox_Steel.get(1L),
             bits,
             new Object[] { "PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.Steel), 'F',
                 OrePrefixes.frameGt.get(Materials.Steel), 'S', OrePrefixes.stick.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Firebox_Titanium.get(1L),
             bits,
             new Object[] { "PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.Titanium), 'F',
                 OrePrefixes.frameGt.get(Materials.Titanium), 'S', OrePrefixes.stick.get(Materials.Titanium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Firebox_TungstenSteel.get(1L),
             bits,
             new Object[] { "PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F',
                 OrePrefixes.frameGt.get(Materials.TungstenSteel), 'S',
                 OrePrefixes.stick.get(Materials.TungstenSteel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Stripes_A.get(1L),
             bits,
             new Object[] { "Y  ", " M ", "  B", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B',
                 Dyes.dyeBlack });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Stripes_B.get(1L),
             bits,
             new Object[] { "  Y", " M ", "B  ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B',
                 Dyes.dyeBlack });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_RadioactiveHazard.get(1L),
             bits,
             new Object[] { " YB", " M ", "   ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B',
                 Dyes.dyeBlack });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_BioHazard.get(1L),
             bits,
             new Object[] { " Y ", " MB", "   ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B',
                 Dyes.dyeBlack });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_ExplosionHazard.get(1L),
             bits,
             new Object[] { " Y ", " M ", "  B", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B',
                 Dyes.dyeBlack });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_FireHazard.get(1L),
             bits,
             new Object[] { " Y ", " M ", " B ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B',
                 Dyes.dyeBlack });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_AcidHazard.get(1L),
             bits,
             new Object[] { " Y ", " M ", "B  ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B',
                 Dyes.dyeBlack });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_MagicHazard.get(1L),
             bits,
             new Object[] { " Y ", "BM ", "   ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B',
                 Dyes.dyeBlack });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_FrostHazard.get(1L),
             bits,
             new Object[] { "BY ", " M ", "   ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B',
                 Dyes.dyeBlack });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_NoiseHazard.get(1L),
             bits,
             new Object[] { "   ", " M ", "BY ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B',
                 Dyes.dyeBlack });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Advanced_Iridium.get(1L),
             bits,
             new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Iridium), 'F',
                 OrePrefixes.frameGt.get(Materials.Iridium) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Bricked_BlastFurnace.get(1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "BFB", "FwF", "BFB", 'B', ItemList.Casing_Firebricks, 'F',
                 OreDictNames.craftingIronFurnace });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hull_Bronze.get(1L),
             bits,
             new Object[] { aTextPlate, "PhP", aTextPlate, 'P', OrePrefixes.plate.get(Materials.Bronze) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hull_Bronze_Bricks.get(1L),
             bits,
             new Object[] { aTextPlate, "PhP", "BBB", 'P', OrePrefixes.plate.get(Materials.Bronze), 'B',
                 new ItemStack(Blocks.brick_block, 1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hull_HP.get(1L),
             bits,
             new Object[] { aTextPlate, "PhP", aTextPlate, 'P', OrePrefixes.plate.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hull_HP_Bricks.get(1L),
             bits,
             new Object[] { aTextPlate, "PhP", "BBB", 'P', OrePrefixes.plate.get(Materials.WroughtIron), 'B',
@@ -2662,805 +2373,805 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
         // hull crafting recipes. (They can't be used for recycling as that would create an exploit loop with the
         // assembler recipes.)
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hull_ULV.get(1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_ULV, 'C',
                 OrePrefixes.cableGt01.get(Materials.Lead), 'H', OrePrefixes.plate.get(Materials.WroughtIron), 'P',
                 OrePrefixes.plate.get(Materials.Wood) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hull_LV.get(1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_LV, 'C',
                 OrePrefixes.cableGt01.get(Materials.Tin), 'H', OrePrefixes.plate.get(Materials.Steel), 'P',
                 OrePrefixes.plate.get(Materials.WroughtIron) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hull_MV.get(1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_MV, 'C',
                 OrePrefixes.cableGt01.get(Materials.Copper), 'H', OrePrefixes.plate.get(Materials.Aluminium), 'P',
                 OrePrefixes.plate.get(Materials.WroughtIron) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hull_HV.get(1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_HV, 'C',
                 OrePrefixes.cableGt01.get(Materials.Gold), 'H', OrePrefixes.plate.get(Materials.StainlessSteel), 'P',
                 OrePrefixes.plate.get(Materials.Plastic) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hull_EV.get(1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_EV, 'C',
                 OrePrefixes.cableGt01.get(Materials.Aluminium), 'H', OrePrefixes.plate.get(Materials.Titanium), 'P',
                 OrePrefixes.plate.get(Materials.Plastic) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hull_IV.get(1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_IV, 'C',
                 OrePrefixes.cableGt01.get(Materials.Tungsten), 'H', OrePrefixes.plate.get(Materials.TungstenSteel), 'P',
                 OrePrefixes.plate.get(Materials.Polytetrafluoroethylene) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hull_LuV.get(1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_LuV, 'C',
                 OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'H',
                 OrePrefixes.plate.get(ExternalMaterials.getRhodiumPlatedPalladium()), 'P',
                 OrePrefixes.plate.get(Materials.Polytetrafluoroethylene) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hull_ZPM.get(1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_ZPM, 'C',
                 OrePrefixes.cableGt01.get(Materials.Naquadah), 'H', OrePrefixes.plate.get(Materials.Iridium), 'P',
                 OrePrefixes.plate.get(Materials.Polybenzimidazole) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hull_UV.get(1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_UV, 'C',
                 OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), 'H', OrePrefixes.plate.get(Materials.Osmium), 'P',
                 OrePrefixes.plate.get(Materials.Polybenzimidazole) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hull_MAX.get(1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "PHP", aTextCableHull, 'M', ItemList.Casing_MAX, 'C',
                 OrePrefixes.wireGt04.get(Materials.SuperconductorUV), 'H', OrePrefixes.plate.get(Materials.Neutronium),
                 'P', OrePrefixes.plate.get(Materials.Polybenzimidazole) });
 
         // hull recycling data
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hull_ULV.get(1L),
             ItemList.Casing_ULV.get(1),
             OrePrefixes.cableGt01.get(Materials.Lead),
             OrePrefixes.cableGt01.get(Materials.Lead));
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hull_LV.get(1L),
             ItemList.Casing_LV.get(1),
             OrePrefixes.cableGt01.get(Materials.Tin),
             OrePrefixes.cableGt01.get(Materials.Tin));
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hull_MV.get(1L),
             ItemList.Casing_MV.get(1),
             OrePrefixes.cableGt01.get(Materials.AnyCopper),
             OrePrefixes.cableGt01.get(Materials.AnyCopper));
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hull_HV.get(1L),
             ItemList.Casing_HV.get(1),
             OrePrefixes.cableGt01.get(Materials.Gold),
             OrePrefixes.cableGt01.get(Materials.Gold));
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hull_EV.get(1L),
             ItemList.Casing_EV.get(1),
             OrePrefixes.cableGt01.get(Materials.Aluminium),
             OrePrefixes.cableGt01.get(Materials.Aluminium));
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hull_IV.get(1L),
             ItemList.Casing_IV.get(1),
             OrePrefixes.cableGt01.get(Materials.Tungsten),
             OrePrefixes.cableGt01.get(Materials.Tungsten));
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hull_LuV.get(1L),
             ItemList.Casing_LuV.get(1),
             OrePrefixes.cableGt01.get(Materials.VanadiumGallium),
             OrePrefixes.cableGt01.get(Materials.VanadiumGallium));
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hull_ZPM.get(1L),
             ItemList.Casing_ZPM.get(1),
             OrePrefixes.cableGt02.get(Materials.Naquadah),
             OrePrefixes.cableGt02.get(Materials.Naquadah));
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hull_UV.get(1L),
             ItemList.Casing_UV.get(1),
             OrePrefixes.cableGt04.get(Materials.NaquadahAlloy),
             OrePrefixes.cableGt04.get(Materials.NaquadahAlloy));
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hull_MAX.get(1L),
             ItemList.Casing_MAX.get(1),
             OrePrefixes.cableGt04.get(Materials.SuperconductorUV),
             OrePrefixes.cableGt04.get(Materials.SuperconductorUV));
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Transformer_LV_ULV.get(1L),
             bitsd,
             new Object[] { " BB", "CM ", " BB", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Tin),
                 'B', OrePrefixes.cableGt01.get(Materials.Lead) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Transformer_MV_LV.get(1L),
             bitsd,
             new Object[] { " BB", "CM ", " BB", 'M', ItemList.Hull_LV, 'C',
                 OrePrefixes.cableGt01.get(Materials.AnyCopper), 'B', OrePrefixes.cableGt01.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Transformer_HV_MV.get(1L),
             bitsd,
             new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Hull_MV, 'C', OrePrefixes.cableGt01.get(Materials.Gold),
                 'B', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'K',
                 OrePrefixes.componentCircuit.get(Materials.Inductor) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Transformer_EV_HV.get(1L),
             bitsd,
             new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Hull_HV, 'C',
                 OrePrefixes.cableGt01.get(Materials.Aluminium), 'B', OrePrefixes.cableGt01.get(Materials.Gold), 'K',
                 ItemList.Circuit_Chip_ULPIC });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Transformer_IV_EV.get(1L),
             bitsd,
             new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Hull_EV, 'C',
                 OrePrefixes.cableGt01.get(Materials.Tungsten), 'B', OrePrefixes.cableGt01.get(Materials.Aluminium), 'K',
                 ItemList.Circuit_Chip_LPIC });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Transformer_LuV_IV.get(1L),
             bitsd,
             new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Hull_IV, 'C',
                 OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'B',
                 OrePrefixes.cableGt01.get(Materials.Tungsten), 'K', ItemList.Circuit_Chip_PIC });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Transformer_ZPM_LuV.get(1L),
             bitsd,
             new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Hull_LuV, 'C',
                 OrePrefixes.cableGt01.get(Materials.Naquadah), 'B',
                 OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'K', ItemList.Circuit_Chip_HPIC });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Transformer_UV_ZPM.get(1L),
             bitsd,
             new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Hull_ZPM, 'C',
                 OrePrefixes.cableGt01.get(Materials.NaquadahAlloy), 'B', OrePrefixes.cableGt01.get(Materials.Naquadah),
                 'K', ItemList.Circuit_Chip_UHPIC });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Transformer_MAX_UV.get(1L),
             bitsd,
             new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Hull_UV, 'C',
                 OrePrefixes.wireGt01.get(Materials.Bedrockium), 'B', OrePrefixes.cableGt01.get(Materials.NaquadahAlloy),
                 'K', ItemList.Circuit_Chip_NPIC });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hatch_Dynamo_ULV.get(1L),
             bitsd,
             new Object[] { "XOL", "SMP", "XOL", 'M', ItemList.Hull_ULV, 'S', OrePrefixes.spring.get(Materials.Lead),
                 'X', OrePrefixes.circuit.get(Materials.ULV), 'O', ItemList.ULV_Coil, 'L',
                 OrePrefixes.cell.get(Materials.Lubricant), 'P', OrePrefixes.rotor.get(Materials.Lead) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hatch_Dynamo_LV.get(1L),
             bitsd,
             new Object[] { "XOL", "SMP", "XOL", 'M', ItemList.Hull_LV, 'S', OrePrefixes.spring.get(Materials.Tin), 'X',
                 OrePrefixes.circuit.get(Materials.LV), 'O', ItemList.LV_Coil, 'L',
                 OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hatch_Dynamo_MV.get(1L),
             bitsd,
             new Object[] { "XOL", "SMP", "XOL", 'M', ItemList.Hull_MV, 'S', OrePrefixes.spring.get(Materials.Copper),
                 'X', ItemList.Circuit_Chip_ULPIC, 'O', ItemList.MV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant),
                 'P', ItemList.Electric_Pump_MV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hatch_Energy_ULV.get(1L),
             bitsd,
             new Object[] { "COL", "XMP", "COL", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Lead),
                 'X', OrePrefixes.circuit.get(Materials.ULV), 'O', ItemList.ULV_Coil, 'L',
                 OrePrefixes.cell.get(Materials.Lubricant), 'P', OrePrefixes.rotor.get(Materials.Lead) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hatch_Energy_LV.get(1L),
             bitsd,
             new Object[] { "COL", "XMP", "COL", 'M', ItemList.Hull_LV, 'C', OrePrefixes.cableGt01.get(Materials.Tin),
                 'X', OrePrefixes.circuit.get(Materials.LV), 'O', ItemList.LV_Coil, 'L',
                 OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hatch_Energy_MV.get(1L),
             bitsd,
             new Object[] { "XOL", "CMP", "XOL", 'M', ItemList.Hull_MV, 'C', OrePrefixes.cableGt01.get(Materials.Copper),
                 'X', ItemList.Circuit_Chip_ULPIC, 'O', ItemList.MV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant),
                 'P', ItemList.Electric_Pump_MV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hatch_Maintenance.get(1L),
             bitsd,
             new Object[] { "dwx", "hMc", "fsr", 'M', ItemList.Hull_LV });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hatch_DataAccess_EV.get(1L),
             bitsd,
             new Object[] { "COC", "OMO", "COC", 'M', ItemList.Hull_EV, 'O', ItemList.Tool_DataStick, 'C',
                 OrePrefixes.circuit.get(Materials.IV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hatch_DataAccess_LuV.get(1L),
             bitsd,
             new Object[] { "COC", "OMO", "COC", 'M', ItemList.Hull_LuV, 'O', ItemList.Tool_DataOrb, 'C',
                 OrePrefixes.circuit.get(Materials.ZPM) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hatch_DataAccess_UV.get(1L),
             bitsd,
             new Object[] { "CRC", "OMO", "CRC", 'M', ItemList.Hull_UV, 'O', ItemList.Tool_DataOrb, 'C',
                 OrePrefixes.circuit.get(Materials.UHV), 'R', ItemList.Robot_Arm_UV });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hatch_AutoMaintenance.get(1L),
             bitsd,
             new Object[] { "CHC", "AMA", "CHC", 'M', ItemList.Hull_LuV, 'H', ItemList.Hatch_Maintenance, 'A',
                 ItemList.Robot_Arm_LuV, 'C', OrePrefixes.circuit.get(Materials.ZPM) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hatch_Muffler_LV.get(1L),
             bitsd,
             new Object[] { "MX ", "PR ", 'M', ItemList.Hull_LV, 'P', OrePrefixes.pipeMedium.get(Materials.Bronze), 'R',
                 OrePrefixes.rotor.get(Materials.Bronze), 'X', ItemList.Electric_Motor_LV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hatch_Muffler_MV.get(1L),
             bitsd,
             new Object[] { "MX ", "PR ", 'M', ItemList.Hull_MV, 'P', OrePrefixes.pipeMedium.get(Materials.Steel), 'R',
                 OrePrefixes.rotor.get(Materials.Steel), 'X', ItemList.Electric_Motor_MV });
 
         // recycling data for the other mufflers, recipes are in assembler
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hatch_Muffler_HV.get(1L),
             ItemList.Hull_HV.get(1),
             OrePrefixes.pipeLarge.get(Materials.StainlessSteel),
             OrePrefixes.rotor.get(Materials.StainlessSteel),
             ItemList.Electric_Motor_HV.get(1));
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hatch_Muffler_EV.get(1L),
             ItemList.Hull_EV.get(1),
             OrePrefixes.pipeLarge.get(Materials.Titanium),
             OrePrefixes.rotor.get(Materials.Titanium),
             ItemList.Electric_Motor_EV.get(1));
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hatch_Muffler_IV.get(1L),
             ItemList.Hull_IV.get(1),
             OrePrefixes.pipeLarge.get(Materials.TungstenSteel),
             OrePrefixes.rotor.get(Materials.TungstenSteel),
             ItemList.Electric_Motor_IV.get(1));
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hatch_Muffler_LuV.get(1L),
             ItemList.Hull_LuV.get(1),
             OrePrefixes.pipeLarge.get(Materials.Enderium),
             OrePrefixes.rotor.get(Materials.Enderium),
             ItemList.Electric_Motor_LuV.get(1));
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hatch_Muffler_ZPM.get(1L),
             ItemList.Hull_ZPM.get(1),
             OrePrefixes.pipeLarge.get(Materials.Naquadah),
             OrePrefixes.rotor.get(Materials.NaquadahAlloy),
             ItemList.Electric_Motor_ZPM.get(1));
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hatch_Muffler_UV.get(1L),
             ItemList.Hull_UV.get(1),
             OrePrefixes.pipeLarge.get(Materials.NetherStar),
             OrePrefixes.rotor.get(Materials.Neutronium),
             ItemList.Electric_Motor_UV.get(1));
-        GT_OreDictUnificator.addItemDataFromInputs(
+        GTOreDictUnificator.addItemDataFromInputs(
             ItemList.Hatch_Muffler_MAX.get(1L),
             ItemList.Hull_MAX.get(1),
             OrePrefixes.pipeLarge.get(Materials.MysteriousCrystal),
             OrePrefixes.rotor.get(Materials.CosmicNeutronium),
             ItemList.Electric_Motor_UHV.get(1));
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Bronze_Boiler.get(1L),
             bitsd,
             new Object[] { aTextPlate, "PwP", "BFB", 'F', OreDictNames.craftingIronFurnace, 'P',
                 OrePrefixes.plate.get(Materials.Bronze), 'B', new ItemStack(Blocks.brick_block, 1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Steel_Boiler.get(1L),
             bitsd,
             new Object[] { aTextPlate, "PwP", "BFB", 'F', OreDictNames.craftingIronFurnace, 'P',
                 OrePrefixes.plate.get(Materials.Steel), 'B', new ItemStack(Blocks.brick_block, 1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Steel_Boiler_Lava.get(1L),
             bitsd,
             new Object[] { aTextPlate, "PTP", aTextPlateMotor, 'M', ItemList.Hull_HP, 'P',
                 OrePrefixes.plate.get(Materials.Steel), 'T',
-                GT_ModHandler.getModItem(BuildCraftFactory.ID, "tankBlock", 1L, 0) });
-        GT_ModHandler.addCraftingRecipe(
+                GTModHandler.getModItem(BuildCraftFactory.ID, "tankBlock", 1L, 0) });
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Bronze_Boiler_Solar.get(1L),
             bitsd,
             new Object[] { "GGG", "SSS", aTextPlateMotor, 'M', ItemList.Hull_Bronze_Bricks, 'P',
                 OrePrefixes.pipeSmall.get(Materials.Bronze), 'S', OrePrefixes.plateDouble.get(Materials.Silver), 'G',
                 new ItemStack(Blocks.glass, 1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_HP_Solar.get(1L),
             bitsd,
             new Object[] { "GGG", "SSS", aTextPlateMotor, 'M', ItemList.Hull_HP_Bricks, 'P',
                 OrePrefixes.pipeSmall.get(Materials.Steel), 'S', OrePrefixes.plateTriple.get(Materials.Silver), 'G',
-                GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockAlloyGlass", 1L) });
+                GTModHandler.getModItem(IndustrialCraft2.ID, "blockAlloyGlass", 1L) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Bronze_Furnace.get(1L),
             bitsd,
             new Object[] { "XXX", "XMX", "XFX", 'M', ItemList.Hull_Bronze_Bricks, 'X',
                 OrePrefixes.pipeSmall.get(Materials.Bronze), 'F', OreDictNames.craftingFurnace });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_HP_Furnace.get(1L),
             bitsd,
             new Object[] { "XSX", "PMP", "XXX", 'M', ItemList.Machine_Bronze_Furnace, 'X',
                 OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron),
                 'S', OrePrefixes.plate.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Bronze_Macerator.get(1L),
             bitsd,
             new Object[] { "DXD", "XMX", "PXP", 'M', ItemList.Hull_Bronze, 'X',
                 OrePrefixes.pipeSmall.get(Materials.Bronze), 'P', OreDictNames.craftingPiston, 'D',
                 OrePrefixes.gem.get(Materials.Diamond) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_HP_Macerator.get(1L),
             bitsd,
             new Object[] { "PSP", "XMX", "PPP", 'M', ItemList.Machine_Bronze_Macerator, 'X',
                 OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron),
                 'S', OrePrefixes.plate.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Bronze_Extractor.get(1L),
             bitsd,
             new Object[] { "XXX", "PMG", "XXX", 'M', ItemList.Hull_Bronze, 'X',
                 OrePrefixes.pipeSmall.get(Materials.Bronze), 'P', OreDictNames.craftingPiston, 'G',
                 new ItemStack(Blocks.glass, 1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_HP_Extractor.get(1L),
             bitsd,
             new Object[] { "XSX", "PMP", "XXX", 'M', ItemList.Machine_Bronze_Extractor, 'X',
                 OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron),
                 'S', OrePrefixes.plate.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Bronze_Hammer.get(1L),
             bitsd,
             new Object[] { "XPX", "XMX", "XAX", 'M', ItemList.Hull_Bronze, 'X',
                 OrePrefixes.pipeSmall.get(Materials.Bronze), 'P', OreDictNames.craftingPiston, 'A',
                 OreDictNames.craftingAnvil });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_HP_Hammer.get(1L),
             bitsd,
             new Object[] { "PSP", "XMX", "PPP", 'M', ItemList.Machine_Bronze_Hammer, 'X',
                 OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron),
                 'S', OrePrefixes.plate.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Bronze_Compressor.get(1L),
             bitsd,
             new Object[] { "XXX", aTextPlateMotor, "XXX", 'M', ItemList.Hull_Bronze, 'X',
                 OrePrefixes.pipeSmall.get(Materials.Bronze), 'P', OreDictNames.craftingPiston });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_HP_Compressor.get(1L),
             bitsd,
             new Object[] { "XSX", "PMP", "XXX", 'M', ItemList.Machine_Bronze_Compressor, 'X',
                 OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron),
                 'S', OrePrefixes.plate.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Bronze_AlloySmelter.get(1L),
             bitsd,
             new Object[] { "XXX", "FMF", "XXX", 'M', ItemList.Hull_Bronze_Bricks, 'X',
                 OrePrefixes.pipeSmall.get(Materials.Bronze), 'F', OreDictNames.craftingFurnace });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_HP_AlloySmelter.get(1L),
             bitsd,
             new Object[] { "PSP", "PMP", "PXP", 'M', ItemList.Machine_Bronze_AlloySmelter, 'X',
                 OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron),
                 'S', OrePrefixes.plate.get(Materials.Steel) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_1by1_ULV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ULV, 'W',
                 OrePrefixes.wireGt01.get(Materials.Lead), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_1by1_LV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LV, 'W',
                 OrePrefixes.wireGt01.get(Materials.Tin), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_1by1_MV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MV, 'W',
                 OrePrefixes.wireGt01.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_1by1_HV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_HV, 'W',
                 OrePrefixes.wireGt01.get(Materials.Gold), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_1by1_EV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_EV, 'W',
                 OrePrefixes.wireGt01.get(Materials.Aluminium), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_1by1_IV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_IV, 'W',
                 OrePrefixes.wireGt01.get(Materials.Tungsten), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_1by1_LuV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LuV, 'W',
                 OrePrefixes.wireGt01.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_1by1_ZPM.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ZPM, 'W',
                 OrePrefixes.wireGt01.get(Materials.Naquadah), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_1by1_UV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W',
                 OrePrefixes.wireGt01.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_1by1_UHV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W',
                 OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_2by2_ULV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ULV, 'W',
                 OrePrefixes.wireGt04.get(Materials.Lead), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_2by2_LV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LV, 'W',
                 OrePrefixes.wireGt04.get(Materials.Tin), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_2by2_MV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MV, 'W',
                 OrePrefixes.wireGt04.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_2by2_HV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_HV, 'W',
                 OrePrefixes.wireGt04.get(Materials.Gold), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_2by2_EV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_EV, 'W',
                 OrePrefixes.wireGt04.get(Materials.Aluminium), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_2by2_IV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_IV, 'W',
                 OrePrefixes.wireGt04.get(Materials.Tungsten), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_2by2_LuV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LuV, 'W',
                 OrePrefixes.wireGt04.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_2by2_ZPM.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ZPM, 'W',
                 OrePrefixes.wireGt04.get(Materials.Naquadah), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_2by2_UV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W',
                 OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_2by2_UHV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W',
                 OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_3by3_ULV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ULV, 'W',
                 OrePrefixes.wireGt08.get(Materials.Lead), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_3by3_LV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LV, 'W',
                 OrePrefixes.wireGt08.get(Materials.Tin), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_3by3_MV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MV, 'W',
                 OrePrefixes.wireGt08.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_3by3_HV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_HV, 'W',
                 OrePrefixes.wireGt08.get(Materials.Gold), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_3by3_EV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_EV, 'W',
                 OrePrefixes.wireGt08.get(Materials.Aluminium), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_3by3_IV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_IV, 'W',
                 OrePrefixes.wireGt08.get(Materials.Tungsten), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_3by3_LuV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LuV, 'W',
                 OrePrefixes.wireGt08.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_3by3_ZPM.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ZPM, 'W',
                 OrePrefixes.wireGt08.get(Materials.Naquadah), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_3by3_UV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W',
                 OrePrefixes.wireGt08.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_3by3_UHV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W',
                 OrePrefixes.wireGt08.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_4by4_ULV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ULV, 'W',
                 OrePrefixes.wireGt16.get(Materials.Lead), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_4by4_LV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LV, 'W',
                 OrePrefixes.wireGt16.get(Materials.Tin), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_4by4_MV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MV, 'W',
                 OrePrefixes.wireGt16.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_4by4_HV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_HV, 'W',
                 OrePrefixes.wireGt16.get(Materials.Gold), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_4by4_EV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_EV, 'W',
                 OrePrefixes.wireGt16.get(Materials.Aluminium), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_4by4_IV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_IV, 'W',
                 OrePrefixes.wireGt16.get(Materials.Tungsten), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_4by4_LuV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LuV, 'W',
                 OrePrefixes.wireGt16.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_4by4_ZPM.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ZPM, 'W',
                 OrePrefixes.wireGt16.get(Materials.Naquadah), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_4by4_UV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W',
                 OrePrefixes.wireGt16.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Buffer_4by4_UHV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W',
                 OrePrefixes.wireGt16.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Charger_4by4_ULV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_ULV, 'W',
                 OrePrefixes.wireGt16.get(Materials.Lead), 'T', OreDictNames.craftingChest, 'B',
                 ItemList.Battery_RE_ULV_Tantalum, 'C', OrePrefixes.circuit.get(Materials.ULV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Charger_4by4_LV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_LV, 'W',
                 OrePrefixes.wireGt16.get(Materials.Tin), 'T', OreDictNames.craftingChest, 'B',
                 ItemList.Battery_RE_LV_Lithium, 'C', OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Charger_4by4_MV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_MV, 'W',
                 OrePrefixes.wireGt16.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest, 'B',
                 ItemList.Battery_RE_MV_Lithium, 'C', OrePrefixes.circuit.get(Materials.MV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Charger_4by4_HV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_HV, 'W',
                 OrePrefixes.wireGt16.get(Materials.Gold), 'T', OreDictNames.craftingChest, 'B',
                 ItemList.Battery_RE_HV_Lithium, 'C', OrePrefixes.circuit.get(Materials.HV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Charger_4by4_EV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_EV, 'W',
                 OrePrefixes.wireGt16.get(Materials.Aluminium), 'T', OreDictNames.craftingChest, 'B',
                 OrePrefixes.battery.get(Materials.EV), 'C', OrePrefixes.circuit.get(Materials.EV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Charger_4by4_IV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_IV, 'W',
                 OrePrefixes.wireGt16.get(Materials.Tungsten), 'T', OreDictNames.craftingChest, 'B',
                 OrePrefixes.battery.get(Materials.IV), 'C', OrePrefixes.circuit.get(Materials.IV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Charger_4by4_LuV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_LuV, 'W',
                 OrePrefixes.wireGt16.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest, 'B',
                 OrePrefixes.battery.get(Materials.LuV), 'C', OrePrefixes.circuit.get(Materials.LuV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Charger_4by4_ZPM.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_ZPM, 'W',
                 OrePrefixes.wireGt16.get(Materials.Naquadah), 'T', OreDictNames.craftingChest, 'B',
                 OrePrefixes.battery.get(Materials.ZPM), 'C', OrePrefixes.circuit.get(Materials.ZPM) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Charger_4by4_UV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_UV, 'W',
                 OrePrefixes.wireGt16.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest, 'B', ItemList.ZPM2,
                 'C', OrePrefixes.circuit.get(Materials.UV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Charger_4by4_UHV.get(1L),
             bitsd,
             new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_MAX, 'W',
                 OrePrefixes.wireGt16.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest, 'B',
                 ItemList.ZPM2, 'C', OrePrefixes.circuit.get(Materials.UHV) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Locker_ULV.get(1L),
             bitsd,
             new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_ULV, 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Locker_LV.get(1L),
             bitsd,
             new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_LV, 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Locker_MV.get(1L),
             bitsd,
             new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_MV, 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Locker_HV.get(1L),
             bitsd,
             new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_HV, 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Locker_EV.get(1L),
             bitsd,
             new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_EV, 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Locker_IV.get(1L),
             bitsd,
             new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_IV, 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Locker_LuV.get(1L),
             bitsd,
             new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_LuV, 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Locker_ZPM.get(1L),
             bitsd,
             new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_ZPM, 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Locker_UV.get(1L),
             bitsd,
             new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_UV, 'T', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Locker_MAX.get(1L),
             bitsd,
             new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_UHV, 'T', OreDictNames.craftingChest });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_LV_Scanner.get(1L),
             bitsd,
             new Object[] { "CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_LV, 'T', ItemList.Emitter_LV, 'R',
                 ItemList.Sensor_LV, 'C', OrePrefixes.circuit.get(Materials.MV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_MV_Scanner.get(1L),
             bitsd,
             new Object[] { "CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_MV, 'T', ItemList.Emitter_MV, 'R',
                 ItemList.Sensor_MV, 'C', OrePrefixes.circuit.get(Materials.HV), 'W',
                 OrePrefixes.cableGt01.get(Materials.AnyCopper) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_HV_Scanner.get(1L),
             bitsd,
             new Object[] { "CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_HV, 'T', ItemList.Emitter_HV, 'R',
                 ItemList.Sensor_HV, 'C', OrePrefixes.circuit.get(Materials.EV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Gold) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_EV_Scanner.get(1L),
             bitsd,
             new Object[] { "CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_EV, 'T', ItemList.Emitter_EV, 'R',
                 ItemList.Sensor_EV, 'C', OrePrefixes.circuit.get(Materials.IV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_IV_Scanner.get(1L),
             bitsd,
             new Object[] { "CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_IV, 'T', ItemList.Emitter_IV, 'R',
                 ItemList.Sensor_IV, 'C', OrePrefixes.circuit.get(Materials.LuV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Tungsten) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_LV_Boxinator.get(1L),
             bitsd,
             new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_LV, 'R', ItemList.Robot_Arm_LV, 'V',
                 ItemList.Conveyor_Module_LV, 'C', OrePrefixes.circuit.get(Materials.LV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Tin), 'B', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_MV_Boxinator.get(1L),
             bitsd,
             new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_MV, 'R', ItemList.Robot_Arm_MV, 'V',
                 ItemList.Conveyor_Module_MV, 'C', OrePrefixes.circuit.get(Materials.MV), 'W',
                 OrePrefixes.cableGt01.get(Materials.AnyCopper), 'B', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_HV_Boxinator.get(1L),
             bitsd,
             new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_HV, 'R', ItemList.Robot_Arm_HV, 'V',
                 ItemList.Conveyor_Module_HV, 'C', OrePrefixes.circuit.get(Materials.HV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Gold), 'B', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_EV_Boxinator.get(1L),
             bitsd,
             new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_EV, 'R', ItemList.Robot_Arm_EV, 'V',
                 ItemList.Conveyor_Module_EV, 'C', OrePrefixes.circuit.get(Materials.EV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Aluminium), 'B', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_IV_Boxinator.get(1L),
             bitsd,
             new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_IV, 'R', ItemList.Robot_Arm_IV, 'V',
                 ItemList.Conveyor_Module_IV, 'C', OrePrefixes.circuit.get(Materials.IV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Tungsten), 'B', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_LuV_Boxinator.get(1L),
             bitsd,
             new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_LuV, 'R', ItemList.Robot_Arm_LuV, 'V',
                 ItemList.Conveyor_Module_LuV, 'C', OrePrefixes.circuit.get(Materials.LuV), 'W',
                 OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'B', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_ZPM_Boxinator.get(1L),
             bitsd,
             new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_ZPM, 'R', ItemList.Robot_Arm_ZPM, 'V',
                 ItemList.Conveyor_Module_ZPM, 'C', OrePrefixes.circuit.get(Materials.ZPM), 'W',
                 OrePrefixes.cableGt01.get(Materials.Naquadah), 'B', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_UV_Boxinator.get(1L),
             bitsd,
             new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_UV, 'R', ItemList.Robot_Arm_UV, 'V',
                 ItemList.Conveyor_Module_UV, 'C', OrePrefixes.circuit.get(Materials.UV), 'W',
                 OrePrefixes.cableGt01.get(Materials.NaquadahAlloy), 'B', OreDictNames.craftingChest });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_LV_RockBreaker.get(1L),
             bitsd,
             new Object[] { "PED", aTextWireHull, "GGG", 'M', ItemList.Hull_LV, 'D', OreDictNames.craftingGrinder, 'E',
                 ItemList.Electric_Motor_LV, 'P', ItemList.Electric_Piston_LV, 'C',
                 OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'G',
                 new ItemStack(Blocks.glass, 1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_MV_RockBreaker.get(1L),
             bitsd,
             new Object[] { "PED", aTextWireHull, "GGG", 'M', ItemList.Hull_MV, 'D', OreDictNames.craftingGrinder, 'E',
                 ItemList.Electric_Motor_MV, 'P', ItemList.Electric_Piston_MV, 'C',
                 OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G',
                 new ItemStack(Blocks.glass, 1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_HV_RockBreaker.get(1L),
             bitsd,
             new Object[] { "PED", aTextWireHull, "GGG", 'M', ItemList.Hull_HV, 'D', OreDictNames.craftingGrinder, 'E',
                 ItemList.Electric_Motor_HV, 'P', ItemList.Electric_Piston_HV, 'C',
                 OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G',
                 new ItemStack(Blocks.glass, 1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_EV_RockBreaker.get(1L),
             bitsd,
             new Object[] { "PED", aTextWireHull, "GGG", 'M', ItemList.Hull_EV, 'D', OreDictNames.craftingGrinder, 'E',
                 ItemList.Electric_Motor_EV, 'P', ItemList.Electric_Piston_EV, 'C',
                 OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium), 'G',
                 new ItemStack(Blocks.glass, 1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_IV_RockBreaker.get(1L),
             bitsd,
             new Object[] { "PED", aTextWireHull, "GGG", 'M', ItemList.Hull_IV, 'D', OreDictNames.craftingGrinder, 'E',
@@ -3468,222 +3179,222 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
                 OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten), 'G',
                 new ItemStack(Blocks.glass, 1) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_LV_Massfab.get(1L),
             bitsd,
             new Object[] { "CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_LV, 'F', ItemList.Field_Generator_LV, 'C',
                 OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt04.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_MV_Massfab.get(1L),
             bitsd,
             new Object[] { "CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_MV, 'F', ItemList.Field_Generator_MV, 'C',
                 OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt04.get(Materials.AnyCopper) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_HV_Massfab.get(1L),
             bitsd,
             new Object[] { "CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_HV, 'F', ItemList.Field_Generator_HV, 'C',
                 OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt04.get(Materials.Gold) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_EV_Massfab.get(1L),
             bitsd,
             new Object[] { "CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_EV, 'F', ItemList.Field_Generator_EV, 'C',
                 OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt04.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_IV_Massfab.get(1L),
             bitsd,
             new Object[] { "CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_IV, 'F', ItemList.Field_Generator_IV, 'C',
                 OrePrefixes.circuit.get(Materials.LuV), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_LV_Replicator.get(1L),
             bitsd,
             new Object[] { "EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_LV, 'F',
                 ItemList.Field_Generator_LV, 'E', ItemList.Emitter_LV, 'C', OrePrefixes.circuit.get(Materials.MV), 'W',
                 OrePrefixes.cableGt04.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_MV_Replicator.get(1L),
             bitsd,
             new Object[] { "EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_MV, 'F',
                 ItemList.Field_Generator_MV, 'E', ItemList.Emitter_MV, 'C', OrePrefixes.circuit.get(Materials.HV), 'W',
                 OrePrefixes.cableGt04.get(Materials.AnyCopper) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_HV_Replicator.get(1L),
             bitsd,
             new Object[] { "EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_HV, 'F',
                 ItemList.Field_Generator_HV, 'E', ItemList.Emitter_HV, 'C', OrePrefixes.circuit.get(Materials.EV), 'W',
                 OrePrefixes.cableGt04.get(Materials.Gold) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_EV_Replicator.get(1L),
             bitsd,
             new Object[] { "EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_EV, 'F',
                 ItemList.Field_Generator_EV, 'E', ItemList.Emitter_EV, 'C', OrePrefixes.circuit.get(Materials.IV), 'W',
                 OrePrefixes.cableGt04.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_IV_Replicator.get(1L),
             bitsd,
             new Object[] { "EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_IV, 'F',
                 ItemList.Field_Generator_IV, 'E', ItemList.Emitter_IV, 'C', OrePrefixes.circuit.get(Materials.LuV), 'W',
                 OrePrefixes.cableGt04.get(Materials.Tungsten) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_LV_Brewery.get(1L),
             bitsd,
             new Object[] { "GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_LV, 'P', ItemList.Electric_Pump_LV, 'B',
                 new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.LV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Tin), 'G', new ItemStack(Blocks.glass, 1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_MV_Brewery.get(1L),
             bitsd,
             new Object[] { "GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_MV, 'P', ItemList.Electric_Pump_MV, 'B',
                 new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.MV), 'W',
                 OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', new ItemStack(Blocks.glass, 1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_HV_Brewery.get(1L),
             bitsd,
             new Object[] { "GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_HV, 'P', ItemList.Electric_Pump_HV, 'B',
                 new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.HV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Gold), 'G', new ItemStack(Blocks.glass, 1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_EV_Brewery.get(1L),
             bitsd,
             new Object[] { "GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Pump_EV, 'B',
                 new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.EV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Aluminium), 'G', new ItemStack(Blocks.glass, 1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_IV_Brewery.get(1L),
             bitsd,
             new Object[] { "GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Pump_IV, 'B',
                 new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.IV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', new ItemStack(Blocks.glass, 1) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_LV_Miner.get(1L),
             bitsd,
             new Object[] { "EEE", aTextWireHull, "CSC", 'M', ItemList.Hull_LV, 'E', ItemList.Electric_Motor_LV, 'C',
                 OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'S',
                 ItemList.Sensor_LV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_MV_Miner.get(1L),
             bitsd,
             new Object[] { "PEP", aTextWireHull, "CSC", 'M', ItemList.Hull_MV, 'E', ItemList.Electric_Motor_MV, 'P',
                 ItemList.Electric_Piston_MV, 'C', OrePrefixes.circuit.get(Materials.MV), 'W',
                 OrePrefixes.cableGt02.get(Materials.Copper), 'S', ItemList.Sensor_MV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_HV_Miner.get(1L),
             bitsd,
             new Object[] { "RPR", aTextWireHull, "CSC", 'M', ItemList.Hull_HV, 'E', ItemList.Electric_Motor_HV, 'P',
                 ItemList.Electric_Piston_HV, 'R', ItemList.Robot_Arm_HV, 'C', OrePrefixes.circuit.get(Materials.HV),
                 'W', OrePrefixes.cableGt04.get(Materials.Gold), 'S', ItemList.Sensor_HV });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Multi_BlastFurnace.get(1L),
             bitsd,
             new Object[] { "FFF", aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_HeatProof, 'F',
                 OreDictNames.craftingIronFurnace, 'C', OrePrefixes.circuit.get(Materials.LV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Multi_VacuumFreezer.get(1L),
             bitsd,
             new Object[] { aTextPlate, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_FrostProof, 'P',
                 ItemList.Electric_Pump_HV, 'C', OrePrefixes.circuit.get(Materials.EV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Gold) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Multi_ImplosionCompressor.get(1L),
             bitsd,
             new Object[] { "OOO", aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_SolidSteel, 'O',
                 Ic2Items.reinforcedStone, 'C', OrePrefixes.circuit.get(Materials.HV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Gold) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Multi_Furnace.get(1L),
             bitsd,
             new Object[] { "FFF", aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_HeatProof, 'F',
                 OreDictNames.craftingIronFurnace, 'C', OrePrefixes.circuit.get(Materials.HV), 'W',
                 OrePrefixes.cableGt01.get(Materials.AnnealedCopper) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Multi_LargeBoiler_Bronze.get(1L),
             bitsd,
             new Object[] { aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_Bronze, 'C',
                 OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt01.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Multi_LargeBoiler_Steel.get(1L),
             bitsd,
             new Object[] { aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_Steel, 'C',
                 OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Multi_LargeBoiler_Titanium.get(1L),
             bitsd,
             new Object[] { aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_Titanium, 'C',
                 OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt01.get(Materials.Gold) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Multi_LargeBoiler_TungstenSteel.get(1L),
             bitsd,
             new Object[] { aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_TungstenSteel,
                 'C', OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Generator_Diesel_LV.get(1L),
             bitsd,
             new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_LV, 'P', ItemList.Electric_Piston_LV, 'E',
                 ItemList.Electric_Motor_LV, 'C', OrePrefixes.circuit.get(Materials.LV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Tin), 'G', OrePrefixes.gearGt.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Generator_Diesel_MV.get(1L),
             bitsd,
             new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_MV, 'P', ItemList.Electric_Piston_MV, 'E',
                 ItemList.Electric_Motor_MV, 'C', OrePrefixes.circuit.get(Materials.MV), 'W',
                 OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', OrePrefixes.gearGt.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Generator_Diesel_HV.get(1L),
             bitsd,
             new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_HV, 'P', ItemList.Electric_Piston_HV, 'E',
                 ItemList.Electric_Motor_HV, 'C', OrePrefixes.circuit.get(Materials.HV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Gold), 'G', OrePrefixes.gearGt.get(Materials.StainlessSteel) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Generator_Gas_Turbine_LV.get(1L),
             bitsd,
             new Object[] { "CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_LV, 'E', ItemList.Electric_Motor_LV, 'R',
                 OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.LV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Generator_Gas_Turbine_MV.get(1L),
             bitsd,
             new Object[] { "CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_MV, 'E', ItemList.Electric_Motor_MV, 'R',
                 OrePrefixes.rotor.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.MV), 'W',
                 OrePrefixes.cableGt01.get(Materials.AnyCopper) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Generator_Gas_Turbine_HV.get(1L),
             bitsd,
             new Object[] { "CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_HV, 'E', ItemList.Electric_Motor_HV, 'R',
                 OrePrefixes.rotor.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.HV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Gold) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Generator_Gas_Turbine_EV.get(1L),
             bitsd,
             new Object[] { "CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_EV, 'E', ItemList.Electric_Motor_EV, 'R',
                 OrePrefixes.rotor.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.EV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Generator_Gas_Turbine_IV.get(1L),
             bitsd,
             new Object[] { "CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_IV, 'E', ItemList.Electric_Motor_IV, 'R',
                 OrePrefixes.rotor.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.IV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Tungsten) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Generator_Steam_Turbine_LV.get(1L),
             bitsd,
             new Object[] { "PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_LV, 'E', ItemList.Electric_Motor_LV, 'R',
                 OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.LV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Tin), 'P', OrePrefixes.pipeMedium.get(Materials.Bronze) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Generator_Steam_Turbine_MV.get(1L),
             bitsd,
             new Object[] { "PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_MV, 'E', ItemList.Electric_Motor_MV, 'R',
                 OrePrefixes.rotor.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.MV), 'W',
                 OrePrefixes.cableGt01.get(Materials.AnyCopper), 'P', OrePrefixes.pipeMedium.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Generator_Steam_Turbine_HV.get(1L),
             bitsd,
             new Object[] { "PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_HV, 'E', ItemList.Electric_Motor_HV, 'R',
@@ -3691,227 +3402,227 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
                 OrePrefixes.cableGt01.get(Materials.Gold), 'P', OrePrefixes.pipeMedium.get(Materials.StainlessSteel) });
 
         if (!Thaumcraft.isModLoaded()) {
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 ItemList.MagicEnergyConverter_LV.get(1L),
                 bitsd,
                 new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_LV, 'B', new ItemStack(Blocks.beacon), 'C',
                     OrePrefixes.circuit.get(Materials.HV), 'T', ItemList.Field_Generator_LV, 'F',
                     OrePrefixes.plate.get(Materials.Platinum) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 ItemList.MagicEnergyConverter_MV.get(1L),
                 bitsd,
                 new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_MV, 'B', new ItemStack(Blocks.beacon), 'C',
                     OrePrefixes.circuit.get(Materials.EV), 'T', ItemList.Field_Generator_MV, 'F',
                     OrePrefixes.plate.get(Materials.Iridium) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 ItemList.MagicEnergyConverter_HV.get(1L),
                 bitsd,
                 new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', new ItemStack(Blocks.beacon), 'C',
                     OrePrefixes.circuit.get(Materials.IV), 'T', ItemList.Field_Generator_HV, 'F',
                     OrePrefixes.plate.get(Materials.Neutronium) });
 
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 ItemList.MagicEnergyAbsorber_LV.get(1L),
                 bitsd,
                 new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_LV, 'B',
                     ItemList.MagicEnergyConverter_LV.get(1L), 'C', OrePrefixes.circuit.get(Materials.HV), 'T',
                     ItemList.Field_Generator_LV, 'F', OrePrefixes.plate.get(Materials.Platinum) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 ItemList.MagicEnergyAbsorber_MV.get(1L),
                 bitsd,
                 new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_MV, 'B',
                     ItemList.MagicEnergyConverter_MV.get(1L), 'C', OrePrefixes.circuit.get(Materials.EV), 'T',
                     ItemList.Field_Generator_MV, 'F', OrePrefixes.plate.get(Materials.Iridium) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 ItemList.MagicEnergyAbsorber_HV.get(1L),
                 bitsd,
                 new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B',
                     ItemList.MagicEnergyConverter_MV.get(1L), 'C', OrePrefixes.circuit.get(Materials.IV), 'T',
                     ItemList.Field_Generator_HV, 'F', OrePrefixes.plate.get(Materials.Europium) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 ItemList.MagicEnergyAbsorber_EV.get(1L),
                 bitsd,
                 new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B',
                     ItemList.MagicEnergyConverter_HV.get(1L), 'C', OrePrefixes.circuit.get(Materials.LuV), 'T',
                     ItemList.Field_Generator_EV, 'F', OrePrefixes.plate.get(Materials.Neutronium) });
         }
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Fusion_Coil.get(1L),
             bitsd,
             new Object[] { "CTC", "FMF", "CTC", 'M', ItemList.Casing_Coil_Superconductor, 'C',
                 OrePrefixes.circuit.get(Materials.LuV), 'F', ItemList.Field_Generator_MV, 'T',
                 ItemList.Neutron_Reflector });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Generator_Plasma_EV.get(1L),
             bitsd,
             new Object[] { "UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_LuV, 'F', ItemList.Field_Generator_HV, 'C',
                 OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten), 'U',
                 OrePrefixes.stick.get(Materials.Plutonium241) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Generator_Plasma_IV.get(1L),
             bitsd,
             new Object[] { "UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_ZPM, 'F', ItemList.Field_Generator_EV, 'C',
                 OrePrefixes.circuit.get(Materials.LuV), 'W', OrePrefixes.wireGt04.get(Materials.VanadiumGallium), 'U',
                 OrePrefixes.stick.get(Materials.Europium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Generator_Plasma_LuV.get(1L),
             bitsd,
             new Object[] { "UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_UV, 'F', ItemList.Field_Generator_IV, 'C',
                 OrePrefixes.circuit.get(Materials.ZPM), 'W', OrePrefixes.wireGt04.get(Materials.Naquadah), 'U',
                 OrePrefixes.stick.get(Materials.Americium) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Processing_Array.get(1L),
             bitsd,
             new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_EV, 'B',
                 OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.IV), 'F',
                 ItemList.Robot_Arm_EV, 'T', ItemList.Energy_LapotronicOrb });
 
-        GT_ProcessingArrayRecipeLoader.registerDefaultGregtechMaps();
-        GT_ModHandler.addCraftingRecipe(
+        ProcessingArrayRecipeLoader.registerDefaultGregtechMaps();
+        GTModHandler.addCraftingRecipe(
             ItemList.Distillation_Tower.get(1L),
             bitsd,
             new Object[] { "CBC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B',
                 OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.EV), 'F',
                 ItemList.Electric_Pump_HV });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.LargeSteamTurbine.get(1L),
             bitsd,
             new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_HV, 'B',
                 OrePrefixes.pipeLarge.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.HV), 'P',
                 OrePrefixes.gearGt.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.LargeGasTurbine.get(1L),
             bitsd,
             new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_EV, 'B',
                 OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.EV), 'P',
                 OrePrefixes.gearGt.get(Materials.StainlessSteel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.LargeAdvancedGasTurbine.get(1L),
             bitsd,
             new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_IV, 'B',
                 OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.LuV), 'P',
                 OrePrefixes.gearGt.get(Materials.HSSG) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Pump_LV.get(1L),
             bitsd,
             new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_LV, 'B',
                 OrePrefixes.pipeLarge.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.LV), 'P',
                 ItemList.Electric_Pump_LV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Pump_MV.get(1L),
             bitsd,
             new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_MV, 'B',
                 OrePrefixes.pipeLarge.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.MV), 'P',
                 ItemList.Electric_Pump_MV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Pump_HV.get(1L),
             bitsd,
             new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_HV, 'B',
                 OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.HV), 'P',
                 ItemList.Electric_Pump_HV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Pump_EV.get(1L),
             bitsd,
             new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_EV, 'B',
                 OrePrefixes.pipeLarge.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.EV), 'P',
                 ItemList.Electric_Pump_EV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Pump_IV.get(1L),
             bitsd,
             new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_IV, 'B',
                 OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.IV), 'P',
                 ItemList.Electric_Pump_IV });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.MobRep_LV.get(1L),
             bitsd,
             new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_LV, 'E', ItemList.Emitter_LV.get(1L), 'C',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.MobRep_MV.get(1L),
             bitsd,
             new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_MV, 'E', ItemList.Emitter_MV.get(1L), 'C',
                 OrePrefixes.circuit.get(Materials.MV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.MobRep_HV.get(1L),
             bitsd,
             new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_HV, 'E', ItemList.Emitter_HV.get(1L), 'C',
                 OrePrefixes.circuit.get(Materials.HV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.MobRep_EV.get(1L),
             bitsd,
             new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_EV, 'E', ItemList.Emitter_EV.get(1L), 'C',
                 OrePrefixes.circuit.get(Materials.EV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.MobRep_IV.get(1L),
             bitsd,
             new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_IV, 'E', ItemList.Emitter_IV.get(1L), 'C',
                 OrePrefixes.circuit.get(Materials.IV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.MobRep_LuV.get(1L),
             bitsd,
             new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_LuV, 'E', ItemList.Emitter_LuV.get(1L), 'C',
                 OrePrefixes.circuit.get(Materials.LuV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.MobRep_ZPM.get(1L),
             bitsd,
             new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_ZPM, 'E', ItemList.Emitter_ZPM.get(1L), 'C',
                 OrePrefixes.circuit.get(Materials.ZPM) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.MobRep_UV.get(1L),
             bitsd,
             new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_UV, 'E', ItemList.Emitter_UV.get(1L), 'C',
                 OrePrefixes.circuit.get(Materials.UV) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Multi_HeatExchanger.get(1L),
             bitsd,
             new Object[] { aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Pipe_Titanium, 'C',
                 OrePrefixes.pipeMedium.get(Materials.Titanium), 'W', ItemList.Electric_Pump_EV });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Charcoal_Pile.get(1L),
             bitsd,
             new Object[] { "EXE", "EME", "hCw", 'M', ItemList.Hull_HP_Bricks, 'E',
                 OrePrefixes.plate.get(Materials.AnyBronze), 'C', new ItemStack(Items.flint_and_steel, 1), 'X',
                 OrePrefixes.rotor.get(Materials.Steel), });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Seismic_Prospector_Adv_LV.get(1L),
             bitsd,
             new Object[] { "WWW", "EME", "CXC", 'M', ItemList.Hull_LV, 'W',
                 OrePrefixes.plateDouble.get(Materials.Steel), 'E', OrePrefixes.circuit.get(Materials.LV), 'C',
                 ItemList.Sensor_LV, 'X', OrePrefixes.cableGt02.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Seismic_Prospector_Adv_MV.get(1L),
             bitsd,
             new Object[] { "WWW", "EME", "CXC", 'M', ItemList.Hull_MV, 'W',
                 OrePrefixes.plateDouble.get(Materials.BlackSteel), 'E', OrePrefixes.circuit.get(Materials.MV), 'C',
                 ItemList.Sensor_MV, 'X', OrePrefixes.cableGt02.get(Materials.Copper) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Seismic_Prospector_Adv_HV.get(1L),
             bitsd,
             new Object[] { "WWW", "EME", "CXC", 'M', ItemList.Hull_HV, 'W',
                 OrePrefixes.plateDouble.get(Materials.StainlessSteel), 'E', OrePrefixes.circuit.get(Materials.HV), 'C',
                 ItemList.Sensor_HV, 'X', OrePrefixes.cableGt04.get(Materials.Gold) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Seismic_Prospector_Adv_EV.get(1L),
             bitsd,
             new Object[] { "WWW", "EME", "CXC", 'M', ItemList.Hull_EV, 'W',
                 OrePrefixes.plateDouble.get(Materials.VanadiumSteel), 'E', OrePrefixes.circuit.get(Materials.EV), 'C',
                 ItemList.Sensor_EV, 'X', OrePrefixes.cableGt04.get(Materials.Aluminium) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.ConcreteBackfiller1.get(1L),
             bitsd,
             new Object[] { "WPW", "EME", "CQC", 'M', ItemList.Hull_MV, 'W', OrePrefixes.frameGt.get(Materials.Steel),
                 'E', OrePrefixes.circuit.get(Materials.MV), 'C', ItemList.Electric_Motor_MV, 'P',
                 OrePrefixes.pipeLarge.get(Materials.Steel), 'Q', ItemList.Electric_Pump_MV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.ConcreteBackfiller2.get(1L),
             bitsd,
             new Object[] { "WPW", "EME", "CQC", 'M', ItemList.ConcreteBackfiller1, 'W',
@@ -3919,87 +3630,87 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
                 ItemList.Electric_Motor_EV, 'P', OrePrefixes.pipeLarge.get(Materials.Steel), 'Q',
                 ItemList.Electric_Pump_EV });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.PyrolyseOven.get(1L),
             bitsd,
             new Object[] { "WEP", "EME", "WCP", 'M', ItemList.Hull_MV, 'W', ItemList.Electric_Piston_MV, 'P',
                 OrePrefixes.wireGt04.get(Materials.Cupronickel), 'E', OrePrefixes.circuit.get(Materials.MV), 'C',
                 ItemList.Electric_Pump_MV });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.OilCracker.get(1L),
             bitsd,
             new Object[] { aTextWireCoil, "EME", aTextWireCoil, 'M', ItemList.Hull_HV, 'W',
                 ItemList.Casing_Coil_Cupronickel, 'E', OrePrefixes.circuit.get(Materials.HV), 'C',
                 ItemList.Electric_Pump_HV });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.MicroTransmitter_HV.get(1L),
             bitsd,
             new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_HV, 'B', ItemList.Battery_RE_HV_Lithium,
                 'C', ItemList.Emitter_HV, 'G', OrePrefixes.circuit.get(Materials.HV), 'P',
                 ItemList.Field_Generator_HV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.MicroTransmitter_EV.get(1L),
             bitsd,
             new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_EV, 'B',
-                GT_ModHandler.getIC2Item("lapotronCrystal", 1L, GT_Values.W), 'C', ItemList.Emitter_EV, 'G',
+                GTModHandler.getIC2Item("lapotronCrystal", 1L, GTValues.W), 'C', ItemList.Emitter_EV, 'G',
                 OrePrefixes.circuit.get(Materials.EV), 'P', ItemList.Field_Generator_EV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.MicroTransmitter_IV.get(1L),
             bitsd,
             new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_IV, 'B', ItemList.Energy_LapotronicOrb, 'C',
                 ItemList.Emitter_IV, 'G', OrePrefixes.circuit.get(Materials.IV), 'P', ItemList.Field_Generator_IV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.MicroTransmitter_LUV.get(1L),
             bitsd,
             new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_LuV, 'B', ItemList.Energy_LapotronicOrb2,
                 'C', ItemList.Emitter_LuV, 'G', OrePrefixes.circuit.get(Materials.LuV), 'P',
                 ItemList.Field_Generator_LuV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.MicroTransmitter_ZPM.get(1L),
             bitsd,
             new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_ZPM, 'B', ItemList.Energy_Module, 'C',
                 ItemList.Emitter_ZPM, 'G', OrePrefixes.circuit.get(Materials.ZPM), 'P', ItemList.Field_Generator_ZPM });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.MicroTransmitter_UV.get(1L),
             bitsd,
             new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_UV, 'B', ItemList.Energy_Module, 'C',
                 ItemList.Emitter_UV, 'G', OrePrefixes.circuit.get(Materials.UV), 'P', ItemList.Field_Generator_UV });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Multi_Assemblyline.get(1L),
             bitsd,
             new Object[] { aTextWireCoil, "EME", aTextWireCoil, 'M', ItemList.Hull_IV, 'W', ItemList.Casing_Assembler,
                 'E', OrePrefixes.circuit.get(Materials.IV), 'C', ItemList.Robot_Arm_IV });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Multi_DieselEngine.get(1L),
             bitsd,
             new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E',
                 ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.IV), 'W',
                 OrePrefixes.cableGt01.get(Materials.TungstenSteel), 'G', OrePrefixes.gearGt.get(Materials.Titanium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_EngineIntake.get(4L),
             bitsd,
             new Object[] { "PhP", "RFR", aTextPlateWrench, 'R', OrePrefixes.pipeMedium.get(Materials.Titanium), 'F',
                 ItemList.Casing_StableTitanium, 'P', OrePrefixes.rotor.get(Materials.Titanium) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Multi_ExtremeDieselEngine.get(1L),
             bitsd,
             new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Piston_IV, 'E',
                 ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.LuV), 'W',
                 OrePrefixes.cableGt01.get(Materials.HSSG), 'G', OrePrefixes.gearGt.get(Materials.TungstenSteel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_ExtremeEngineIntake.get(4L),
             bitsd,
             new Object[] { "PhP", "RFR", aTextPlateWrench, 'R', OrePrefixes.pipeMedium.get(Materials.TungstenSteel),
                 'F', ItemList.Casing_RobustTungstenSteel, 'P', OrePrefixes.rotor.get(Materials.TungstenSteel) });
 
         // If Cleanroom is enabled, add a recipe, else hide from NEI.
-        if (GT_Mod.gregtechproxy.mEnableCleanroom) {
-            GT_ModHandler.addCraftingRecipe(
+        if (GTMod.gregtechproxy.mEnableCleanroom) {
+            GTModHandler.addCraftingRecipe(
                 ItemList.Machine_Multi_Cleanroom.get(1L),
                 bitsd,
                 new Object[] { "FFF", "RHR", "MCM", 'H', ItemList.Hull_HV, 'F', ItemList.Component_Filter, 'R',
@@ -4011,23 +3722,23 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
             }
         }
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_HV_LightningRod.get(1L),
             bitsd,
             new Object[] { "LTL", "TMT", "LTL", 'M', ItemList.Hull_LuV, 'L', ItemList.Energy_LapotronicOrb, 'T',
                 ItemList.Transformer_ZPM_LuV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_EV_LightningRod.get(1L),
             bitsd,
             new Object[] { "LTL", "TMT", "LTL", 'M', ItemList.Hull_ZPM, 'L', ItemList.Energy_LapotronicOrb2, 'T',
                 ItemList.Transformer_UV_ZPM });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_IV_LightningRod.get(1L),
             bitsd,
             new Object[] { "LTL", "TMT", "LTL", 'M', ItemList.Hull_UV, 'L', ItemList.ZPM2, 'T',
                 ItemList.Transformer_MAX_UV });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Machine_Multi_LargeChemicalReactor.get(1L),
             bitsd,
             new Object[] { "CRC", "PMP", "CBC", 'C', OrePrefixes.circuit.get(Materials.HV), 'R',
@@ -4036,14 +3747,14 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
                 ItemList.Hull_HV });
 
         // Add Drone down link hatch
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Hatch_DroneDownLink.get(1L),
             bits,
             new Object[] { " S ", "CMC", "RRR", 'M', ItemList.Hatch_Maintenance, 'S', ItemList.Sensor_IV, 'R',
-                new ItemStack(GregTech_API.sBlockReinforced, 1, 9), 'C', ItemList.Conveyor_Module_EV });
+                new ItemStack(GregTechAPI.sBlockReinforced, 1, 9), 'C', ItemList.Conveyor_Module_EV });
 
         // And Drone Centre
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Casing_Assembler.get(1),
                 ItemList.Cover_SolarPanel_HV.get(4),
@@ -4052,7 +3763,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
                 ItemList.Sensor_IV.get(2),
                 ItemList.Energy_LapotronicOrb.get(4),
                 ItemList.Cover_WirelessNeedsMaintainance.get(1),
-                GalacticraftCore.isModLoaded() ? GT_ModHandler.getModItem(GalacticraftCore.ID, "item.basicItem", 1, 19)
+                GalacticraftCore.isModLoaded() ? GTModHandler.getModItem(GalacticraftCore.ID, "item.basicItem", 1, 19)
                     : ItemList.Sensor_EV.get(4))
             .itemOutputs(ItemList.Machine_Multi_DroneCentre.get(1L))
             .fluidInputs(Materials.AdvancedGlue.getFluid(8000L))
@@ -4062,43 +3773,43 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
     }
 
     private static void registerShapelessCraftingRecipes() {
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Casing_SolidSteel.get(1L),
             bits,
             new Object[] { ItemList.Casing_Stripes_A });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Casing_SolidSteel.get(1L),
             bits,
             new Object[] { ItemList.Casing_Stripes_B });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Casing_SolidSteel.get(1L),
             bits,
             new Object[] { ItemList.Casing_RadioactiveHazard });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Casing_SolidSteel.get(1L),
             bits,
             new Object[] { ItemList.Casing_BioHazard });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Casing_SolidSteel.get(1L),
             bits,
             new Object[] { ItemList.Casing_ExplosionHazard });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Casing_SolidSteel.get(1L),
             bits,
             new Object[] { ItemList.Casing_FireHazard });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Casing_SolidSteel.get(1L),
             bits,
             new Object[] { ItemList.Casing_AcidHazard });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Casing_SolidSteel.get(1L),
             bits,
             new Object[] { ItemList.Casing_MagicHazard });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Casing_SolidSteel.get(1L),
             bits,
             new Object[] { ItemList.Casing_FrostHazard });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Casing_SolidSteel.get(1L),
             bits,
             new Object[] { ItemList.Casing_NoiseHazard });
@@ -4107,555 +3818,555 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
             /* Conversion recipes */
             // TODO: Move those recipes with the other recipes
 
-            GT_ModHandler.addShapelessCraftingRecipe(
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.Machine_IndustrialApiary.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "IndustrialApiary", 1, 0) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "IndustrialApiary", 1, 0) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_Frame.get(1),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "UpgradeFrame", 1) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "UpgradeFrame", 1) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_PRODUCTION.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 0) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 0) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_PLAINS.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 17) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 17) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_LIGHT.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 11) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 11) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_FLOWERING.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 2) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 2) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_WINTER.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 20) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 20) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_DRYER.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 5) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 5) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_AUTOMATION.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 14) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 14) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_HUMIDIFIER.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 4) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 4) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_HELL.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 13) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 13) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_POLLEN.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 22) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 22) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_DESERT.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 16) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 16) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_COOLER.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 7) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 7) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_LIFESPAN.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 1) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 1) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_SEAL.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 10) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 10) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_STABILIZER.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 19) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 19) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_JUNGLE.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 18) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 18) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_TERRITORY.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 3) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 3) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_OCEAN.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 21) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 21) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_SKY.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 12) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 12) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_HEATER.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 6) });
-            GT_ModHandler.addShapelessCraftingRecipe(
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 6) });
+            GTModHandler.addShapelessCraftingRecipe(
                 ItemList.IndustrialApiary_Upgrade_SIEVE.get(1L),
-                new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 15) });
+                new Object[] { GTModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 15) });
 
         }
     }
 
     private static void run4() {
-        long bits = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-            | GT_ModHandler.RecipeBits.REVERSIBLE
-            | GT_ModHandler.RecipeBits.BUFFERED;
+        long bits = GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+            | GTModHandler.RecipeBits.REVERSIBLE
+            | GTModHandler.RecipeBits.BUFFERED;
 
         // high pressure fluid pipes
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.TungstenSteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.pipeSmall, Materials.TungstenSteel, 1L),
                 ItemList.Electric_Pump_EV.get(1L),
-                GT_Utility.getIntegratedCircuit(5))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Ultimate, 1L))
+                GTUtility.getIntegratedCircuit(5))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Ultimate, 1L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 1L),
                 ItemList.Electric_Pump_IV.get(1L),
-                GT_Utility.getIntegratedCircuit(5))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 1L))
+                GTUtility.getIntegratedCircuit(5))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 1L))
             .duration(20 * SECONDS)
             .eut(4096)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 1L),
                 ItemList.Electric_Pump_IV.get(2L),
-                GT_Utility.getIntegratedCircuit(5))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 1L))
+                GTUtility.getIntegratedCircuit(5))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 1L))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ChestBuffer_ULV.get(1L),
             bits,
             new Object[] { "CMV", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.ULV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ChestBuffer_LV.get(1L),
             bits,
             new Object[] { "CMV", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ChestBuffer_MV.get(1L),
             bits,
             new Object[] { "CMV", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.MV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ChestBuffer_HV.get(1L),
             bits,
             new Object[] { "CMV", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.HV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ChestBuffer_EV.get(1L),
             bits,
             new Object[] { "CMV", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.EV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ChestBuffer_IV.get(1L),
             bits,
             new Object[] { "CMV", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.IV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ChestBuffer_LuV.get(1L),
             bits,
             new Object[] { "CMV", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LuV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ChestBuffer_ZPM.get(1L),
             bits,
             new Object[] { "CMV", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.ZPM) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ChestBuffer_UV.get(1L),
             bits,
             new Object[] { "CMV", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.UV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ChestBuffer_UHV.get(1L),
             bits,
             new Object[] { "CMV", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.UHV) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Filter_ULV.get(1L),
             bits,
             new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Filter_LV.get(1L),
             bits,
             new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Filter_MV.get(1L),
             bits,
             new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Filter_HV.get(1L),
             bits,
             new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Filter_EV.get(1L),
             bits,
             new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Filter_IV.get(1L),
             bits,
             new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Filter_LuV.get(1L),
             bits,
             new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Filter_ZPM.get(1L),
             bits,
             new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Filter_UV.get(1L),
             bits,
             new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Filter_MAX.get(1L),
             bits,
             new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_TypeFilter_ULV.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_TypeFilter_LV.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_TypeFilter_MV.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_TypeFilter_HV.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_TypeFilter_EV.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_TypeFilter_IV.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_TypeFilter_LuV.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_TypeFilter_ZPM.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_TypeFilter_UV.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_TypeFilter_MAX.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Regulator_ULV.get(1L),
             bits,
             new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_ULV, 'V', ItemList.Robot_Arm_LV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Regulator_LV.get(1L),
             bits,
             new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_LV, 'V', ItemList.Robot_Arm_LV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Regulator_MV.get(1L),
             bits,
             new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_MV, 'V', ItemList.Robot_Arm_MV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Regulator_HV.get(1L),
             bits,
             new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_HV, 'V', ItemList.Robot_Arm_HV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Regulator_EV.get(1L),
             bits,
             new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_EV, 'V', ItemList.Robot_Arm_EV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Regulator_IV.get(1L),
             bits,
             new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_IV, 'V', ItemList.Robot_Arm_IV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Regulator_LuV.get(1L),
             bits,
             new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_LuV, 'V', ItemList.Robot_Arm_LuV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Regulator_ZPM.get(1L),
             bits,
             new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_ZPM, 'V', ItemList.Robot_Arm_ZPM, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Regulator_UV.get(1L),
             bits,
             new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_UV, 'V', ItemList.Robot_Arm_UV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_Regulator_MAX.get(1L),
             bits,
             new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_MAX, 'V', ItemList.Robot_Arm_UHV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_ULV.get(1L),
             bits,
             new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_ULV, 'V', ItemList.Conveyor_Module_LV, 'D',
                 ItemList.Tool_DataOrb });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_LV.get(1L),
             bits,
             new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_LV, 'V', ItemList.Conveyor_Module_LV, 'D',
                 ItemList.Tool_DataOrb });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_MV.get(1L),
             bits,
             new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_MV, 'V', ItemList.Conveyor_Module_MV, 'D',
                 ItemList.Tool_DataOrb });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_HV.get(1L),
             bits,
             new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_HV, 'V', ItemList.Conveyor_Module_HV, 'D',
                 ItemList.Tool_DataOrb });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_EV.get(1L),
             bits,
             new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_EV, 'V', ItemList.Conveyor_Module_EV, 'D',
                 ItemList.Tool_DataOrb });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_IV.get(1L),
             bits,
             new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_IV, 'V', ItemList.Conveyor_Module_IV, 'D',
                 ItemList.Tool_DataOrb });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_LuV.get(1L),
             bits,
             new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_LuV, 'V', ItemList.Conveyor_Module_LuV, 'D',
                 ItemList.Tool_DataOrb });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_ZPM.get(1L),
             bits,
             new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'D',
                 ItemList.Tool_DataOrb });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_UV.get(1L),
             bits,
             new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_UV, 'V', ItemList.Conveyor_Module_UV, 'D',
                 ItemList.Tool_DataOrb });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_MAX.get(1L),
             bits,
             new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_UHV, 'V', ItemList.Conveyor_Module_UHV, 'D',
                 ItemList.Tool_DataOrb });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_ULV.get(1L),
             bits,
             new Object[] { "DMV", "DDD", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'D',
                 ItemList.Tool_DataStick });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_LV.get(1L),
             bits,
             new Object[] { "DMV", "DDD", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'D',
                 ItemList.Tool_DataStick });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_MV.get(1L),
             bits,
             new Object[] { "DMV", "DDD", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'D',
                 ItemList.Tool_DataStick });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_HV.get(1L),
             bits,
             new Object[] { "DMV", "DDD", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'D',
                 ItemList.Tool_DataStick });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_EV.get(1L),
             bits,
             new Object[] { "DMV", "DDD", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'D',
                 ItemList.Tool_DataStick });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_IV.get(1L),
             bits,
             new Object[] { "DMV", "DDD", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'D',
                 ItemList.Tool_DataStick });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_LuV.get(1L),
             bits,
             new Object[] { "DMV", "DDD", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'D',
                 ItemList.Tool_DataStick });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_ZPM.get(1L),
             bits,
             new Object[] { "DMV", "DDD", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'D',
                 ItemList.Tool_DataStick });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_UV.get(1L),
             bits,
             new Object[] { "DMV", "DDD", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'D',
                 ItemList.Tool_DataStick });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_SuperBuffer_MAX.get(1L),
             bits,
             new Object[] { "DMV", "DDD", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'D',
                 ItemList.Tool_DataStick });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ItemDistributor_ULV.get(1L),
             bits,
             new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ItemDistributor_LV.get(1L),
             bits,
             new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ItemDistributor_MV.get(1L),
             bits,
             new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ItemDistributor_HV.get(1L),
             bits,
             new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ItemDistributor_EV.get(1L),
             bits,
             new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ItemDistributor_IV.get(1L),
             bits,
             new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ItemDistributor_LuV.get(1L),
             bits,
             new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ItemDistributor_ZPM.get(1L),
             bits,
             new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ItemDistributor_UV.get(1L),
             bits,
             new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_ItemDistributor_MAX.get(1L),
             bits,
             new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'C',
                 OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_RecipeFilter_ULV.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Robot_Arm_LV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_RecipeFilter_LV.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Robot_Arm_LV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_RecipeFilter_MV.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Robot_Arm_MV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_RecipeFilter_HV.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Robot_Arm_HV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_RecipeFilter_EV.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Robot_Arm_EV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_RecipeFilter_IV.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Robot_Arm_IV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_RecipeFilter_LuV.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Robot_Arm_LuV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_RecipeFilter_ZPM.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Robot_Arm_ZPM, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_RecipeFilter_UV.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Robot_Arm_UV, 'C',
                 OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Automation_RecipeFilter_MAX.get(1L),
             bits,
             new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Robot_Arm_UHV, 'C',
@@ -4667,9 +4378,9 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable {
     public void run() {
         registerShapelessCraftingRecipes();
         registerShapedCraftingRecipes();
-        GT_Log.out.println("GT_Mod: Recipes for MetaTileEntities.");
+        GTLog.out.println("GTMod: Recipes for MetaTileEntities.");
         registerMachineTypes();
-        GT_PCBFactoryMaterialLoader.load();
+        PCBFactoryMaterialLoader.load();
         run4();
     }
 }
diff --git a/src/main/java/gregtech/loaders/load/SonictronLoader.java b/src/main/java/gregtech/loaders/load/SonictronLoader.java
new file mode 100644
index 0000000000..be83b213db
--- /dev/null
+++ b/src/main/java/gregtech/loaders/load/SonictronLoader.java
@@ -0,0 +1,159 @@
+package gregtech.loaders.load;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
+import gregtech.GTMod;
+import gregtech.api.enums.SoundResource;
+import gregtech.api.util.GTLog;
+
+public class SonictronLoader implements Runnable {
+
+    @Override
+    public void run() {
+        GTLog.out.println("GTMod: Loading Sonictron Sounds");
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.iron_block, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.NOTE_HARP.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(25);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.gold_block, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.NOTE_PLING.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(25);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.stone, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.NOTE_BD.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(25);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.log, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.NOTE_BASSATTACK.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(25);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.planks, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.NOTE_BASS.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(25);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.glass, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.NOTE_HAT.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(25);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.sand, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.NOTE_BASS.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(25);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.record_cat, 1));
+        GTMod.gregtechproxy.mSoundNames.add("streaming.");
+        GTMod.gregtechproxy.mSoundCounts.add(12);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.tnt, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_EXPLODE.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(3);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.fire, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.FIRE_FIRE.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.flint_and_steel, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.FIRE_IGNITE.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.lava, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.LIQUID_LAVAPOP.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.water, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.LIQUID_WATER.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.water_bucket, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.LIQUID_SPLASH.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.lava_bucket, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_FIZZ.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.portal, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.PORTAL_PORTAL.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.end_portal, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.PORTAL_TRAVEL.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.end_portal_frame, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.PORTAL_TRIGGER.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.glass_pane, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_GLASS.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.ender_pearl, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_ORB.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.ender_eye, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_LEVELUP.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.stone_button, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_CLICK.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.cobblestone, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.DAMAGE_FALLBIG.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.dirt, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.DAMAGE_FALLSMALL.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.iron_sword, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.DAMAGE_HURTFLESH.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.diamond_sword, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_HURT.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.bow, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_BOW.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.arrow, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_DRR.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.fishing_rod, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_BOWHIT.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.iron_shovel, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_BREAK.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.bucket, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_BREATH.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.potionitem, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_DRINK.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.glass_bottle, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_BURP.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems
+            .add(new ItemStack(Blocks.ender_chest == null ? Blocks.obsidian : Blocks.ender_chest, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_CHESTOPEN.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.chest, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_CHESTCLOSED.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.iron_door, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_DOOR_OPEN.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.wooden_door, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_DOOR_CLOSE.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Items.porkchop, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_EAT.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.wool, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.STEP_CLOTH.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.grass, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.STEP_GRASS.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.gravel, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.STEP_GRAVEL.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.snow, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.STEP_SNOW.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.piston, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.TILE_PISTON_OUT.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.sticky_piston, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.TILE_PISTON_IN.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.mossy_cobblestone, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.AMBIENT_CAVE_CAVE.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.lapis_block, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.AMBIENT_WEATHER_RAIN.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+        GTMod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.diamond_block, 1));
+        GTMod.gregtechproxy.mSoundNames.add(SoundResource.AMBIENT_WEATHER_THUNDER.toString());
+        GTMod.gregtechproxy.mSoundCounts.add(1);
+    }
+}
diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java
index 4fb7388367..6784c32bfc 100644
--- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java
+++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java
@@ -1,12 +1,12 @@
 package gregtech.loaders.materialprocessing;
 
-import gregtech.api.enums.GTNH_ExtraMaterials;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.MaterialsGTNH;
 
 public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandler {
 
     public ProcessingConfig() {
-        new GTNH_ExtraMaterials();
+        new MaterialsGTNH();
         Materials.add(this);
     }
 
@@ -15,7 +15,7 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandle
      * <blockquote>
      *
      * <pre>
-     * int numberOfMaterialSlots = GregTech_API.sMaterialProperties.get("general", "AmountOfCustomMaterialSlots", 16);
+     * int numberOfMaterialSlots = GregTechAPI.sMaterialProperties.get("general", "AmountOfCustomMaterialSlots", 16);
      * for (int i = 0; i < numberOfMaterialSlots; i++) {
      *     String aID = (i < 10 ? "0" : "") + i;
      *     new Materials(
diff --git a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java
index 964fcc5c8f..b32ddde894 100644
--- a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java
+++ b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java
@@ -160,7 +160,7 @@ import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Element;
 import gregtech.api.enums.MaterialBuilder;
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.TC_Aspects;
+import gregtech.api.enums.TCAspects;
 import gregtech.api.enums.TextureSet;
 import gregtech.api.enums.TierEU;
 import gregtech.api.objects.MaterialStack;
@@ -169,101 +169,101 @@ public class MaterialsInit1 {
 
     public static void load() {
         // spotless:off
-        Materials.Aluminium               = new Materials(  19, TextureSet.SET_DULL              ,  10.0F,    128,  2, 1|2  |8   |32|64|128      , 128, 200, 240,   0,   "Aluminium"               ,   "Aluminium"                     ,    0,       0,        933, 1700,  true, false,   3,   1,   1, Dyes.dyeLightBlue   , Element.Al        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 1))).disableAutoGeneratedBlastFurnaceRecipes();
-        Materials.Americium               = new Materials( 103, TextureSet.SET_METALLIC          ,   1.0F,      0,  3, 1|2  |8   |32             , 200, 200, 200,   0,   "Americium"               ,   "Americium"                     ,    0,       0,       1449,    0, false, false,   3,   1,   1, Dyes.dyeLightGray   , Element.Am        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Antimony                = new Materials(  58, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8   |32             , 220, 220, 240,   0,   "Antimony"                ,   "Antimony"                      ,    0,       0,        903,    0, false, false,   2,   1,   1, Dyes.dyeLightGray   , Element.Sb        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1)));
-        Materials.Argon                   = new Materials(  24, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             ,   0, 255,   0, 240,   "Argon"                   ,   "Argon"                         ,    0,       0,         83,    0, false,  true,   5,   1,   1, Dyes.dyeGreen       , Element.Ar        , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AER, 2)));
-        Materials.Arsenic                 = new Materials(  39, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1|2  |8|16|32             , 255, 255, 255,   0,   "Arsenic"                 ,   "Arsenic"                       ,    0,       0,       1090,    0, false, false,   3,   1,   1, Dyes.dyeOrange      , Element.As        , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 3)));
-        Materials.Barium                  = new Materials(  63, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 255, 255, 255,   0,   "Barium"                  ,   "Barium"                        ,    0,       0,       1000,    0, false, false,   1,   1,   1, Dyes._NULL          , Element.Ba        , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VINCULUM, 3)));
-        Materials.Beryllium               = new Materials(   8, TextureSet.SET_METALLIC          ,  14.0F,     64,  2, 1|2  |8   |32|64          , 100, 180, 100,   0,   "Beryllium"               ,   "Beryllium"                     ,    0,       0,       1560,    0, false, false,   6,   1,   1, Dyes.dyeGreen       , Element.Be        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1)));
-        Materials.Bismuth                 = new Materials(  90, TextureSet.SET_METALLIC          ,   6.0F,     64,  1, 1|2  |8   |32|64|128      , 100, 160, 160,   0,   "Bismuth"                 ,   "Bismuth"                       ,    0,       0,        544,    0, false, false,   2,   1,   1, Dyes.dyeCyan        , Element.Bi        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1)));
-        Materials.Boron                   = new Materials(   9, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1         |32             , 210, 250, 210,   0,   "Boron"                   ,   "Boron"                         ,    0,       0,       2349,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , Element.B         , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 3)));
-        Materials.Caesium                 = new Materials(  62, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 176, 196, 222,   0,   "Caesium"                 ,   "Caesium"                       ,    0,       0,        301,    0, false, false,   4,   1,   1, Dyes._NULL          , Element.Cs        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Calcium                 = new Materials(  26, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1         |32             , 255, 245, 245,   0,   "Calcium"                 ,   "Calcium"                       ,    0,       0,       1115, 1115,  true, false,   4,   1,   1, Dyes.dyePink        , Element.Ca        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1)));
-        Materials.Carbon                  = new Materials(  10, TextureSet.SET_DULL              ,   1.0F,     64,  2, 1|2    |16|32|64|128      ,  20,  20,  20,   0,   "Carbon"                  ,   "Carbon"                        ,    0,       0,       3800,    0, false, false,   2,   1,   1, Dyes.dyeBlack       , Element.C         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1)));
-        Materials.Cadmium                 = new Materials(  55, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1    |8   |32             ,  50,  50,  60,   0,   "Cadmium"                 ,   "Cadmium"                       ,    0,       0,        594,    0, false, false,   3,   1,   1, Dyes.dyeGray        , Element.Cd        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1)));
-        Materials.Cerium                  = new Materials(  65, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 123, 212, 144,   0,   "Cerium"                  ,   "Cerium"                        ,    0,       0,       1068, 1068,  true, false,   4,   1,   1, Dyes._NULL          , Element.Ce        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Chlorine                = new Materials(  23, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             , 255, 255, 255,   0,   "Chlorine"                ,   "Chlorine"                      ,    0,       0,        171,    0, false, false,   2,   1,   1, Dyes.dyeCyan        , Element.Cl        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.PANNUS, 1)));
-        Materials.Chrome                  = new Materials(  30, TextureSet.SET_SHINY             ,  11.0F,    256,  3, 1|2  |8   |32|64|128      , 255, 230, 230,   0,   "Chrome"                  ,   "Chrome"                        ,    0,       0,       2180, 1700,  true, false,   5,   1,   1, Dyes.dyePink        , Element.Cr        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1)));
-        Materials.Cobalt                  = new Materials(  33, TextureSet.SET_METALLIC          ,   8.0F,    512,  3, 1|2  |8   |32|64|128      ,  80,  80, 250,   0,   "Cobalt"                  ,   "Cobalt"                        ,    0,       0,       1768, 1700,  true, false,   3,   1,   1, Dyes.dyeBlue        , Element.Co        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1))).disableAutoGeneratedBlastFurnaceRecipes();
-        Materials.Copper                  = new Materials(  35, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1|2  |8   |32   |128      , 255, 100,   0,   0,   "Copper"                  ,   "Copper"                        ,    0,       0,       1357,    0, false, false,   3,   1,   1, Dyes.dyeOrange      , Element.Cu        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 1)));
-        Materials.Deuterium               = new Materials(   2, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             , 255, 255,   0, 240,   "Deuterium"               ,   "Deuterium"                     ,    0,       0,         14,    0, false,  true,  10,   1,   1, Dyes.dyeYellow      , Element.D         , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 3)));
-        Materials.Dysprosium              = new Materials(  73, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 105, 209,  80,   0,   "Dysprosium"              ,   "Dysprosium"                    ,    0,       0,       1680, 1680,  true, false,   4,   1,   1, Dyes._NULL          , Element.Dy        , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3)));
-        Materials.Empty                   = new Materials(   0, TextureSet.SET_NONE              ,   1.0F,      0,  2, 256/*Only when needed*/   , 255, 255, 255, 255,   "Empty"                   ,   "Empty"                         ,    0,       0,         -1,    0, false,  true,   1,   1,   1, Dyes._NULL          , Element._NULL     , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 2)));
-        Materials.Erbium                  = new Materials(  75, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8   |32             , 176, 152,  81,   0,   "Erbium"                  ,   "Erbium"                        ,    0,       0,       1802, 1802,  true, false,   4,   1,   1, Dyes._NULL          , Element.Er        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Europium                = new Materials(  70, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8   |32             , 246, 181, 255,   0,   "Europium"                ,   "Europium"                      ,    0,       0,       1099, 1099,  true, false,   4,   1,   1, Dyes._NULL          , Element.Eu        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Fluorine                = new Materials(  14, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             , 255, 255, 255, 127,   "Fluorine"                ,   "Fluorine"                      ,    0,       0,         53,    0, false,  true,   2,   1,   1, Dyes.dyeGreen       , Element.F         , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 2)));
-        Materials.Gadolinium              = new Materials(  71, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             ,  59, 186,  28,   0,   "Gadolinium"              ,   "Gadolinium"                    ,    0,       0,       1585, 1585,  true, false,   4,   1,   1, Dyes._NULL          , Element.Gd        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Gallium                 = new Materials(  37, TextureSet.SET_SHINY             ,   1.0F,     64,  2, 1|2  |8   |32             , 220, 220, 255,   0,   "Gallium"                 ,   "Gallium"                       ,    0,       0,        302,    0, false, false,   5,   1,   1, Dyes.dyeLightGray   , Element.Ga        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1)));
-        Materials.Gold                    = new Materials(  86, TextureSet.SET_SHINY             ,  12.0F,     64,  2, 1|2  |8   |32|64|128      , 255, 255,  30,   0,   "Gold"                    ,   "Gold"                          ,    0,       0,       1337,    0, false, false,   4,   1,   1, Dyes.dyeYellow      , Element.Au        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 2)));
-        Materials.Holmium                 = new Materials(  74, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8   |32             ,  22,   8, 166,   0,   "Holmium"                 ,   "Holmium"                       ,    0,       0,       1734, 1734,  true, false,   4,   1,   1, Dyes._NULL          , Element.Ho        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Hydrogen                = new Materials(   1, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             ,   0,   0, 255, 240,   "Hydrogen"                ,   "Hydrogen"                      ,    1,      20,         14,    0, false,  true,   2,   1,   1, Dyes.dyeBlue        , Element.H         , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1)));
-        Materials.Helium                  = new Materials(   4, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             , 255, 255,   0, 240,   "Helium"                  ,   "Helium"                        ,    0,       0,          1,    0, false,  true,   5,   1,   1, Dyes.dyeYellow      , Element.He        , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AER, 2)));
-        Materials.Helium_3                = new Materials(   5, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             , 255, 255,   0, 240,   "Helium_3"                ,   "Helium-3"                      ,    0,       0,          1,    0, false,  true,  10,   1,   1, Dyes.dyeYellow      , Element.He_3      , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AER, 3)));
-        Materials.Indium                  = new Materials(  56, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             ,  64,   0, 128,   0,   "Indium"                  ,   "Indium"                        ,    0,       0,        429,    0, false, false,   4,   1,   1, Dyes.dyeGray        , Element.In        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Iridium                 = new Materials(  84, TextureSet.SET_DULL              ,   6.0F,   2560,  3, 1|2  |8   |32|64|128      , 240, 240, 245,   0,   "Iridium"                 ,   "Iridium"                       ,    0,       0,       2719, 4500,  true, false,  10,   1,   1, Dyes.dyeWhite       , Element.Ir        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Iron                    = new Materials(  32, TextureSet.SET_METALLIC          ,   6.0F,    256,  2, 1|2  |8   |32|64|128      , 200, 200, 200,   0,   "Iron"                    ,   "Iron"                          ,    0,       0,       1811,    0, false, false,   3,   1,   1, Dyes.dyeLightGray   , Element.Fe        , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3)));
-        Materials.Lanthanum               = new Materials(  64, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 138, 138, 138,   0,   "Lanthanum"               ,   "Lanthanum"                     ,    0,       0,       1193, 1193,  true, false,   4,   1,   1, Dyes._NULL          , Element.La        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Lead                    = new Materials(  89, TextureSet.SET_DULL              ,   8.0F,     64,  1, 1|2  |8   |32|64|128      , 140, 100, 140,   0,   "Lead"                    ,   "Lead"                          ,    0,       0,        600,    0, false, false,   3,   1,   1, Dyes.dyePurple      , Element.Pb        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1)));
-        Materials.Lithium                 = new Materials(   6, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1|2  |8   |32             , 225, 220, 255,   0,   "Lithium"                 ,   "Lithium"                       ,    0,       0,        454,    0, false, false,   4,   1,   1, Dyes.dyeLightBlue   , Element.Li        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2)));
-        Materials.Lutetium                = new Materials(  78, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8   |32             , 188,  62, 199,   0,   "Lutetium"                ,   "Lutetium"                      ,    0,       0,       1925, 1925,  true, false,   4,   1,   1, Dyes._NULL          , Element.Lu        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Magic                   = new Materials(-128, TextureSet.SET_SHINY             ,   8.0F,   5120,  5, 1|2|4|8|16|32|64|128      , 100,   0, 200,   0,   "Magic"                   ,   "Magic"                         ,    5,      32,       5000,    0, false, false,   7,   1,   1, Dyes.dyePurple      , Element.Ma        , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 4)));
-        Materials.Magnesium               = new Materials(  18, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 255, 200, 200,   0,   "Magnesium"               ,   "Magnesium"                     ,    0,       0,        923,    0, false, false,   3,   1,   1, Dyes.dyePink        , Element.Mg        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1)));
-        Materials.Manganese               = new Materials(  31, TextureSet.SET_DULL              ,   7.0F,    512,  2, 1|2  |8   |32|64          , 250, 250, 250,   0,   "Manganese"               ,   "Manganese"                     ,    0,       0,       1519,    0, false, false,   3,   1,   1, Dyes.dyeWhite       , Element.Mn        , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3)));
-        Materials.Mercury                 = new Materials(  87, TextureSet.SET_SHINY             ,   1.0F,      0,  0,         16|32             , 255, 220, 220,   0,   "Mercury"                 ,   "Mercury"                       ,    5,      32,        234,    0, false, false,   3,   1,   1, Dyes.dyeLightGray   , Element.Hg        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1)));
-        Materials.Molybdenum              = new Materials(  48, TextureSet.SET_SHINY             ,   7.0F,    512,  2, 1|2  |8   |32|64          , 180, 180, 220,   0,   "Molybdenum"              ,   "Molybdenum"                    ,    0,       0,       2896,    0, false, false,   1,   1,   1, Dyes.dyeBlue        , Element.Mo        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1)));
-        Materials.Neodymium               = new Materials(  67, TextureSet.SET_METALLIC          ,   7.0F,    512,  2, 1|2  |8   |32|64|128      , 100, 100, 100,   0,   "Neodymium"               ,   "Neodymium"                     ,    0,       0,       1297, 1297,  true, false,   4,   1,   1, Dyes._NULL          , Element.Nd        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 2)));
-        Materials.Neutronium              = new Materials( 129, TextureSet.SET_DULL              ,  24.0F, 655360,  6, 1|2  |8   |32|64|128      , 250, 250, 250,   0,   "Neutronium"              ,   "Neutronium"                    ,    0,       0,      10000, 10000, true, false,  20,   1,   1, Dyes.dyeWhite       , Element.Nt        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 2))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe().setProcessingMaterialTierEU(TierEU.RECIPE_LuV);
-        Materials.Nickel                  = new Materials(  34, TextureSet.SET_METALLIC          ,   6.0F,     64,  2, 1|2  |8   |32|64|128      , 200, 200, 250,   0,   "Nickel"                  ,   "Nickel"                        ,    0,       0,       1728,    0, false, false,   4,   1,   1, Dyes.dyeLightBlue   , Element.Ni        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1)));
-        Materials.Niobium                 = new Materials(  47, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 190, 180, 200,   0,   "Niobium"                 ,   "Niobium"                       ,    0,       0,       2750, 2750,  true, false,   5,   1,   1, Dyes._NULL          , Element.Nb        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1)));
-        Materials.Nitrogen                = new Materials(  12, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             ,   0, 150, 200, 240,   "Nitrogen"                ,   "Nitrogen"                      ,    0,       0,         63,    0, false,  true,   2,   1,   1, Dyes.dyeCyan        , Element.N         , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AER, 2)));
-        Materials.Osmium                  = new Materials(  83, TextureSet.SET_METALLIC          ,  16.0F,   1280,  4, 1|2  |8   |32|64|128      ,  50,  50, 255,   0,   "Osmium"                  ,   "Osmium"                        ,    0,       0,       3306, 4500,  true, false,  10,   1,   1, Dyes.dyeBlue        , Element.Os        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Oxygen                  = new Materials(  13, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             ,   0, 100, 200, 240,   "Oxygen"                  ,   "Oxygen"                        ,    0,       0,         54,    0, false,  true,   1,   1,   1, Dyes.dyeWhite       , Element.O         , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AER, 1)));
-        Materials.Palladium               = new Materials(  52, TextureSet.SET_SHINY             ,   8.0F,    512,  4, 1|2  |8   |32|64|128      , 128, 128, 128,   0,   "Palladium"               ,   "Palladium"                     ,    0,       0,       1828, 1828,  true, false,   4,   1,   1, Dyes.dyeGray        , Element.Pd        , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3))).disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Phosphorus              = new Materials(  21, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1         |32             , 255, 255,   0,   0,   "Phosphorus"              ,   "Phosphorus"                    ,    0,       0,        317,    0, false, false,   2,   1,   1, Dyes.dyeYellow      , Element.P         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1)));
-        Materials.Platinum                = new Materials(  85, TextureSet.SET_SHINY             ,  12.0F,     64,  4, 1|2  |8   |32|64|128      , 255, 255, 200,   0,   "Platinum"                ,   "Platinum"                      ,    0,       0,       2041,    0, false, false,   6,   1,   1, Dyes.dyeOrange      , Element.Pt        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 1)));
-        Materials.Plutonium               = new Materials( 100, TextureSet.SET_METALLIC          ,   6.0F,    512,  3, 1|2  |8   |32|64          , 240,  50,  50,   0,   "Plutonium"               ,   "Plutonium 239"                 ,    0,       0,        912,    0, false, false,   6,   1,   1, Dyes.dyeLime        , Element.Pu        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 2)));
-        Materials.Plutonium241            = new Materials( 101, TextureSet.SET_SHINY             ,   6.0F,    512,  3, 1|2  |8   |32|64          , 250,  70,  70,   0,   "Plutonium241"            ,   "Plutonium 241"                 ,    0,       0,        912,    0, false, false,   6,   1,   1, Dyes.dyeLime        , Element.Pu_241    , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 3)));
-        Materials.Potassium               = new Materials(  25, TextureSet.SET_METALLIC          ,   1.0F,      0,  1, 1|2       |32             , 154, 172, 223,   0,   "Potassium"               ,   "Potassium"                     ,    0,       0,        336,    0, false, false,   2,   1,   1, Dyes.dyeWhite       , Element.K         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1)));
-        Materials.Praseodymium            = new Materials(  66, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1|2  |8   |32             , 117, 214, 129,   0,   "Praseodymium"            ,   "Praseodymium"                  ,    0,       0,       1208, 1208,  true, false,   4,   1,   1, Dyes._NULL          , Element.Pr        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Promethium              = new Materials(  68, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8   |32             ,  36, 181,  53,   0,   "Promethium"              ,   "Promethium"                    ,    0,       0,       1315, 1315,  true, false,   4,   1,   1, Dyes._NULL          , Element.Pm        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Radon                   = new Materials(  93, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             , 255,   0, 255, 240,   "Radon"                   ,   "Radon"                         ,    0,       0,        202,    0, false,  true,   5,   1,   1, Dyes.dyePurple      , Element.Rn        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AER, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Rubidium                = new Materials(  43, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 240,  30,  30,   0,   "Rubidium"                ,   "Rubidium"                      ,    0,       0,        312,    0, false, false,   4,   1,   1, Dyes.dyeRed         , Element.Rb        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1)));
-        Materials.Samarium                = new Materials(  69, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 255, 255, 204,   0,   "Samarium"                ,   "Samarium"                      ,    0,       0,       1345, 1345,  true, false,   4,   1,   1, Dyes.dyeWhite       , Element.Sm        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO,10)));
-        Materials.Scandium                = new Materials(  27, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 204, 204, 204,   0,   "Scandium"                ,   "Scandium"                      ,    0,       0,       1814, 1814,  true, false,   2,   1,   1, Dyes.dyeYellow      , Element.Sc        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Silicon                 = new Materials(  20, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             ,  60,  60,  80,   0,   "Silicon"                 ,   "Raw Silicon"                   ,    0,       0,       2273, 2273,  true, false,   1,   1,   1, Dyes.dyeBlack       , Element.Si        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 1)));
-        Materials.Silver                  = new Materials(  54, TextureSet.SET_SHINY             ,  10.0F,     64,  2, 1|2  |8   |32|64|128      , 220, 220, 255,   0,   "Silver"                  ,   "Silver"                        ,    0,       0,       1234,    0, false, false,   3,   1,   1, Dyes.dyeLightGray   , Element.Ag        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1)));
-        Materials.Sodium                  = new Materials(  17, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1      |16|32             ,   0,   0, 150,   0,   "Sodium"                  ,   "Sodium"                        ,    0,       0,        370,    0, false, false,   1,   1,   1, Dyes.dyeBlue        , Element.Na        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 1)));
-        Materials.Strontium               = new Materials(  44, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1    |8   |32             , 200, 200, 200,   0,   "Strontium"               ,   "Strontium"                     ,    0,       0,       1050,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Element.Sr        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 1)));
-        Materials.Sulfur                  = new Materials(  22, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1    |8   |32             , 200, 200,   0,   0,   "Sulfur"                  ,   "Sulfur"                        ,    0,       0,        388,    0, false, false,   2,   1,   1, Dyes.dyeYellow      , Element.S         , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1)));
-        Materials.Tantalum                = new Materials(  80, TextureSet.SET_SHINY             ,   6.0F,   2560,  3, 1|2  |8   |32             , 105, 183, 255,   0,   "Tantalum"                ,   "Tantalum"                      ,    0,       0,       3290, 3290,  true, false,   4,   1,   1, Dyes._NULL          , Element.Ta        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.VINCULUM, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Tellurium               = new Materials(  59, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1|2  |8   |32             , 206, 277,  86,   0,   "Tellurium"               ,   "Tellurium"                     ,    0,       0,        722,    0, false, false,   4,   1,   1, Dyes.dyeGray        , Element.Te        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Terbium                 = new Materials(  72, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 255, 255, 255,   0,   "Terbium"                 ,   "Terbium"                       ,    0,       0,       1629, 1629,  true, false,   4,   1,   1, Dyes._NULL          , Element.Tb        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Thorium                 = new Materials(  96, TextureSet.SET_SHINY             ,   6.0F,    512,  2, 1|2  |8   |32|64          ,   0,  30,   0,   0,   "Thorium"                 ,   "Thorium"                       ,    0,       0,       2115,    0, false, false,   4,   1,   1, Dyes.dyeBlack       , Element.Th        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Thulium                 = new Materials(  76, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8   |32             ,  89, 107, 194,   0,   "Thulium"                 ,   "Thulium"                       ,    0,       0,       1818, 1818,  true, false,   4,   1,   1, Dyes._NULL          , Element.Tm        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Tin                     = new Materials(  57, TextureSet.SET_DULL              ,   1.0F,      0,  3, 1|2  |8   |32   |128      , 220, 220, 220,   0,   "Tin"                     ,   "Tin"                           ,    0,       0,        505,  505, false, false,   3,   1,   1, Dyes.dyeWhite       , Element.Sn        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1)));
-        Materials.Titanium                = new Materials(  28, TextureSet.SET_METALLIC          ,   7.0F,   1600,  3, 1|2  |8   |32|64|128      , 220, 160, 240,   0,   "Titanium"                ,   "Titanium"                      ,    0,       0,       1941, 1940,  true, false,   5,   1,   1, Dyes.dyePurple      , Element.Ti        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Tritanium               = new Materials( 329, TextureSet.SET_METALLIC          ,  20.0F,1435392,  6, 1|2  |8   |32|64          , 96, 0, 0,   0,   "Tritanium"               ,   "Tritanium"                     ,    0,       0,       9900, 9900,  true, false,   1,   1,   1, Dyes.dyeWhite       , Element.Tn  ,Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2))).disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Tritium                 = new Materials(   3, TextureSet.SET_METALLIC          ,   1.0F,      0,  2,         16|32             , 255,   0,   0, 240,   "Tritium"                 ,   "Tritium"                       ,    0,       0,         14,    0, false,  true,  10,   1,   1, Dyes.dyeRed         , Element.T         , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4)));
-        Materials.Tungsten                = new Materials(  81, TextureSet.SET_METALLIC          ,   7.0F,   2560,  3, 1|2  |8   |32|64|128      ,  50,  50,  50,   0,   "Tungsten"                ,   "Tungsten"                      ,    0,       0,       3695, 3000,  true, false,   4,   1,   1, Dyes.dyeBlack       , Element.W         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Uranium                 = new Materials(  98, TextureSet.SET_METALLIC          ,   6.0F,    512,  3, 1|2  |8   |32|64          ,  50, 240,  50,   0,   "Uranium"                 ,   "Uranium 238"                   ,    0,       0,       1405,    0, false, false,   4,   1,   1, Dyes.dyeGreen       , Element.U         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Uranium235              = new Materials(  97, TextureSet.SET_SHINY             ,   6.0F,    512,  3, 1|2  |8   |32|64          ,  70, 250,  70,   0,   "Uranium235"              ,   "Uranium 235"                   ,    0,       0,       1405,    0, false, false,   4,   1,   1, Dyes.dyeGreen       , Element.U_235     , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 2)));
-        Materials.Vanadium                = new Materials(  29, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             ,  50,  50,  50,   0,   "Vanadium"                ,   "Vanadium"                      ,    0,       0,       2183, 2183,  true, false,   2,   1,   1, Dyes.dyeBlack       , Element.V         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Ytterbium               = new Materials(  77, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8   |32             ,  44, 199,  80,   0,   "Ytterbium"               ,   "Ytterbium"                     ,    0,       0,       1097, 1097,  true, false,   4,   1,   1, Dyes._NULL          , Element.Yb        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Yttrium                 = new Materials(  45, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 220, 250, 220,   0,   "Yttrium"                 ,   "Yttrium"                       ,    0,       0,       1799, 1799,  true, false,   4,   1,   1, Dyes._NULL          , Element.Y         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1)));
-        Materials.Zinc                    = new Materials(  36, TextureSet.SET_METALLIC          ,   1.0F,      0,  1, 1|2  |8   |32             , 250, 240, 240,   0,   "Zinc"                    ,   "Zinc"                          ,    0,       0,        692,    0, false, false,   2,   1,   1, Dyes.dyeWhite       , Element.Zn        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1)));
+        Materials.Aluminium               = new Materials(  19, TextureSet.SET_DULL              ,  10.0F,    128,  2, 1|2  |8   |32|64|128      , 128, 200, 240,   0,   "Aluminium"               ,   "Aluminium"                     ,    0,       0,        933, 1700,  true, false,   3,   1,   1, Dyes.dyeLightBlue   , Element.Al        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.VOLATUS, 1))).disableAutoGeneratedBlastFurnaceRecipes();
+        Materials.Americium               = new Materials( 103, TextureSet.SET_METALLIC          ,   1.0F,      0,  3, 1|2  |8   |32             , 200, 200, 200,   0,   "Americium"               ,   "Americium"                     ,    0,       0,       1449,    0, false, false,   3,   1,   1, Dyes.dyeLightGray   , Element.Am        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Antimony                = new Materials(  58, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8   |32             , 220, 220, 240,   0,   "Antimony"                ,   "Antimony"                      ,    0,       0,        903,    0, false, false,   2,   1,   1, Dyes.dyeLightGray   , Element.Sb        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.AQUA, 1)));
+        Materials.Argon                   = new Materials(  24, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             ,   0, 255,   0, 240,   "Argon"                   ,   "Argon"                         ,    0,       0,         83,    0, false,  true,   5,   1,   1, Dyes.dyeGreen       , Element.Ar        , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AER, 2)));
+        Materials.Arsenic                 = new Materials(  39, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1|2  |8|16|32             , 255, 255, 255,   0,   "Arsenic"                 ,   "Arsenic"                       ,    0,       0,       1090,    0, false, false,   3,   1,   1, Dyes.dyeOrange      , Element.As        , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.VENENUM, 3)));
+        Materials.Barium                  = new Materials(  63, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 255, 255, 255,   0,   "Barium"                  ,   "Barium"                        ,    0,       0,       1000,    0, false, false,   1,   1,   1, Dyes._NULL          , Element.Ba        , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.VINCULUM, 3)));
+        Materials.Beryllium               = new Materials(   8, TextureSet.SET_METALLIC          ,  14.0F,     64,  2, 1|2  |8   |32|64          , 100, 180, 100,   0,   "Beryllium"               ,   "Beryllium"                     ,    0,       0,       1560,    0, false, false,   6,   1,   1, Dyes.dyeGreen       , Element.Be        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 1)));
+        Materials.Bismuth                 = new Materials(  90, TextureSet.SET_METALLIC          ,   6.0F,     64,  1, 1|2  |8   |32|64|128      , 100, 160, 160,   0,   "Bismuth"                 ,   "Bismuth"                       ,    0,       0,        544,    0, false, false,   2,   1,   1, Dyes.dyeCyan        , Element.Bi        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 1)));
+        Materials.Boron                   = new Materials(   9, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1         |32             , 210, 250, 210,   0,   "Boron"                   ,   "Boron"                         ,    0,       0,       2349,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , Element.B         , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3)));
+        Materials.Caesium                 = new Materials(  62, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 176, 196, 222,   0,   "Caesium"                 ,   "Caesium"                       ,    0,       0,        301,    0, false, false,   4,   1,   1, Dyes._NULL          , Element.Cs        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Calcium                 = new Materials(  26, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1         |32             , 255, 245, 245,   0,   "Calcium"                 ,   "Calcium"                       ,    0,       0,       1115, 1115,  true, false,   4,   1,   1, Dyes.dyePink        , Element.Ca        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.SANO, 1), new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 1)));
+        Materials.Carbon                  = new Materials(  10, TextureSet.SET_DULL              ,   1.0F,     64,  2, 1|2    |16|32|64|128      ,  20,  20,  20,   0,   "Carbon"                  ,   "Carbon"                        ,    0,       0,       3800,    0, false, false,   2,   1,   1, Dyes.dyeBlack       , Element.C         , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1), new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1)));
+        Materials.Cadmium                 = new Materials(  55, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1    |8   |32             ,  50,  50,  60,   0,   "Cadmium"                 ,   "Cadmium"                       ,    0,       0,        594,    0, false, false,   3,   1,   1, Dyes.dyeGray        , Element.Cd        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1), new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1), new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1)));
+        Materials.Cerium                  = new Materials(  65, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 123, 212, 144,   0,   "Cerium"                  ,   "Cerium"                        ,    0,       0,       1068, 1068,  true, false,   4,   1,   1, Dyes._NULL          , Element.Ce        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Chlorine                = new Materials(  23, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             , 255, 255, 255,   0,   "Chlorine"                ,   "Chlorine"                      ,    0,       0,        171,    0, false, false,   2,   1,   1, Dyes.dyeCyan        , Element.Cl        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 2), new TCAspects.TC_AspectStack(TCAspects.PANNUS, 1)));
+        Materials.Chrome                  = new Materials(  30, TextureSet.SET_SHINY             ,  11.0F,    256,  3, 1|2  |8   |32|64|128      , 255, 230, 230,   0,   "Chrome"                  ,   "Chrome"                        ,    0,       0,       2180, 1700,  true, false,   5,   1,   1, Dyes.dyePink        , Element.Cr        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1)));
+        Materials.Cobalt                  = new Materials(  33, TextureSet.SET_METALLIC          ,   8.0F,    512,  3, 1|2  |8   |32|64|128      ,  80,  80, 250,   0,   "Cobalt"                  ,   "Cobalt"                        ,    0,       0,       1768, 1700,  true, false,   3,   1,   1, Dyes.dyeBlue        , Element.Co        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 1))).disableAutoGeneratedBlastFurnaceRecipes();
+        Materials.Copper                  = new Materials(  35, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1|2  |8   |32   |128      , 255, 100,   0,   0,   "Copper"                  ,   "Copper"                        ,    0,       0,       1357,    0, false, false,   3,   1,   1, Dyes.dyeOrange      , Element.Cu        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 1)));
+        Materials.Deuterium               = new Materials(   2, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             , 255, 255,   0, 240,   "Deuterium"               ,   "Deuterium"                     ,    0,       0,         14,    0, false,  true,  10,   1,   1, Dyes.dyeYellow      , Element.D         , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 3)));
+        Materials.Dysprosium              = new Materials(  73, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 105, 209,  80,   0,   "Dysprosium"              ,   "Dysprosium"                    ,    0,       0,       1680, 1680,  true, false,   4,   1,   1, Dyes._NULL          , Element.Dy        , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 3)));
+        Materials.Empty                   = new Materials(   0, TextureSet.SET_NONE              ,   1.0F,      0,  2, 256/*Only when needed*/   , 255, 255, 255, 255,   "Empty"                   ,   "Empty"                         ,    0,       0,         -1,    0, false,  true,   1,   1,   1, Dyes._NULL          , Element._NULL     , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.VACUOS, 2)));
+        Materials.Erbium                  = new Materials(  75, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8   |32             , 176, 152,  81,   0,   "Erbium"                  ,   "Erbium"                        ,    0,       0,       1802, 1802,  true, false,   4,   1,   1, Dyes._NULL          , Element.Er        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Europium                = new Materials(  70, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8   |32             , 246, 181, 255,   0,   "Europium"                ,   "Europium"                      ,    0,       0,       1099, 1099,  true, false,   4,   1,   1, Dyes._NULL          , Element.Eu        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Fluorine                = new Materials(  14, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             , 255, 255, 255, 127,   "Fluorine"                ,   "Fluorine"                      ,    0,       0,         53,    0, false,  true,   2,   1,   1, Dyes.dyeGreen       , Element.F         , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 2)));
+        Materials.Gadolinium              = new Materials(  71, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             ,  59, 186,  28,   0,   "Gadolinium"              ,   "Gadolinium"                    ,    0,       0,       1585, 1585,  true, false,   4,   1,   1, Dyes._NULL          , Element.Gd        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Gallium                 = new Materials(  37, TextureSet.SET_SHINY             ,   1.0F,     64,  2, 1|2  |8   |32             , 220, 220, 255,   0,   "Gallium"                 ,   "Gallium"                       ,    0,       0,        302,    0, false, false,   5,   1,   1, Dyes.dyeLightGray   , Element.Ga        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1)));
+        Materials.Gold                    = new Materials(  86, TextureSet.SET_SHINY             ,  12.0F,     64,  2, 1|2  |8   |32|64|128      , 255, 255,  30,   0,   "Gold"                    ,   "Gold"                          ,    0,       0,       1337,    0, false, false,   4,   1,   1, Dyes.dyeYellow      , Element.Au        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 2)));
+        Materials.Holmium                 = new Materials(  74, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8   |32             ,  22,   8, 166,   0,   "Holmium"                 ,   "Holmium"                       ,    0,       0,       1734, 1734,  true, false,   4,   1,   1, Dyes._NULL          , Element.Ho        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Hydrogen                = new Materials(   1, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             ,   0,   0, 255, 240,   "Hydrogen"                ,   "Hydrogen"                      ,    1,      20,         14,    0, false,  true,   2,   1,   1, Dyes.dyeBlue        , Element.H         , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1)));
+        Materials.Helium                  = new Materials(   4, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             , 255, 255,   0, 240,   "Helium"                  ,   "Helium"                        ,    0,       0,          1,    0, false,  true,   5,   1,   1, Dyes.dyeYellow      , Element.He        , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AER, 2)));
+        Materials.Helium_3                = new Materials(   5, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             , 255, 255,   0, 240,   "Helium_3"                ,   "Helium-3"                      ,    0,       0,          1,    0, false,  true,  10,   1,   1, Dyes.dyeYellow      , Element.He_3      , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AER, 3)));
+        Materials.Indium                  = new Materials(  56, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             ,  64,   0, 128,   0,   "Indium"                  ,   "Indium"                        ,    0,       0,        429,    0, false, false,   4,   1,   1, Dyes.dyeGray        , Element.In        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Iridium                 = new Materials(  84, TextureSet.SET_DULL              ,   6.0F,   2560,  3, 1|2  |8   |32|64|128      , 240, 240, 245,   0,   "Iridium"                 ,   "Iridium"                       ,    0,       0,       2719, 4500,  true, false,  10,   1,   1, Dyes.dyeWhite       , Element.Ir        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Iron                    = new Materials(  32, TextureSet.SET_METALLIC          ,   6.0F,    256,  2, 1|2  |8   |32|64|128      , 200, 200, 200,   0,   "Iron"                    ,   "Iron"                          ,    0,       0,       1811,    0, false, false,   3,   1,   1, Dyes.dyeLightGray   , Element.Fe        , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 3)));
+        Materials.Lanthanum               = new Materials(  64, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 138, 138, 138,   0,   "Lanthanum"               ,   "Lanthanum"                     ,    0,       0,       1193, 1193,  true, false,   4,   1,   1, Dyes._NULL          , Element.La        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Lead                    = new Materials(  89, TextureSet.SET_DULL              ,   8.0F,     64,  1, 1|2  |8   |32|64|128      , 140, 100, 140,   0,   "Lead"                    ,   "Lead"                          ,    0,       0,        600,    0, false, false,   3,   1,   1, Dyes.dyePurple      , Element.Pb        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.ORDO, 1)));
+        Materials.Lithium                 = new Materials(   6, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1|2  |8   |32             , 225, 220, 255,   0,   "Lithium"                 ,   "Lithium"                       ,    0,       0,        454,    0, false, false,   4,   1,   1, Dyes.dyeLightBlue   , Element.Li        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1), new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2)));
+        Materials.Lutetium                = new Materials(  78, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8   |32             , 188,  62, 199,   0,   "Lutetium"                ,   "Lutetium"                      ,    0,       0,       1925, 1925,  true, false,   4,   1,   1, Dyes._NULL          , Element.Lu        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Magic                   = new Materials(-128, TextureSet.SET_SHINY             ,   8.0F,   5120,  5, 1|2|4|8|16|32|64|128      , 100,   0, 200,   0,   "Magic"                   ,   "Magic"                         ,    5,      32,       5000,    0, false, false,   7,   1,   1, Dyes.dyePurple      , Element.Ma        , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 4)));
+        Materials.Magnesium               = new Materials(  18, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 255, 200, 200,   0,   "Magnesium"               ,   "Magnesium"                     ,    0,       0,        923,    0, false, false,   3,   1,   1, Dyes.dyePink        , Element.Mg        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.SANO, 1)));
+        Materials.Manganese               = new Materials(  31, TextureSet.SET_DULL              ,   7.0F,    512,  2, 1|2  |8   |32|64          , 250, 250, 250,   0,   "Manganese"               ,   "Manganese"                     ,    0,       0,       1519,    0, false, false,   3,   1,   1, Dyes.dyeWhite       , Element.Mn        , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 3)));
+        Materials.Mercury                 = new Materials(  87, TextureSet.SET_SHINY             ,   1.0F,      0,  0,         16|32             , 255, 220, 220,   0,   "Mercury"                 ,   "Mercury"                       ,    5,      32,        234,    0, false, false,   3,   1,   1, Dyes.dyeLightGray   , Element.Hg        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1), new TCAspects.TC_AspectStack(TCAspects.AQUA, 1), new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1)));
+        Materials.Molybdenum              = new Materials(  48, TextureSet.SET_SHINY             ,   7.0F,    512,  2, 1|2  |8   |32|64          , 180, 180, 220,   0,   "Molybdenum"              ,   "Molybdenum"                    ,    0,       0,       2896,    0, false, false,   1,   1,   1, Dyes.dyeBlue        , Element.Mo        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 1)));
+        Materials.Neodymium               = new Materials(  67, TextureSet.SET_METALLIC          ,   7.0F,    512,  2, 1|2  |8   |32|64|128      , 100, 100, 100,   0,   "Neodymium"               ,   "Neodymium"                     ,    0,       0,       1297, 1297,  true, false,   4,   1,   1, Dyes._NULL          , Element.Nd        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 2)));
+        Materials.Neutronium              = new Materials( 129, TextureSet.SET_DULL              ,  24.0F, 655360,  6, 1|2  |8   |32|64|128      , 250, 250, 250,   0,   "Neutronium"              ,   "Neutronium"                    ,    0,       0,      10000, 10000, true, false,  20,   1,   1, Dyes.dyeWhite       , Element.Nt        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3), new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 2))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe().setProcessingMaterialTierEU(TierEU.RECIPE_LuV);
+        Materials.Nickel                  = new Materials(  34, TextureSet.SET_METALLIC          ,   6.0F,     64,  2, 1|2  |8   |32|64|128      , 200, 200, 250,   0,   "Nickel"                  ,   "Nickel"                        ,    0,       0,       1728,    0, false, false,   4,   1,   1, Dyes.dyeLightBlue   , Element.Ni        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1)));
+        Materials.Niobium                 = new Materials(  47, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 190, 180, 200,   0,   "Niobium"                 ,   "Niobium"                       ,    0,       0,       2750, 2750,  true, false,   5,   1,   1, Dyes._NULL          , Element.Nb        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1)));
+        Materials.Nitrogen                = new Materials(  12, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             ,   0, 150, 200, 240,   "Nitrogen"                ,   "Nitrogen"                      ,    0,       0,         63,    0, false,  true,   2,   1,   1, Dyes.dyeCyan        , Element.N         , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AER, 2)));
+        Materials.Osmium                  = new Materials(  83, TextureSet.SET_METALLIC          ,  16.0F,   1280,  4, 1|2  |8   |32|64|128      ,  50,  50, 255,   0,   "Osmium"                  ,   "Osmium"                        ,    0,       0,       3306, 4500,  true, false,  10,   1,   1, Dyes.dyeBlue        , Element.Os        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Oxygen                  = new Materials(  13, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             ,   0, 100, 200, 240,   "Oxygen"                  ,   "Oxygen"                        ,    0,       0,         54,    0, false,  true,   1,   1,   1, Dyes.dyeWhite       , Element.O         , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AER, 1)));
+        Materials.Palladium               = new Materials(  52, TextureSet.SET_SHINY             ,   8.0F,    512,  4, 1|2  |8   |32|64|128      , 128, 128, 128,   0,   "Palladium"               ,   "Palladium"                     ,    0,       0,       1828, 1828,  true, false,   4,   1,   1, Dyes.dyeGray        , Element.Pd        , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 3))).disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Phosphorus              = new Materials(  21, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1         |32             , 255, 255,   0,   0,   "Phosphorus"              ,   "Phosphorus"                    ,    0,       0,        317,    0, false, false,   2,   1,   1, Dyes.dyeYellow      , Element.P         , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.IGNIS, 2), new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1)));
+        Materials.Platinum                = new Materials(  85, TextureSet.SET_SHINY             ,  12.0F,     64,  4, 1|2  |8   |32|64|128      , 255, 255, 200,   0,   "Platinum"                ,   "Platinum"                      ,    0,       0,       2041,    0, false, false,   6,   1,   1, Dyes.dyeOrange      , Element.Pt        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 1)));
+        Materials.Plutonium               = new Materials( 100, TextureSet.SET_METALLIC          ,   6.0F,    512,  3, 1|2  |8   |32|64          , 240,  50,  50,   0,   "Plutonium"               ,   "Plutonium 239"                 ,    0,       0,        912,    0, false, false,   6,   1,   1, Dyes.dyeLime        , Element.Pu        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 2)));
+        Materials.Plutonium241            = new Materials( 101, TextureSet.SET_SHINY             ,   6.0F,    512,  3, 1|2  |8   |32|64          , 250,  70,  70,   0,   "Plutonium241"            ,   "Plutonium 241"                 ,    0,       0,        912,    0, false, false,   6,   1,   1, Dyes.dyeLime        , Element.Pu_241    , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 3)));
+        Materials.Potassium               = new Materials(  25, TextureSet.SET_METALLIC          ,   1.0F,      0,  1, 1|2       |32             , 154, 172, 223,   0,   "Potassium"               ,   "Potassium"                     ,    0,       0,        336,    0, false, false,   2,   1,   1, Dyes.dyeWhite       , Element.K         , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1), new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1)));
+        Materials.Praseodymium            = new Materials(  66, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1|2  |8   |32             , 117, 214, 129,   0,   "Praseodymium"            ,   "Praseodymium"                  ,    0,       0,       1208, 1208,  true, false,   4,   1,   1, Dyes._NULL          , Element.Pr        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Promethium              = new Materials(  68, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8   |32             ,  36, 181,  53,   0,   "Promethium"              ,   "Promethium"                    ,    0,       0,       1315, 1315,  true, false,   4,   1,   1, Dyes._NULL          , Element.Pm        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Radon                   = new Materials(  93, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             , 255,   0, 255, 240,   "Radon"                   ,   "Radon"                         ,    0,       0,        202,    0, false,  true,   5,   1,   1, Dyes.dyePurple      , Element.Rn        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.AER, 1), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Rubidium                = new Materials(  43, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 240,  30,  30,   0,   "Rubidium"                ,   "Rubidium"                      ,    0,       0,        312,    0, false, false,   4,   1,   1, Dyes.dyeRed         , Element.Rb        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1)));
+        Materials.Samarium                = new Materials(  69, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 255, 255, 204,   0,   "Samarium"                ,   "Samarium"                      ,    0,       0,       1345, 1345,  true, false,   4,   1,   1, Dyes.dyeWhite       , Element.Sm        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1), new TCAspects.TC_AspectStack(TCAspects.MAGNETO,10)));
+        Materials.Scandium                = new Materials(  27, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 204, 204, 204,   0,   "Scandium"                ,   "Scandium"                      ,    0,       0,       1814, 1814,  true, false,   2,   1,   1, Dyes.dyeYellow      , Element.Sc        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Silicon                 = new Materials(  20, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             ,  60,  60,  80,   0,   "Silicon"                 ,   "Raw Silicon"                   ,    0,       0,       2273, 2273,  true, false,   1,   1,   1, Dyes.dyeBlack       , Element.Si        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 1)));
+        Materials.Silver                  = new Materials(  54, TextureSet.SET_SHINY             ,  10.0F,     64,  2, 1|2  |8   |32|64|128      , 220, 220, 255,   0,   "Silver"                  ,   "Silver"                        ,    0,       0,       1234,    0, false, false,   3,   1,   1, Dyes.dyeLightGray   , Element.Ag        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 1)));
+        Materials.Sodium                  = new Materials(  17, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1      |16|32             ,   0,   0, 150,   0,   "Sodium"                  ,   "Sodium"                        ,    0,       0,        370,    0, false, false,   1,   1,   1, Dyes.dyeBlue        , Element.Na        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 2), new TCAspects.TC_AspectStack(TCAspects.LUX, 1)));
+        Materials.Strontium               = new Materials(  44, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1    |8   |32             , 200, 200, 200,   0,   "Strontium"               ,   "Strontium"                     ,    0,       0,       1050,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Element.Sr        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.STRONTIO, 1)));
+        Materials.Sulfur                  = new Materials(  22, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1    |8   |32             , 200, 200,   0,   0,   "Sulfur"                  ,   "Sulfur"                        ,    0,       0,        388,    0, false, false,   2,   1,   1, Dyes.dyeYellow      , Element.S         , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1)));
+        Materials.Tantalum                = new Materials(  80, TextureSet.SET_SHINY             ,   6.0F,   2560,  3, 1|2  |8   |32             , 105, 183, 255,   0,   "Tantalum"                ,   "Tantalum"                      ,    0,       0,       3290, 3290,  true, false,   4,   1,   1, Dyes._NULL          , Element.Ta        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.VINCULUM, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Tellurium               = new Materials(  59, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1|2  |8   |32             , 206, 277,  86,   0,   "Tellurium"               ,   "Tellurium"                     ,    0,       0,        722,    0, false, false,   4,   1,   1, Dyes.dyeGray        , Element.Te        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Terbium                 = new Materials(  72, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 255, 255, 255,   0,   "Terbium"                 ,   "Terbium"                       ,    0,       0,       1629, 1629,  true, false,   4,   1,   1, Dyes._NULL          , Element.Tb        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Thorium                 = new Materials(  96, TextureSet.SET_SHINY             ,   6.0F,    512,  2, 1|2  |8   |32|64          ,   0,  30,   0,   0,   "Thorium"                 ,   "Thorium"                       ,    0,       0,       2115,    0, false, false,   4,   1,   1, Dyes.dyeBlack       , Element.Th        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Thulium                 = new Materials(  76, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8   |32             ,  89, 107, 194,   0,   "Thulium"                 ,   "Thulium"                       ,    0,       0,       1818, 1818,  true, false,   4,   1,   1, Dyes._NULL          , Element.Tm        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Tin                     = new Materials(  57, TextureSet.SET_DULL              ,   1.0F,      0,  3, 1|2  |8   |32   |128      , 220, 220, 220,   0,   "Tin"                     ,   "Tin"                           ,    0,       0,        505,  505, false, false,   3,   1,   1, Dyes.dyeWhite       , Element.Sn        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1)));
+        Materials.Titanium                = new Materials(  28, TextureSet.SET_METALLIC          ,   7.0F,   1600,  3, 1|2  |8   |32|64|128      , 220, 160, 240,   0,   "Titanium"                ,   "Titanium"                      ,    0,       0,       1941, 1940,  true, false,   5,   1,   1, Dyes.dyePurple      , Element.Ti        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Tritanium               = new Materials( 329, TextureSet.SET_METALLIC          ,  20.0F,1435392,  6, 1|2  |8   |32|64          , 96, 0, 0,   0,   "Tritanium"               ,   "Tritanium"                     ,    0,       0,       9900, 9900,  true, false,   1,   1,   1, Dyes.dyeWhite       , Element.Tn  ,Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.ORDO, 2))).disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Tritium                 = new Materials(   3, TextureSet.SET_METALLIC          ,   1.0F,      0,  2,         16|32             , 255,   0,   0, 240,   "Tritium"                 ,   "Tritium"                       ,    0,       0,         14,    0, false,  true,  10,   1,   1, Dyes.dyeRed         , Element.T         , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 4)));
+        Materials.Tungsten                = new Materials(  81, TextureSet.SET_METALLIC          ,   7.0F,   2560,  3, 1|2  |8   |32|64|128      ,  50,  50,  50,   0,   "Tungsten"                ,   "Tungsten"                      ,    0,       0,       3695, 3000,  true, false,   4,   1,   1, Dyes.dyeBlack       , Element.W         , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 3), new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Uranium                 = new Materials(  98, TextureSet.SET_METALLIC          ,   6.0F,    512,  3, 1|2  |8   |32|64          ,  50, 240,  50,   0,   "Uranium"                 ,   "Uranium 238"                   ,    0,       0,       1405,    0, false, false,   4,   1,   1, Dyes.dyeGreen       , Element.U         , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Uranium235              = new Materials(  97, TextureSet.SET_SHINY             ,   6.0F,    512,  3, 1|2  |8   |32|64          ,  70, 250,  70,   0,   "Uranium235"              ,   "Uranium 235"                   ,    0,       0,       1405,    0, false, false,   4,   1,   1, Dyes.dyeGreen       , Element.U_235     , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 2)));
+        Materials.Vanadium                = new Materials(  29, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             ,  50,  50,  50,   0,   "Vanadium"                ,   "Vanadium"                      ,    0,       0,       2183, 2183,  true, false,   2,   1,   1, Dyes.dyeBlack       , Element.V         , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Ytterbium               = new Materials(  77, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8   |32             ,  44, 199,  80,   0,   "Ytterbium"               ,   "Ytterbium"                     ,    0,       0,       1097, 1097,  true, false,   4,   1,   1, Dyes._NULL          , Element.Yb        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Yttrium                 = new Materials(  45, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 220, 250, 220,   0,   "Yttrium"                 ,   "Yttrium"                       ,    0,       0,       1799, 1799,  true, false,   4,   1,   1, Dyes._NULL          , Element.Y         , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));
+        Materials.Zinc                    = new Materials(  36, TextureSet.SET_METALLIC          ,   1.0F,      0,  1, 1|2  |8   |32             , 250, 240, 240,   0,   "Zinc"                    ,   "Zinc"                          ,    0,       0,        692,    0, false, false,   2,   1,   1, Dyes.dyeWhite       , Element.Zn        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.SANO, 1)));
 
-        Materials.Grade1PurifiedWater                = new Materials(   554, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16             ,   63,   76, 253, 0,   "Grade1PurifiedWater"                ,   "Filtered Water (Grade 1)"                      ,    0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue               , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true);
-        Materials.Grade2PurifiedWater                = new Materials(   555, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16             ,   93,   93, 254, 0,   "Grade2PurifiedWater"                ,   "Ozonated Water (Grade 2)"                      ,    0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue               , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true);
-        Materials.Grade3PurifiedWater                = new Materials(   556, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16            ,   115,   109, 254, 0,   "Grade3PurifiedWater"                ,   "Flocculated Water (Grade 3)"                      ,    0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue             , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true);
-        Materials.Grade4PurifiedWater                = new Materials(   557, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16            ,   135,   126, 255, 0,   "Grade4PurifiedWater"                ,   "pH Neutralized Water (Grade 4)"                      ,    0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue                 , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true);
-        Materials.Grade5PurifiedWater                = new Materials(   558, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16             ,   152,   144, 255, 0,   "Grade5PurifiedWater"                ,   "Extreme-Temperature Treated Water (Grade 5)"                      ,    0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue                 , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true);
-        Materials.Grade6PurifiedWater                = new Materials(   559, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16            ,   168,   161, 255, 0,   "Grade6PurifiedWater"                ,   "Ultraviolet Treated Electrically Neutral Water (Grade 6)"                      ,    0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue                 , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true);
-        Materials.Grade7PurifiedWater                = new Materials(   560, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16             ,   183,   179, 255, 0,   "Grade7PurifiedWater"                ,   "Degassed Decontaminant-Free Water (Grade 7)"                      ,    0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue                , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true);
-        Materials.Grade8PurifiedWater                = new Materials(   561, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16             ,   197,   197, 255, 0,   "Grade8PurifiedWater"                ,   "Subatomically Perfect Water (Grade 8)"                      ,    0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue                 , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true);
-        Materials.FlocculationWasteLiquid            = new Materials(562, TextureSet.SET_FLUID, 1.0f, 0, 2, 16, 61, 58, 82, 0, "FlocculationWasteLiquid", "Flocculation Waste Liquid", 0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue                 , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true);
+        Materials.Grade1PurifiedWater                = new Materials(   554, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16             ,   63,   76, 253, 0,   "Grade1PurifiedWater"                ,   "Filtered Water (Grade 1)"                      ,    0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue               , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1))).setHasCorrespondingFluid(true);
+        Materials.Grade2PurifiedWater                = new Materials(   555, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16             ,   93,   93, 254, 0,   "Grade2PurifiedWater"                ,   "Ozonated Water (Grade 2)"                      ,    0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue               , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1))).setHasCorrespondingFluid(true);
+        Materials.Grade3PurifiedWater                = new Materials(   556, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16            ,   115,   109, 254, 0,   "Grade3PurifiedWater"                ,   "Flocculated Water (Grade 3)"                      ,    0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue             , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1))).setHasCorrespondingFluid(true);
+        Materials.Grade4PurifiedWater                = new Materials(   557, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16            ,   135,   126, 255, 0,   "Grade4PurifiedWater"                ,   "pH Neutralized Water (Grade 4)"                      ,    0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue                 , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1))).setHasCorrespondingFluid(true);
+        Materials.Grade5PurifiedWater                = new Materials(   558, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16             ,   152,   144, 255, 0,   "Grade5PurifiedWater"                ,   "Extreme-Temperature Treated Water (Grade 5)"                      ,    0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue                 , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1))).setHasCorrespondingFluid(true);
+        Materials.Grade6PurifiedWater                = new Materials(   559, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16            ,   168,   161, 255, 0,   "Grade6PurifiedWater"                ,   "Ultraviolet Treated Electrically Neutral Water (Grade 6)"                      ,    0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue                 , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1))).setHasCorrespondingFluid(true);
+        Materials.Grade7PurifiedWater                = new Materials(   560, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16             ,   183,   179, 255, 0,   "Grade7PurifiedWater"                ,   "Degassed Decontaminant-Free Water (Grade 7)"                      ,    0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue                , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1))).setHasCorrespondingFluid(true);
+        Materials.Grade8PurifiedWater                = new Materials(   561, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16             ,   197,   197, 255, 0,   "Grade8PurifiedWater"                ,   "Subatomically Perfect Water (Grade 8)"                      ,    0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue                 , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1))).setHasCorrespondingFluid(true);
+        Materials.FlocculationWasteLiquid            = new Materials(562, TextureSet.SET_FLUID, 1.0f, 0, 2, 16, 61, 58, 82, 0, "FlocculationWasteLiquid", "Flocculation Waste Liquid", 0,      0,         273,    0, false,  true,   2,   1,   1, Dyes.dyeBlue                 , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1))).setHasCorrespondingFluid(true);
 
-        Materials.Flerovium                          = new Materials( 984, TextureSet.SET_SHINY             ,   1.0F,      0,  0, 1|2  |8   |32|64|128      , 255,255, 255,   0,   "Flerovium_GT5U"                ,    "Flerovium"                ,     0,       0,         0,    0, false,  false,  1 ,  1,   1, Dyes.dyeWhite      , Element.Fl         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 3))).disableAutoGeneratedBlastFurnaceRecipes();
+        Materials.Flerovium                          = new Materials( 984, TextureSet.SET_SHINY             ,   1.0F,      0,  0, 1|2  |8   |32|64|128      , 255,255, 255,   0,   "Flerovium_GT5U"                ,    "Flerovium"                ,     0,       0,         0,    0, false,  false,  1 ,  1,   1, Dyes.dyeWhite      , Element.Fl         , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 3))).disableAutoGeneratedBlastFurnaceRecipes();
         Materials.Organic                            = new Materials(  -1, TextureSet.SET_LEAF              ,   1.0F,      0,  1,                                          false,   "Organic"                 ,   "Organic"                       );
         Materials.AnyCopper                          = new Materials(  -1, TextureSet.SET_SHINY             ,   1.0F,      0,  3,                                          false,   "AnyCopper"               ,   "AnyCopper"                     );
         Materials.AnyBronze                          = new Materials(  -1, TextureSet.SET_SHINY             ,   1.0F,      0,  3,                                          false,   "AnyBronze"               ,   "AnyBronze"                     );
@@ -304,7 +304,7 @@ public class MaterialsInit1 {
         Materials.Adluorite               = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1|2  |8      |64|128      , 255, 255, 255,   0,   "Adluorite"               ,   "Adluorite"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightBlue   );
         Materials.Agate                   = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1                         , 255, 255, 255,   0,   "Agate"                   ,   "Agate"                         ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL          );
         Materials.Alduorite               = new Materials( 485, TextureSet.SET_SHINY             ,  32.0F,   8192,  1, 1|2  |8      |64|128      , 159, 180, 180,   0,   "Alduorite"               ,   "Alduorite"                     ,    0,       0,       6600, 6600,  true, false,   1,   1,   1, Dyes._NULL          ).disableAutoGeneratedBlastFurnaceRecipes().setTurbineMultipliers(6, 1, 1);
-        Materials.Amber                   = new Materials( 514, TextureSet.SET_RUBY              ,   4.0F,    128,  2, 1  |4|8      |64          , 255, 128,   0, 127,   "Amber"                   ,   "Amber"                         ,    5,       3,         -1,    0, false,  true,   1,   1,   1, Dyes.dyeOrange      ,1,  Arrays.asList(new MaterialStack(Carbon, 10), new MaterialStack(Hydrogen, 10), new MaterialStack(Oxygen, 16)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VINCULUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1)));
+        Materials.Amber                   = new Materials( 514, TextureSet.SET_RUBY              ,   4.0F,    128,  2, 1  |4|8      |64          , 255, 128,   0, 127,   "Amber"                   ,   "Amber"                         ,    5,       3,         -1,    0, false,  true,   1,   1,   1, Dyes.dyeOrange      ,1,  Arrays.asList(new MaterialStack(Carbon, 10), new MaterialStack(Hydrogen, 10), new MaterialStack(Oxygen, 16)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VINCULUM, 2), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1)));
         Materials.Ammonium                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1                         , 255, 255, 255,   0,   "Ammonium"                ,   "Ammonium"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
         Materials.Amordrine               = new Materials(  -1, TextureSet.SET_NONE              ,   6.0F,     64,  2, 1|2  |8      |64          , 255, 255, 255,   0,   "Amordrine"               ,   "Amordrine"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
         Materials.Andesite                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1    |8                   , 255, 255, 255,   0,   "Andesite"                ,   "Andesite"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
@@ -321,8 +321,8 @@ public class MaterialsInit1 {
         Materials.Blutonium               = new Materials(  -1, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2  |8                   ,   0,   0, 255,   0,   "Blutonium"               ,   "Blutonium"                     ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeBlue        );
         Materials.Carmot                  = new Materials( 962, TextureSet.SET_METALLIC          ,  16.0F,    128,  1, 1|2  |8      |64          , 217, 205, 140,   0,   "Carmot"                  ,   "Carmot"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
         Materials.Celenegil               = new Materials( 964, TextureSet.SET_METALLIC          ,  10.0F,   4096,  2, 1|2  |8      |64          , 148, 204,  72,   0,   "Celenegil"               ,   "Celenegil"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
-        Materials.CertusQuartz            = new Materials( 516, TextureSet.SET_QUARTZ            ,   5.0F,     32,  1, 1  |4|8      |64          , 210, 210, 230,   0,   "CertusQuartz"            ,   "Certus Quartz"                 ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeLightGray   , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1)));
-        Materials.CertusQuartzCharged     = new Materials( 517, TextureSet.SET_QUARTZ            ,   5.0F,     32,  1,       8                   , 221, 221, 236,   0,   "ChargedCertusQuartz"     ,   "Charged Certus Quartz"         ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeLightGray   , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1)));
+        Materials.CertusQuartz            = new Materials( 516, TextureSet.SET_QUARTZ            ,   5.0F,     32,  1, 1  |4|8      |64          , 210, 210, 230,   0,   "CertusQuartz"            ,   "Certus Quartz"                 ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeLightGray   , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1)));
+        Materials.CertusQuartzCharged     = new Materials( 517, TextureSet.SET_QUARTZ            ,   5.0F,     32,  1,       8                   , 221, 221, 236,   0,   "ChargedCertusQuartz"     ,   "Charged Certus Quartz"         ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeLightGray   , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1), new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1)));
         Materials.Ceruclase               = new Materials( 952, TextureSet.SET_METALLIC          ,  32.0F,   1280,  2, 1|2  |8      |64|128      , 140, 189, 208,   0,   "Ceruclase"               ,   "Ceruclase"                     ,    0,       0,         6600,    6600, true, false,   1,   1,   1, Dyes.dyeBlue        ).disableAutoGeneratedBlastFurnaceRecipes().setTurbineMultipliers(1, 22, 1);
         Materials.Citrine                 = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1                         , 255, 255, 255,   0,   "Citrine"                 ,   "Citrine"                       ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL          );
         Materials.CobaltHexahydrate       = new Materials( 853, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1      |16                ,  80,  80, 250,   0,   "CobaltHexahydrate"       ,   "Cobalt Hexahydrate"            ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlue        );
@@ -338,7 +338,7 @@ public class MaterialsInit1 {
         Materials.DarkIron                = new Materials( 342, TextureSet.SET_DULL              ,   7.0F,    384,  3, 1|2  |8      |64          ,  55,  40,  60,   0,   "DarkIron"                ,   "Deep Dark Iron"                ,    0,       0,         -1,    0, false, false,   5,   1,   1, Dyes.dyePurple      );
         Materials.DarkStone               = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1                         , 255, 255, 255,   0,   "DarkStone"               ,   "Dark Stone"                    ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeBlack       );
         Materials.Demonite                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1                         , 255, 255, 255,   0,   "Demonite"                ,   "Demonite"                      ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeRed         );
-        Materials.Desh                    = new Materials( 884, TextureSet.SET_DULL              ,  20.0F,   1280,  4, 1|2  |8   |32|64|128      ,  40,  40,  40,   0,   "Desh"                    ,   "Desh"                          ,    0,       0,       2500, 2500,  true, false,   1,   1,   1, Dyes.dyeBlack       ,Element.De, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Desh                    = new Materials( 884, TextureSet.SET_DULL              ,  20.0F,   1280,  4, 1|2  |8   |32|64|128      ,  40,  40,  40,   0,   "Desh"                    ,   "Desh"                          ,    0,       0,       2500, 2500,  true, false,   1,   1,   1, Dyes.dyeBlack       ,Element.De, Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
         Materials.Desichalkos             = new Materials(  -1, TextureSet.SET_NONE              ,   6.0F,   1280,  3, 1|2  |8      |64          , 255, 255, 255,   0,   "Desichalkos"             ,   "Desichalkos"                   ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
         Materials.Dilithium               = new Materials( 515, TextureSet.SET_DIAMOND           ,   1.0F,      0,  1, 1  |4|8|16                , 255, 250, 250, 127,   "Dilithium"               ,   "Dilithium"                     ,    0,       0,         -1,    0, false,  true,   1,   1,   1, Dyes.dyeWhite       );
         Materials.Draconic                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1                         , 255, 255, 255,   0,   "Draconic"                ,   "Draconic"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeRed         );
@@ -347,44 +347,44 @@ public class MaterialsInit1 {
         Materials.Eclogite                = new Materials( 860, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1                         , 255, 255, 255,   0,   "Eclogite"                ,   "Eclogite"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
         Materials.ElectrumFlux            = new Materials( 320, TextureSet.SET_SHINY             ,  16.0F,    512,  3, 1|2  |8      |64|128      , 255, 255, 120,   0,   "ElectrumFlux"            ,   "Fluxed Electrum"               ,    0,       0,       9000, 9000,  true, false,   1,   1,   1, Dyes.dyeYellow      ).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
         Materials.Emery                   = new Materials( 861, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1    |8                   , 255, 255, 255,   0,   "Emery"                   ,   "Emery"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
-        Materials.EnderiumBase            = new Materials( 380, TextureSet.SET_DULL              ,  16.0F,    768,  4, 1|2          |64|128      ,  72, 119, 153,   0,   "EnderiumBase"            ,   "Enderium Base"                 ,    0,       0,       3600, 3600,  true, false,   1,   1,   1, Dyes.dyeGreen       , 1, Arrays.asList(new MaterialStack(Tin, 2), new MaterialStack(Silver, 1), new MaterialStack(Platinum, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.EnderiumBase            = new Materials( 380, TextureSet.SET_DULL              ,  16.0F,    768,  4, 1|2          |64|128      ,  72, 119, 153,   0,   "EnderiumBase"            ,   "Enderium Base"                 ,    0,       0,       3600, 3600,  true, false,   1,   1,   1, Dyes.dyeGreen       , 1, Arrays.asList(new MaterialStack(Tin, 2), new MaterialStack(Silver, 1), new MaterialStack(Platinum, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
         Materials.Energized               = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 0                         , 255, 255, 255,   0,   "Energized"               ,   "Energized"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
         Materials.Epidote                 = new Materials( 862, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1                         , 255, 255, 255,   0,   "Epidote"                 ,   "Epidote"                       ,    0,       0,         -1,    0, false, false,   0,   1,   1, Dyes._NULL          );
         Materials.Eximite                 = new Materials( 959, TextureSet.SET_METALLIC          ,   5.0F,   2560,  3, 1|2  |8      |64          , 124,  90, 150,   0,   "Eximite"                 ,   "Eximite"                       ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
-        Materials.FierySteel              = new Materials( 346, TextureSet.SET_FIERY             ,   8.0F,    256,  3, 1|2          |64|128      ,  64,   0,   0,   0,   "FierySteel"              ,   "Fiery Steel"                   ,    5,    2048,       1811, 1800,  true, false,   1,   1,   1, Dyes.dyeRed         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 3))).disableAutoGeneratedBlastFurnaceRecipes();
+        Materials.FierySteel              = new Materials( 346, TextureSet.SET_FIERY             ,   8.0F,    256,  3, 1|2          |64|128      ,  64,   0,   0,   0,   "FierySteel"              ,   "Fiery Steel"                   ,    5,    2048,       1811, 1800,  true, false,   1,   1,   1, Dyes.dyeRed         , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 3), new TCAspects.TC_AspectStack(TCAspects.IGNIS, 3), new TCAspects.TC_AspectStack(TCAspects.CORPUS, 3))).disableAutoGeneratedBlastFurnaceRecipes();
         Materials.Firestone               = new Materials( 347, TextureSet.SET_QUARTZ            ,   6.0F,   1280,  3, 1  |4|8      |64          , 200,  20,   0,   0,   "Firestone"               ,   "Firestone"                     ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeRed         );
         Materials.Fluorite                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1    |8                   , 255, 255, 255,   0,   "Fluorite"                ,   "Fluorite"                      ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeGreen       );
-        Materials.FoolsRuby               = new Materials( 512, TextureSet.SET_RUBY              ,   1.0F,      0,  2, 1  |4|8                   , 255, 100, 100, 127,   "FoolsRuby"               ,   "Spinel"                          ,    0,       0,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeRed         , 1, Arrays.asList(new MaterialStack(Magnesium, 1), new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 4)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 2)));
-        Materials.Force                   = new Materials( 521, TextureSet.SET_DIAMOND           ,  10.0F,    128,  3, 1|2|4|8      |64|128      , 255, 255,   0,   0,   "Force"                   ,   "Force"                         ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeYellow      , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 5)));
-        Materials.Forcicium               = new Materials( 518, TextureSet.SET_DIAMOND           ,   1.0F,      0,  1, 1  |4|8|16                ,  50,  50,  70,   0,   "Forcicium"               ,   "Forcicium"                     ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeGreen       , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2)));
-        Materials.Forcillium              = new Materials( 519, TextureSet.SET_DIAMOND           ,   1.0F,      0,  1, 1  |4|8|16                ,  50,  50,  70,   0,   "Forcillium"              ,   "Forcillium"                    ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeGreen       , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2)));
+        Materials.FoolsRuby               = new Materials( 512, TextureSet.SET_RUBY              ,   1.0F,      0,  2, 1  |4|8                   , 255, 100, 100, 127,   "FoolsRuby"               ,   "Spinel"                          ,    0,       0,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeRed         , 1, Arrays.asList(new MaterialStack(Magnesium, 1), new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 4)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 2), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 2)));
+        Materials.Force                   = new Materials( 521, TextureSet.SET_DIAMOND           ,  10.0F,    128,  3, 1|2|4|8      |64|128      , 255, 255,   0,   0,   "Force"                   ,   "Force"                         ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeYellow      , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 5)));
+        Materials.Forcicium               = new Materials( 518, TextureSet.SET_DIAMOND           ,   1.0F,      0,  1, 1  |4|8|16                ,  50,  50,  70,   0,   "Forcicium"               ,   "Forcicium"                     ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeGreen       , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2)));
+        Materials.Forcillium              = new Materials( 519, TextureSet.SET_DIAMOND           ,   1.0F,      0,  1, 1  |4|8|16                ,  50,  50,  70,   0,   "Forcillium"              ,   "Forcillium"                    ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeGreen       , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2)));
         Materials.Gabbro                  = new Materials( 863, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1                         , 255, 255, 255,   0,   "Gabbro"                  ,   "Gabbro"                        ,    0,       0,         -1,    0, false, false,   0,   1,   1, Dyes._NULL          );
-        Materials.Glowstone               = new Materials( 811, TextureSet.SET_SHINY             ,   1.0F,      0,  1, 1      |16                , 255, 255,   0,   0,   "Glowstone"               ,   "Glowstone"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow      , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1)));
+        Materials.Glowstone               = new Materials( 811, TextureSet.SET_SHINY             ,   1.0F,      0,  1, 1      |16                , 255, 255,   0,   0,   "Glowstone"               ,   "Glowstone"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow      , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.LUX, 2), new TCAspects.TC_AspectStack(TCAspects.SENSUS, 1)));
         Materials.Gneiss                  = new Materials( 864, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1                         , 255, 255, 255,   0,   "Gneiss"                  ,   "Gneiss"                        ,    0,       0,         -1,    0, false, false,   0,   1,   1, Dyes._NULL          );
-        Materials.Graphite                = new Materials( 865, TextureSet.SET_DULL              ,   5.0F,     32,  2, 1    |8|16   |64          , 128, 128, 128,   0,   "Graphite"                ,   "Graphite"                      ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeGray        , 0, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1)));
-        Materials.Graphene                = new Materials( 819, TextureSet.SET_DULL              ,   6.0F,     32,  1, 1            |64          , 128, 128, 128,   0,   "Graphene"                ,   "Graphene"                      ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeGray        , 0, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1)));
+        Materials.Graphite                = new Materials( 865, TextureSet.SET_DULL              ,   5.0F,     32,  2, 1    |8|16   |64          , 128, 128, 128,   0,   "Graphite"                ,   "Graphite"                      ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeGray        , 0, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 2), new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1)));
+        Materials.Graphene                = new Materials( 819, TextureSet.SET_DULL              ,   6.0F,     32,  1, 1            |64          , 128, 128, 128,   0,   "Graphene"                ,   "Graphene"                      ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeGray        , 0, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 2), new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1)));
         Materials.Greenschist             = new Materials( 866, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1                         , 255, 255, 255,   0,   "Greenschist"             ,   "Green Schist"                  ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGreen       );
         Materials.Greenstone              = new Materials( 867, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1                         , 255, 255, 255,   0,   "Greenstone"              ,   "Greenstone"                    ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGreen       );
         Materials.Greywacke               = new Materials( 897, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1                         , 255, 255, 255,   0,   "Greywacke"               ,   "Greywacke"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGray        );
         Materials.Haderoth                = new Materials( 963, TextureSet.SET_METALLIC          ,  10.0F,   3200,  3, 1|2  |8      |64          , 119,  52,  30,   0,   "Haderoth"                ,   "Haderoth"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
         Materials.Hematite                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1|2  |8                   , 255, 255, 255,   0,   "Hematite"                ,   "Hematite"                      ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL          );
         Materials.Hepatizon               = new Materials( 957, TextureSet.SET_METALLIC          ,  12.0F,    128,  2, 1|2  |8      |64          , 117,  94, 117,   0,   "Hepatizon"               ,   "Hepatizon"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
-        Materials.HSLA                    = new Materials( 322, TextureSet.SET_METALLIC          ,   6.0F,    500,  3, 1|2          |64|128      , 128, 128, 128,   0,   "HSLA"                    ,   "HSLA Steel"                    ,    0,       0,       1811, 1000,  true, false,   3,   1,   1, Dyes._NULL          , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1)));
+        Materials.HSLA                    = new Materials( 322, TextureSet.SET_METALLIC          ,   6.0F,    500,  3, 1|2          |64|128      , 128, 128, 128,   0,   "HSLA"                    ,   "HSLA Steel"                    ,    0,       0,       1811, 1000,  true, false,   3,   1,   1, Dyes._NULL          , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1), new TCAspects.TC_AspectStack(TCAspects.ORDO, 1)));
         Materials.Ignatius                = new Materials( 950, TextureSet.SET_METALLIC          ,  12.0F,    512,  2, 1|2                       , 255, 169,  83,   0,   "Ignatius"                ,   "Ignatius"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
         Materials.Infernal                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 0                         , 255, 255, 255,   0,   "Infernal"                ,   "Infernal"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
         Materials.Infuscolium             = new Materials( 490, TextureSet.SET_METALLIC          ,   6.0F,     64,  2, 1|2  |8      |64          , 146,  33,  86,   0,   "Infuscolium"             ,   "Infuscolium"                   ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL          );
         Materials.InfusedGold             = new Materials( 323, TextureSet.SET_SHINY             ,  12.0F,     64,  3, 1|2  |8      |64|128      , 255, 200,  60,   0,   "InfusedGold"             ,   "Infused Gold"                  ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeYellow      );
-        Materials.InfusedAir              = new Materials( 540, TextureSet.SET_SHARDS            ,   8.0F,     64,  3, 1  |4|8      |64|128      , 255, 255,   0,   0,   "InfusedAir"              ,   "Aer"                           ,    5,     160,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeYellow      , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.AER, 2)));
-        Materials.InfusedFire             = new Materials( 541, TextureSet.SET_SHARDS            ,   8.0F,     64,  3, 1  |4|8      |64|128      , 255,   0,   0,   0,   "InfusedFire"             ,   "Ignis"                         ,    5,     320,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeRed         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 2)));
-        Materials.InfusedEarth            = new Materials( 542, TextureSet.SET_SHARDS            ,   8.0F,    256,  3, 1  |4|8      |64|128      ,   0, 255,   0,   0,   "InfusedEarth"            ,   "Terra"                         ,    5,     160,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeGreen       , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 2)));
-        Materials.InfusedWater            = new Materials( 543, TextureSet.SET_SHARDS            ,   8.0F,     64,  3, 1  |4|8      |64|128      ,   0,   0, 255,   0,   "InfusedWater"            ,   "Aqua"                          ,    5,     160,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeBlue        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2)));
-        Materials.InfusedEntropy          = new Materials( 544, TextureSet.SET_SHARDS            ,  32.0F,     64,  4, 1  |4|8      |64|128      ,  62,  62,  62,   0,   "InfusedEntropy"          ,   "Perditio"                      ,    5,     320,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeBlack       , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 2)));
-        Materials.InfusedOrder            = new Materials( 545, TextureSet.SET_SHARDS            ,   8.0F,     64,  3, 1  |4|8      |64|128      , 252, 252, 252,   0,   "InfusedOrder"            ,   "Ordo"                          ,    5,     240,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeWhite       , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2)));
-        Materials.InfusedVis              = new Materials(  -1, TextureSet.SET_SHARDS            ,   8.0F,     64,  3, 1  |4|8      |64|128      , 255,   0, 255,   0,   "InfusedVis"              ,   "Auram"                         ,    5,     240,         -1,    0, false,  true,   3,   1,   1, Dyes.dyePurple      , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 2)));
-        Materials.InfusedDull             = new Materials(  -1, TextureSet.SET_SHARDS            ,  32.0F,     64,  3, 1  |4|8      |64|128      , 100, 100, 100,   0,   "InfusedDull"             ,   "Vacuus"                        ,    5,     160,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeLightGray   , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 2)));
+        Materials.InfusedAir              = new Materials( 540, TextureSet.SET_SHARDS            ,   8.0F,     64,  3, 1  |4|8      |64|128      , 255, 255,   0,   0,   "InfusedAir"              ,   "Aer"                           ,    5,     160,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeYellow      , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 1), new TCAspects.TC_AspectStack(TCAspects.AER, 2)));
+        Materials.InfusedFire             = new Materials( 541, TextureSet.SET_SHARDS            ,   8.0F,     64,  3, 1  |4|8      |64|128      , 255,   0,   0,   0,   "InfusedFire"             ,   "Ignis"                         ,    5,     320,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeRed         , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 1), new TCAspects.TC_AspectStack(TCAspects.IGNIS, 2)));
+        Materials.InfusedEarth            = new Materials( 542, TextureSet.SET_SHARDS            ,   8.0F,    256,  3, 1  |4|8      |64|128      ,   0, 255,   0,   0,   "InfusedEarth"            ,   "Terra"                         ,    5,     160,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeGreen       , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 1), new TCAspects.TC_AspectStack(TCAspects.TERRA, 2)));
+        Materials.InfusedWater            = new Materials( 543, TextureSet.SET_SHARDS            ,   8.0F,     64,  3, 1  |4|8      |64|128      ,   0,   0, 255,   0,   "InfusedWater"            ,   "Aqua"                          ,    5,     160,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeBlue        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 1), new TCAspects.TC_AspectStack(TCAspects.AQUA, 2)));
+        Materials.InfusedEntropy          = new Materials( 544, TextureSet.SET_SHARDS            ,  32.0F,     64,  4, 1  |4|8      |64|128      ,  62,  62,  62,   0,   "InfusedEntropy"          ,   "Perditio"                      ,    5,     320,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeBlack       , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 1), new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 2)));
+        Materials.InfusedOrder            = new Materials( 545, TextureSet.SET_SHARDS            ,   8.0F,     64,  3, 1  |4|8      |64|128      , 252, 252, 252,   0,   "InfusedOrder"            ,   "Ordo"                          ,    5,     240,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeWhite       , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 1), new TCAspects.TC_AspectStack(TCAspects.ORDO, 2)));
+        Materials.InfusedVis              = new Materials(  -1, TextureSet.SET_SHARDS            ,   8.0F,     64,  3, 1  |4|8      |64|128      , 255,   0, 255,   0,   "InfusedVis"              ,   "Auram"                         ,    5,     240,         -1,    0, false,  true,   3,   1,   1, Dyes.dyePurple      , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 1), new TCAspects.TC_AspectStack(TCAspects.AURAM, 2)));
+        Materials.InfusedDull             = new Materials(  -1, TextureSet.SET_SHARDS            ,  32.0F,     64,  3, 1  |4|8      |64|128      , 100, 100, 100,   0,   "InfusedDull"             ,   "Vacuus"                        ,    5,     160,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeLightGray   , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 1), new TCAspects.TC_AspectStack(TCAspects.VACUOS, 2)));
         Materials.Inolashite              = new Materials( 954, TextureSet.SET_NONE              ,   8.0F,   2304,  3, 1|2  |8      |64          , 148, 216, 187,   0,   "Inolashite"              ,   "Inolashite"                    ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGreen       );
         Materials.Invisium                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1                         , 255, 255, 255,   0,   "Invisium"                ,   "Invisium"                      ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL          );
-        Materials.Jade                    = new Materials( 537, TextureSet.SET_SHINY             ,   1.0F,     16,  2, 1  |4|8      |64          ,   0, 100,   0,   0,   "Jade"                    ,   "Jade"                          ,    0,       0,         -1,    0, false, false,   5,   1,   1, Dyes.dyeGreen       ,0, Arrays.asList(new MaterialStack(Sodium, 1), new MaterialStack(Aluminium, 1), new MaterialStack(Silicon, 2), new MaterialStack(Oxygen, 6)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 6), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 3)));
+        Materials.Jade                    = new Materials( 537, TextureSet.SET_SHINY             ,   1.0F,     16,  2, 1  |4|8      |64          ,   0, 100,   0,   0,   "Jade"                    ,   "Jade"                          ,    0,       0,         -1,    0, false, false,   5,   1,   1, Dyes.dyeGreen       ,0, Arrays.asList(new MaterialStack(Sodium, 1), new MaterialStack(Aluminium, 1), new MaterialStack(Silicon, 2), new MaterialStack(Oxygen, 6)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 6), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3)));
         Materials.Kalendrite              = new Materials( 953, TextureSet.SET_METALLIC          ,   5.0F,   2560,  3, 1|2                       , 170,  91, 189,   0,   "Kalendrite"              ,   "Kalendrite"                    ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
         Materials.Komatiite               = new Materials( 869, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1                         , 255, 255, 255,   0,   "Komatiite"               ,   "Komatiite"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow      );
         Materials.Lava                    = new Materials( 700, TextureSet.SET_FLUID             ,   1.0F,      0,  1,         16                , 255,  64,   0,   0,   "Lava"                    ,   "Lava"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      );
@@ -393,20 +393,20 @@ public class MaterialsInit1 {
         Materials.Magma                   = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  1, 0                         , 255,  64,   0,   0,   "Magma"                   ,   "Magma"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      );
         Materials.Mawsitsit               = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  1, 1                         , 255, 255, 255,   0,   "Mawsitsit"               ,   "Mawsitsit"                     ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL          );
         Materials.Mercassium              = new Materials(  -1, TextureSet.SET_NONE              ,   6.0F,     64,  1, 1|2  |8      |64          , 255, 255, 255,   0,   "Mercassium"              ,   "Mercassium"                    ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
-        Materials.MeteoricIron            = new Materials( 340, TextureSet.SET_METALLIC          ,   6.0F,    384,  3, 1|2  |8   |32|64          , 100,  50,  80,   0,   "MeteoricIron"            ,   "Meteoric Iron"                 ,    0,       0,       1811, 1000,  true, false,   1,   1,   1, Dyes.dyeGray        ,Element.SpFe, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 1)));
-        Materials.MeteoricSteel           = new Materials( 341, TextureSet.SET_METALLIC          ,   6.0F,    768,  4, 1|2          |64          ,  50,  25,  40,   0,   "MeteoricSteel"           ,   "Meteoric Steel"                ,    0,       0,       1811, 1000,  true, false,   4,  51,  50, Dyes.dyeGray        , 1, Arrays.asList(new MaterialStack(Materials.MeteoricIron, 50), new MaterialStack(Carbon, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1)));
+        Materials.MeteoricIron            = new Materials( 340, TextureSet.SET_METALLIC          ,   6.0F,    384,  3, 1|2  |8   |32|64          , 100,  50,  80,   0,   "MeteoricIron"            ,   "Meteoric Iron"                 ,    0,       0,       1811, 1000,  true, false,   1,   1,   1, Dyes.dyeGray        ,Element.SpFe, Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1)));
+        Materials.MeteoricSteel           = new Materials( 341, TextureSet.SET_METALLIC          ,   6.0F,    768,  4, 1|2          |64          ,  50,  25,  40,   0,   "MeteoricSteel"           ,   "Meteoric Steel"                ,    0,       0,       1811, 1000,  true, false,   4,  51,  50, Dyes.dyeGray        , 1, Arrays.asList(new MaterialStack(Materials.MeteoricIron, 50), new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1), new TCAspects.TC_AspectStack(TCAspects.ORDO, 1)));
         Materials.Meteorite               = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  1, 1    |8                   ,  80,  35,  60,   0,   "Meteorite"               ,   "Meteorite"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyePurple      );
         Materials.Meutoite                = new Materials( 487, TextureSet.SET_METALLIC          ,   1.0F,      0,  1, 1    |8                   ,  95,  82, 105,   0,   "Meutoite"                ,   "Meutoite"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
         Materials.Migmatite               = new Materials( 872, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1                         , 255, 255, 255,   0,   "Migmatite"               ,   "Migmatite"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
         Materials.Mimichite               = new Materials(  -1, TextureSet.SET_GEM_VERTICAL      ,   1.0F,      0,  1, 1  |4|8                   , 255, 255, 255,   0,   "Mimichite"               ,   "Mimichite"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
-        Materials.Moonstone               = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  1, 1    |8                   , 255, 255, 255,   0,   "Moonstone"               ,   "Moonstone"                     ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeWhite       , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 1)));
-        Materials.Naquadah                = new Materials( 324, TextureSet.SET_METALLIC          ,   6.0F,   1280,  4, 1|2  |8   |32|64|128      ,  50,  50,  50,   0,   "Naquadah"                ,   "Naquadah"                      ,    0,       0,       5400, 5400,  true, false,  10,   1,   1, Dyes.dyeBlack       , Element.Nq, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.NaquadahAlloy           = new Materials( 325, TextureSet.SET_METALLIC          ,   8.0F,   5120,  5, 1|2          |64|128      ,  40,  40,  40,   0,   "NaquadahAlloy"           ,   "Naquadah Alloy"                ,    0,       0,       7200, 7200,  true, false,  10,   1,   1, Dyes.dyeBlack       , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4), new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.NaquadahEnriched        = new Materials( 326, TextureSet.SET_METALLIC          ,   6.0F,   1280,  4, 1|2  |8      |64          ,  50,  50,  50,   0,   "NaquadahEnriched"        ,   "Enriched Naquadah"             ,    0,       0,       4500, 4500,  true, false,  15,   1,   1, Dyes.dyeBlack       , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 2))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Naquadria               = new Materials( 327, TextureSet.SET_SHINY             ,   1.0F,    512,  4, 1|2  |8      |64          ,  30,  30,  30,   0,   "Naquadria"               ,   "Naquadria"                     ,    0,       0,       9000, 9000,  true, false,  20,   1,   1, Dyes.dyeBlack       , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 3))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Moonstone               = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  1, 1    |8                   , 255, 255, 255,   0,   "Moonstone"               ,   "Moonstone"                     ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeWhite       , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1), new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 1)));
+        Materials.Naquadah                = new Materials( 324, TextureSet.SET_METALLIC          ,   6.0F,   1280,  4, 1|2  |8   |32|64|128      ,  50,  50,  50,   0,   "Naquadah"                ,   "Naquadah"                      ,    0,       0,       5400, 5400,  true, false,  10,   1,   1, Dyes.dyeBlack       , Element.Nq, Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 3), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.NaquadahAlloy           = new Materials( 325, TextureSet.SET_METALLIC          ,   8.0F,   5120,  5, 1|2          |64|128      ,  40,  40,  40,   0,   "NaquadahAlloy"           ,   "Naquadah Alloy"                ,    0,       0,       7200, 7200,  true, false,  10,   1,   1, Dyes.dyeBlack       , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.NaquadahEnriched        = new Materials( 326, TextureSet.SET_METALLIC          ,   6.0F,   1280,  4, 1|2  |8      |64          ,  50,  50,  50,   0,   "NaquadahEnriched"        ,   "Enriched Naquadah"             ,    0,       0,       4500, 4500,  true, false,  15,   1,   1, Dyes.dyeBlack       , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 3), new TCAspects.TC_AspectStack(TCAspects.RADIO, 2), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 2))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Naquadria               = new Materials( 327, TextureSet.SET_SHINY             ,   1.0F,    512,  4, 1|2  |8      |64          ,  30,  30,  30,   0,   "Naquadria"               ,   "Naquadria"                     ,    0,       0,       9000, 9000,  true, false,  20,   1,   1, Dyes.dyeBlack       , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4), new TCAspects.TC_AspectStack(TCAspects.RADIO, 3), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 3))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
         Materials.Nether                  = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  1, 0                         , 255, 255, 255,   0,   "Nether"                  ,   "Nether"                        ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL          );
-        Materials.NetherBrick             = new Materials( 814, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1                         , 100,   0,   0,   0,   "NetherBrick"             ,   "Nether Brick"                  ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeRed         , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1)));
-        Materials.NetherQuartz            = new Materials( 522, TextureSet.SET_QUARTZ            ,   1.0F,     32,  1, 1  |4|8      |64          , 230, 210, 210,   0,   "NetherQuartz"            ,   "Nether Quartz"                 ,    0,       0,         -1,    0, false, false,   2,   1,   1, Dyes.dyeWhite       , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1)));
+        Materials.NetherBrick             = new Materials( 814, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1                         , 100,   0,   0,   0,   "NetherBrick"             ,   "Nether Brick"                  ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeRed         , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1)));
+        Materials.NetherQuartz            = new Materials( 522, TextureSet.SET_QUARTZ            ,   1.0F,     32,  1, 1  |4|8      |64          , 230, 210, 210,   0,   "NetherQuartz"            ,   "Nether Quartz"                 ,    0,       0,         -1,    0, false, false,   2,   1,   1, Dyes.dyeWhite       , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1)));
         Materials.NetherStar              = new Materials( 506, TextureSet.SET_NETHERSTAR        ,   6.0F,   5120,  4, 1|  4|8      |64          , 255, 255, 255,   0,   "NetherStar"              ,   "Nether Star"                   ,    5,   50000,         -1,    0, false, false,  15,   1,   1, Dyes.dyeWhite       );
         Materials.ObsidianFlux            = new Materials(  -1, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1|2                       ,  80,  50, 100,   0,   "ObsidianFlux"            ,   "Fluxed Obsidian"               ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyePurple      );
         Materials.Oilsands                = new Materials( 878, TextureSet.SET_NONE              ,   1.0F,      0,  1, 1    |8                   ,  10,  10,  10,   0,   "Oilsands"                ,   "Oilsands"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
@@ -427,20 +427,20 @@ public class MaterialsInit1 {
         Materials.Sand                    = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  1, 0                         , 255, 255, 255,   0,   "Sand"                    ,   "Sand"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow      );
         Materials.Sanguinite              = new Materials( 955, TextureSet.SET_METALLIC          ,   3.0F,   4480,  4, 1|2  |8                   , 185,   0,   0,   0,   "Sanguinite"              ,   "Sanguinite"                    ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
         Materials.Siltstone               = new Materials( 876, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1                         , 255, 255, 255,   0,   "Siltstone"               ,   "Siltstone"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          );
-        Materials.Sunstone                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  1, 1    |8                   , 255, 255, 255,   0,   "Sunstone"                ,   "Sunstone"                      ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeYellow      , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 1)));
+        Materials.Sunstone                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  1, 1    |8                   , 255, 255, 255,   0,   "Sunstone"                ,   "Sunstone"                      ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeYellow      , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1), new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 1)));
         Materials.Tar                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  1, 0                         ,  10,  10,  10,   0,   "Tar"                     ,   "Tar"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlack       );
         Materials.Tartarite               = new Materials( 956, TextureSet.SET_METALLIC          ,  32.0F,  20480,  3, 1|2  |8                   , 255, 118,  60,   0,   "Tartarite"               ,   "Tartarite"                     ,    0,       0,         10400,    10400, true, false,   1,   1,   1, Dyes._NULL          ).disableAutoGeneratedBlastFurnaceRecipes().setTurbineMultipliers(1120, 1120, 1);
         Materials.UUAmplifier             = new Materials( 721, TextureSet.SET_FLUID             ,   1.0F,      0,  1,         16                ,  96,   0, 128,   0,   "UUAmplifier"             ,   "UU-Amplifier"                  ,    0,       0,         -1,    0, false, false,  10,   1,   1, Dyes.dyePink        );
         Materials.UUMatter                = new Materials( 703, TextureSet.SET_FLUID             ,   1.0F,      0,  1,         16                , 128,   0, 196,   0,   "UUMatter"                ,   "UU-Matter"                     ,    0,       0,         -1,    0, false, false,  10,   1,   1, Dyes.dyePink        );
-        Materials.Void                    = new Materials( 970, TextureSet.SET_METALLIC          ,  32.0F,    512,  4, 1|2          |64|128      ,  28,   6,  57,   0,   "Void"                    ,   "Void"                          ,    5,    1500,         -1,    0, false,  true,   5,   2,   1, Dyes.dyeBlack       , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1)));
-        Materials.Voidstone               = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  1, 0                         , 255, 255, 255, 200,   "Voidstone"               ,   "Voidstone"                     ,    0,       0,         -1,    0, false,  true,   1,   1,   1, Dyes._NULL          , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1)));
+        Materials.Void                    = new Materials( 970, TextureSet.SET_METALLIC          ,  32.0F,    512,  4, 1|2          |64|128      ,  28,   6,  57,   0,   "Void"                    ,   "Void"                          ,    5,    1500,         -1,    0, false,  true,   5,   2,   1, Dyes.dyeBlack       , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.VACUOS, 1)));
+        Materials.Voidstone               = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  1, 0                         , 255, 255, 255, 200,   "Voidstone"               ,   "Voidstone"                     ,    0,       0,         -1,    0, false,  true,   1,   1,   1, Dyes._NULL          , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1), new TCAspects.TC_AspectStack(TCAspects.VACUOS, 1)));
         Materials.Vulcanite               = new Materials( 489, TextureSet.SET_METALLIC          ,  32.0F,  20480,  2, 1|2  |8      |64|128      , 255, 132,  72,   0,   "Vulcanite"               ,   "Vulcanite"                     ,    0,       0,         8400,    8400, true, false,   1,   1,   1, Dyes._NULL          ).disableAutoGeneratedBlastFurnaceRecipes().setTurbineMultipliers(40, 1, 1);
         Materials.Vyroxeres               = new Materials( 951, TextureSet.SET_METALLIC          ,  32.0F,   7680,  1, 1|2  |8      |64          ,  85, 224,   1,   0,   "Vyroxeres"               ,   "Vyroxeres"                     ,    0,       0,       5400, 5400, true, false,   1,   1,   1, Dyes._NULL          ).disableAutoGeneratedBlastFurnaceRecipes().setTurbineMultipliers(1, 3, 1);
         Materials.Yellorium               = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1|2                       , 255, 255, 255,   0,   "Yellorium"               ,   "Yellorium"                     ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeYellow      );
         Materials.Zectium                 = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1|2  |8                   , 255, 255, 255,   0,   "Zectium"                 ,   "Zectium"                       ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeBlack       );
 
-        Materials.Antimatter              = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Antimatter"              ,   "Antimatter"                    ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyePink        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 9), new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 8)));
-        Materials.AdvancedGlue            = new MaterialBuilder(567, TextureSet.SET_FLUID         ,                                                                                                         "Advanced Glue").setName("AdvancedGlue").addCell().addFluid().setRGB(255, 255, 185).setColor(Dyes.dyeYellow).setAspects(Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.LIMUS, 5))).constructMaterial();
+        Materials.Antimatter              = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Antimatter"              ,   "Antimatter"                    ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyePink        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 9), new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 8)));
+        Materials.AdvancedGlue            = new MaterialBuilder(567, TextureSet.SET_FLUID         ,                                                                                                         "Advanced Glue").setName("AdvancedGlue").addCell().addFluid().setRGB(255, 255, 185).setColor(Dyes.dyeYellow).setAspects(Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.LIMUS, 5))).constructMaterial();
         Materials.BioFuel                 = new Materials( 705, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 255, 128,   0,   0,   "BioFuel"                 ,   "Biofuel"                       ,    0,       6,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      );
         Materials.Biomass                 = new Materials( 704, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                ,   0, 255,   0,   0,   "Biomass"        	     ,   "Forestry Biomass"              ,    3,       8,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGreen       );
         Materials.CharcoalByproducts      = new MaterialBuilder(675, TextureSet.SET_FLUID             ,                                                                                                     "Charcoal Byproducts").addCell().setRGB(120, 68, 33).setColor(Dyes.dyeBrown).constructMaterial();
@@ -452,36 +452,36 @@ public class MaterialsInit1 {
         Materials.Cocoa                   = new Materials( 887, TextureSet.SET_FINE              ,   1.0F,      0,  0, 1                         , 190,  95,   0,   0,   "Cocoa"                   ,   "Cocoa"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBrown       );
         Materials.Coffee                  = new Materials( 888, TextureSet.SET_FINE              ,   1.0F,      0,  0, 1                         , 150,  75,   0,   0,   "Coffee"                  ,   "Coffee"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBrown       );
         Materials.Creosote                = new Materials( 712, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 128,  64,   0,   0,   "Creosote"                ,   "Creosote"                      ,    3,       8,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBrown       );
-        Materials.Ethanol                 = new Materials( 706, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 255, 128,   0,   0,   "Ethanol"                 ,   "Ethanol"                       ,    0,     192,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , 1, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1)));
-        Materials.FishOil                 = new Materials( 711, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 255, 196,   0,   0,   "FishOil"                 ,   "Fish Oil"                      ,    3,       2,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow      , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 2)));
+        Materials.Ethanol                 = new Materials( 706, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 255, 128,   0,   0,   "Ethanol"                 ,   "Ethanol"                       ,    0,     192,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , 1, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1), new TCAspects.TC_AspectStack(TCAspects.AQUA, 1)));
+        Materials.FishOil                 = new Materials( 711, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 255, 196,   0,   0,   "FishOil"                 ,   "Fish Oil"                      ,    3,       2,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow      , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.CORPUS, 2)));
         Materials.FermentedBiomass        = new MaterialBuilder(691, TextureSet.SET_FLUID             ,                                                                                                     "Fermented Biomass").addCell().addFluid().setRGB(68, 85, 0).setColor(Dyes.dyeBrown).constructMaterial();
         Materials.Fuel                    = new Materials( 708, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 255, 255,   0,   0,   "Fuel"                  ,   "Diesel"                        ,    0,     480,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow      );
-        Materials.Glue                    = new Materials( 726, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 200, 196,   0,   0,   "Glue"                    ,   "Refined Glue"                  ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.LIMUS, 2)));
-        Materials.Gunpowder               = new Materials( 800, TextureSet.SET_DULL              ,   1.0F,      0,  0, 1                         , 128, 128, 128,   0,   "Gunpowder"               ,   "Gunpowder"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGray        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 4)));
-        Materials.FryingOilHot            = new Materials( 727, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 200, 196,   0,   0,   "FryingOilHot"            ,   "Hot Frying Oil"                ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1)));
+        Materials.Glue                    = new Materials( 726, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 200, 196,   0,   0,   "Glue"                    ,   "Refined Glue"                  ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.LIMUS, 2)));
+        Materials.Gunpowder               = new Materials( 800, TextureSet.SET_DULL              ,   1.0F,      0,  0, 1                         , 128, 128, 128,   0,   "Gunpowder"               ,   "Gunpowder"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGray        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 3), new TCAspects.TC_AspectStack(TCAspects.IGNIS, 4)));
+        Materials.FryingOilHot            = new Materials( 727, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 200, 196,   0,   0,   "FryingOilHot"            ,   "Hot Frying Oil"                ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1), new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1)));
         Materials.Honey                   = new Materials( 725, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 210, 200,   0,   0,   "Honey"                   ,   "Honey"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow      );
         Materials.Leather                 = new Materials(  -1, TextureSet.SET_ROUGH             ,   1.0F,      0,  0, 1                         , 150, 150,  80, 127,   "Leather"                 ,   "Leather"                       ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      );
-        Materials.Lubricant               = new Materials( 724, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 255, 196,   0,   0,   "Lubricant"               ,   "Lubricant"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1)));
-        Materials.McGuffium239            = new Materials( 999, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 200,  50, 150,   0,   "McGuffium239"            ,   "Mc Guffium 239"                ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyePink        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 8), new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 8), new TC_Aspects.TC_AspectStack(TC_Aspects.SPIRITUS, 8), new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 8), new TC_Aspects.TC_AspectStack(TC_Aspects.VITIUM, 8), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 8), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 8), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8), new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 8), new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 8)));
+        Materials.Lubricant               = new Materials( 724, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 255, 196,   0,   0,   "Lubricant"               ,   "Lubricant"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 2), new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1)));
+        Materials.McGuffium239            = new Materials( 999, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 200,  50, 150,   0,   "McGuffium239"            ,   "Mc Guffium 239"                ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyePink        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 8), new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 8), new TCAspects.TC_AspectStack(TCAspects.SPIRITUS, 8), new TCAspects.TC_AspectStack(TCAspects.AURAM, 8), new TCAspects.TC_AspectStack(TCAspects.VITIUM, 8), new TCAspects.TC_AspectStack(TCAspects.RADIO, 8), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 8), new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 8), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 8), new TCAspects.TC_AspectStack(TCAspects.STRONTIO, 8)));
         Materials.MeatRaw                 = new Materials( 892, TextureSet.SET_FINE              ,   1.0F,      0,  0, 1                         , 255, 100, 100,   0,   "MeatRaw"                 ,   "Raw Meat"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyePink        );
         Materials.MeatCooked              = new Materials( 893, TextureSet.SET_FINE              ,   1.0F,      0,  0, 1                         , 150,  60,  20,   0,   "MeatCooked"              ,   "Cooked Meat"                   ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyePink        );
-        Materials.Milk                    = new Materials( 885, TextureSet.SET_FINE              ,   1.0F,      0,  0, 1      |16                , 254, 254, 254,   0,   "Milk"                    ,   "Milk"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 2)));
+        Materials.Milk                    = new Materials( 885, TextureSet.SET_FINE              ,   1.0F,      0,  0, 1      |16                , 254, 254, 254,   0,   "Milk"                    ,   "Milk"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.SANO, 2)));
         Materials.Mud                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Mud"                     ,   "Mud"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBrown       );
         Materials.Oil                     = new Materials( 707, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                ,  10,  10,  10,   0,   "Oil"                     ,   "Oil"                           ,    3,      20,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlack       );
-        Materials.Paper                   = new Materials( 879, TextureSet.SET_PAPER             ,   1.0F,      0,  0, 1                         , 250, 250, 250,   0,   "Paper"                   ,   "Paper"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1)));
-        Materials.Peat                    = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Peat"                    ,   "Peat"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBrown       , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 2)));
-        Materials.RareEarth               = new Materials( 891, TextureSet.SET_FINE              ,   1.0F,      0,  0, 1                         , 128, 128, 100,   0,   "RareEarth"               ,   "Rare Earth"                    ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGray        , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1)));
+        Materials.Paper                   = new Materials( 879, TextureSet.SET_PAPER             ,   1.0F,      0,  0, 1                         , 250, 250, 250,   0,   "Paper"                   ,   "Paper"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 1)));
+        Materials.Peat                    = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Peat"                    ,   "Peat"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBrown       , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2), new TCAspects.TC_AspectStack(TCAspects.IGNIS, 2)));
+        Materials.RareEarth               = new Materials( 891, TextureSet.SET_FINE              ,   1.0F,      0,  0, 1                         , 128, 128, 100,   0,   "RareEarth"               ,   "Rare Earth"                    ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGray        , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1), new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 1)));
         Materials.Red                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255,   0,   0,   0,   "Red"                     ,   "Red"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeRed         );
         Materials.Reinforced              = new Materials( 383, TextureSet.SET_METALLIC          ,   7.0F,    480,  4, 1|2          |64|128      , 105, 141, 165,   0,   "Reinforced"              ,   "Reinforced"                    ,    0,       0,         -1, 1700,  true, false,   1,   1,   1, Dyes.dyeBlue        ).disableAutoGeneratedBlastFurnaceRecipes();
-        Materials.SeedOil                 = new Materials( 713, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 196, 255,   0,   0,   "SeedOil"                 ,   "Seed Oil"                      ,    3,       2,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLime        , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.GRANUM, 2)));
-        Materials.SeedOilHemp             = new Materials( 722, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 196, 255,   0,   0,   "SeedOilHemp"             ,   "Hemp Seed Oil"                 ,    3,       2,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLime        , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.GRANUM, 2)));
-        Materials.SeedOilLin              = new Materials( 723, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 196, 255,   0,   0,   "SeedOilLin"              ,   "Lin Seed Oil"                  ,    3,       2,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLime        , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.GRANUM, 2)));
-        Materials.Stone                   = new Materials( 299, TextureSet.SET_ROUGH             ,   4.0F,     32,  1, 1            |64|128      , 205, 205, 205,   0,   "Stone"                   ,   "Stone"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1)));
-        Materials.TNT                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "TNT"                     ,   "TNT"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeRed         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 7), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 4)));
-        Materials.Unstable                = new Materials( 396, TextureSet.SET_SHINY             ,   1.0F,      0,  4, 1                         , 220, 220, 220, 127,   "Unstable"                ,   "Unstable"                      ,    0,       0,         -1,    0, false,  true,   1,   1,   1, Dyes.dyeWhite       , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 4)));
-        Materials.Unstableingot           = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  4, 0                         , 255, 255, 255, 127,   "Unstableingot"           ,   "Unstable"                      ,    0,       0,         -1,    0, false,  true,   1,   1,   1, Dyes.dyeWhite       , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 4)));
+        Materials.SeedOil                 = new Materials( 713, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 196, 255,   0,   0,   "SeedOil"                 ,   "Seed Oil"                      ,    3,       2,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLime        , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.GRANUM, 2)));
+        Materials.SeedOilHemp             = new Materials( 722, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 196, 255,   0,   0,   "SeedOilHemp"             ,   "Hemp Seed Oil"                 ,    3,       2,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLime        , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.GRANUM, 2)));
+        Materials.SeedOilLin              = new Materials( 723, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 196, 255,   0,   0,   "SeedOilLin"              ,   "Lin Seed Oil"                  ,    3,       2,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLime        , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.GRANUM, 2)));
+        Materials.Stone                   = new Materials( 299, TextureSet.SET_ROUGH             ,   4.0F,     32,  1, 1            |64|128      , 205, 205, 205,   0,   "Stone"                   ,   "Stone"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.TERRA, 1)));
+        Materials.TNT                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "TNT"                     ,   "TNT"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeRed         , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 7), new TCAspects.TC_AspectStack(TCAspects.IGNIS, 4)));
+        Materials.Unstable                = new Materials( 396, TextureSet.SET_SHINY             ,   1.0F,      0,  4, 1                         , 220, 220, 220, 127,   "Unstable"                ,   "Unstable"                      ,    0,       0,         -1,    0, false,  true,   1,   1,   1, Dyes.dyeWhite       , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 4)));
+        Materials.Unstableingot           = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  4, 0                         , 255, 255, 255, 127,   "Unstableingot"           ,   "Unstable"                      ,    0,       0,         -1,    0, false,  true,   1,   1,   1, Dyes.dyeWhite       , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 4)));
         Materials.Vinegar                 = new MaterialBuilder(690, TextureSet.SET_FLUID             ,                                                                                                     "Vinegar").setColor(Dyes.dyeBrown).constructMaterial();
-        Materials.Wheat                   = new Materials( 881, TextureSet.SET_POWDER            ,   1.0F,      0,  0, 1                         , 255, 255, 196,   0,   "Wheat"                   ,   "Wheat"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow      , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 2)));
+        Materials.Wheat                   = new Materials( 881, TextureSet.SET_POWDER            ,   1.0F,      0,  0, 1                         , 255, 255, 196,   0,   "Wheat"                   ,   "Wheat"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow      , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.MESSIS, 2)));
         Materials.WoodGas                 = new MaterialBuilder(660, TextureSet.SET_FLUID             ,                                                                                                     "Wood Gas").addCell().addGas().setRGB(222, 205, 135).setColor(Dyes.dyeBrown).setFuelType(MaterialBuilder.GAS).setFuelPower(24).constructMaterial();
         Materials.WoodTar                 = new MaterialBuilder(662, TextureSet.SET_FLUID             ,                                                                                                     "Wood Tar").addCell().addFluid().setRGB(40, 23, 11).setColor(Dyes.dyeBrown).constructMaterial();
         Materials.WoodVinegar             = new MaterialBuilder(661, TextureSet.SET_FLUID             ,                                                                                                     "Wood Vinegar").addCell().addFluid().setRGB(212, 85, 0).setColor(Dyes.dyeBrown).constructMaterial();
@@ -502,57 +502,57 @@ public class MaterialsInit1 {
         Materials.LiquidNitrogen          = new Materials( 494, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             , 169, 208, 245, 240,   "LiquidNitrogen"          ,   "Liquid Nitrogen"               ,    0,       0,          4,    0, false,  true,   1,   1,   1, Dyes.dyeLightBlue   , 1, Collections.singletonList(new MaterialStack(Nitrogen, 1)));
         Materials.LiquidOxygen            = new Materials( 493, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16|32             , 169, 208, 245, 240,   "LiquidOxygen"            ,   "Liquid Oxygen"                 ,    0,       0,          4,    0, false,  true,   1,   1,   1, Dyes.dyeLightBlue   , 1, Collections.singletonList(new MaterialStack(Oxygen, 1)));
         Materials.SiliconDioxide          = new MaterialBuilder(837, TextureSet.SET_QUARTZ, "Silicon Dioxide").setToolSpeed(1.0F).setDurability(0).setToolQuality(1).addDustItems().setRGB(255, 255, 255).setColor(Dyes.dyeLightGray).setOreValue(1).setExtraData(0).setMaterialList(new MaterialStack(Silicon, 1), new MaterialStack(Oxygen, 2)).constructMaterial();
-        Materials.Jasper                  = new Materials( 511, TextureSet.SET_EMERALD           ,   1.0F,      0,  2, 1  |4|8      |64          , 200,  80,  80, 100,   "Jasper"                  ,   "Jasper"                        ,    0,       0,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeRed         , 1, Collections.singletonList(new MaterialStack(SiliconDioxide, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 4), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 2)));
+        Materials.Jasper                  = new Materials( 511, TextureSet.SET_EMERALD           ,   1.0F,      0,  2, 1  |4|8      |64          , 200,  80,  80, 100,   "Jasper"                  ,   "Jasper"                        ,    0,       0,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeRed         , 1, Collections.singletonList(new MaterialStack(SiliconDioxide, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 4), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 2)));
         Materials.Almandine               = new Materials( 820, TextureSet.SET_ROUGH             ,   1.0F,      0,  1, 1    |8                   , 255,   0,   0,   0,   "Almandine"               ,   "Almandine"                     ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeRed         , 0, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Iron, 3), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)));
         Materials.Andradite               = new Materials( 821, TextureSet.SET_ROUGH             ,   1.0F,      0,  1, 1    |8                   , 150, 120,   0,   0,   "Andradite"               ,   "Andradite"                     ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeYellow      , 1, Arrays.asList(new MaterialStack(Calcium, 3), new MaterialStack(Iron, 2), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)));
         Materials.AnnealedCopper          = new Materials( 345, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2             |128      , 255, 120,  20,   0,   "AnnealedCopper"          ,   "Annealed Copper"               ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeOrange      , 2, Collections.singletonList(new MaterialStack(Copper, 1)));
         Materials.Asbestos                = new Materials( 946, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1    |8                   , 230, 230, 230,   0,   "Asbestos"                ,   "Asbestos"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 1, Arrays.asList(new MaterialStack(Magnesium, 3), new MaterialStack(Silicon, 2), new MaterialStack(Hydrogen, 4), new MaterialStack(Oxygen, 9))); // Mg3Si2O5(OH)4
-        Materials.Ash                     = new Materials( 815, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1                         , 150, 150, 150,   0,   "Ash"                     ,   "Ashes"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , 2, Collections.singletonList(new MaterialStack(Carbon, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 1)));
+        Materials.Ash                     = new Materials( 815, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1                         , 150, 150, 150,   0,   "Ash"                     ,   "Ashes"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , 2, Collections.singletonList(new MaterialStack(Carbon, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 1)));
         Materials.BandedIron              = new Materials( 917, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1    |8                   , 145,  90,  90,   0,   "BandedIron"              ,   "Banded Iron"                   ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBrown       , 1, Arrays.asList(new MaterialStack(Iron, 2), new MaterialStack(Oxygen, 3)));
         Materials.BatteryAlloy            = new Materials( 315, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1|2                       , 156, 124, 160,   0,   "BatteryAlloy"            ,   "Battery Alloy"                 ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyePurple      , 2, Arrays.asList(new MaterialStack(Lead, 4), new MaterialStack(Antimony, 1)));
-        Materials.BlueTopaz               = new Materials( 513, TextureSet.SET_GEM_HORIZONTAL    ,   7.0F,    256,  3, 1  |4|8      |64          ,   0,   0, 255, 127,   "BlueTopaz"               ,   "Blue Topaz"                    ,    0,       0,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeBlue        , 0, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 1), new MaterialStack(Fluorine, 2), new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 6)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 6), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4)));
-        Materials.Bone                    = new Materials( 806, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1                         , 250, 250, 250,   0,   "Bone"                    ,   "Bone"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 0, Collections.singletonList(new MaterialStack(Calcium, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.MORTUUS, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1)));
-        Materials.Brass                   = new Materials( 301, TextureSet.SET_METALLIC          ,   7.0F,     96,  1, 1|2          |64|128      , 255, 180,   0,   0,   "Brass"                   ,   "Brass"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow      , 2, Arrays.asList(new MaterialStack(Zinc, 1), new MaterialStack(Copper, 3)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1)));
-        Materials.Bronze                  = new Materials( 300, TextureSet.SET_METALLIC          ,   6.0F,    192,  2, 1|2          |64|128      , 255, 128,   0,   0,   "Bronze"                  ,   "Bronze"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , 2, Arrays.asList(new MaterialStack(Tin, 1), new MaterialStack(Copper, 3)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1)));
+        Materials.BlueTopaz               = new Materials( 513, TextureSet.SET_GEM_HORIZONTAL    ,   7.0F,    256,  3, 1  |4|8      |64          ,   0,   0, 255, 127,   "BlueTopaz"               ,   "Blue Topaz"                    ,    0,       0,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeBlue        , 0, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 1), new MaterialStack(Fluorine, 2), new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 6)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 6), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 4)));
+        Materials.Bone                    = new Materials( 806, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1                         , 250, 250, 250,   0,   "Bone"                    ,   "Bone"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 0, Collections.singletonList(new MaterialStack(Calcium, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.MORTUUS, 2), new TCAspects.TC_AspectStack(TCAspects.CORPUS, 1)));
+        Materials.Brass                   = new Materials( 301, TextureSet.SET_METALLIC          ,   7.0F,     96,  1, 1|2          |64|128      , 255, 180,   0,   0,   "Brass"                   ,   "Brass"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow      , 2, Arrays.asList(new MaterialStack(Zinc, 1), new MaterialStack(Copper, 3)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 1)));
+        Materials.Bronze                  = new Materials( 300, TextureSet.SET_METALLIC          ,   6.0F,    192,  2, 1|2          |64|128      , 255, 128,   0,   0,   "Bronze"                  ,   "Bronze"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , 2, Arrays.asList(new MaterialStack(Tin, 1), new MaterialStack(Copper, 3)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 1)));
         Materials.BrownLimonite           = new Materials( 930, TextureSet.SET_METALLIC          ,   1.0F,      0,  1, 1    |8                   , 200, 100,   0,   0,   "BrownLimonite"           ,   "Brown Limonite"                ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBrown       , 2, Arrays.asList(new MaterialStack(Iron, 1), new MaterialStack(Hydrogen, 1), new MaterialStack(Oxygen, 2))); // FeO(OH)
         Materials.Calcite                 = new Materials( 823, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1    |8                   , 250, 230, 220,   0,   "Calcite"                 ,   "Calcite"                       ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , 1, Arrays.asList(new MaterialStack(Calcium, 1), new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 3)));
         Materials.Cassiterite             = new Materials( 824, TextureSet.SET_METALLIC          ,   1.0F,      0,  3, 1    |8                   , 220, 220, 220,   0,   "Cassiterite"             ,   "Cassiterite"                   ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 1, Arrays.asList(new MaterialStack(Tin, 1), new MaterialStack(Oxygen, 2)));
         Materials.CassiteriteSand         = new Materials( 937, TextureSet.SET_SAND              ,   1.0F,      0,  1, 1    |8                   , 220, 220, 220,   0,   "CassiteriteSand"         ,   "Cassiterite Sand"              ,    0,       0,         -1,    0, false, false,   4,   1,   1, Dyes.dyeWhite       , 1, Arrays.asList(new MaterialStack(Tin, 1), new MaterialStack(Oxygen, 2)));
         Materials.Chalcopyrite            = new Materials( 855, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1    |8                   , 160, 120,  40,   0,   "Chalcopyrite"            ,   "Chalcopyrite"                  ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow      , 1, Arrays.asList(new MaterialStack(Copper, 1), new MaterialStack(Iron, 1), new MaterialStack(Sulfur, 2)));
-        Materials.Charcoal                = new Materials( 536, TextureSet.SET_FINE              ,   1.0F,      0,  1, 1  |4                     , 100,  70,  70,   0,   "Charcoal"                ,   "Charcoal"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 1, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 2)));
+        Materials.Charcoal                = new Materials( 536, TextureSet.SET_FINE              ,   1.0F,      0,  1, 1  |4                     , 100,  70,  70,   0,   "Charcoal"                ,   "Charcoal"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 1, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2), new TCAspects.TC_AspectStack(TCAspects.IGNIS, 2)));
         Materials.Chromite                = new Materials( 825, TextureSet.SET_METALLIC          ,   1.0F,      0,  1, 1    |8                   ,  35,  20,  15,   0,   "Chromite"                ,   "Chromite"                      ,    0,       0,       1700, 1700,  true, false,   6,   1,   1, Dyes.dyePink        , 1, Arrays.asList(new MaterialStack(Iron, 1), new MaterialStack(Chrome, 2), new MaterialStack(Oxygen, 4)));
-        Materials.ChromiumDioxide         = new Materials( 361, TextureSet.SET_DULL              ,  11.0F,    256,  3, 1|2                       , 230, 200, 200,   0,   "ChromiumDioxide"         ,   "Chromium Dioxide"              ,    0,       0,        650,  650, false, false,   5,   1,   1, Dyes.dyePink        , 1, Arrays.asList(new MaterialStack(Chrome, 1), new MaterialStack(Oxygen, 2)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1)));
+        Materials.ChromiumDioxide         = new Materials( 361, TextureSet.SET_DULL              ,  11.0F,    256,  3, 1|2                       , 230, 200, 200,   0,   "ChromiumDioxide"         ,   "Chromium Dioxide"              ,    0,       0,        650,  650, false, false,   5,   1,   1, Dyes.dyePink        , 1, Arrays.asList(new MaterialStack(Chrome, 1), new MaterialStack(Oxygen, 2)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1)));
         Materials.Cinnabar                = new Materials( 826, TextureSet.SET_ROUGH             ,   1.0F,      0,  1, 1    |8                   , 150,   0,   0,   0,   "Cinnabar"                ,   "Cinnabar"                      ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeBrown       , 2, Arrays.asList(new MaterialStack(Mercury, 1), new MaterialStack(Sulfur, 1)));
-        Materials.Water                   = new Materials( 701, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                ,   0,   0, 255,   0,   "Water"                   ,   "Water"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlue        , 0, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2)));
+        Materials.Water                   = new Materials( 701, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                ,   0,   0, 255,   0,   "Water"                   ,   "Water"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlue        , 0, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 2)));
         Materials.Clay                    = new Materials( 805, TextureSet.SET_ROUGH             ,   1.0F,      0,  1, 1                         , 200, 200, 220,   0,   "Clay"                    ,   "Clay"                          ,    0,       0,         -1,    0, false, false,   5,   1,   1, Dyes.dyeLightBlue   , 0, Arrays.asList(new MaterialStack(Sodium, 2), new MaterialStack(Lithium, 1), new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 2),new MaterialStack(Oxygen,7),new MaterialStack(Water,2)));
-        Materials.Coal                    = new Materials( 535, TextureSet.SET_ROUGH             ,   1.0F,      0,  1, 1  |4|8                   ,  70,  70,  70,   0,   "Coal"                    ,   "Coal"                          ,    0,       0,         -1,    0, false, false,   2,   2,   1, Dyes.dyeBlack       , 1, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 2)));
+        Materials.Coal                    = new Materials( 535, TextureSet.SET_ROUGH             ,   1.0F,      0,  1, 1  |4|8                   ,  70,  70,  70,   0,   "Coal"                    ,   "Coal"                          ,    0,       0,         -1,    0, false, false,   2,   2,   1, Dyes.dyeBlack       , 1, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2), new TCAspects.TC_AspectStack(TCAspects.IGNIS, 2)));
         Materials.Cobaltite               = new Materials( 827, TextureSet.SET_METALLIC          ,   1.0F,      0,  1, 1    |8                   ,  80,  80, 250,   0,   "Cobaltite"               ,   "Cobaltite"                     ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeBlue        , 1, Arrays.asList(new MaterialStack(Cobalt, 1), new MaterialStack(Arsenic, 1), new MaterialStack(Sulfur, 1)));
         Materials.Cooperite               = new Materials( 828, TextureSet.SET_METALLIC          ,   1.0F,      0,  1, 1    |8                   , 255, 255, 200,   0,   "Cooperite"               ,   "Sheldonite"                    ,    0,       0,         -1,    0, false, false,   5,   1,   1, Dyes.dyeYellow      , 2, Arrays.asList(new MaterialStack(Platinum, 3), new MaterialStack(Nickel, 1), new MaterialStack(Sulfur, 1), new MaterialStack(Palladium, 1)));
         Materials.Cupronickel             = new Materials( 310, TextureSet.SET_METALLIC          ,   6.0F,     64,  1, 1|2          |64          , 227, 150, 128,   0,   "Cupronickel"             ,   "Cupronickel"                   ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , 2, Arrays.asList(new MaterialStack(Copper, 1), new MaterialStack(Nickel, 1)));
-        Materials.DarkAsh                 = new Materials( 816, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1                         ,  50,  50,  50,   0,   "DarkAsh"                 ,   "Dark Ashes"                    ,    0,       0,         -1,    0, false, false,   1,   2,   1, Dyes.dyeGray        , 1, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 1)));
-        Materials.DeepIron                = new Materials( 829, TextureSet.SET_METALLIC          ,   6.0F,    384,  2, 1|2  |8      |64          , 150, 140, 140,   0,   "DeepIron"                ,   "Deep Iron"                     ,    0,       0,       7500, 7500,  true, false,   3,   1,   1, Dyes.dyePink        , 2, Collections.singletonList(new MaterialStack(Iron, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 1))).disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Diamond                 = new Materials( 500, TextureSet.SET_DIAMOND           ,   8.0F,   1280,  4, 1  |4|8      |64|128      , 200, 255, 255, 127,   "Diamond"                 ,   "Diamond"                       ,    0,       0,         -1,    0, false,  true,   5,  64,   1, Dyes.dyeWhite       , 1, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 4)));
+        Materials.DarkAsh                 = new Materials( 816, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1                         ,  50,  50,  50,   0,   "DarkAsh"                 ,   "Dark Ashes"                    ,    0,       0,         -1,    0, false, false,   1,   2,   1, Dyes.dyeGray        , 1, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1), new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 1)));
+        Materials.DeepIron                = new Materials( 829, TextureSet.SET_METALLIC          ,   6.0F,    384,  2, 1|2  |8      |64          , 150, 140, 140,   0,   "DeepIron"                ,   "Deep Iron"                     ,    0,       0,       7500, 7500,  true, false,   3,   1,   1, Dyes.dyePink        , 2, Collections.singletonList(new MaterialStack(Iron, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1))).disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Diamond                 = new Materials( 500, TextureSet.SET_DIAMOND           ,   8.0F,   1280,  4, 1  |4|8      |64|128      , 200, 255, 255, 127,   "Diamond"                 ,   "Diamond"                       ,    0,       0,         -1,    0, false,  true,   5,  64,   1, Dyes.dyeWhite       , 1, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3), new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 4)));
         Materials.Electrum                = new Materials( 303, TextureSet.SET_SHINY             ,  12.0F,     64,  2, 1|2  |8      |64|128      , 255, 255, 100,   0,   "Electrum"                ,   "Electrum"                      ,    0,       0,         -1,    0, false, false,   4,   1,   1, Dyes.dyeYellow      , 2, Arrays.asList(new MaterialStack(Silver, 1), new MaterialStack(Gold, 1)));
-        Materials.Emerald                 = new Materials( 501, TextureSet.SET_EMERALD           ,   7.0F,    256,  4, 1  |4|8      |64          ,  80, 255,  80, 127,   "Emerald"                 ,   "Emerald"                       ,    0,       0,         -1,    0, false,  true,   5,   1,   1, Dyes.dyeGreen       , 0, Arrays.asList(new MaterialStack(Beryllium, 3), new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 6), new MaterialStack(Oxygen, 18)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 5)));
-        Materials.FreshWater              = new Materials(  -1, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                ,   0,   0, 255,   0,   "FreshWater"              ,   "Fresh Water"                   ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlue        , 0, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2)));
+        Materials.Emerald                 = new Materials( 501, TextureSet.SET_EMERALD           ,   7.0F,    256,  4, 1  |4|8      |64          ,  80, 255,  80, 127,   "Emerald"                 ,   "Emerald"                       ,    0,       0,         -1,    0, false,  true,   5,   1,   1, Dyes.dyeGreen       , 0, Arrays.asList(new MaterialStack(Beryllium, 3), new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 6), new MaterialStack(Oxygen, 18)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3), new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 5)));
+        Materials.FreshWater              = new Materials(  -1, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                ,   0,   0, 255,   0,   "FreshWater"              ,   "Fresh Water"                   ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlue        , 0, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 2)));
         Materials.Galena                  = new Materials( 830, TextureSet.SET_DULL              ,   1.0F,      0,  3, 1 |8                      , 100,  60, 100,   0,   "Galena"                  ,   "Galena"                        ,    0,       0,         -1,    0, false, false,   4,   1,   1, Dyes.dyePurple      , 1, Arrays.asList(new MaterialStack(Lead, 1), new MaterialStack(Sulfur, 1)));
         Materials.Garnierite              = new Materials( 906, TextureSet.SET_METALLIC          ,   1.0F,      0,  3, 1    |8                   ,  50, 200,  70,   0,   "Garnierite"              ,   "Garnierite"                    ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightBlue   , 1, Arrays.asList(new MaterialStack(Nickel, 1), new MaterialStack(Oxygen, 1)));
         Materials.Glyceryl                = new Materials( 714, TextureSet.SET_FLUID             ,   1.0F,      0,  1,         16                ,   0, 150, 150,   0,   "Glyceryl"                ,   "Glyceryl Trinitrate"           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeCyan        , 1, Arrays.asList(new MaterialStack(Carbon, 3), new MaterialStack(Hydrogen, 5), new MaterialStack(Nitrogen, 3), new MaterialStack(Oxygen, 9)));
-        Materials.GreenSapphire           = new MaterialBuilder(504, TextureSet.SET_GEM_HORIZONTAL, "Green Sapphire").setToolSpeed(7.0F).setDurability(256).setToolQuality(2).addDustItems().addGemItems().setTransparent(true).addOreItems().addToolHeadItems().setRGBA(100, 200, 130, 127).setColor(Dyes.dyeCyan).setOreValue(5).setExtraData(0).setMaterialList(new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 3)).setAspects(Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 3))).constructMaterial().disableAutoGeneratedBlastFurnaceRecipes();
+        Materials.GreenSapphire           = new MaterialBuilder(504, TextureSet.SET_GEM_HORIZONTAL, "Green Sapphire").setToolSpeed(7.0F).setDurability(256).setToolQuality(2).addDustItems().addGemItems().setTransparent(true).addOreItems().addToolHeadItems().setRGBA(100, 200, 130, 127).setColor(Dyes.dyeCyan).setOreValue(5).setExtraData(0).setMaterialList(new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 3)).setAspects(Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 5), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3))).constructMaterial().disableAutoGeneratedBlastFurnaceRecipes();
         Materials.Grossular               = new Materials( 831, TextureSet.SET_ROUGH             ,   1.0F,      0,  1, 1    |8                   , 200, 100,   0,   0,   "Grossular"               ,   "Grossular"                     ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeOrange      , 0, Arrays.asList(new MaterialStack(Calcium, 3), new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)));
-        Materials.HolyWater               = new Materials( 729, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                ,   0,   0, 255,   0,   "HolyWater"               ,   "Holy Water"                    ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlue        , 0, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 1)));
-        Materials.Ice                     = new Materials( 702, TextureSet.SET_SHINY             ,   1.0F,      0,  0, 1|      16                , 200, 200, 255,   0,   "Ice"                     ,   "Ice"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlue        , 0, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 2)));
+        Materials.HolyWater               = new Materials( 729, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                ,   0,   0, 255,   0,   "HolyWater"               ,   "Holy Water"                    ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlue        , 0, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 2), new TCAspects.TC_AspectStack(TCAspects.AURAM, 1)));
+        Materials.Ice                     = new Materials( 702, TextureSet.SET_SHINY             ,   1.0F,      0,  0, 1|      16                , 200, 200, 255,   0,   "Ice"                     ,   "Ice"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlue        , 0, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.GELUM, 2)));
         Materials.Ilmenite                = new Materials( 918, TextureSet.SET_METALLIC          ,   1.0F,      0,  3, 1    |8                   ,  70,  55,  50,   0,   "Ilmenite"                ,   "Ilmenite"                      ,    0,       0,         -1,    0, false, false,   1,   2,   1, Dyes.dyePurple      , 0, Arrays.asList(new MaterialStack(Iron, 1), new MaterialStack(Titanium, 1), new MaterialStack(Oxygen, 3)));
         Materials.Rutile                  = new Materials( 375, TextureSet.SET_GEM_HORIZONTAL    ,   1.0F,      0,  2, 1    |8                   , 212,  13,  92,   0,   "Rutile"                  ,   "Rutile"                        ,    0,       0,         -1,    0, false, false,   1,   2,   1, Dyes.dyeRed         , 0, Arrays.asList(new MaterialStack(Titanium, 1), new MaterialStack(Oxygen, 2)));
         Materials.Bauxite                 = new Materials( 822, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1    |8                   , 200, 100,   0,   0,   "Bauxite"                 ,   "Bauxite"                       ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeBrown       , 1, Arrays.asList(new MaterialStack(Rutile, 2), new MaterialStack(Aluminium, 16), new MaterialStack(Hydrogen, 10), new MaterialStack(Oxygen, 11)));
         Materials.Titaniumtetrachloride   = new Materials( 376, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16                , 212,  13,  92,   0,   "Titaniumtetrachloride"   ,   "Titaniumtetrachloride"         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeRed         , 0, Arrays.asList(new MaterialStack(Titanium, 1), new MaterialStack(Chlorine, 4)));
         Materials.Magnesiumchloride       = new Materials( 377, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1|16                      , 212,  13,  92,   0,   "Magnesiumchloride"       ,   "Magnesiumchloride"             ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeRed         , 0, Arrays.asList(new MaterialStack(Magnesium, 1), new MaterialStack(Chlorine, 2)));
-        Materials.Invar                   = new Materials( 302, TextureSet.SET_METALLIC          ,   6.0F,    256,  2, 1|2          |64|128      , 180, 180, 120,   0,   "Invar"                   ,   "Invar"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBrown       , 2, Arrays.asList(new MaterialStack(Iron, 2), new MaterialStack(Nickel, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1)));
+        Materials.Invar                   = new Materials( 302, TextureSet.SET_METALLIC          ,   6.0F,    256,  2, 1|2          |64|128      , 180, 180, 120,   0,   "Invar"                   ,   "Invar"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBrown       , 2, Arrays.asList(new MaterialStack(Iron, 2), new MaterialStack(Nickel, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.GELUM, 1)));
         Materials.Kanthal                 = new Materials( 312, TextureSet.SET_METALLIC          ,   6.0F,     64,  2, 1|2          |64          , 194, 210, 223,   0,   "Kanthal"                 ,   "Kanthal"                       ,    0,       0,       1800, 1800,  true, false,   1,   1,   1, Dyes.dyeYellow      , 2, Arrays.asList(new MaterialStack(Iron, 1), new MaterialStack(Aluminium, 1), new MaterialStack(Chrome, 1))).disableAutoGeneratedBlastFurnaceRecipes();
         Materials.Lazurite                = new Materials( 524, TextureSet.SET_LAPIS             ,   1.0F,      0,  1, 1  |4|8                   , 100, 120, 255,   0,   "Lazurite"                ,   "Lazurite"                      ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeCyan        , 1, Arrays.asList(new MaterialStack(Aluminium, 6), new MaterialStack(Silicon, 6), new MaterialStack(Calcium, 8), new MaterialStack(Sodium, 8)));
         Materials.Magnalium               = new Materials( 313, TextureSet.SET_DULL              ,   6.0F,    256,  2, 1|2          |64|128      , 200, 190, 255,   0,   "Magnalium"               ,   "Magnalium"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightBlue   , 2, Arrays.asList(new MaterialStack(Magnesium, 1), new MaterialStack(Aluminium, 2)));
         Materials.Magnesite               = new Materials( 908, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1    |8                   , 250, 250, 180,   0,   "Magnesite"               ,   "Magnesite"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyePink        , 1, Arrays.asList(new MaterialStack(Magnesium, 1), new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 3)));
-        Materials.Magnetite               = new Materials( 870, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1    |8                   ,  30,  30,  30,   0,   "Magnetite"               ,   "Magnetite"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGray        , 1, Arrays.asList(new MaterialStack(Iron, 3), new MaterialStack(Oxygen, 4)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 1)));
+        Materials.Magnetite               = new Materials( 870, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1    |8                   ,  30,  30,  30,   0,   "Magnetite"               ,   "Magnetite"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGray        , 1, Arrays.asList(new MaterialStack(Iron, 3), new MaterialStack(Oxygen, 4)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1)));
         Materials.Molybdenite             = new Materials( 942, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1    |8                   ,  25,  25,  25,   0,   "Molybdenite"             ,   "Molybdenite"                   ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlue        , 1, Arrays.asList(new MaterialStack(Molybdenum, 1), new MaterialStack(Sulfur, 2))); // MoS2 (also source of Re)
         Materials.Nichrome                = new Materials( 311, TextureSet.SET_METALLIC          ,   6.0F,     64,  2, 1|2          |64          , 205, 206, 246,   0,   "Nichrome"                ,   "Nichrome"                      ,    0,       0,       2700, 2700,  true, false,   1,   1,   1, Dyes.dyeRed         , 2, Arrays.asList(new MaterialStack(Nickel, 4), new MaterialStack(Chrome, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
         Materials.NiobiumNitride          = new Materials( 359, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1|2                       ,  29,  41,  29,   0,   "NiobiumNitride"          ,   "Niobium Nitride"               ,    0,       0,       2573, 2573,  true, false,   1,   1,   1, Dyes.dyeBlack       , 1, Arrays.asList(new MaterialStack(Niobium, 1), new MaterialStack(Nitrogen, 1))); // Anti-Reflective Material
@@ -562,27 +562,27 @@ public class MaterialsInit1 {
         Materials.Obsidian                = new Materials( 804, TextureSet.SET_DULL              ,   1.0F,      0,  3, 1|2                       ,  80,  50, 100,   0,   "Obsidian"                ,   "Obsidian"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 1, Arrays.asList(new MaterialStack(Magnesium, 1), new MaterialStack(Iron, 1), new MaterialStack(Silicon, 2), new MaterialStack(Oxygen, 8)));
         Materials.Phosphate               = new Materials( 833, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1    |8|16                , 255, 255,   0,   0,   "Phosphate"               ,   "Phosphate"                     ,    0,       0,         -1,    0, false, false,   2,   1,   1, Dyes.dyeYellow      , 1, Arrays.asList(new MaterialStack(Phosphorus, 1), new MaterialStack(Oxygen, 4)));
         Materials.PigIron                 = new Materials( 307, TextureSet.SET_METALLIC          ,   6.0F,    384,  2, 1|2  |8      |64          , 200, 180, 180,   0,   "PigIron"                 ,   "Pig Iron"                      ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyePink        , 2, Collections.singletonList(new MaterialStack(Iron, 1)));
-        Materials.Plastic                 = new Materials( 874, TextureSet.SET_DULL              ,   3.0F,     32,  1, 1|2          |64|128      , 200, 200, 200,   0,   "Plastic"                 ,   "Polyethylene"                  ,    0,       0,        400,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 0, Arrays.asList(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 2)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2)));
-        Materials.Epoxid                  = new Materials( 470, TextureSet.SET_DULL              ,   3.0F,     32,  1, 1|2          |64|128      , 200, 140,  20,   0,   "Epoxid"                  ,   "Epoxid"                        ,    0,       0,        400,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 0, Arrays.asList(new MaterialStack(Carbon, 21), new MaterialStack(Hydrogen, 24), new MaterialStack(Oxygen, 4)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2)));
+        Materials.Plastic                 = new Materials( 874, TextureSet.SET_DULL              ,   3.0F,     32,  1, 1|2          |64|128      , 200, 200, 200,   0,   "Plastic"                 ,   "Polyethylene"                  ,    0,       0,        400,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 0, Arrays.asList(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 2)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2)));
+        Materials.Epoxid                  = new Materials( 470, TextureSet.SET_DULL              ,   3.0F,     32,  1, 1|2          |64|128      , 200, 140,  20,   0,   "Epoxid"                  ,   "Epoxid"                        ,    0,       0,        400,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 0, Arrays.asList(new MaterialStack(Carbon, 21), new MaterialStack(Hydrogen, 24), new MaterialStack(Oxygen, 4)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2)));
         Materials.Polydimethylsiloxane    = new MaterialBuilder(633, TextureSet.SET_FLUID         ,                                                                                                     "Polydimethylsiloxane").addDustItems().setRGB(245, 245, 245).setColor(Dyes.dyeWhite).setMaterialList(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 1), new MaterialStack(Silicon, 1)).addElectrolyzerRecipe().constructMaterial();
-        Materials.Silicone                = new Materials( 471, TextureSet.SET_DULL              ,   3.0F,    128,  1, 1|2          |64|128      , 220, 220, 220,   0,   "Silicone"                ,   "Silicone Rubber"               ,    0,       0,        900,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 0, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 1), new MaterialStack(Silicon, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2)));
-        Materials.Polycaprolactam         = new Materials( 472, TextureSet.SET_DULL              ,   3.0F,     32,  1, 1|2          |64|128      ,  50,  50,  50,   0,   "Polycaprolactam"         ,   "Polycaprolactam"               ,    0,       0,        500,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 0, Arrays.asList(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 11), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2)));
-        Materials.Polytetrafluoroethylene = new Materials( 473, TextureSet.SET_DULL              ,   3.0F,     32,  1, 1|2          |64|128      , 100, 100, 100,   0,   "Polytetrafluoroethylene" ,   "Polytetrafluoroethylene"       ,    0,       0,       1400,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 0, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Fluorine, 4)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2)));
+        Materials.Silicone                = new Materials( 471, TextureSet.SET_DULL              ,   3.0F,    128,  1, 1|2          |64|128      , 220, 220, 220,   0,   "Silicone"                ,   "Silicone Rubber"               ,    0,       0,        900,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 0, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 1), new MaterialStack(Silicon, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2)));
+        Materials.Polycaprolactam         = new Materials( 472, TextureSet.SET_DULL              ,   3.0F,     32,  1, 1|2          |64|128      ,  50,  50,  50,   0,   "Polycaprolactam"         ,   "Polycaprolactam"               ,    0,       0,        500,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 0, Arrays.asList(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 11), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2)));
+        Materials.Polytetrafluoroethylene = new Materials( 473, TextureSet.SET_DULL              ,   3.0F,     32,  1, 1|2          |64|128      , 100, 100, 100,   0,   "Polytetrafluoroethylene" ,   "Polytetrafluoroethylene"       ,    0,       0,       1400,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 0, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Fluorine, 4)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2)));
         Materials.Powellite               = new Materials( 883, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1    |8                   , 255, 255,   0,   0,   "Powellite"               ,   "Powellite"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow      , 2, Arrays.asList(new MaterialStack(Calcium, 1), new MaterialStack(Molybdenum, 1), new MaterialStack(Oxygen, 4)));
         Materials.Pumice                  = new Materials( 926, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1    |8                   , 230, 185, 185,   0,   "Pumice"                  ,   "Pumice"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGray        , 2, Collections.singletonList(new MaterialStack(Stone, 1)));
         Materials.Pyrite                  = new Materials( 834, TextureSet.SET_ROUGH             ,   1.0F,      0,  1, 1    |8                   , 150, 120,  40,   0,   "Pyrite"                  ,   "Pyrite"                        ,    0,       0,         -1,    0, false, false,   2,   1,   1, Dyes.dyeOrange      , 1, Arrays.asList(new MaterialStack(Iron, 1), new MaterialStack(Sulfur, 2)));
         Materials.Pyrolusite              = new Materials( 943, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1    |8                   , 150, 150, 170,   0,   "Pyrolusite"              ,   "Pyrolusite"                    ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , 1, Arrays.asList(new MaterialStack(Manganese, 1), new MaterialStack(Oxygen, 2)));
         Materials.Pyrope                  = new Materials( 835, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1    |8                   , 120,  50, 100,   0,   "Pyrope"                  ,   "Pyrope"                        ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyePurple      , 0, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Magnesium, 3), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)));
         Materials.RockSalt                = new Materials( 944, TextureSet.SET_FINE              ,   1.0F,      0,  1, 1    |8                   , 240, 200, 200,   0,   "RockSalt"                ,   "Rock Salt"                     ,    0,       0,         -1,    0, false, false,   2,   1,   1, Dyes.dyeWhite       , 1, Arrays.asList(new MaterialStack(Potassium, 1), new MaterialStack(Chlorine, 1)));
-        Materials.Rubber                  = new Materials( 880, TextureSet.SET_SHINY             ,   1.5F,     32,  0, 1|2          |64|128      ,   0,   0,   0,   0,   "Rubber"                  ,   "Rubber"                        ,    0,       0,        400,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 0, Arrays.asList(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 8)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2)));
-        Materials.RawRubber               = new Materials( 896, TextureSet.SET_DULL              ,   1.0F,      0,  0, 1                         , 204, 199, 137,   0,   "RawRubber"               ,   "Raw Rubber"                    ,    0,       0,        400,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 0, Arrays.asList(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 8)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2)));
-        Materials.Ruby                    = new Materials( 502, TextureSet.SET_RUBY              ,   7.0F,    256,  2, 1  |4|8      |64          , 255, 100, 100, 127,   "Ruby"                    ,   "Ruby"                          ,    0,       0,         -1,    0, false,  true,   5,   1,   1, Dyes.dyeRed         , 0, Arrays.asList(new MaterialStack(Chrome, 1), new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 3)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 6), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4))).disableAutoGeneratedBlastFurnaceRecipes();
+        Materials.Rubber                  = new Materials( 880, TextureSet.SET_SHINY             ,   1.5F,     32,  0, 1|2          |64|128      ,   0,   0,   0,   0,   "Rubber"                  ,   "Rubber"                        ,    0,       0,        400,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 0, Arrays.asList(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 8)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2)));
+        Materials.RawRubber               = new Materials( 896, TextureSet.SET_DULL              ,   1.0F,      0,  0, 1                         , 204, 199, 137,   0,   "RawRubber"               ,   "Raw Rubber"                    ,    0,       0,        400,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 0, Arrays.asList(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 8)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2)));
+        Materials.Ruby                    = new Materials( 502, TextureSet.SET_RUBY              ,   7.0F,    256,  2, 1  |4|8      |64          , 255, 100, 100, 127,   "Ruby"                    ,   "Ruby"                          ,    0,       0,         -1,    0, false,  true,   5,   1,   1, Dyes.dyeRed         , 0, Arrays.asList(new MaterialStack(Chrome, 1), new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 3)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 6), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 4))).disableAutoGeneratedBlastFurnaceRecipes();
         Materials.Salt                    = new Materials( 817, TextureSet.SET_FINE              ,   1.0F,      0,  1, 1    |8                   , 250, 250, 250,   0,   "Salt"                    ,   "Salt"                          ,    0,       0,         -1,    0, false, false,   2,   1,   1, Dyes.dyeWhite       , 0, Arrays.asList(new MaterialStack(Sodium, 1), new MaterialStack(Chlorine, 1)));
         Materials.Saltpeter               = new Materials( 836, TextureSet.SET_FINE              ,   1.0F,      0,  1, 1    |8                   , 230, 230, 230,   0,   "Saltpeter"               ,   "Saltpeter"                     ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeWhite       , 1, Arrays.asList(new MaterialStack(Potassium, 1), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 3)));
-        Materials.Sapphire                = new MaterialBuilder(503, TextureSet.SET_GEM_VERTICAL, "Sapphire").setToolSpeed(7.0F).setDurability(256).setToolQuality(2).addDustItems().addGemItems().setTransparent(true).addOreItems().addToolHeadItems().setRGBA(100, 100, 200, 127).setColor(Dyes.dyeBlue).setOreValue(5).setExtraData(0).setMaterialList(new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 3)).setAspects(Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 3))).constructMaterial().disableAutoGeneratedBlastFurnaceRecipes();
+        Materials.Sapphire                = new MaterialBuilder(503, TextureSet.SET_GEM_VERTICAL, "Sapphire").setToolSpeed(7.0F).setDurability(256).setToolQuality(2).addDustItems().addGemItems().setTransparent(true).addOreItems().addToolHeadItems().setRGBA(100, 100, 200, 127).setColor(Dyes.dyeBlue).setOreValue(5).setExtraData(0).setMaterialList(new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 3)).setAspects(Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 5), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3))).constructMaterial().disableAutoGeneratedBlastFurnaceRecipes();
 
         Materials.Scheelite               = new Materials( 910, TextureSet.SET_DULL              ,   1.0F,      0,  3, 1    |8                   , 200, 140,  20,   0,   "Scheelite"               ,   "Scheelite"                     ,    0,       0,       2500, 2500, false, false,   4,   1,   1, Dyes.dyeBlack       , 0, Arrays.asList(new MaterialStack(Tungsten, 1), new MaterialStack(Calcium, 1), new MaterialStack(Oxygen, 4)));
-        Materials.Snow                    = new Materials( 728, TextureSet.SET_FINE              ,   1.0F,      0,  0, 1|      16                , 250, 250, 250,   0,   "Snow"                    ,   "Snow"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 0, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1)));
+        Materials.Snow                    = new Materials( 728, TextureSet.SET_FINE              ,   1.0F,      0,  0, 1|      16                , 250, 250, 250,   0,   "Snow"                    ,   "Snow"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 0, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.GELUM, 1)));
         Materials.Sodalite                = new Materials( 525, TextureSet.SET_LAPIS             ,   1.0F,      0,  1, 1  |4|8                   ,  20,  20, 255,   0,   "Sodalite"                ,   "Sodalite"                      ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeBlue        , 1, Arrays.asList(new MaterialStack(Aluminium, 3), new MaterialStack(Silicon, 3), new MaterialStack(Sodium, 4), new MaterialStack(Chlorine, 1)));
         Materials.SodiumPersulfate        = new Materials( 718, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16                , 255, 255, 255,   0,   "SodiumPersulfate"        ,   "Sodium Persulfate"             ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , 1, Arrays.asList(new MaterialStack(Sodium, 2), new MaterialStack(Sulfur, 2), new MaterialStack(Oxygen, 8)));
         Materials.SodiumSulfide           = new Materials( 719, TextureSet.SET_FLUID             ,   1.0F,      0,  2, 1                         , 255, 230, 128,   0,   "SodiumSulfide"           ,   "Sodium Sulfide"                ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , 1, Arrays.asList(new MaterialStack(Sodium, 2), new MaterialStack(Sulfur, 1)));
@@ -695,16 +695,16 @@ public class MaterialsInit1 {
         Materials.RoastedArsenic            = new MaterialBuilder(552, TextureSet.SET_SHINY   , "Roasted Arsenic").setName("RoastedArsenic").addDustItems().setRGB(240, 240, 240).constructMaterial();
         Materials.RoastedLead               = new MaterialBuilder(553, TextureSet.SET_SHINY   , "Roasted Lead").setName("RoastedLead").addDustItems().setRGB(168, 149, 43).constructMaterial();
 
-        Materials.SiliconSG               = new Materials(  856, TextureSet.SET_METALLIC         ,   1.0F,      0,  2, 1|2  |8   |32             ,  80,  80, 100,   0,   "SiliconSolarGrade"  ,   "Silicon Solar Grade (Poly SI)"      ,    0,       0,         2273,   2273, true, false,   1,   1,   1, Dyes.dyeBlack       , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 2))).disableAutoGeneratedBlastFurnaceRecipes();
-        Materials.CalciumDisilicide       = new Materials(  971, TextureSet.SET_METALLIC         ,   1.0F,      0,  2, 1    |8                   , 180, 180, 180,   0,   "CalciumDisilicide"       ,   "Calcium Disilicide"            ,    0,       0,       1313,   -1, false, false,   1,   1,   1, Dyes.dyeGray        ,1         , Arrays.asList(new MaterialStack(Calcium, 1), new MaterialStack(Silicon, 2)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1)));//CaSi2
-        Materials.SiliconTetrafluoride    = new MaterialBuilder(  967, TextureSet.SET_FLUID            , "Silicon Tetrafluoride" ).setName("SiliconTetrafluoride").addCell().addGas().setTransparent(true).setRGB(200, 200, 200).setColor(Dyes.dyeWhite).setMeltingPoint(178).setMaterialList(new MaterialStack(Silicon, 1), new MaterialStack(Fluorine, 4)).setAspects(Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))).constructMaterial();//SIF4
-        Materials.SiliconTetrachloride    = new MaterialBuilder(  968, TextureSet.SET_FLUID            ,  "Silicon Tetrachloride").setName("SiliconTetrachloride").addCell().addFluid().setRGB(220, 220, 220).setColor(Dyes.dyeWhite).setMeltingPoint(204).setMaterialList(new MaterialStack(Silicon, 1), new MaterialStack(Chlorine, 4)).setAspects(Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))).constructMaterial();//SICL4
-        Materials.Trichlorosilane         = new MaterialBuilder(  972, TextureSet.SET_FLUID            ,   "Trichlorosilane" ).setName("Trichlorosilane" ).addCell().addFluid().setRGB( 255, 255, 255).setColor(Dyes.dyeWhite).setMeltingPoint(139).setMaterialList(new MaterialStack(Hydrogen, 1), new MaterialStack(Silicon, 1), new MaterialStack(Chlorine, 3)).setAspects(Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))).constructMaterial();//HSICL3
-        Materials.Hexachlorodisilane      = new MaterialBuilder(  973, TextureSet.SET_FLUID            ,  "Hexachlorodisilane").setName("Hexachlorodisilane" ).addCell().addFluid().setRGB( 255, 255, 255).setColor(Dyes.dyeWhite).setMeltingPoint(272).setExtraData(1).setMaterialList(new MaterialStack(Silicon, 2), new MaterialStack(Chlorine, 6)).setAspects(Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))).constructMaterial();//SI2CL6
-        Materials.Dichlorosilane          = new MaterialBuilder(  799, TextureSet.SET_FLUID            ,   "Dichlorosilane").setName("Dichlorosilane").addCell().addGas().setTransparent(true).setRGB( 255, 255, 255).setColor(Dyes.dyeWhite).setMeltingPoint(151).setExtraData(1).setMaterialList(new MaterialStack(Silicon, 1), new MaterialStack(Hydrogen, 2), new MaterialStack(Chlorine, 2)).setAspects(Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))).constructMaterial();//SIH2CL2
-        Materials.Silane                  = new MaterialBuilder(  798, TextureSet.SET_FLUID            ,   "Silane").setName( "Silane").addCell().addGas().setRGB( 255, 255, 255).setColor(Dyes.dyeWhite).setMeltingPoint(88).setMaterialList(new MaterialStack(Silicon, 1), new MaterialStack(Hydrogen, 4)).setAspects(Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))).constructMaterial();//SIH4
-        Materials.Calciumhydride          = new Materials(  797, TextureSet.SET_METALLIC         ,   1.0F,      0,  2, 1    |8                   , 220, 220, 220,   0,   "CalciumHydride"       ,   "Calcium Hydride"            ,    0,       0,       1089,   -1, false, false,   1,   1,   1, Dyes.dyeGray        ,1         , Arrays.asList(new MaterialStack(Calcium, 1), new MaterialStack(Hydrogen, 2)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1)));//CaH2
-        Materials.AluminiumFluoride       = new Materials(  969, TextureSet.SET_METALLIC         ,   1.0F,      0,  2, 1    |8                   , 255, 255, 255,   0,   "Aluminiumfluoride"        ,   "Aluminium Fluoride"             ,    0,       0,       1533,   -1, false, false,   1,   1,   1, Dyes.dyeWhite       ,1         , Arrays.asList(new MaterialStack(Aluminium, 1), new MaterialStack(Fluorine, 3)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1)));//ALF3
+        Materials.SiliconSG               = new Materials(  856, TextureSet.SET_METALLIC         ,   1.0F,      0,  2, 1|2  |8   |32             ,  80,  80, 100,   0,   "SiliconSolarGrade"  ,   "Silicon Solar Grade (Poly SI)"      ,    0,       0,         2273,   2273, true, false,   1,   1,   1, Dyes.dyeBlack       , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4), new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 2))).disableAutoGeneratedBlastFurnaceRecipes();
+        Materials.CalciumDisilicide       = new Materials(  971, TextureSet.SET_METALLIC         ,   1.0F,      0,  2, 1    |8                   , 180, 180, 180,   0,   "CalciumDisilicide"       ,   "Calcium Disilicide"            ,    0,       0,       1313,   -1, false, false,   1,   1,   1, Dyes.dyeGray        ,1         , Arrays.asList(new MaterialStack(Calcium, 1), new MaterialStack(Silicon, 2)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.TERRA, 1), new TCAspects.TC_AspectStack(TCAspects.ORDO, 1)));//CaSi2
+        Materials.SiliconTetrafluoride    = new MaterialBuilder(  967, TextureSet.SET_FLUID            , "Silicon Tetrafluoride" ).setName("SiliconTetrafluoride").addCell().addGas().setTransparent(true).setRGB(200, 200, 200).setColor(Dyes.dyeWhite).setMeltingPoint(178).setMaterialList(new MaterialStack(Silicon, 1), new MaterialStack(Fluorine, 4)).setAspects(Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1), new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1))).constructMaterial();//SIF4
+        Materials.SiliconTetrachloride    = new MaterialBuilder(  968, TextureSet.SET_FLUID            ,  "Silicon Tetrachloride").setName("SiliconTetrachloride").addCell().addFluid().setRGB(220, 220, 220).setColor(Dyes.dyeWhite).setMeltingPoint(204).setMaterialList(new MaterialStack(Silicon, 1), new MaterialStack(Chlorine, 4)).setAspects(Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1), new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1))).constructMaterial();//SICL4
+        Materials.Trichlorosilane         = new MaterialBuilder(  972, TextureSet.SET_FLUID            ,   "Trichlorosilane" ).setName("Trichlorosilane" ).addCell().addFluid().setRGB( 255, 255, 255).setColor(Dyes.dyeWhite).setMeltingPoint(139).setMaterialList(new MaterialStack(Hydrogen, 1), new MaterialStack(Silicon, 1), new MaterialStack(Chlorine, 3)).setAspects(Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1), new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1))).constructMaterial();//HSICL3
+        Materials.Hexachlorodisilane      = new MaterialBuilder(  973, TextureSet.SET_FLUID            ,  "Hexachlorodisilane").setName("Hexachlorodisilane" ).addCell().addFluid().setRGB( 255, 255, 255).setColor(Dyes.dyeWhite).setMeltingPoint(272).setExtraData(1).setMaterialList(new MaterialStack(Silicon, 2), new MaterialStack(Chlorine, 6)).setAspects(Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1))).constructMaterial();//SI2CL6
+        Materials.Dichlorosilane          = new MaterialBuilder(  799, TextureSet.SET_FLUID            ,   "Dichlorosilane").setName("Dichlorosilane").addCell().addGas().setTransparent(true).setRGB( 255, 255, 255).setColor(Dyes.dyeWhite).setMeltingPoint(151).setExtraData(1).setMaterialList(new MaterialStack(Silicon, 1), new MaterialStack(Hydrogen, 2), new MaterialStack(Chlorine, 2)).setAspects(Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1), new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1))).constructMaterial();//SIH2CL2
+        Materials.Silane                  = new MaterialBuilder(  798, TextureSet.SET_FLUID            ,   "Silane").setName( "Silane").addCell().addGas().setRGB( 255, 255, 255).setColor(Dyes.dyeWhite).setMeltingPoint(88).setMaterialList(new MaterialStack(Silicon, 1), new MaterialStack(Hydrogen, 4)).setAspects(Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 1))).constructMaterial();//SIH4
+        Materials.Calciumhydride          = new Materials(  797, TextureSet.SET_METALLIC         ,   1.0F,      0,  2, 1    |8                   , 220, 220, 220,   0,   "CalciumHydride"       ,   "Calcium Hydride"            ,    0,       0,       1089,   -1, false, false,   1,   1,   1, Dyes.dyeGray        ,1         , Arrays.asList(new MaterialStack(Calcium, 1), new MaterialStack(Hydrogen, 2)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.TERRA, 1), new TCAspects.TC_AspectStack(TCAspects.ORDO, 1)));//CaH2
+        Materials.AluminiumFluoride       = new Materials(  969, TextureSet.SET_METALLIC         ,   1.0F,      0,  2, 1    |8                   , 255, 255, 255,   0,   "Aluminiumfluoride"        ,   "Aluminium Fluoride"             ,    0,       0,       1533,   -1, false, false,   1,   1,   1, Dyes.dyeWhite       ,1         , Arrays.asList(new MaterialStack(Aluminium, 1), new MaterialStack(Fluorine, 3)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.TERRA, 1), new TCAspects.TC_AspectStack(TCAspects.ORDO, 1)));//ALF3
 
         Materials.SolderingAlloy          = new Materials( 314, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1|2                       , 220, 220, 230,   0,   "SolderingAlloy"          ,   "Soldering Alloy"               ,    0,       0,        400,  400, false, false,   1,   1,   1, Dyes.dyeWhite       , 2, Arrays.asList(new MaterialStack(Tin, 9), new MaterialStack(Antimony, 1)));
         Materials.GalliumArsenide         = new Materials( 980, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1|2                       , 160, 160, 160,   0,   "GalliumArsenide"         ,   "Gallium Arsenide"              ,    0,       0,         -1, 1200,  true, false,   1,   1,   1, Dyes.dyeGray        , 2, Arrays.asList(new MaterialStack(Arsenic, 1), new MaterialStack(Gallium, 1)));
@@ -712,52 +712,52 @@ public class MaterialsInit1 {
         Materials.Spessartine             = new Materials( 838, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1    |8                   , 255, 100, 100,   0,   "Spessartine"             ,   "Spessartine"                   ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeRed         , 0, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Manganese, 3), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)));
         Materials.Sphalerite              = new Materials( 839, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1    |8                   , 255, 255, 255,   0,   "Sphalerite"              ,   "Sphalerite"                    ,    0,       0,         -1,    0, false, false,   2,   1,   1, Dyes.dyeYellow      , 1, Arrays.asList(new MaterialStack(Zinc, 1), new MaterialStack(Sulfur, 1)));
         Materials.StainlessSteel          = new Materials( 306, TextureSet.SET_SHINY             ,   7.0F,    480,  4, 1|2          |64|128      , 200, 200, 220,   0,   "StainlessSteel"          ,   "Stainless Steel"               ,    0,       0,         -1, 1700,  true, false,   1,   1,   1, Dyes.dyeWhite       , 1, Arrays.asList(new MaterialStack(Iron, 6), new MaterialStack(Chrome, 1), new MaterialStack(Manganese, 1), new MaterialStack(Nickel, 1)));
-        Materials.Steel                   = new Materials( 305, TextureSet.SET_METALLIC          ,   6.0F,    512,  3, 1|2          |64|128      , 128, 128, 128,   0,   "Steel"                   ,   "Steel"                         ,    0,       0,       1811, 1000,  true, false,   4,  51,  50, Dyes.dyeGray        , 1, Arrays.asList(new MaterialStack(Iron, 50), new MaterialStack(Carbon, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1)));
+        Materials.Steel                   = new Materials( 305, TextureSet.SET_METALLIC          ,   6.0F,    512,  3, 1|2          |64|128      , 128, 128, 128,   0,   "Steel"                   ,   "Steel"                         ,    0,       0,       1811, 1000,  true, false,   4,  51,  50, Dyes.dyeGray        , 1, Arrays.asList(new MaterialStack(Iron, 50), new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.ORDO, 1)));
         Materials.Stibnite                = new Materials( 945, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1    |8                   ,  70,  70,  70,   0,   "Stibnite"                ,   "Stibnite"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 2, Arrays.asList(new MaterialStack(Antimony, 2), new MaterialStack(Sulfur, 3)));
         Materials.SulfuricAcid            = new Materials( 720, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16                , 255, 128,   0,   0,   "SulfuricAcid"            ,   "Sulfuric Acid"                 ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , 1, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Sulfur, 1), new MaterialStack(Oxygen, 4)));
-        Materials.Tanzanite               = new Materials( 508, TextureSet.SET_GEM_VERTICAL      ,   7.0F,    256,  2, 1  |4|8      |64          ,  64,   0, 200, 127,   "Tanzanite"               ,   "Tanzanite"                     ,    0,       0,         -1,    0, false,  true,   5,   1,   1, Dyes.dyePurple      , 0, Arrays.asList(new MaterialStack(Calcium, 2), new MaterialStack(Aluminium, 3), new MaterialStack(Silicon, 3), new MaterialStack(Hydrogen, 1), new MaterialStack(Oxygen, 13)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 3)));
+        Materials.Tanzanite               = new Materials( 508, TextureSet.SET_GEM_VERTICAL      ,   7.0F,    256,  2, 1  |4|8      |64          ,  64,   0, 200, 127,   "Tanzanite"               ,   "Tanzanite"                     ,    0,       0,         -1,    0, false,  true,   5,   1,   1, Dyes.dyePurple      , 0, Arrays.asList(new MaterialStack(Calcium, 2), new MaterialStack(Aluminium, 3), new MaterialStack(Silicon, 3), new MaterialStack(Hydrogen, 1), new MaterialStack(Oxygen, 13)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 5), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3)));
         Materials.Tetrahedrite            = new Materials( 840, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1    |8                   , 200,  32,   0,   0,   "Tetrahedrite"            ,   "Tetrahedrite"                  ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeRed         , 2, Arrays.asList(new MaterialStack(Copper, 3), new MaterialStack(Antimony, 1), new MaterialStack(Sulfur, 3), new MaterialStack(Iron, 1))); //Cu3SbS3 + x(Fe,Zn)6Sb2S9
-        Materials.TinAlloy                = new Materials( 363, TextureSet.SET_METALLIC          ,   6.5F,     96,  2, 1|2          |64|128      , 200, 200, 200,   0,   "TinAlloy"                ,   "Tin Alloy"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 2, Arrays.asList(new MaterialStack(Tin, 1), new MaterialStack(Iron, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1)));
-        Materials.Topaz                   = new Materials( 507, TextureSet.SET_GEM_HORIZONTAL    ,   7.0F,    256,  3, 1  |4|8      |64          , 255, 128,   0, 127,   "Topaz"                   ,   "Topaz"                         ,    0,       0,         -1,    0, false,  true,   5,   1,   1, Dyes.dyeOrange      , 0, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 1), new MaterialStack(Fluorine, 2), new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 6)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 6), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4)));
+        Materials.TinAlloy                = new Materials( 363, TextureSet.SET_METALLIC          ,   6.5F,     96,  2, 1|2          |64|128      , 200, 200, 200,   0,   "TinAlloy"                ,   "Tin Alloy"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 2, Arrays.asList(new MaterialStack(Tin, 1), new MaterialStack(Iron, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 1)));
+        Materials.Topaz                   = new Materials( 507, TextureSet.SET_GEM_HORIZONTAL    ,   7.0F,    256,  3, 1  |4|8      |64          , 255, 128,   0, 127,   "Topaz"                   ,   "Topaz"                         ,    0,       0,         -1,    0, false,  true,   5,   1,   1, Dyes.dyeOrange      , 0, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 1), new MaterialStack(Fluorine, 2), new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 6)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 6), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 4)));
         Materials.Tungstate               = new Materials( 841, TextureSet.SET_DULL              ,   1.0F,      0,  3, 1    |8                   ,  55,  50,  35,   0,   "Tungstate"               ,   "Tungstate"                     ,    0,       0,       2500, 2500,  true, false,   4,   1,   1, Dyes.dyeBlack       , 0, Arrays.asList(new MaterialStack(Tungsten, 1), new MaterialStack(Lithium, 2), new MaterialStack(Oxygen, 4)));
         Materials.Ultimet                 = new Materials( 344, TextureSet.SET_SHINY             ,   9.0F,   2048,  4, 1|2          |64|128      , 180, 180, 230,   0,   "Ultimet"                 ,   "Ultimet"                       ,    0,       0,       2700, 2700,  true, false,   1,   1,   1, Dyes.dyeLightBlue   , 1, Arrays.asList(new MaterialStack(Cobalt, 5), new MaterialStack(Chrome, 2), new MaterialStack(Nickel, 1), new MaterialStack(Molybdenum, 1))); // 54% Cobalt, 26% Chromium, 9% Nickel, 5% Molybdenum, 3% Iron, 2% Tungsten, 0.8% Manganese, 0.3% Silicon, 0.08% Nitrogen and 0.06% Carbon
         Materials.Uraninite               = new Materials( 922, TextureSet.SET_METALLIC          ,   1.0F,      0,  3, 1    |8                   ,  35,  35,  35,   0,   "Uraninite"               ,   "Uraninite"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLime        , 2, Arrays.asList(new MaterialStack(Uranium, 1), new MaterialStack(Oxygen, 2)));
         Materials.Uvarovite               = new Materials( 842, TextureSet.SET_DIAMOND           ,   1.0F,      0,  2, 1    |8                   , 180, 255, 180,   0,   "Uvarovite"               ,   "Uvarovite"                     ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeGreen       , 1, Arrays.asList(new MaterialStack(Calcium, 3), new MaterialStack(Chrome, 2), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)));
         Materials.VanadiumGallium         = new Materials( 357, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1|2             |128      , 128, 128, 140,   0,   "VanadiumGallium"         ,   "Vanadium-Gallium"              ,    0,       0,       4500, 4500,  true, false,   1,   1,   1, Dyes.dyeGray        , 2, Arrays.asList(new MaterialStack(Vanadium, 3), new MaterialStack(Gallium, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Wood                    = new Materials( 809, TextureSet.SET_WOOD              ,   2.0F,     16,  0, 1|2          |64|128      , 100,  50,   0,   0,   "Wood"                    ,   "Wood"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBrown       , 0, Arrays.asList(new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 1), new MaterialStack(Hydrogen, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2)));
+        Materials.Wood                    = new Materials( 809, TextureSet.SET_WOOD              ,   2.0F,     16,  0, 1|2          |64|128      , 100,  50,   0,   0,   "Wood"                    ,   "Wood"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBrown       , 0, Arrays.asList(new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 1), new MaterialStack(Hydrogen, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ARBOR, 2)));
         Materials.WroughtIron             = new Materials( 304, TextureSet.SET_METALLIC          ,   6.0F,    384,  2, 1|2          |64|128      , 200, 180, 180,   0,   "WroughtIron"             ,   "Wrought Iron"                  ,    0,       0,       1811,    0, false, false,   3,   1,   1, Dyes.dyeLightGray   , 2, Collections.singletonList(new MaterialStack(Iron, 1)));
         Materials.Wulfenite               = new Materials( 882, TextureSet.SET_DULL              ,   1.0F,      0,  3, 1    |8                   , 255, 128,   0,   0,   "Wulfenite"               ,   "Wulfenite"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , 2, Arrays.asList(new MaterialStack(Lead, 1), new MaterialStack(Molybdenum, 1), new MaterialStack(Oxygen, 4)));
         Materials.YellowLimonite          = new Materials( 931, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1    |8                   , 200, 200,   0,   0,   "YellowLimonite"          ,   "Yellow Limonite"               ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow      , 2, Arrays.asList(new MaterialStack(Iron, 1), new MaterialStack(Hydrogen, 1), new MaterialStack(Oxygen, 2))); // FeO(OH) + a bit of Ni and Co
         Materials.YttriumBariumCuprate    = new Materials( 358, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2                       ,  80,  64,  70,   0,   "YttriumBariumCuprate"    ,   "Yttrium Barium Cuprate"        ,    0,       0,       4500, 4500,  true, false,   1,   1,   1, Dyes.dyeGray        , 0, Arrays.asList(new MaterialStack(Yttrium, 1), new MaterialStack(Barium, 2), new MaterialStack(Copper, 3), new MaterialStack(Oxygen, 7))).disableAutoGeneratedVacuumFreezerRecipe();
 
-        Materials.WoodSealed              = new Materials( 889, TextureSet.SET_WOOD              ,   3.0F,     24,  0, 1|2          |64|128      ,  80,  40,   0,   0,   "WoodSealed"              ,   "Sealed Wood"                   ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBrown       , 0, Collections.singletonList(new MaterialStack(Wood, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1)));
-        Materials.LiveRoot                = new Materials( 832, TextureSet.SET_WOOD              ,   1.0F,      0,  1, 1                         , 220, 200,   0,   0,   "LiveRoot"                ,   "Liveroot"                      ,    5,      16,         -1,    0, false, false,   2,   4,   3, Dyes.dyeBrown       , 2, Arrays.asList(new MaterialStack(Wood, 3), new MaterialStack(Magic, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.VICTUS, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1)));
+        Materials.WoodSealed              = new Materials( 889, TextureSet.SET_WOOD              ,   3.0F,     24,  0, 1|2          |64|128      ,  80,  40,   0,   0,   "WoodSealed"              ,   "Sealed Wood"                   ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBrown       , 0, Collections.singletonList(new MaterialStack(Wood, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.ARBOR, 2), new TCAspects.TC_AspectStack(TCAspects.FABRICO, 1)));
+        Materials.LiveRoot                = new Materials( 832, TextureSet.SET_WOOD              ,   1.0F,      0,  1, 1                         , 220, 200,   0,   0,   "LiveRoot"                ,   "Liveroot"                      ,    5,      16,         -1,    0, false, false,   2,   4,   3, Dyes.dyeBrown       , 2, Arrays.asList(new MaterialStack(Wood, 3), new MaterialStack(Magic, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.ARBOR, 2), new TCAspects.TC_AspectStack(TCAspects.VICTUS, 2), new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 1)));
         Materials.IronWood                = new Materials( 338, TextureSet.SET_WOOD              ,   6.0F,    384,  2, 1|2          |64|128      , 150, 140, 110,   0,   "IronWood"                ,   "Ironwood"                      ,    5,       8,         -1,    0, false, false,   2,  19,  18, Dyes.dyeBrown       , 2, Arrays.asList(new MaterialStack(Iron, 9), new MaterialStack(LiveRoot, 9), new MaterialStack(Gold, 1)));
-        Materials.Glass                   = new Materials( 890, TextureSet.SET_GLASS             ,   1.0F,      4,  0, 1  |4                     , 250, 250, 250, 220,   "Glass"                   ,   "Glass"                         ,    0,       0,       1500,    0, false,  true,   1,   1,   1, Dyes.dyeWhite       , 2, Collections.singletonList(new MaterialStack(SiliconDioxide, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 2)));
+        Materials.Glass                   = new Materials( 890, TextureSet.SET_GLASS             ,   1.0F,      4,  0, 1  |4                     , 250, 250, 250, 220,   "Glass"                   ,   "Glass"                         ,    0,       0,       1500,    0, false,  true,   1,   1,   1, Dyes.dyeWhite       , 2, Collections.singletonList(new MaterialStack(SiliconDioxide, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 2)));
         Materials.BorosilicateGlass  = new MaterialBuilder(611, TextureSet.SET_GLASS             ,                                                                                                     "Borosilicate Glass").addDustItems().addMetalItems().setRGB(230, 243, 230).setColor(Dyes.dyeWhite).setMaterialList(new MaterialStack(Boron, 1), new MaterialStack(Glass, 7)).addCentrifugeRecipe().constructMaterial();
         Materials.Perlite                 = new Materials( 925, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1    |8                   ,  30,  20,  30,   0,   "Perlite"                 ,   "Perlite"                       ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 2, Arrays.asList(new MaterialStack(Obsidian, 2), new MaterialStack(Water, 1)));
         Materials.Borax                   = new Materials( 941, TextureSet.SET_FINE              ,   1.0F,      0,  1, 1    |8                   , 250, 250, 250,   0,   "Borax"                   ,   "Borax"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 1, Arrays.asList(new MaterialStack(Sodium, 2), new MaterialStack(Boron, 4), new MaterialStack(Oxygen, 7), new MaterialStack(Water, 10)));
         Materials.Lignite                 = new Materials( 538, TextureSet.SET_LIGNITE           ,   1.0F,      0,  0, 1  |4|8                   , 100,  70,  70,   0,   "Lignite"                 ,   "Lignite Coal"                  ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 1, Arrays.asList(new MaterialStack(Carbon, 3), new MaterialStack(Water, 1)));
-        Materials.Olivine                 = new Materials( 505, TextureSet.SET_RUBY              ,   7.0F,    256,  2, 1  |4|8      |64          , 150, 255, 150, 127,   "Olivine"                 ,   "Olivine"                       ,    0,       0,         -1,    0, false,  true,   5,   1,   1, Dyes.dyeLime        , 1, Arrays.asList(new MaterialStack(Magnesium, 2), new MaterialStack(Iron, 1), new MaterialStack(SiliconDioxide, 2)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 4), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 2)));
-        Materials.Opal                    = new Materials( 510, TextureSet.SET_OPAL              ,   7.0F,    256,  2, 1  |4|8      |64          ,   0,   0, 255,   0,   "Opal"                    ,   "Opal"                          ,    0,       0,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeBlue        , 1, Collections.singletonList(new MaterialStack(SiliconDioxide, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 3)));
-        Materials.Amethyst                = new Materials( 509, TextureSet.SET_FLINT             ,   7.0F,    256,  3, 1  |4|8      |64          , 210,  50, 210, 127,   "Amethyst"                ,   "Amethyst"                      ,    0,       0,         -1,    0, false,  true,   3,   1,   1, Dyes.dyePink        , 1, Arrays.asList(new MaterialStack(SiliconDioxide, 4), new MaterialStack(Iron, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 6), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4)));
-        Materials.Redstone                = new Materials( 810, TextureSet.SET_ROUGH             ,   1.0F,      0,  2, 1    |8                   , 200,   0,   0,   0,   "Redstone"                ,   "Redstone"                      ,    0,       0,        500,    0, false, false,   3,   1,   1, Dyes.dyeRed         , 2, Arrays.asList(new MaterialStack(Silicon, 1), new MaterialStack(Pyrite, 5), new MaterialStack(Ruby, 1), new MaterialStack(Mercury, 3)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2)));
-        Materials.Lapis                   = new Materials( 526, TextureSet.SET_LAPIS             ,   1.0F,      0,  1, 1  |4|8                   ,  70,  70, 220,   0,   "Lapis"                   ,   "Lapis"                         ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeBlue        , 2, Arrays.asList(new MaterialStack(Lazurite, 12), new MaterialStack(Sodalite, 2), new MaterialStack(Pyrite, 1), new MaterialStack(Calcite, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1)));
-        Materials.Blaze                   = new Materials( 801, TextureSet.SET_POWDER            ,   2.0F,     16,  1, 1            |64          , 255, 200,   0,   0,   "Blaze"                   ,   "Blaze"                         ,    0,       0,       6400,    0, false, false,   2,   3,   2, Dyes.dyeYellow      , 2, Arrays.asList(new MaterialStack(DarkAsh, 1), new MaterialStack(Sulfur, 1), new MaterialStack(Magic, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 4)));
-        Materials.EnderPearl              = new Materials( 532, TextureSet.SET_SHINY             ,   1.0F,     16,  1, 1  |4                     , 108, 220, 200,   0,   "EnderPearl"              ,   "Enderpearl"                    ,    0,       0,         -1,    0, false, false,   1,  16,  10, Dyes.dyeGreen       , 1, Arrays.asList(new MaterialStack(Beryllium, 1), new MaterialStack(Potassium, 4), new MaterialStack(Nitrogen, 5), new MaterialStack(Magic, 6)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 4), new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 4), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 2)));
-        Materials.EnderEye                = new Materials( 533, TextureSet.SET_SHINY             ,   1.0F,     16,  1, 1  |4                     , 160, 250, 230,   0,   "EnderEye"                ,   "Endereye"                      ,    5,      10,         -1,    0, false, false,   1,   2,   1, Dyes.dyeGreen       , 2, Arrays.asList(new MaterialStack(EnderPearl, 1), new MaterialStack(Blaze, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 4), new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 4), new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 4), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 2)));
-        Materials.Flint                   = new Materials( 802, TextureSet.SET_FLINT             ,   2.5F,    128,  1, 1            |64          ,   0,  32,  64,   0,   "Flint"                   ,   "Flint"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGray        , 2, Collections.singletonList(new MaterialStack(SiliconDioxide, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1)));
+        Materials.Olivine                 = new Materials( 505, TextureSet.SET_RUBY              ,   7.0F,    256,  2, 1  |4|8      |64          , 150, 255, 150, 127,   "Olivine"                 ,   "Olivine"                       ,    0,       0,         -1,    0, false,  true,   5,   1,   1, Dyes.dyeLime        , 1, Arrays.asList(new MaterialStack(Magnesium, 2), new MaterialStack(Iron, 1), new MaterialStack(SiliconDioxide, 2)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 4), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 2)));
+        Materials.Opal                    = new Materials( 510, TextureSet.SET_OPAL              ,   7.0F,    256,  2, 1  |4|8      |64          ,   0,   0, 255,   0,   "Opal"                    ,   "Opal"                          ,    0,       0,         -1,    0, false,  true,   3,   1,   1, Dyes.dyeBlue        , 1, Collections.singletonList(new MaterialStack(SiliconDioxide, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 5), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3)));
+        Materials.Amethyst                = new Materials( 509, TextureSet.SET_FLINT             ,   7.0F,    256,  3, 1  |4|8      |64          , 210,  50, 210, 127,   "Amethyst"                ,   "Amethyst"                      ,    0,       0,         -1,    0, false,  true,   3,   1,   1, Dyes.dyePink        , 1, Arrays.asList(new MaterialStack(SiliconDioxide, 4), new MaterialStack(Iron, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 6), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 4)));
+        Materials.Redstone                = new Materials( 810, TextureSet.SET_ROUGH             ,   1.0F,      0,  2, 1    |8                   , 200,   0,   0,   0,   "Redstone"                ,   "Redstone"                      ,    0,       0,        500,    0, false, false,   3,   1,   1, Dyes.dyeRed         , 2, Arrays.asList(new MaterialStack(Silicon, 1), new MaterialStack(Pyrite, 5), new MaterialStack(Ruby, 1), new MaterialStack(Mercury, 3)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1), new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2)));
+        Materials.Lapis                   = new Materials( 526, TextureSet.SET_LAPIS             ,   1.0F,      0,  1, 1  |4|8                   ,  70,  70, 220,   0,   "Lapis"                   ,   "Lapis"                         ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeBlue        , 2, Arrays.asList(new MaterialStack(Lazurite, 12), new MaterialStack(Sodalite, 2), new MaterialStack(Pyrite, 1), new MaterialStack(Calcite, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.SENSUS, 1)));
+        Materials.Blaze                   = new Materials( 801, TextureSet.SET_POWDER            ,   2.0F,     16,  1, 1            |64          , 255, 200,   0,   0,   "Blaze"                   ,   "Blaze"                         ,    0,       0,       6400,    0, false, false,   2,   3,   2, Dyes.dyeYellow      , 2, Arrays.asList(new MaterialStack(DarkAsh, 1), new MaterialStack(Sulfur, 1), new MaterialStack(Magic, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 2), new TCAspects.TC_AspectStack(TCAspects.IGNIS, 4)));
+        Materials.EnderPearl              = new Materials( 532, TextureSet.SET_SHINY             ,   1.0F,     16,  1, 1  |4                     , 108, 220, 200,   0,   "EnderPearl"              ,   "Enderpearl"                    ,    0,       0,         -1,    0, false, false,   1,  16,  10, Dyes.dyeGreen       , 1, Arrays.asList(new MaterialStack(Beryllium, 1), new MaterialStack(Potassium, 4), new MaterialStack(Nitrogen, 5), new MaterialStack(Magic, 6)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 4), new TCAspects.TC_AspectStack(TCAspects.ITER, 4), new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 2)));
+        Materials.EnderEye                = new Materials( 533, TextureSet.SET_SHINY             ,   1.0F,     16,  1, 1  |4                     , 160, 250, 230,   0,   "EnderEye"                ,   "Endereye"                      ,    5,      10,         -1,    0, false, false,   1,   2,   1, Dyes.dyeGreen       , 2, Arrays.asList(new MaterialStack(EnderPearl, 1), new MaterialStack(Blaze, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.SENSUS, 4), new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 4), new TCAspects.TC_AspectStack(TCAspects.ITER, 4), new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 3), new TCAspects.TC_AspectStack(TCAspects.IGNIS, 2)));
+        Materials.Flint                   = new Materials( 802, TextureSet.SET_FLINT             ,   2.5F,    128,  1, 1            |64          ,   0,  32,  64,   0,   "Flint"                   ,   "Flint"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGray        , 2, Collections.singletonList(new MaterialStack(SiliconDioxide, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.TERRA, 1), new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 1)));
         Materials.Diatomite               = new Materials( 948, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1    |8                   , 225, 225, 225,   0,   "Diatomite"               ,   "Diatomite"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGray        , 2, Arrays.asList(new MaterialStack(Flint, 8), new MaterialStack(BandedIron, 1), new MaterialStack(Sapphire, 1)));
         Materials.VolcanicAsh             = new Materials( 940, TextureSet.SET_FLINT             ,   1.0F,      0,  0, 1                         ,  60,  50,  50,   0,   "VolcanicAsh"             ,   "Volcanic Ashes"                ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 2, Arrays.asList(new MaterialStack(Flint, 6), new MaterialStack(Iron, 1), new MaterialStack(Magnesium, 1)));
         Materials.Niter                   = new Materials( 531, TextureSet.SET_FLINT             ,   1.0F,      0,  1, 1  |4|8                   , 255, 200, 200,   0,   "Niter"                   ,   "Niter"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyePink        , 2, Collections.singletonList(new MaterialStack(Saltpeter, 1)));
-        Materials.Pyrotheum               = new Materials( 843, TextureSet.SET_FIERY             ,   1.0F,      0,  1, 1                         , 255, 128,   0,   0,   "Pyrotheum"               ,   "Pyrotheum"                     ,    2,      62,         -1,    0, false, false,   2,   3,   1, Dyes.dyeYellow      , 2, Arrays.asList(new MaterialStack(Coal, 1), new MaterialStack(Redstone, 1), new MaterialStack(Blaze, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1)));
-        Materials.Cryotheum               = new Materials( 898, TextureSet.SET_SHINY             ,   1.0F,      0,  1, 1                         ,   0, 148, 203,   0,   "Cryotheum"               ,   "Cryotheum"                     ,    2,      62,         -1,    0, false, false,   2,   3,   1, Dyes.dyeLightBlue   , 2, Arrays.asList(new MaterialStack(Saltpeter, 1), new MaterialStack(Redstone, 1), new MaterialStack(Snow, 1), new MaterialStack(Blizz, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1),  new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1)));
+        Materials.Pyrotheum               = new Materials( 843, TextureSet.SET_FIERY             ,   1.0F,      0,  1, 1                         , 255, 128,   0,   0,   "Pyrotheum"               ,   "Pyrotheum"                     ,    2,      62,         -1,    0, false, false,   2,   3,   1, Dyes.dyeYellow      , 2, Arrays.asList(new MaterialStack(Coal, 1), new MaterialStack(Redstone, 1), new MaterialStack(Blaze, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 2), new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1)));
+        Materials.Cryotheum               = new Materials( 898, TextureSet.SET_SHINY             ,   1.0F,      0,  1, 1                         ,   0, 148, 203,   0,   "Cryotheum"               ,   "Cryotheum"                     ,    2,      62,         -1,    0, false, false,   2,   3,   1, Dyes.dyeLightBlue   , 2, Arrays.asList(new MaterialStack(Saltpeter, 1), new MaterialStack(Redstone, 1), new MaterialStack(Snow, 1), new MaterialStack(Blizz, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 2), new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1),  new TCAspects.TC_AspectStack(TCAspects.GELUM, 1)));
         Materials.HydratedCoal            = new Materials( 818, TextureSet.SET_ROUGH             ,   1.0F,      0,  1, 1                         ,  70,  70, 100,   0,   "HydratedCoal"            ,   "Hydrated Coal"                 ,    0,       0,         -1,    0, false, false,   1,   9,   8, Dyes.dyeBlack       , 2, Arrays.asList(new MaterialStack(Coal, 8), new MaterialStack(Water, 1)));
-        Materials.Apatite                 = new Materials( 530, TextureSet.SET_DIAMOND           ,   1.0F,      0,  1, 1  |4|8                   , 200, 200, 255,   0,   "Apatite"                 ,   "Apatite"                       ,    0,       0,         -1,    0, false, false,   2,   1,   1, Dyes.dyeCyan        , 1, Arrays.asList(new MaterialStack(Calcium, 5), new MaterialStack(Phosphate, 3), new MaterialStack(Chlorine, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 2)));
-        Materials.Alumite                 = new Materials( 400, TextureSet.SET_METALLIC          ,   5.0F,    768,  2, 1|2          |64|128      , 255, 105, 180,   0,   "Alumite"                 ,   "Alumite"                       ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyePink        , 2, Arrays.asList(new MaterialStack(Aluminium, 5), new MaterialStack(Steel, 2), new MaterialStack(Obsidian, 2)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 2)));
-        Materials.Manyullyn               = new Materials( 386, TextureSet.SET_SHINY             ,  25.0F,   2048,  5, 1|2  |8      |64|128      , 154,  76, 185,   0,   "Manyullyn"               ,   "Manyullyn"                     ,    0,       0,       3600, 3600,  true, false,   1,   1,   1, Dyes.dyePurple      , 2, Arrays.asList(new MaterialStack(Cobalt, 1), new MaterialStack(Ardite, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 2))).disableAutoGeneratedBlastFurnaceRecipes();
-        Materials.Steeleaf                = new Materials( 339, TextureSet.SET_LEAF              ,   8.0F,    768,  3, 1|2          |64|128      ,  50, 127,  50,   0,   "Steeleaf"                ,   "Steeleaf"                      ,    5,      24,         -1,    0, false, false,   4,   1,   1, Dyes.dyeGreen       , 2, Arrays.asList(new MaterialStack(Steel, 1), new MaterialStack(Magic, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1)));
-        Materials.Knightmetal             = new Materials( 362, TextureSet.SET_METALLIC          ,   8.0F,   1024,  3, 1|2          |64|128      , 210, 240, 200,   0,   "Knightmetal"             ,   "Knightmetal"                   ,    5,      24,         -1,    0, false, false,   4,   1,   1, Dyes.dyeLime        , 2, Arrays.asList(new MaterialStack(Steel, 2), new MaterialStack(Magic, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2)));
+        Materials.Apatite                 = new Materials( 530, TextureSet.SET_DIAMOND           ,   1.0F,      0,  1, 1  |4|8                   , 200, 200, 255,   0,   "Apatite"                 ,   "Apatite"                       ,    0,       0,         -1,    0, false, false,   2,   1,   1, Dyes.dyeCyan        , 1, Arrays.asList(new MaterialStack(Calcium, 5), new MaterialStack(Phosphate, 3), new MaterialStack(Chlorine, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.MESSIS, 2)));
+        Materials.Alumite                 = new Materials( 400, TextureSet.SET_METALLIC          ,   5.0F,    768,  2, 1|2          |64|128      , 255, 105, 180,   0,   "Alumite"                 ,   "Alumite"                       ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyePink        , 2, Arrays.asList(new MaterialStack(Aluminium, 5), new MaterialStack(Steel, 2), new MaterialStack(Obsidian, 2)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.STRONTIO, 2)));
+        Materials.Manyullyn               = new Materials( 386, TextureSet.SET_SHINY             ,  25.0F,   2048,  5, 1|2  |8      |64|128      , 154,  76, 185,   0,   "Manyullyn"               ,   "Manyullyn"                     ,    0,       0,       3600, 3600,  true, false,   1,   1,   1, Dyes.dyePurple      , 2, Arrays.asList(new MaterialStack(Cobalt, 1), new MaterialStack(Ardite, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.STRONTIO, 2))).disableAutoGeneratedBlastFurnaceRecipes();
+        Materials.Steeleaf                = new Materials( 339, TextureSet.SET_LEAF              ,   8.0F,    768,  3, 1|2          |64|128      ,  50, 127,  50,   0,   "Steeleaf"                ,   "Steeleaf"                      ,    5,      24,         -1,    0, false, false,   4,   1,   1, Dyes.dyeGreen       , 2, Arrays.asList(new MaterialStack(Steel, 1), new MaterialStack(Magic, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.HERBA, 2), new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 1)));
+        Materials.Knightmetal             = new Materials( 362, TextureSet.SET_METALLIC          ,   8.0F,   1024,  3, 1|2          |64|128      , 210, 240, 200,   0,   "Knightmetal"             ,   "Knightmetal"                   ,    5,      24,         -1,    0, false, false,   4,   1,   1, Dyes.dyeLime        , 2, Arrays.asList(new MaterialStack(Steel, 2), new MaterialStack(Magic, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 1), new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2)));
         Materials.SterlingSilver          = new Materials( 350, TextureSet.SET_SHINY             ,  13.0F,    128,  2, 1|2          |64|128      , 250, 220, 225,   0,   "SterlingSilver"          ,   "Sterling Silver"               ,    0,       0,         -1, 1700,  true, false,   4,   1,   1, Dyes.dyeWhite       , 2, Arrays.asList(new MaterialStack(Copper, 1), new MaterialStack(Silver, 4)));
         Materials.RoseGold                = new Materials( 351, TextureSet.SET_SHINY             ,  14.0F,    128,  2, 1|2          |64|128      , 255, 230,  30,   0,   "RoseGold"                ,   "Rose Gold"                     ,    0,       0,         -1, 1600,  true, false,   4,   1,   1, Dyes.dyeOrange      , 2, Arrays.asList(new MaterialStack(Copper, 1), new MaterialStack(Gold, 4)));
         Materials.BlackBronze             = new Materials( 352, TextureSet.SET_DULL              ,  12.0F,    256,  2, 1|2          |64|128      , 100,  50, 125,   0,   "BlackBronze"             ,   "Black Bronze"                  ,    0,       0,         -1, 2000,  true, false,   4,   1,   1, Dyes.dyePurple      , 2, Arrays.asList(new MaterialStack(Gold, 1), new MaterialStack(Silver, 1), new MaterialStack(Copper, 3)));
@@ -769,27 +769,27 @@ public class MaterialsInit1 {
         Materials.TungstenSteel           = new Materials( 316, TextureSet.SET_METALLIC          ,   8.0F,   2560,  4, 1|2          |64|128      , 100, 100, 160,   0,   "TungstenSteel"           ,   "Tungstensteel"                 ,    0,       0,       4000, 4000,  true, false,   4,   1,   1, Dyes.dyeBlue        , 2, Arrays.asList(new MaterialStack(Steel, 1), new MaterialStack(Tungsten, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
         Materials.NitroCoalFuel           = new Materials(  -1, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16                ,  50,  70,  50,   0,   "NitroCoalFuel"           ,   "Nitro-Coalfuel"                ,    0,      48,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 0, Arrays.asList(new MaterialStack(Glyceryl, 1), new MaterialStack(CoalFuel, 4)));
         Materials.NitroFuel               = new Materials( 709, TextureSet.SET_FLUID             ,   1.0F,      0,  2,         16                , 200, 255,   0,   0,   "NitroFuel"               ,   "Cetane-Boosted Diesel"         ,    0,    1000,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLime        );
-        Materials.RedAlloy                = new Materials( 308, TextureSet.SET_DULL              ,   1.0F,      0,  0, 1|2                       , 200,   0,   0,   0,   "RedAlloy"                ,   "Red Alloy"                     ,    0,       0,        500,    0, false, false,   3,   5,   1, Dyes.dyeRed         , 2, Arrays.asList(new MaterialStack(Copper, 1), new MaterialStack(Redstone, 4)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 3)));
+        Materials.RedAlloy                = new Materials( 308, TextureSet.SET_DULL              ,   1.0F,      0,  0, 1|2                       , 200,   0,   0,   0,   "RedAlloy"                ,   "Red Alloy"                     ,    0,       0,        500,    0, false, false,   3,   5,   1, Dyes.dyeRed         , 2, Arrays.asList(new MaterialStack(Copper, 1), new MaterialStack(Redstone, 4)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.MACHINA, 3)));
         Materials.CobaltBrass             = new Materials( 343, TextureSet.SET_METALLIC          ,   8.0F,    256,  2, 1|2          |64|128      , 180, 180, 160,   0,   "CobaltBrass"             ,   "Cobalt Brass"                  ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeOrange      , 2, Arrays.asList(new MaterialStack(Brass, 7), new MaterialStack(Aluminium, 1), new MaterialStack(Cobalt, 1)));
         Materials.TricalciumPhosphate     = new Materials( 534, TextureSet.SET_FLINT             ,   1.0F,      0, 2,  1|4|8|16                  , 255, 255,   0,   0,   "TricalciumPhosphate"     ,   "Tricalcium Phosphate"          ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeYellow      , 2, Arrays.asList(new MaterialStack(Calcium, 3), new MaterialStack(Phosphate, 2)));
-        Materials.Basalt                  = new Materials( 844, TextureSet.SET_ROUGH             ,   1.0F,     64,  1, 1            |64|128      ,  30,  20,  20,   0,   "Basalt"                  ,   "Basalt"                        ,    0,       0,         -1,    0, false, false,   2,   1,   1, Dyes.dyeBlack       , 2, Arrays.asList(new MaterialStack(Olivine, 1), new MaterialStack(Calcite, 3), new MaterialStack(Flint, 8), new MaterialStack(DarkAsh, 4)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 1))).disableAutoGeneratedRecycleRecipes();
-        Materials.GarnetRed               = new Materials( 527, TextureSet.SET_RUBY              ,   7.0F,    128,  2, 1  |4|8      |64          , 200,  80,  80, 127,   "GarnetRed"               ,   "Red Garnet"                    ,    0,       0,         -1,    0, false,  true,   4,   1,   1, Dyes.dyeRed         , 2, Arrays.asList(new MaterialStack(Pyrope, 3), new MaterialStack(Almandine, 5), new MaterialStack(Spessartine, 8)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 3)));
-        Materials.GarnetYellow            = new Materials( 528, TextureSet.SET_RUBY              ,   7.0F,    128,  2, 1  |4|8      |64          , 200, 200,  80, 127,   "GarnetYellow"            ,   "Yellow Garnet"                 ,    0,       0,         -1,    0, false,  true,   4,   1,   1, Dyes.dyeYellow      , 2, Arrays.asList(new MaterialStack(Andradite, 5), new MaterialStack(Grossular, 8), new MaterialStack(Uvarovite, 3)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 3)));
-        Materials.Marble                  = new Materials( 845, TextureSet.SET_FINE              ,   1.0F,     16,  1, 1            |64|128      , 200, 200, 200,   0,   "Marble"                  ,   "Marble"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 2, Arrays.asList(new MaterialStack(Magnesium, 1), new MaterialStack(Calcite, 7)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1)));
-        Materials.Sugar                   = new Materials( 803, TextureSet.SET_FINE              ,   1.0F,      0,  1, 1                         , 250, 250, 250,   0,   "Sugar"                   ,   "Sugar"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 1, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Water, 5), new MaterialStack(Oxygen, 25)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.AER, 1)));
-        Materials.Thaumium                = new Materials( 330, TextureSet.SET_METALLIC          ,  12.0F,    256,  3, 1|2          |64|128      , 150, 100, 200,   0,   "Thaumium"                ,   "Thaumium"                      ,    0,       0,         -1,    0, false, false,   5,   2,   1, Dyes.dyePurple      , 0, Arrays.asList(new MaterialStack(Iron, 1), new MaterialStack(Magic, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1)));
-        Materials.Vinteum                 = new Materials( 529, TextureSet.SET_METALLIC          ,  10.0F,    128,  3, 1|2|4|8      |64|128      , 100, 200, 255,   0,   "Vinteum"                 ,   "Vinteum"                       ,    5,      32,         -1,    0, false, false,   4,   1,   1, Dyes.dyeLightBlue   , 2, Collections.singletonList(new MaterialStack(Thaumium, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1)));
-        Materials.Vis                     = new Materials(  -1, TextureSet.SET_SHINY             ,   1.0F,      0,  3, 0                         , 128,   0, 255,   0,   "Vis"                     ,   "Vis"                           ,    5,      32,         -1,    0, false, false,   1,   1,   1, Dyes.dyePurple      , 2, Collections.singletonList(new MaterialStack(Magic, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1)));
+        Materials.Basalt                  = new Materials( 844, TextureSet.SET_ROUGH             ,   1.0F,     64,  1, 1            |64|128      ,  30,  20,  20,   0,   "Basalt"                  ,   "Basalt"                        ,    0,       0,         -1,    0, false, false,   2,   1,   1, Dyes.dyeBlack       , 2, Arrays.asList(new MaterialStack(Olivine, 1), new MaterialStack(Calcite, 3), new MaterialStack(Flint, 8), new MaterialStack(DarkAsh, 4)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 1))).disableAutoGeneratedRecycleRecipes();
+        Materials.GarnetRed               = new Materials( 527, TextureSet.SET_RUBY              ,   7.0F,    128,  2, 1  |4|8      |64          , 200,  80,  80, 127,   "GarnetRed"               ,   "Red Garnet"                    ,    0,       0,         -1,    0, false,  true,   4,   1,   1, Dyes.dyeRed         , 2, Arrays.asList(new MaterialStack(Pyrope, 3), new MaterialStack(Almandine, 5), new MaterialStack(Spessartine, 8)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3)));
+        Materials.GarnetYellow            = new Materials( 528, TextureSet.SET_RUBY              ,   7.0F,    128,  2, 1  |4|8      |64          , 200, 200,  80, 127,   "GarnetYellow"            ,   "Yellow Garnet"                 ,    0,       0,         -1,    0, false,  true,   4,   1,   1, Dyes.dyeYellow      , 2, Arrays.asList(new MaterialStack(Andradite, 5), new MaterialStack(Grossular, 8), new MaterialStack(Uvarovite, 3)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3)));
+        Materials.Marble                  = new Materials( 845, TextureSet.SET_FINE              ,   1.0F,     16,  1, 1            |64|128      , 200, 200, 200,   0,   "Marble"                  ,   "Marble"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 2, Arrays.asList(new MaterialStack(Magnesium, 1), new MaterialStack(Calcite, 7)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 1)));
+        Materials.Sugar                   = new Materials( 803, TextureSet.SET_FINE              ,   1.0F,      0,  1, 1                         , 250, 250, 250,   0,   "Sugar"                   ,   "Sugar"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 1, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Water, 5), new MaterialStack(Oxygen, 25)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.HERBA, 1), new TCAspects.TC_AspectStack(TCAspects.AQUA, 1), new TCAspects.TC_AspectStack(TCAspects.AER, 1)));
+        Materials.Thaumium                = new Materials( 330, TextureSet.SET_METALLIC          ,  12.0F,    256,  3, 1|2          |64|128      , 150, 100, 200,   0,   "Thaumium"                ,   "Thaumium"                      ,    0,       0,         -1,    0, false, false,   5,   2,   1, Dyes.dyePurple      , 0, Arrays.asList(new MaterialStack(Iron, 1), new MaterialStack(Magic, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 1)));
+        Materials.Vinteum                 = new Materials( 529, TextureSet.SET_METALLIC          ,  10.0F,    128,  3, 1|2|4|8      |64|128      , 100, 200, 255,   0,   "Vinteum"                 ,   "Vinteum"                       ,    5,      32,         -1,    0, false, false,   4,   1,   1, Dyes.dyeLightBlue   , 2, Collections.singletonList(new MaterialStack(Thaumium, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 2), new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 1)));
+        Materials.Vis                     = new Materials(  -1, TextureSet.SET_SHINY             ,   1.0F,      0,  3, 0                         , 128,   0, 255,   0,   "Vis"                     ,   "Vis"                           ,    5,      32,         -1,    0, false, false,   1,   1,   1, Dyes.dyePurple      , 2, Collections.singletonList(new MaterialStack(Magic, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.AURAM, 2), new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 1)));
         Materials.Redrock                 = new Materials( 846, TextureSet.SET_ROUGH             ,   1.0F,      0,  1, 1                         , 255,  80,  50,   0,   "Redrock"                 ,   "Redrock"                       ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeRed         , 2, Arrays.asList(new MaterialStack(Calcite, 2), new MaterialStack(Flint, 1), new MaterialStack(Clay, 1)));
         Materials.PotassiumFeldspar       = new Materials( 847, TextureSet.SET_FINE              ,   1.0F,      0,  1, 1                         , 120,  40,  40,   0,   "PotassiumFeldspar"       ,   "Potassium Feldspar"            ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyePink        , 0, Arrays.asList(new MaterialStack(Potassium, 1), new MaterialStack(Aluminium, 1), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 8)));
         Materials.Biotite                 = new Materials( 848, TextureSet.SET_METALLIC          ,   1.0F,      0,  1, 1                         ,  20,  30,  20,   0,   "Biotite"                 ,   "Biotite"                       ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGray        , 0, Arrays.asList(new MaterialStack(Potassium, 1), new MaterialStack(Magnesium, 3), new MaterialStack(Aluminium, 3), new MaterialStack(Fluorine, 2), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 10)));
-        Materials.GraniteBlack            = new Materials( 849, TextureSet.SET_ROUGH             ,   4.0F,     64,  3, 1            |64|128      ,  10,  10,  10,   0,   "GraniteBlack"            ,   "Black Granite"                 ,    0,       0,         -1,    0, false, false,   0,   1,   1, Dyes.dyeBlack       , 2, Arrays.asList(new MaterialStack(SiliconDioxide, 4), new MaterialStack(Biotite, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1)));
-        Materials.GraniteRed              = new Materials( 850, TextureSet.SET_ROUGH             ,   4.0F,     64,  3, 1            |64|128      , 255,   0, 128,   0,   "GraniteRed"              ,   "Red Granite"                   ,    0,       0,         -1,    0, false, false,   0,   1,   1, Dyes.dyeMagenta     , 0, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(PotassiumFeldspar, 1), new MaterialStack(Oxygen, 3)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1)));
+        Materials.GraniteBlack            = new Materials( 849, TextureSet.SET_ROUGH             ,   4.0F,     64,  3, 1            |64|128      ,  10,  10,  10,   0,   "GraniteBlack"            ,   "Black Granite"                 ,    0,       0,         -1,    0, false, false,   0,   1,   1, Dyes.dyeBlack       , 2, Arrays.asList(new MaterialStack(SiliconDioxide, 4), new MaterialStack(Biotite, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 1)));
+        Materials.GraniteRed              = new Materials( 850, TextureSet.SET_ROUGH             ,   4.0F,     64,  3, 1            |64|128      , 255,   0, 128,   0,   "GraniteRed"              ,   "Red Granite"                   ,    0,       0,         -1,    0, false, false,   0,   1,   1, Dyes.dyeMagenta     , 0, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(PotassiumFeldspar, 1), new MaterialStack(Oxygen, 3)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 1)));
         Materials.Chrysotile              = new Materials( 912, TextureSet.SET_DULL              ,  32.0F,  10240,  3, 1|2  |8      |64|128      , 110, 140, 110,   0,   "Chrysotile"              ,   "Chrysotile"                    ,    0,       0,       9400, 9400,  true, false,   1,   1,   1, Dyes.dyeWhite       , 2, Collections.singletonList(new MaterialStack(Asbestos, 1))).disableAutoGeneratedBlastFurnaceRecipes().setTurbineMultipliers(280, 280, 1);
         Materials.Realgar                 = new Materials( 913, TextureSet.SET_DULL              ,   1.0F,     32,  1, 1|2  |8      |64|128      , 140, 100, 100,   0,   "Realgar"                 ,   "Realgar"                       ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 2, Arrays.asList(new MaterialStack(Arsenic, 4), new MaterialStack(Sulfur,4)));
-        Materials.VanadiumMagnetite       = new Materials( 923, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1    |8                   ,  35,  35,  60,   0,   "VanadiumMagnetite"       ,   "Vanadium Magnetite"            ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 2, Arrays.asList(new MaterialStack(Magnetite, 1), new MaterialStack(Vanadium, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 1))); // Mixture of Fe3O4 and V2O5
-        Materials.BasalticMineralSand     = new Materials( 935, TextureSet.SET_SAND              ,   1.0F,      0,  1, 1    |8                   ,  40,  50,  40,   0,   "BasalticMineralSand"     ,   "Basaltic Mineral Sand"         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 2, Arrays.asList(new MaterialStack(Magnetite, 1), new MaterialStack(Basalt, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 1)));
-        Materials.GraniticMineralSand     = new Materials( 936, TextureSet.SET_SAND              ,   1.0F,      0,  1, 1    |8                   ,  40,  60,  60,   0,   "GraniticMineralSand"     ,   "Granitic Mineral Sand"         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 2, Arrays.asList(new MaterialStack(Magnetite, 1), new MaterialStack(GraniteBlack, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 1)));
+        Materials.VanadiumMagnetite       = new Materials( 923, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1    |8                   ,  35,  35,  60,   0,   "VanadiumMagnetite"       ,   "Vanadium Magnetite"            ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 2, Arrays.asList(new MaterialStack(Magnetite, 1), new MaterialStack(Vanadium, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1))); // Mixture of Fe3O4 and V2O5
+        Materials.BasalticMineralSand     = new Materials( 935, TextureSet.SET_SAND              ,   1.0F,      0,  1, 1    |8                   ,  40,  50,  40,   0,   "BasalticMineralSand"     ,   "Basaltic Mineral Sand"         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 2, Arrays.asList(new MaterialStack(Magnetite, 1), new MaterialStack(Basalt, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1)));
+        Materials.GraniticMineralSand     = new Materials( 936, TextureSet.SET_SAND              ,   1.0F,      0,  1, 1    |8                   ,  40,  60,  60,   0,   "GraniticMineralSand"     ,   "Granitic Mineral Sand"         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 2, Arrays.asList(new MaterialStack(Magnetite, 1), new MaterialStack(GraniteBlack, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1)));
         Materials.GarnetSand              = new Materials( 938, TextureSet.SET_SAND              ,   1.0F,      0,  1, 1    |8                   , 200, 100,   0,   0,   "GarnetSand"              ,   "Garnet Sand"                   ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeOrange      , 2, Arrays.asList(new MaterialStack(GarnetRed, 1), new MaterialStack(GarnetYellow, 1)));
         Materials.QuartzSand              = new Materials( 939, TextureSet.SET_SAND              ,   1.0F,      0,  1, 1    |8                   , 194, 178, 128,   0,   "QuartzSand"              ,   "Quartz Sand"                   ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , 2, Arrays.asList(new MaterialStack(CertusQuartz, 1), new MaterialStack(Quartzite, 1)));
         Materials.Bastnasite              = new Materials( 905, TextureSet.SET_FINE              ,   1.0F,      0,  2, 1    |8                   , 200, 110,  45,   0,   "Bastnasite"              ,   "Bastnasite"                    ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          , 1, Arrays.asList(new MaterialStack(Cerium, 1), new MaterialStack(Carbon, 1), new MaterialStack(Fluorine, 1), new MaterialStack(Oxygen, 3))); // (Ce, La, Y)CO3F
@@ -819,11 +819,11 @@ public class MaterialsInit1 {
         Materials.Kaolinite               = new Materials( 929, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1    |8                   , 245, 235, 235,   0,   "Kaolinite"               ,   "Kaolinite"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          , 0, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 2), new MaterialStack(Hydrogen, 4), new MaterialStack(Oxygen, 9))); // Al2Si2O5(OH)4
         Materials.Talc                    = new Materials( 902, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1    |8                   ,  90, 180,  90,   0,   "Talc"                    ,   "Talc"                          ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          , 1, Arrays.asList(new MaterialStack(Magnesium, 3), new MaterialStack(Silicon, 4), new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 12))); // H2Mg3(SiO3)4
         Materials.Soapstone               = new Materials( 877, TextureSet.SET_DULL              ,   1.0F,      0,  1, 1    |8                   ,  95, 145,  95,   0,   "Soapstone"               ,   "Soapstone"                     ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes._NULL          , 1, Arrays.asList(new MaterialStack(Magnesium, 3), new MaterialStack(Silicon, 4), new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 12))); // H2Mg3(SiO3)4
-        Materials.Concrete                = new Materials( 947, TextureSet.SET_ROUGH             ,   1.0F,      0,  1, 1                         , 100, 100, 100,   0,   "Concrete"                ,   "Concrete"                      ,    0,       0,        300,    0, false, false,   0,   1,   1, Dyes.dyeGray        , 0, Collections.singletonList(new MaterialStack(Stone, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1)));
-        Materials.IronMagnetic            = new Materials( 354, TextureSet.SET_MAGNETIC          ,   6.0F,    256,  2, 1|2          |64|128      , 200, 200, 200,   0,   "IronMagnetic"            ,   "Magnetic Iron"                 ,    0,       0,         -1,    0, false, false,   4,  51,  50, Dyes.dyeGray        , 1, Collections.singletonList(new MaterialStack(Iron, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 1)));
-        Materials.SteelMagnetic           = new Materials( 355, TextureSet.SET_MAGNETIC          ,   6.0F,    512,  3, 1|2          |64|128      , 128, 128, 128,   0,   "SteelMagnetic"           ,   "Magnetic Steel"                ,    0,       0,       1000, 1000,  true, false,   4,  51,  50, Dyes.dyeGray        , 1, Collections.singletonList(new MaterialStack(Steel, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 1)));
-        Materials.NeodymiumMagnetic       = new Materials( 356, TextureSet.SET_MAGNETIC          ,   7.0F,    512,  2, 1|2          |64|128      , 100, 100, 100,   0,   "NeodymiumMagnetic"       ,   "Magnetic Neodymium"            ,    0,       0,       1297, 1297,  true, false,   4,  51,  50, Dyes.dyeGray        , 1, Collections.singletonList(new MaterialStack(Neodymium, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 3)));
-        Materials.SamariumMagnetic        = new Materials( 399, TextureSet.SET_MAGNETIC          ,   1.0F,      0,  2, 1|2          |64|128      , 255, 255, 204,   0,   "SamariumMagnetic"        ,   "Magnetic Samarium"             ,    0,       0,       1345, 1345,  true, false,   4,   1,   1, Dyes.dyeWhite       , 1, Collections.singletonList(new MaterialStack(Samarium, 1)),Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO,10)));
+        Materials.Concrete                = new Materials( 947, TextureSet.SET_ROUGH             ,   1.0F,      0,  1, 1                         , 100, 100, 100,   0,   "Concrete"                ,   "Concrete"                      ,    0,       0,        300,    0, false, false,   0,   1,   1, Dyes.dyeGray        , 0, Collections.singletonList(new MaterialStack(Stone, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.TERRA, 1)));
+        Materials.IronMagnetic            = new Materials( 354, TextureSet.SET_MAGNETIC          ,   6.0F,    256,  2, 1|2          |64|128      , 200, 200, 200,   0,   "IronMagnetic"            ,   "Magnetic Iron"                 ,    0,       0,         -1,    0, false, false,   4,  51,  50, Dyes.dyeGray        , 1, Collections.singletonList(new MaterialStack(Iron, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1)));
+        Materials.SteelMagnetic           = new Materials( 355, TextureSet.SET_MAGNETIC          ,   6.0F,    512,  3, 1|2          |64|128      , 128, 128, 128,   0,   "SteelMagnetic"           ,   "Magnetic Steel"                ,    0,       0,       1000, 1000,  true, false,   4,  51,  50, Dyes.dyeGray        , 1, Collections.singletonList(new MaterialStack(Steel, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1), new TCAspects.TC_AspectStack(TCAspects.ORDO, 1), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1)));
+        Materials.NeodymiumMagnetic       = new Materials( 356, TextureSet.SET_MAGNETIC          ,   7.0F,    512,  2, 1|2          |64|128      , 100, 100, 100,   0,   "NeodymiumMagnetic"       ,   "Magnetic Neodymium"            ,    0,       0,       1297, 1297,  true, false,   4,  51,  50, Dyes.dyeGray        , 1, Collections.singletonList(new MaterialStack(Neodymium, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 3)));
+        Materials.SamariumMagnetic        = new Materials( 399, TextureSet.SET_MAGNETIC          ,   1.0F,      0,  2, 1|2          |64|128      , 255, 255, 204,   0,   "SamariumMagnetic"        ,   "Magnetic Samarium"             ,    0,       0,       1345, 1345,  true, false,   4,   1,   1, Dyes.dyeWhite       , 1, Collections.singletonList(new MaterialStack(Samarium, 1)),Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1), new TCAspects.TC_AspectStack(TCAspects.MAGNETO,10)));
         Materials.TungstenCarbide         = new Materials( 370, TextureSet.SET_METALLIC          ,  14.0F,   1280,  4, 1|2          |64|128      ,  51,   0, 102,   0,   "TungstenCarbide"         ,   "Tungstencarbide"               ,    0,       0,       2460, 2460,  true, false,   4,   1,   1, Dyes.dyeBlack       , 2, Arrays.asList(new MaterialStack(Tungsten, 1), new MaterialStack(Carbon, 1))).disableAutoGeneratedVacuumFreezerRecipe();
         Materials.VanadiumSteel           = new Materials( 371, TextureSet.SET_METALLIC          ,   3.0F,   1920,  3, 1|2          |64|128      , 192, 192, 192,   0,   "VanadiumSteel"           ,   "Vanadiumsteel"                 ,    0,       0,       1453, 1453,  true, false,   4,   1,   1, Dyes.dyeWhite       , 2, Arrays.asList(new MaterialStack(Vanadium, 1), new MaterialStack(Chrome, 1), new MaterialStack(Steel, 7))).disableAutoGeneratedBlastFurnaceRecipes();
         Materials.HSSG                    = new Materials( 372, TextureSet.SET_METALLIC          ,  10.0F,   4000,  3, 1|2          |64|128      , 153, 153,   0,   0,   "HSSG"                    ,   "HSS-G"                         ,    0,       0,       4500, 4500,  true, false,   4,   1,   1, Dyes.dyeYellow      , 2, Arrays.asList(new MaterialStack(TungstenSteel, 5), new MaterialStack(Chrome, 1), new MaterialStack(Molybdenum, 2), new MaterialStack(Vanadium, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
@@ -831,11 +831,11 @@ public class MaterialsInit1 {
         Materials.HSSS                    = new Materials( 374, TextureSet.SET_METALLIC          ,  32.0F,  10240,  8, 1|2          |64|128      , 102,   0,  51,   0,   "HSSS"                    ,   "HSS-S"                         ,    0,       0,       5400, 5400,  true, false,   4,   1,   1, Dyes.dyeRed         , 2, Arrays.asList(new MaterialStack(HSSG, 6), new MaterialStack(Iridium, 2), new MaterialStack(Osmium, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
         Materials.TPV                     = new Materials( 576, TextureSet.SET_METALLIC          ,  16.0F,   4000,  5, 1|2          |64|128      , 250,  170,250,   0,   "TPVAlloy"                ,   "TPV-Alloy"                     ,    0,       0,       3000, 3000,  true, false,   4,   1,   1, Dyes.dyeRed         , 2, Arrays.asList(new MaterialStack(Titanium, 3), new MaterialStack(Platinum, 3), new MaterialStack(Vanadium, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
         Materials.DilutedSulfuricAcid     = new MaterialBuilder(640, TextureSet.SET_FLUID             ,                                                                                                     "Diluted Sulfuric Acid").addCell().addFluid().setRGB(192, 120, 32).setColor(Dyes.dyeOrange).setMaterialList(new MaterialStack(SulfuricAcid, 1)).constructMaterial();
-        Materials.EpoxidFiberReinforced   = new Materials( 610, TextureSet.SET_DULL                 ,3.0F,     64,  1, 1|2          |64|128      , 160, 112,  16,   0,   "EpoxidFiberReinforced"   ,   "Fiber-Reinforced Epoxy Resin"  ,    0,       0,        400,    0, false, false,   1,   1,   1, Dyes.dyeBrown       , 2, Collections.singletonList(new MaterialStack(Epoxid, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2)));
+        Materials.EpoxidFiberReinforced   = new Materials( 610, TextureSet.SET_DULL                 ,3.0F,     64,  1, 1|2          |64|128      , 160, 112,  16,   0,   "EpoxidFiberReinforced"   ,   "Fiber-Reinforced Epoxy Resin"  ,    0,       0,        400,    0, false, false,   1,   1,   1, Dyes.dyeBrown       , 2, Collections.singletonList(new MaterialStack(Epoxid, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2)));
         Materials.SodiumCarbonate         = new MaterialBuilder(695, TextureSet.SET_QUARTZ, "Sodium Carbonate").setToolSpeed(1.0F).setDurability(64).setToolQuality(1).addDustItems().setRGB(255, 255, 235).setColor(Dyes.dyeWhite).setBlastFurnaceTemp(851 ).setMeltingPoint(851 ).setBlastFurnaceRequired(false).setOreValue(1).setExtraData(1).setMaterialList(new MaterialStack(Sodium, 2), new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 3)).constructMaterial().disableAutoGeneratedBlastFurnaceRecipes();
         Materials.SodiumAluminate         = new MaterialBuilder(696, TextureSet.SET_QUARTZ, "Sodium Aluminate").setToolSpeed(1.0F).setDurability(64).setToolQuality(1).addDustItems().setRGB(255, 235, 255).setColor(Dyes.dyeWhite).setBlastFurnaceTemp(1800).setMeltingPoint(1800).setBlastFurnaceRequired(false).setOreValue(1).setExtraData(0).setMaterialList(new MaterialStack(Sodium, 1), new MaterialStack(Aluminium, 1), new MaterialStack(Oxygen, 2)).constructMaterial().disableAutoGeneratedBlastFurnaceRecipes();
-        Materials.Aluminiumoxide          = new MaterialBuilder(697, TextureSet.SET_QUARTZ, "Alumina").setToolSpeed(1.0F).setDurability(64).setToolQuality(1).addDustItems().setRGB(235, 255, 255).setColor(Dyes.dyeWhite).setBlastFurnaceTemp(2054).setMeltingPoint(2054).setBlastFurnaceRequired(true).setOreValue(1).setExtraData(0).setMaterialList(new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 3)).setAspects(Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 2))).constructMaterial().disableAutoGeneratedBlastFurnaceRecipes();
-        Materials.Aluminiumhydroxide      = new MaterialBuilder(698, TextureSet.SET_QUARTZ, "Aluminium Hydroxide").setToolSpeed(1.0F).setDurability(64).setToolQuality(1).addDustItems().setRGB(235, 235, 255).setColor(Dyes.dyeWhite).setBlastFurnaceTemp(1200).setMeltingPoint(1200).setBlastFurnaceRequired(true).setOreValue(1).setExtraData(0).setMaterialList(new MaterialStack(Aluminium, 1), new MaterialStack(Oxygen, 3),  new MaterialStack(Hydrogen, 3)).setAspects(Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 2))).constructMaterial().disableAutoGeneratedBlastFurnaceRecipes();
+        Materials.Aluminiumoxide          = new MaterialBuilder(697, TextureSet.SET_QUARTZ, "Alumina").setToolSpeed(1.0F).setDurability(64).setToolQuality(1).addDustItems().setRGB(235, 255, 255).setColor(Dyes.dyeWhite).setBlastFurnaceTemp(2054).setMeltingPoint(2054).setBlastFurnaceRequired(true).setOreValue(1).setExtraData(0).setMaterialList(new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 3)).setAspects(Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.GELUM, 2))).constructMaterial().disableAutoGeneratedBlastFurnaceRecipes();
+        Materials.Aluminiumhydroxide      = new MaterialBuilder(698, TextureSet.SET_QUARTZ, "Aluminium Hydroxide").setToolSpeed(1.0F).setDurability(64).setToolQuality(1).addDustItems().setRGB(235, 235, 255).setColor(Dyes.dyeWhite).setBlastFurnaceTemp(1200).setMeltingPoint(1200).setBlastFurnaceRequired(true).setOreValue(1).setExtraData(0).setMaterialList(new MaterialStack(Aluminium, 1), new MaterialStack(Oxygen, 3),  new MaterialStack(Hydrogen, 3)).setAspects(Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.GELUM, 2))).constructMaterial().disableAutoGeneratedBlastFurnaceRecipes();
         Materials.Cryolite                = new MaterialBuilder(699, TextureSet.SET_QUARTZ, "Cryolite").setToolSpeed(1.0F).setDurability(64).setToolQuality(1).addOreItems().setRGB(191, 239, 255).setColor(Dyes.dyeLightBlue).setMeltingPoint(1012).setBlastFurnaceTemp(1012).setExtraData(0).setMaterialList(new MaterialStack(Sodium, 3), new MaterialStack(Aluminium, 1), new MaterialStack(Fluorine, 6)).constructMaterial().disableAutoGeneratedBlastFurnaceRecipes();
         Materials.RedMud                  = new MaterialBuilder(743, TextureSet.SET_FLUID, "Red Mud").addCell().addFluid().setRGB(140, 22, 22).setColor(Dyes.dyeRed).constructMaterial();
 
@@ -851,7 +851,7 @@ public class MaterialsInit1 {
         Materials.Dichlorobenzidine = new MaterialBuilder(596, TextureSet.SET_FLUID             ,                                                                                                     "3,3-Dichlorobenzidine").addCell().addFluid().setRGB(161, 222, 166).setColor(Dyes.dyeOrange).setMaterialList(new MaterialStack(Carbon, 12),new MaterialStack(Hydrogen, 10), new MaterialStack(Nitrogen, 2), new MaterialStack(Chlorine, 2)).constructMaterial();
         Materials.Diaminobenzidin = new MaterialBuilder(597, TextureSet.SET_FLUID             ,                                                                                                     "3,3-Diaminobenzidine").addCell().addFluid().setRGB(51, 125, 89).setColor(Dyes.dyeOrange).setMaterialList(new MaterialStack(Carbon, 12),new MaterialStack(Hydrogen, 14),new MaterialStack(Nitrogen, 4)).constructMaterial();
         Materials.Diphenylisophthalate = new MaterialBuilder(598, TextureSet.SET_FLUID             ,                                                                                                     "Diphenyl Isophtalate").addCell().addFluid().setRGB(36, 110, 87).setColor(Dyes.dyeOrange).setMaterialList(new MaterialStack(Carbon, 20),new MaterialStack(Hydrogen, 14),new MaterialStack(Oxygen, 4)).constructMaterial();
-        Materials.Polybenzimidazole   = new Materials(599, TextureSet.SET_DULL                 ,3.0F,     64,  1, 1|2          |64|128      , 45, 45,  45,   0,   "Polybenzimidazole"   ,   "Polybenzimidazole"  ,    0,       0,        1450,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 0, Arrays.asList(new MaterialStack(Carbon, 20), new MaterialStack(Nitrogen, 4), new MaterialStack(Hydrogen, 12)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2),new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 1)));
+        Materials.Polybenzimidazole   = new Materials(599, TextureSet.SET_DULL                 ,3.0F,     64,  1, 1|2          |64|128      , 45, 45,  45,   0,   "Polybenzimidazole"   ,   "Polybenzimidazole"  ,    0,       0,        1450,    0, false, false,   1,   1,   1, Dyes.dyeBlack       , 0, Arrays.asList(new MaterialStack(Carbon, 20), new MaterialStack(Nitrogen, 4), new MaterialStack(Hydrogen, 12)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.ORDO, 2),new TCAspects.TC_AspectStack(TCAspects.VOLATUS, 1)));
 
         Materials.MTBEMixture        = new MaterialBuilder(983, TextureSet.SET_FLUID             ,                                                                                                      "MTBE Reaction Mixture (Butene)").addCell().addGas().setRGB(255, 255, 255).setColor(Dyes.dyeWhite).setMaterialList(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 12), new MaterialStack(Oxygen, 1)).constructMaterial();
         Materials.MTBEMixtureAlt = new MaterialBuilder(425, TextureSet.SET_FLUID , "MTBE Reaction Mixture (Butane)").addCell().addGas().setRGB(255, 255, 255).setColor(Dyes.dyeWhite).setMaterialList(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 14), new MaterialStack(Oxygen, 1)).constructMaterial();
@@ -862,10 +862,10 @@ public class MaterialsInit1 {
         Materials.GasolineRegular    = new MaterialBuilder(997, TextureSet.SET_FLUID             ,                                                                                                      "Gasoline").addCell().addFluid().setRGB(255,165,0).setColor(Dyes.dyeOrange).setFuelType(MaterialBuilder.DIESEL).setFuelPower(576).constructMaterial();
         Materials.GasolinePremium    = new MaterialBuilder(998, TextureSet.SET_FLUID             ,                                                                                                      "High Octane Gasoline").addCell().addFluid().setRGB(255,165,0).setColor(Dyes.dyeOrange).setFuelType(MaterialBuilder.DIESEL).setFuelPower(2500).constructMaterial();
 
-        Materials.Electrotine             = new Materials( 812, TextureSet.SET_SHINY             ,   1.0F,      0,  1, 1    |8                   ,  60, 180, 200,   0,   "Electrotine"             ,   "Electrotine"                   ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeCyan        , 0, Arrays.asList(new MaterialStack(Redstone, 1), new MaterialStack(Electrum, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2)));
+        Materials.Electrotine             = new Materials( 812, TextureSet.SET_SHINY             ,   1.0F,      0,  1, 1    |8                   ,  60, 180, 200,   0,   "Electrotine"             ,   "Electrotine"                   ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeCyan        , 0, Arrays.asList(new MaterialStack(Redstone, 1), new MaterialStack(Electrum, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2)));
         Materials.Galgadorian             = new Materials( 384, TextureSet.SET_METALLIC          ,  16.0F,   3600,  3, 1|2          |64|128      , 154, 105, 119,   0,   "Galgadorian"             ,   "Galgadorian"                   ,    0,       0,       3000, 3000,  true, false,   1,   1,   1, Dyes.dyePink        ).disableAutoGeneratedBlastFurnaceRecipes();
         Materials.EnhancedGalgadorian     = new Materials( 385, TextureSet.SET_METALLIC          ,  32.0F,   7200,  5, 1|2|          64|128      , 152, 93, 133,    0,   "EnhancedGalgadorian"     ,   "Enhanced Galgadorian"          ,    0,       0,       4500, 4500,  true, false,   1,   1,   1, Dyes.dyePink        ).disableAutoGeneratedBlastFurnaceRecipes();
-        Materials.BloodInfusedIron        = new Materials( 977, TextureSet.SET_METALLIC          ,  10.0F,    384,  2, 1|2          |64|128      ,  69,   9,  10,   0,   "BloodInfusedIron"        ,   "Blood Infused Iron"            ,    0,       0,       2400,    0, false, false,   3,   1,   1, Dyes.dyeRed         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3),  new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1)));
+        Materials.BloodInfusedIron        = new Materials( 977, TextureSet.SET_METALLIC          ,  10.0F,    384,  2, 1|2          |64|128      ,  69,   9,  10,   0,   "BloodInfusedIron"        ,   "Blood Infused Iron"            ,    0,       0,       2400,    0, false, false,   3,   1,   1, Dyes.dyeRed         , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 3),  new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 1)));
         Materials.Shadow                  = new Materials( 368, TextureSet.SET_METALLIC          ,  32.0F,   8192,  4, 1|2  |8      |64|128      ,  16,   3,  66,   0,   "Shadow"                  ,   "Shadow Metal"                  ,    0,       0,       1800, 1800,  true, false,   3,   4,   3, Dyes.dyeBlue        );
 
         Materials.Ledox                   = new Materials( 390, TextureSet.SET_SHINY             ,  15.0F,   1024,  4, 1|2  |8      |64|128      ,   0, 116, 255,   0,   "Ledox"                   ,   "Ledox"                         ,     0,       0,        -1,    0, false, false,  4,   1,   1, Dyes.dyeBlue         );
@@ -874,7 +874,7 @@ public class MaterialsInit1 {
         Materials.BlackPlutonium          = new Materials( 388, TextureSet.SET_DULL              ,  36.0F,   8192,  8, 1|2  |8      |64|128      ,  50,  50,  50,   0,   "BlackPlutonium"          ,   "Black Plutonium"               ,     0,       0,     9000,  9000,  true, false,  4,   1,   1, Dyes.dyeBlack        ).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
         Materials.CallistoIce             = new Materials( 389, TextureSet.SET_SHINY             ,   9.0F,   1024,  4, 1|2  |8      |64|128      ,  30, 177, 255,   0,   "CallistoIce"             ,   "Callisto Ice"                  ,     0,       0,       -1,     0, false, false,  4,   1,   1, Dyes.dyeLightBlue    );
         Materials.Duralumin               = new Materials( 392, TextureSet.SET_SHINY             ,  16.0F,    512,  3, 1|2  |8      |64|128      , 235, 209, 160,   0,   "Duralumin"               ,   "Duralumin"                     ,     0,       0,     1600,  1600,  true, false,  4,   1,   1, Dyes.dyeOrange       , 2, Arrays.asList(new MaterialStack(Aluminium, 6), new MaterialStack(Copper, 1), new MaterialStack(Manganese, 1), new MaterialStack(Magnesium, 1)));
-        Materials.Oriharukon              = new Materials( 393, TextureSet.SET_SHINY             ,  32.0F,  10240,  5, 1|2  |8   |32|64|128      , 103, 125, 104,   0,   "Oriharukon"              ,   "Oriharukon"                    ,     0,       0,     5400,  5400,  true, false,  4,   1,   1, Dyes.dyeLime         , Element.Oh, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2),new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Oriharukon              = new Materials( 393, TextureSet.SET_SHINY             ,  32.0F,  10240,  5, 1|2  |8   |32|64|128      , 103, 125, 104,   0,   "Oriharukon"              ,   "Oriharukon"                    ,     0,       0,     5400,  5400,  true, false,  4,   1,   1, Dyes.dyeLime         , Element.Oh, Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2),new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 2), new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
         Materials.MysteriousCrystal       = new Materials( 398, TextureSet.SET_SHINY             ,   8.0F,    256,  6, 1|2  |8      |64|128      ,  22, 133, 108,   0,   "MysteriousCrystal"       ,   "Mysterious Crystal"            ,     0,       0,     7200,  7200,  true, false,  4,   1,   1, Dyes.dyeCyan         ).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
 
         Materials.RedstoneAlloy           = new Materials( 381, TextureSet.SET_METALLIC          ,   3.0F,    128,  2, 1|2          |64|128      , 181,  51,  51,   0,   "RedstoneAlloy"           ,   "Redstone Alloy"                ,    0,       0,        671, 1000,  true, false,   1,   1,   1, Dyes.dyeRed         , 1, Arrays.asList(new MaterialStack(Redstone, 1), new MaterialStack(Silicon, 1), new MaterialStack(Coal, 1))).disableAutoGeneratedBlastFurnaceRecipes();
@@ -893,9 +893,9 @@ public class MaterialsInit1 {
         Materials.CrystallinePinkSlime    = new Materials( 406, TextureSet.SET_METALLIC          ,   6.0F,    128,  3, 1|2          |64|128      , 231, 158, 219,   0,   "CrystallinePinkSlime"    ,   "Crystalline Pink Slime"        ,    0,       0,       5000, 5000,  true, false,   4,   1,   1, Dyes.dyePink        , 1, Arrays.asList(new MaterialStack(CrystallineAlloy, 1), new MaterialStack(Diamond, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
         Materials.EnergeticSilver         = new Materials( 407, TextureSet.SET_METALLIC          ,   8.0F,    512,  3, 1|2          |64|128      , 149, 183, 205,   0,   "EnergeticSilver"         ,   "Energetic Silver"              ,    0,       0,         -1, 2200,  true, false,   4,   1,   1, Dyes.dyeLightBlue   , 1, Arrays.asList(new MaterialStack(Silver, 1), new MaterialStack(ConductiveIron, 1), new MaterialStack(BlackSteel, 1))).disableAutoGeneratedBlastFurnaceRecipes();
         Materials.VividAlloy              = new Materials( 408, TextureSet.SET_METALLIC          ,  12.0F,    768,  4, 1|2          |64|128      ,  70, 188, 219,   0,   "VividAlloy"              ,   "Vivid Alloy"                   ,    0,       0,       3300, 3300,  true, false,   4,   1,   1, Dyes.dyeBlue        , 1, Arrays.asList(new MaterialStack(EnergeticSilver, 1), new MaterialStack(EnderEye, 1), new MaterialStack(Chrome, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Enderium                = new Materials( 321, TextureSet.SET_DULL              ,   8.0F,   1500,  3, 1|2          |64|128      ,  89, 145, 135,   0,   "Enderium"                ,   "Enderium"                      ,    0,       0,       4500, 4500,  true, false,   1,   1,   1, Dyes.dyeGreen       , 1, Arrays.asList(new MaterialStack(EnderiumBase, 2), new MaterialStack(Thaumium, 1), new MaterialStack(EnderPearl, 1)), Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Enderium                = new Materials( 321, TextureSet.SET_DULL              ,   8.0F,   1500,  3, 1|2          |64|128      ,  89, 145, 135,   0,   "Enderium"                ,   "Enderium"                      ,    0,       0,       4500, 4500,  true, false,   1,   1,   1, Dyes.dyeGreen       , 1, Arrays.asList(new MaterialStack(EnderiumBase, 2), new MaterialStack(Thaumium, 1), new MaterialStack(EnderPearl, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
         Materials.Mithril                 = new Materials( 331, TextureSet.SET_SHINY             ,  32.0F,     64,  2, 1|2  |8      |64          , 255, 255, 210,   0,   "Mithril"                 ,   "Mithril"                       ,    0,       0,       6600, 6600,  true, false,   4,   3,   2, Dyes.dyeLightBlue   , 2, Arrays.asList(new MaterialStack(Platinum, 2), new MaterialStack(Thaumium, 1))).disableAutoGeneratedBlastFurnaceRecipes().setTurbineMultipliers(22, 1, 1);
-        Materials.BlueAlloy               = new Materials( 309, TextureSet.SET_DULL              ,   1.0F,      0,  0, 1|2                       , 100, 180, 255,   0,   "BlueAlloy"               ,   "Blue Alloy"                    ,    0,       0,         -1,    0, false, false,   3,   5,   1, Dyes.dyeLightBlue   , 2, Arrays.asList(new MaterialStack(Silver, 1), new MaterialStack(Electrotine, 4)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 3)));
+        Materials.BlueAlloy               = new Materials( 309, TextureSet.SET_DULL              ,   1.0F,      0,  0, 1|2                       , 100, 180, 255,   0,   "BlueAlloy"               ,   "Blue Alloy"                    ,    0,       0,         -1,    0, false, false,   3,   5,   1, Dyes.dyeLightBlue   , 2, Arrays.asList(new MaterialStack(Silver, 1), new MaterialStack(Electrotine, 4)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 3)));
         Materials.ShadowIron              = new Materials( 336, TextureSet.SET_METALLIC          ,  32.0F,  10240,  2, 1|2  |8      |64          , 120, 120, 120,   0,   "ShadowIron"              ,   "Shadow Iron"                   ,    0,       0,       8400, 8400,  true, false,   3,   4,   3, Dyes.dyeBlack       , 2, Arrays.asList(new MaterialStack(Iron, 1), new MaterialStack(Thaumium, 3))).disableAutoGeneratedBlastFurnaceRecipes().setTurbineMultipliers(1, 76, 1);
         Materials.ShadowSteel             = new Materials( 337, TextureSet.SET_METALLIC          ,   6.0F,    768,  4, 1|2          |64          ,  90,  90,  90,   0,   "ShadowSteel"             ,   "Shadow Steel"                  ,    0,       0,         -1, 1700,  true, false,   4,   4,   3, Dyes.dyeBlack       , 2, Arrays.asList(new MaterialStack(Steel, 1), new MaterialStack(Thaumium, 3)));
         Materials.AstralSilver            = new Materials( 333, TextureSet.SET_SHINY             ,  10.0F,     64,  2, 1|2          |64          , 230, 230, 255,   0,   "AstralSilver"            ,   "Astral Silver"                 ,    0,       0,         -1,    0, false, false,   4,   3,   2, Dyes.dyeWhite       , 2, Arrays.asList(new MaterialStack(Silver, 2), new MaterialStack(Thaumium, 1)));
@@ -907,37 +907,37 @@ public class MaterialsInit1 {
         Materials.Ichorium                = new Materials( 978, TextureSet.SET_SHINY             ,  32.0F, 850000,  12, 1|2    |8 |32|64|128      , 211, 120,   6,   0,   "Ichorium"                ,   "Ichorium"                      ,     5,  250000,      9000,   9000,  true, false,  4,   1,   1, Dyes.dyeOrange       ).setTurbineMultipliers(6, 6, 3).setHasCorrespondingPlasma(true);
         Materials.CosmicNeutronium        = new Materials( 982, TextureSet.SET_SHINY             ,  96.0F, 163840,  12, 1|2    |8 |32|64|128      ,  50,  50,  50,   0,   "CosmicNeutronium"        ,   "Cosmic Neutronium"             ,     0,       0,      9900,   9900,  true, false,  4,   1,   1, Dyes.dyeBlack        ).setProcessingMaterialTierEU(TierEU.RECIPE_ZPM).disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true);
 
-        Materials.Pentacadmiummagnesiumhexaoxid                                   = new Materials( 987, TextureSet.SET_SHINY          ,   1.0F,      0,  3, 1|2                ,  85, 85,  85,   0,   "Pentacadmiummagnesiumhexaoxid"                                 ,   "Superconductor Base MV"       ,     0,       0,     2500,  2500,  true,  false,  1,   1,   1, Dyes.dyeGray       , 1, Arrays.asList(new MaterialStack(Cadmium, 5), new MaterialStack(Magnesium, 1), new MaterialStack(Oxygen, 6)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 3))).disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Titaniumonabariumdecacoppereikosaoxid                           = new Materials( 988, TextureSet.SET_METALLIC       ,   1.0F,      0,  3, 1|2                ,  51, 25,   0,   0,   "Titaniumonabariumdecacoppereikosaoxid"                         ,   "Superconductor Base HV"       ,     0,       0,     3300,  3300,  true,  false,  1,   1,   1, Dyes.dyeBrown      , 1, Arrays.asList(new MaterialStack(Titanium, 1), new MaterialStack(Barium, 9),  new MaterialStack(Copper, 10), new MaterialStack(Oxygen, 20)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 6))).disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Uraniumtriplatinid                                              = new Materials( 989, TextureSet.SET_SHINY          ,   1.0F,      0,  3, 1|2                ,   0,135,   0,   0,   "Uraniumtriplatinid"                                            ,   "Superconductor Base EV"       ,     0,       0,     4400,  4400,  true,  false,  1,   1,   1, Dyes.dyeLime       , 1, Arrays.asList(new MaterialStack(Uranium, 1), new MaterialStack(Platinum, 3)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 9))).disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Vanadiumtriindinid                                              = new Materials( 990, TextureSet.SET_SHINY          ,   1.0F,      0,  3, 1|2                ,  51,  0,  51,   0,   "Vanadiumtriindinid"                                            ,   "Superconductor Base IV"       ,     0,       0,     5200,  5200,  true,  false,  1,   1,   1, Dyes.dyeMagenta    , 1, Arrays.asList(new MaterialStack(Vanadium , 1), new MaterialStack(Indium, 3)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 12))).disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid     = new Materials( 991, TextureSet.SET_METALLIC       ,   1.0F,      0,  3, 1|2                , 153, 76,   0,   0,   "Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid"   ,   "Superconductor Base LuV"      ,     0,       0,     6000,  6000,  true,  false,  1,   1,   1, Dyes.dyeBrown      , 1, Arrays.asList(new MaterialStack(Indium, 4), new MaterialStack(Tin, 2), new MaterialStack(Barium, 2), new MaterialStack(Titanium, 1), new MaterialStack(Copper, 7), new MaterialStack(Oxygen, 14)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 15))).disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Tetranaquadahdiindiumhexaplatiumosminid                         = new Materials( 992, TextureSet.SET_METALLIC       ,   1.0F,      0,  3, 1|2                ,  10, 10,  10,   0,   "Tetranaquadahdiindiumhexaplatiumosminid"                       ,   "Superconductor Base ZPM"      ,     0,       0,     9000,  9000,  true,  false,  1,   1,   1, Dyes.dyeBlack      , 1, Arrays.asList(new MaterialStack(Naquadah, 4), new MaterialStack(Indium, 2), new MaterialStack(Palladium, 6), new MaterialStack(Osmium, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 18))).disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Longasssuperconductornameforuvwire                              = new Materials( 986, TextureSet.SET_METALLIC       ,   1.0F,      0,  3, 1|2                , 224,210,   7,   0,   "Longasssuperconductornameforuvwire"                            ,   "Superconductor Base UV"       ,     0,       0,     9900,  9900,  true,  false,  1,   1,   1, Dyes.dyeYellow     , 1, Arrays.asList(new MaterialStack(Naquadria, 4), new MaterialStack(Osmiridium, 3), new MaterialStack(Europium, 1), new MaterialStack(Samarium, 1)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 21))).setProcessingMaterialTierEU(TierEU.RECIPE_LuV).disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.Longasssuperconductornameforuhvwire                             = new Materials( 985, TextureSet.SET_SHINY          ,   1.0F,      0,  3, 1|2                ,  38,129, 189,   0,   "Longasssuperconductornameforuhvwire"                           ,   "Superconductor Base UHV"      ,     0,       0,     10800,  10800,  true,  false,  1,   1,   1, Dyes.dyeWhite      , 1, Arrays.asList(new MaterialStack(Draconium, 6), new MaterialStack(CosmicNeutronium, 7), new MaterialStack(Tritanium, 5), new MaterialStack(Americium, 6)), Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 24))).setProcessingMaterialTierEU(TierEU.RECIPE_ZPM).disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.SuperconductorUEVBase                                           = new Materials( 974, TextureSet.SET_SHINY          ,   1.0F,      0,  3, 1|2                ,  174, 8,   8,   0,   "SuperconductorUEVBase"                                         ,   "Superconductor Base UEV"      ,     0,       0,     11700,  11800,  true,  false,  1,   1,   1, Dyes.dyeWhite, Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 27))).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.SuperconductorUIVBase                                           = new Materials( 131, TextureSet.SET_SHINY          ,   1.0F,      0,  3, 1|2                ,  229, 88,   177,   0,   "SuperconductorUIVBase"                                         ,   "Superconductor Base UIV"      ,     0,       0,     12700,  12700,  true,  false,  1,   1,   1, Dyes.dyeWhite, Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 34))).setProcessingMaterialTierEU(TierEU.RECIPE_UHV).disableAutoGeneratedVacuumFreezerRecipe();
-        Materials.SuperconductorUMVBase                                           = new Materials( 134, TextureSet.SET_SHINY          ,   1.0F,      0,  3, 1|2                ,  181, 38,   205,   0,   "SuperconductorUMVBase"                                         ,   "Superconductor Base UMV"      ,     0,       0,     13600,  13600,  true,  false,  1,   1,   1, Dyes.dyeWhite, Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 40))).setProcessingMaterialTierEU(TierEU.RECIPE_UEV).disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Pentacadmiummagnesiumhexaoxid                                   = new Materials( 987, TextureSet.SET_SHINY          ,   1.0F,      0,  3, 1|2                ,  85, 85,  85,   0,   "Pentacadmiummagnesiumhexaoxid"                                 ,   "Superconductor Base MV"       ,     0,       0,     2500,  2500,  true,  false,  1,   1,   1, Dyes.dyeGray       , 1, Arrays.asList(new MaterialStack(Cadmium, 5), new MaterialStack(Magnesium, 1), new MaterialStack(Oxygen, 6)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 3))).disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Titaniumonabariumdecacoppereikosaoxid                           = new Materials( 988, TextureSet.SET_METALLIC       ,   1.0F,      0,  3, 1|2                ,  51, 25,   0,   0,   "Titaniumonabariumdecacoppereikosaoxid"                         ,   "Superconductor Base HV"       ,     0,       0,     3300,  3300,  true,  false,  1,   1,   1, Dyes.dyeBrown      , 1, Arrays.asList(new MaterialStack(Titanium, 1), new MaterialStack(Barium, 9),  new MaterialStack(Copper, 10), new MaterialStack(Oxygen, 20)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 6))).disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Uraniumtriplatinid                                              = new Materials( 989, TextureSet.SET_SHINY          ,   1.0F,      0,  3, 1|2                ,   0,135,   0,   0,   "Uraniumtriplatinid"                                            ,   "Superconductor Base EV"       ,     0,       0,     4400,  4400,  true,  false,  1,   1,   1, Dyes.dyeLime       , 1, Arrays.asList(new MaterialStack(Uranium, 1), new MaterialStack(Platinum, 3)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 9))).disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Vanadiumtriindinid                                              = new Materials( 990, TextureSet.SET_SHINY          ,   1.0F,      0,  3, 1|2                ,  51,  0,  51,   0,   "Vanadiumtriindinid"                                            ,   "Superconductor Base IV"       ,     0,       0,     5200,  5200,  true,  false,  1,   1,   1, Dyes.dyeMagenta    , 1, Arrays.asList(new MaterialStack(Vanadium , 1), new MaterialStack(Indium, 3)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 12))).disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid     = new Materials( 991, TextureSet.SET_METALLIC       ,   1.0F,      0,  3, 1|2                , 153, 76,   0,   0,   "Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid"   ,   "Superconductor Base LuV"      ,     0,       0,     6000,  6000,  true,  false,  1,   1,   1, Dyes.dyeBrown      , 1, Arrays.asList(new MaterialStack(Indium, 4), new MaterialStack(Tin, 2), new MaterialStack(Barium, 2), new MaterialStack(Titanium, 1), new MaterialStack(Copper, 7), new MaterialStack(Oxygen, 14)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 15))).disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Tetranaquadahdiindiumhexaplatiumosminid                         = new Materials( 992, TextureSet.SET_METALLIC       ,   1.0F,      0,  3, 1|2                ,  10, 10,  10,   0,   "Tetranaquadahdiindiumhexaplatiumosminid"                       ,   "Superconductor Base ZPM"      ,     0,       0,     9000,  9000,  true,  false,  1,   1,   1, Dyes.dyeBlack      , 1, Arrays.asList(new MaterialStack(Naquadah, 4), new MaterialStack(Indium, 2), new MaterialStack(Palladium, 6), new MaterialStack(Osmium, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 18))).disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Longasssuperconductornameforuvwire                              = new Materials( 986, TextureSet.SET_METALLIC       ,   1.0F,      0,  3, 1|2                , 224,210,   7,   0,   "Longasssuperconductornameforuvwire"                            ,   "Superconductor Base UV"       ,     0,       0,     9900,  9900,  true,  false,  1,   1,   1, Dyes.dyeYellow     , 1, Arrays.asList(new MaterialStack(Naquadria, 4), new MaterialStack(Osmiridium, 3), new MaterialStack(Europium, 1), new MaterialStack(Samarium, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 21))).setProcessingMaterialTierEU(TierEU.RECIPE_LuV).disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.Longasssuperconductornameforuhvwire                             = new Materials( 985, TextureSet.SET_SHINY          ,   1.0F,      0,  3, 1|2                ,  38,129, 189,   0,   "Longasssuperconductornameforuhvwire"                           ,   "Superconductor Base UHV"      ,     0,       0,     10800,  10800,  true,  false,  1,   1,   1, Dyes.dyeWhite      , 1, Arrays.asList(new MaterialStack(Draconium, 6), new MaterialStack(CosmicNeutronium, 7), new MaterialStack(Tritanium, 5), new MaterialStack(Americium, 6)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 24))).setProcessingMaterialTierEU(TierEU.RECIPE_ZPM).disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.SuperconductorUEVBase                                           = new Materials( 974, TextureSet.SET_SHINY          ,   1.0F,      0,  3, 1|2                ,  174, 8,   8,   0,   "SuperconductorUEVBase"                                         ,   "Superconductor Base UEV"      ,     0,       0,     11700,  11800,  true,  false,  1,   1,   1, Dyes.dyeWhite, Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 27))).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.SuperconductorUIVBase                                           = new Materials( 131, TextureSet.SET_SHINY          ,   1.0F,      0,  3, 1|2                ,  229, 88,   177,   0,   "SuperconductorUIVBase"                                         ,   "Superconductor Base UIV"      ,     0,       0,     12700,  12700,  true,  false,  1,   1,   1, Dyes.dyeWhite, Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 34))).setProcessingMaterialTierEU(TierEU.RECIPE_UHV).disableAutoGeneratedVacuumFreezerRecipe();
+        Materials.SuperconductorUMVBase                                           = new Materials( 134, TextureSet.SET_SHINY          ,   1.0F,      0,  3, 1|2                ,  181, 38,   205,   0,   "SuperconductorUMVBase"                                         ,   "Superconductor Base UMV"      ,     0,       0,     13600,  13600,  true,  false,  1,   1,   1, Dyes.dyeWhite, Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 40))).setProcessingMaterialTierEU(TierEU.RECIPE_UEV).disableAutoGeneratedVacuumFreezerRecipe();
 
-        Materials.SuperconductorMV      = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                ,  85, 85,  85,   0,   "SuperconductorMV"   ,   "Superconductor MV"       ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeGray       , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 6)));
-        Materials.SuperconductorHV      = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                ,  51, 25,   0,   0,   "SuperconductorHV"   ,   "Superconductor HV"       ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeBrown      , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 12)));
-        Materials.SuperconductorEV      = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                ,   0,135,   0,   0,   "SuperconductorEV"   ,   "Superconductor EV"       ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeLime       , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 18)));
-        Materials.SuperconductorIV      = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                ,  51,  0,  51,   0,   "SuperconductorIV"   ,   "Superconductor IV"       ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeMagenta    , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 24)));
-        Materials.SuperconductorLuV     = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 153, 76,   0,   0,   "SuperconductorLuV"  ,   "Superconductor LuV"      ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeBrown      , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 30)));
-        Materials.SuperconductorZPM     = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                ,  10, 10,  10,   0,   "SuperconductorZPM"  ,   "Superconductor ZPM"      ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeBlack      , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 36)));
-        Materials.SuperconductorUV      = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 224,210,   7,   0,   "SuperconductorUV"   ,   "Superconductor UV"       ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeYellow     , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 42)));
-        Materials.SuperconductorUHV     = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                ,  38,129, 189,   0,   "Superconductor"     ,   "Superconductor UHV"      ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeWhite      , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 48)));
-        Materials.SuperconductorUEV     = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 174,  8,   8,   0,   "SuperconductorUEV"  ,   "Superconductor UEV"      ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeWhite      , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 54)));
-        Materials.SuperconductorUIV     = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 229, 88, 177,   0,   "SuperconductorUIV"  ,   "Superconductor UIV"      ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeWhite      , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 60)));
-        Materials.SuperconductorUMV     = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 181, 38, 205,   0,   "SuperconductorUMV"  ,   "Superconductor UMV"      ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeWhite      , Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 66)));
+        Materials.SuperconductorMV      = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                ,  85, 85,  85,   0,   "SuperconductorMV"   ,   "Superconductor MV"       ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeGray       , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 6)));
+        Materials.SuperconductorHV      = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                ,  51, 25,   0,   0,   "SuperconductorHV"   ,   "Superconductor HV"       ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeBrown      , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 12)));
+        Materials.SuperconductorEV      = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                ,   0,135,   0,   0,   "SuperconductorEV"   ,   "Superconductor EV"       ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeLime       , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 18)));
+        Materials.SuperconductorIV      = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                ,  51,  0,  51,   0,   "SuperconductorIV"   ,   "Superconductor IV"       ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeMagenta    , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 24)));
+        Materials.SuperconductorLuV     = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 153, 76,   0,   0,   "SuperconductorLuV"  ,   "Superconductor LuV"      ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeBrown      , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 30)));
+        Materials.SuperconductorZPM     = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                ,  10, 10,  10,   0,   "SuperconductorZPM"  ,   "Superconductor ZPM"      ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeBlack      , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 36)));
+        Materials.SuperconductorUV      = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 224,210,   7,   0,   "SuperconductorUV"   ,   "Superconductor UV"       ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeYellow     , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 42)));
+        Materials.SuperconductorUHV     = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                ,  38,129, 189,   0,   "Superconductor"     ,   "Superconductor UHV"      ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeWhite      , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 48)));
+        Materials.SuperconductorUEV     = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 174,  8,   8,   0,   "SuperconductorUEV"  ,   "Superconductor UEV"      ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeWhite      , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 54)));
+        Materials.SuperconductorUIV     = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 229, 88, 177,   0,   "SuperconductorUIV"  ,   "Superconductor UIV"      ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeWhite      , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 60)));
+        Materials.SuperconductorUMV     = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 181, 38, 205,   0,   "SuperconductorUMV"  ,   "Superconductor UMV"      ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeWhite      , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 66)));
 
         Materials.SuperCoolant = new MaterialBuilder( 140, TextureSet.SET_DULL,"Super Coolant").setRGB(2, 91, 111).addCell().addFluid().constructMaterial().setLiquidTemperature(1);
 
         Materials.EnrichedHolmium       = new Materials(582, TextureSet.SET_METALLIC    ,   1.0F,      0,  2,    2             ,  18,  100, 255,   0,   "EnrichedHolmium"    ,   "Enriched Holmium"        ,    -1,      -1,      0, 3000,  true,  false,200,   1,   1, Dyes.dyePurple);
 
-        Materials.TengamPurified = new MaterialBuilder(111, TextureSet.SET_METALLIC, "Purified Tengam").addDustItems().addGearItems().addMetalItems().addToolHeadItems().setAspects(Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2))).setColor(Dyes.dyeLime).setName("TengamPurified").setRGB(186, 223, 112).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_UV);
-        Materials.TengamAttuned  = new MaterialBuilder(112, TextureSet.SET_MAGNETIC, "Attuned Tengam") .addDustItems().addGearItems().addMetalItems().addToolHeadItems().setAspects(Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 4), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1))).setColor(Dyes.dyeLime).setName("TengamAttuned") .setRGB(213, 255, 128).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_UV);
-        Materials.TengamRaw      = new MaterialBuilder(110, TextureSet.SET_ROUGH,    "Raw Tengam")     .addOreItems()                                                   .setAspects(Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 1), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4))).setColor(Dyes.dyeLime).setName("TengamRaw")     .setRGB(160, 191,  96).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_UV);
+        Materials.TengamPurified = new MaterialBuilder(111, TextureSet.SET_METALLIC, "Purified Tengam").addDustItems().addGearItems().addMetalItems().addToolHeadItems().setAspects(Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 2), new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2))).setColor(Dyes.dyeLime).setName("TengamPurified").setRGB(186, 223, 112).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_UV);
+        Materials.TengamAttuned  = new MaterialBuilder(112, TextureSet.SET_MAGNETIC, "Attuned Tengam") .addDustItems().addGearItems().addMetalItems().addToolHeadItems().setAspects(Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 4), new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1))).setColor(Dyes.dyeLime).setName("TengamAttuned") .setRGB(213, 255, 128).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_UV);
+        Materials.TengamRaw      = new MaterialBuilder(110, TextureSet.SET_ROUGH,    "Raw Tengam")     .addOreItems()                                                   .setAspects(Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1), new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4))).setColor(Dyes.dyeLime).setName("TengamRaw")     .setRGB(160, 191,  96).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_UV);
 
         Materials.ActivatedCarbon = new MaterialBuilder(563, TextureSet.SET_DULL, "Activated Carbon")
             .addDustItems()
@@ -1039,7 +1039,7 @@ public class MaterialsInit1 {
                 new MaterialStack(Materials.Oxygen, 7),
                 new MaterialStack(Materials.Silver, 3),
                 new MaterialStack(Materials.CallistoIce, 1)),
-            Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.HUMANUS, 2))).setHasCorrespondingGas(true)
+            Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.HUMANUS, 2))).setHasCorrespondingGas(true)
             .setGasTemperature(12406);
 
         // spotless:on
diff --git a/src/main/java/gregtech/loaders/misc/CoverLoader.java b/src/main/java/gregtech/loaders/misc/CoverLoader.java
new file mode 100644
index 0000000000..f2feaa3a29
--- /dev/null
+++ b/src/main/java/gregtech/loaders/misc/CoverLoader.java
@@ -0,0 +1,42 @@
+package gregtech.loaders.misc;
+
+import static gregtech.api.enums.Textures.BlockIcons.VENT_ADVANCED;
+import static gregtech.api.enums.Textures.BlockIcons.VENT_NORMAL;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+
+import gregtech.api.GregTechAPI;
+import gregtech.api.render.TextureFactory;
+import gregtech.api.util.GTModHandler;
+import gregtech.common.covers.CoverVent;
+
+public class CoverLoader implements Runnable {
+
+    @Override
+    public void run() {
+        for (byte i = 0; i < 16; i = (byte) (i + 1)) {
+            GregTechAPI.registerCover(new ItemStack(Blocks.carpet, 1, i), TextureFactory.of(Blocks.wool, i), null);
+        }
+        GregTechAPI.registerCover(
+            GTModHandler.getIC2Item("reactorVent", 1L, 1),
+            TextureFactory.of(VENT_NORMAL),
+            new CoverVent(1));
+        GregTechAPI.registerCover(
+            GTModHandler.getIC2Item("reactorVentCore", 1L, 1),
+            TextureFactory.of(VENT_NORMAL),
+            new CoverVent(1));
+        GregTechAPI.registerCover(
+            GTModHandler.getIC2Item("reactorVentGold", 1L, 1),
+            TextureFactory.of(VENT_ADVANCED),
+            new CoverVent(2));
+        GregTechAPI.registerCover(
+            GTModHandler.getIC2Item("reactorVentSpread", 1L),
+            TextureFactory.of(VENT_NORMAL),
+            new CoverVent(2));
+        GregTechAPI.registerCover(
+            GTModHandler.getIC2Item("reactorVentDiamond", 1L, 1),
+            TextureFactory.of(VENT_ADVANCED),
+            new CoverVent(3));
+    }
+}
diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GTAchievements.java
index 1245a1dbaf..aed2ff6d28 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/src/main/java/gregtech/loaders/misc/GTAchievements.java
@@ -19,23 +19,23 @@ import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent.ItemSmeltedEvent;
-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.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.objects.ItemData;
 import gregtech.api.recipe.RecipeMaps;
-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.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.ID_MetaTool_01;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.common.items.IDMetaTool01;
+import gregtech.common.items.MetaGeneratedTool01;
 import ic2.core.Ic2Items;
 import thaumcraft.api.ThaumcraftApiHelper;
 
-public class GT_Achievements {
+public class GTAchievements {
 
     public static int oreReg = -1;
     public static int assReg = -1;
@@ -44,11 +44,11 @@ public class GT_Achievements {
     public int adjX = 5;
     public int adjY = 9;
 
-    public GT_Achievements() {
+    public GTAchievements() {
         this.achievementList = new ConcurrentHashMap<>();
         this.issuedAchievements = new ConcurrentHashMap<>();
 
-        for (GT_Recipe recipe : RecipeMaps.assemblylineVisualRecipes.getAllRecipes()) {
+        for (GTRecipe recipe : RecipeMaps.assemblylineVisualRecipes.getAllRecipes()) {
             registerAssAchievement(recipe);
         }
 
@@ -56,10 +56,10 @@ public class GT_Achievements {
             "flintpick",
             0,
             0,
-            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(2, 1, Materials.Flint, Materials.Wood, null),
+            MetaGeneratedTool01.INSTANCE.getToolWithStats(2, 1, Materials.Flint, Materials.Wood, null),
             "",
             false);
-        registerAchievement("crops", -4, 0, GT_ModHandler.getIC2Item("crop", 1L), "flintpick", false);
+        registerAchievement("crops", -4, 0, GTModHandler.getIC2Item("crop", 1L), "flintpick", false);
         registerAchievement("havestlead", -4, 2, ItemList.Crop_Drop_Plumbilia.get(1), "crops", false);
         registerAchievement("havestcopper", -2, 1, ItemList.Crop_Drop_Coppon.get(1), "crops", false);
         registerAchievement("havesttin", -2, -1, ItemList.Crop_Drop_Tine.get(1), "crops", false);
@@ -73,48 +73,40 @@ public class GT_Achievements {
             "tools",
             0,
             4,
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.HARDHAMMER.ID, 1, Materials.Iron, Materials.Wood, null),
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.HARDHAMMER.ID, 1, Materials.Iron, Materials.Wood, null),
             "flintpick",
             false);
         registerAchievement(
             "driltime",
             2,
             4,
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.DRILL_LV.ID, 1, Materials.BlueSteel, Materials.StainlessSteel, null),
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.DRILL_LV.ID, 1, Materials.BlueSteel, Materials.StainlessSteel, null),
             "tools",
             false);
         registerAchievement(
             "brrrr",
             2,
             6,
-            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                ID_MetaTool_01.CHAINSAW_LV.ID,
-                1,
-                Materials.BlueSteel,
-                Materials.StainlessSteel,
-                null),
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.CHAINSAW_LV.ID, 1, Materials.BlueSteel, Materials.StainlessSteel, null),
             "driltime",
             false);
         registerAchievement(
             "highpowerdrill",
             3,
             5,
-            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                ID_MetaTool_01.DRILL_HV.ID,
-                1,
-                Materials.TungstenSteel,
-                Materials.TungstenSteel,
-                null),
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.DRILL_HV.ID, 1, Materials.TungstenSteel, Materials.TungstenSteel, null),
             "driltime",
             false);
         registerAchievement(
             "hammertime",
             3,
             7,
-            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                ID_MetaTool_01.JACKHAMMER.ID,
+            MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                IDMetaTool01.JACKHAMMER.ID,
                 1,
                 Materials.TungstenSteel,
                 Materials.TungstenSteel,
@@ -126,8 +118,8 @@ public class GT_Achievements {
             "unitool",
             -2,
             4,
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.UNIVERSALSPADE.ID, 1, Materials.Steel, Materials.Iron, null),
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.UNIVERSALSPADE.ID, 1, Materials.Steel, Materials.Iron, null),
             "tools",
             false);
         registerAchievement("recycling", -4, 4, ItemList.Machine_LV_ArcFurnace.get(1), "unitool", false);
@@ -136,28 +128,28 @@ public class GT_Achievements {
             "crushed",
             0,
             6,
-            GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Tin, 1L),
+            GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Tin, 1L),
             "tools",
             false);
         registerAchievement(
             "cleandust",
             0,
             10,
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
             "crushed",
             false);
         registerAchievement(
             "washing",
             -2,
             6,
-            GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Iron, 1L),
+            GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Iron, 1L),
             "crushed",
             false);
         registerAchievement(
             "spinit",
             -4,
             6,
-            GT_OreDictUnificator.get(OrePrefixes.crushedCentrifuged, Materials.Redstone, 1L),
+            GTOreDictUnificator.get(OrePrefixes.crushedCentrifuged, Materials.Redstone, 1L),
             "crushed",
             false);
 
@@ -166,7 +158,7 @@ public class GT_Achievements {
             "newmetal",
             -4,
             10,
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 1L),
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 1L),
             "newfuel",
             false);
         registerAchievement("reflect", -2, 9, ItemList.Neutron_Reflector.get(1), "newfuel", false);
@@ -175,7 +167,7 @@ public class GT_Achievements {
             "bronze",
             2,
             0,
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 1L),
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 1L),
             "flintpick",
             false);
         registerAchievement(
@@ -228,7 +220,7 @@ public class GT_Achievements {
             "steel",
             4,
             0,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
             "bronze",
             false);
         registerAchievement("highpressure", 4, 2, ItemList.Machine_Steel_Boiler.get(1), "steel", false);
@@ -244,7 +236,7 @@ public class GT_Achievements {
             "complexalloys",
             6,
             3,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.BlueSteel, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.BlueSteel, 1L),
             "cheapermac",
             false);
 
@@ -252,7 +244,7 @@ public class GT_Achievements {
             "magneticiron",
             4,
             -2,
-            GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L),
+            GTOreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L),
             "steel",
             false);
         registerAchievement("lvmotor", 4, -6, ItemList.Electric_Motor_LV.get(1), "magneticiron", false);
@@ -277,7 +269,7 @@ public class GT_Achievements {
             "gtaluminium",
             8,
             0,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 1L),
             "steel",
             false);
         registerAchievement("highpowersmelt", 8, 2, ItemList.Machine_Multi_Furnace.get(1), "gtaluminium", false);
@@ -291,7 +283,7 @@ public class GT_Achievements {
             "titan",
             14,
             0,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L),
             "upgrade",
             false);
         registerAchievement("magic", 14, 3, ItemList.MagicEnergyConverter_LV.get(1), "titan", false);
@@ -305,14 +297,14 @@ public class GT_Achievements {
             "tungsten",
             16,
             2,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tungsten, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tungsten, 1L),
             "upgrade2",
             false);
         registerAchievement(
             "osmium",
             16,
             -2,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L),
             "upgrade2",
             false);
         registerAchievement("hightech", 15, -3, ItemList.Field_Generator_LV.get(1), "osmium", false);
@@ -326,7 +318,7 @@ public class GT_Achievements {
             "tungstensteel",
             16,
             4,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L),
             "tungsten",
             false);
         registerAchievement("upgrade3", 15, 5, ItemList.Casing_Coil_TungstenSteel.get(1), "tungstensteel", false);
@@ -334,7 +326,7 @@ public class GT_Achievements {
             "hssg",
             13,
             5,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1L),
             "upgrade3",
             false);
         registerAchievement("upgrade4", 11, 5, ItemList.Casing_Coil_HSSG.get(1), "hssg", false);
@@ -342,7 +334,7 @@ public class GT_Achievements {
             "stargatematerial",
             11,
             7,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1L),
             "upgrade4",
             false);
         registerAchievement("conducting", 14, 6, ItemList.Casing_Coil_Superconductor.get(1), "upgrade3", false);
@@ -358,7 +350,7 @@ public class GT_Achievements {
             "alienmetallurgy",
             9,
             7,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1L),
             "upgrade5",
             false);
         registerAchievement("over9000", 7, 7, ItemList.Casing_Coil_NaquadahAlloy.get(1), "alienmetallurgy", false);
@@ -366,7 +358,7 @@ public class GT_Achievements {
             "finalpreparations",
             7,
             9,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadria, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadria, 1L),
             "over9000",
             false);
         registerAchievement("denseaspossible", 6, 10, ItemList.FusionComputer_UV.get(1), "finalpreparations", false);
@@ -375,7 +367,7 @@ public class GT_Achievements {
         registerAchievement("uvage", 10, 10, ItemList.Energy_Cluster.get(1), "zpmage", false);
         registerAchievement("whatnow", 12, 10, ItemList.ZPM2.get(1), "uvage", false);
 
-        if (GT_Mod.gregtechproxy.mAchievements) {
+        if (GTMod.gregtechproxy.mAchievements) {
             AchievementPage.registerAchievementPage(
                 new AchievementPage(
                     "GregTech 5",
@@ -393,7 +385,7 @@ public class GT_Achievements {
 
     public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, Achievement requirement,
         boolean special) {
-        if (!GT_Mod.gregtechproxy.mAchievements) {
+        if (!GTMod.gregtechproxy.mAchievements) {
             return null;
         }
         Achievement achievement = new Achievement(textId, textId, this.adjX + x, this.adjY + y, icon, requirement);
@@ -401,9 +393,9 @@ public class GT_Achievements {
             achievement.setSpecial();
         }
         ((StatBase) achievement).registerStat();
-        if (GT_Values.D2) {
-            GT_Log.out.println("achievement." + textId + "=");
-            GT_Log.out.println("achievement." + textId + ".desc=");
+        if (GTValues.D2) {
+            GTLog.out.println("achievement." + textId + "=");
+            GTLog.out.println("achievement." + textId + ".desc=");
         }
         this.achievementList.put(textId, achievement);
         return achievement;
@@ -411,7 +403,7 @@ public class GT_Achievements {
 
     public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, String requirement,
         boolean special) {
-        if (!GT_Mod.gregtechproxy.mAchievements) {
+        if (!GTMod.gregtechproxy.mAchievements) {
             return null;
         }
         Achievement achievement = new Achievement(
@@ -425,9 +417,9 @@ public class GT_Achievements {
             achievement.setSpecial();
         }
         ((StatBase) achievement).registerStat();
-        if (GT_Values.D2) {
-            GT_Log.out.println("achievement." + textId + "=");
-            GT_Log.out.println("achievement." + textId + ".desc=");
+        if (GTValues.D2) {
+            GTLog.out.println("achievement." + textId + "=");
+            GTLog.out.println("achievement." + textId + ".desc=");
         }
         this.achievementList.put(textId, achievement);
         return achievement;
@@ -437,13 +429,13 @@ public class GT_Achievements {
         return null;
     }
 
-    public Achievement registerAssAchievement(GT_Recipe recipe) {
+    public Achievement registerAssAchievement(GTRecipe recipe) {
         if (recipe == null) {
-            GT_Mod.GT_FML_LOGGER.error("Invalid achievement registration attempt for null recipe", new Exception());
+            GTMod.GT_FML_LOGGER.error("Invalid achievement registration attempt for null recipe", new Exception());
             return null;
         }
         if (recipe.getOutput(0) == null) {
-            GT_Mod.GT_FML_LOGGER
+            GTMod.GT_FML_LOGGER
                 .error("Invalid achievement registration attempt for recipe with null output", new Exception());
             return null;
         }
@@ -465,7 +457,7 @@ public class GT_Achievements {
     }
 
     public void issueAchievement(EntityPlayer entityplayer, String textId) {
-        if (entityplayer == null || !GT_Mod.gregtechproxy.mAchievements) {
+        if (entityplayer == null || !GTMod.gregtechproxy.mAchievements) {
             return;
         }
         entityplayer.triggerAchievement(this.achievementList.get(textId));
@@ -482,7 +474,7 @@ public class GT_Achievements {
         if (player == null || stack == null) {
             return;
         }
-        ItemData data = GT_OreDictUnificator.getItemData(stack);
+        ItemData data = GTOreDictUnificator.getItemData(stack);
 
         if ((data != null) && (data.mPrefix == OrePrefixes.ingot)) {
             if (data.mMaterial.mMaterial == Materials.Aluminium) {
@@ -536,7 +528,7 @@ public class GT_Achievements {
         if (player == null || stack == null) {
             return;
         }
-        ItemData data = GT_OreDictUnificator.getItemData(stack);
+        ItemData data = GTOreDictUnificator.getItemData(stack);
         if (data != null) {
             if (data.mPrefix == OrePrefixes.dust && data.mMaterial.mMaterial == Materials.Bronze) {
                 issueAchievement(player, "bronze");
@@ -705,7 +697,7 @@ public class GT_Achievements {
         if (player == null || stack == null) {
             return;
         }
-        ItemData data = GT_OreDictUnificator.getItemData(stack);
+        ItemData data = GTOreDictUnificator.getItemData(stack);
         if (data != null && data.mPrefix != null) {
             if (data.mPrefix == OrePrefixes.dust) {
                 if (data.mMaterial.mMaterial == Materials.Lutetium) {
@@ -789,7 +781,7 @@ public class GT_Achievements {
             case "gt.blockcasings.15" -> issueAchievement(player, "conducting");
             case "gt.metaitem.01.32761" -> { // Debug Scanner pickup shows all assline recipes.
                 if (player.capabilities.isCreativeMode) {
-                    for (GT_Recipe recipe : RecipeMaps.assemblylineVisualRecipes.getAllRecipes()) {
+                    for (GTRecipe recipe : RecipeMaps.assemblylineVisualRecipes.getAllRecipes()) {
                         issueAchievement(
                             player,
                             recipe.getOutput(0)
@@ -807,7 +799,7 @@ public class GT_Achievements {
             issueAchievement(player, "buildQArmor");
         }
 
-        for (GT_Recipe recipe : RecipeMaps.assemblylineVisualRecipes.getAllRecipes()) {
+        for (GTRecipe recipe : RecipeMaps.assemblylineVisualRecipes.getAllRecipes()) {
             if (recipe.getOutput(0)
                 .getUnlocalizedName()
                 .equals(stack.getUnlocalizedName())) {
diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java
index 87292ced62..c8fcf5839e 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java
@@ -51,11 +51,11 @@ import static gregtech.api.enums.Mods.TaintedMagic;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.enums.Mods.ThaumicBases;
 import static gregtech.api.enums.Mods.TinkerConstruct;
-import static gregtech.loaders.misc.GT_BeeDefinitionReference.EXTRABEES;
-import static gregtech.loaders.misc.GT_BeeDefinitionReference.FORESTRY;
-import static gregtech.loaders.misc.GT_BeeDefinitionReference.GENDUSTRY;
-import static gregtech.loaders.misc.GT_BeeDefinitionReference.GREGTECH;
-import static gregtech.loaders.misc.GT_BeeDefinitionReference.MAGICBEES;
+import static gregtech.loaders.misc.GTBeeDefinitionReference.EXTRABEES;
+import static gregtech.loaders.misc.GTBeeDefinitionReference.FORESTRY;
+import static gregtech.loaders.misc.GTBeeDefinitionReference.GENDUSTRY;
+import static gregtech.loaders.misc.GTBeeDefinitionReference.GREGTECH;
+import static gregtech.loaders.misc.GTBeeDefinitionReference.MAGICBEES;
 
 import java.awt.Color;
 import java.util.Arrays;
@@ -69,8 +69,6 @@ import net.minecraft.item.ItemStack;
 
 import org.apache.commons.lang3.text.WordUtils;
 
-import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool;
-
 import cpw.mods.fml.common.registry.GameRegistry;
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeType;
@@ -89,26 +87,27 @@ import forestry.apiculture.genetics.Bee;
 import forestry.apiculture.genetics.IBeeDefinition;
 import forestry.apiculture.genetics.alleles.AlleleEffect;
 import forestry.core.genetics.alleles.AlleleHelper;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsKevlar;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_JubilanceMegaApiary;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.bees.GT_AlleleBeeSpecies;
-import gregtech.common.bees.GT_Bee_Mutation;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.JubilanceMegaApiary;
+import gregtech.common.bees.GTAlleleBeeSpecies;
+import gregtech.common.bees.GTBeeMutation;
 import gregtech.common.items.CombType;
 import gregtech.common.items.DropType;
 import gregtech.common.items.PropolisType;
-import gregtech.loaders.misc.bees.GT_Flowers;
+import gregtech.loaders.misc.bees.GTFlowers;
+import gtnhlanth.common.register.WerkstoffMaterialPool;
 
 /**
  * Bride Class for Lambdas
  */
-class GT_BeeDefinitionReference {
+class GTBeeDefinitionReference {
 
     protected static final byte FORESTRY = 0;
     protected static final byte EXTRABEES = 1;
@@ -116,16 +115,16 @@ class GT_BeeDefinitionReference {
     protected static final byte MAGICBEES = 3;
     protected static final byte GREGTECH = 4;
 
-    private GT_BeeDefinitionReference() {}
+    private GTBeeDefinitionReference() {}
 }
 
-public enum GT_BeeDefinition implements IBeeDefinition {
+public enum GTBeeDefinition implements IBeeDefinition {
 
     // organic
-    CLAY(GT_BranchDefinition.ORGANIC, "Clay", true, new Color(0xC8C8DA), new Color(0x0000FF), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f);
+    CLAY(GTBranchDefinition.ORGANIC, "Clay", true, new Color(0xC8C8DA), new Color(0x0000FF), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f);
         beeSpecies.addProduct(new ItemStack(Items.clay_ball, 1), 0.15f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(BiomesOPlenty.ID, "mudball", 1, 0), 0.05f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(BiomesOPlenty.ID, "mudball", 1, 0), 0.05f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> {
@@ -137,15 +136,15 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             .registerMutation(getSpecies(FORESTRY, "Industrious"), getSpecies(FORESTRY, "Diligent"), 10);
         tMutation.requireResource(Blocks.clay, 0); // blockStainedHardenedClay
     }),
-    SLIMEBALL(GT_BranchDefinition.ORGANIC, "SlimeBall", true, new Color(0x4E9E55), new Color(0x00FF15), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 15), 0.30f);
+    SLIMEBALL(GTBranchDefinition.ORGANIC, "SlimeBall", true, new Color(0x4E9E55), new Color(0x00FF15), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 15), 0.30f);
         beeSpecies.addProduct(new ItemStack(Items.slime_ball, 1), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STICKY), 0.05f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.STICKY), 0.05f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         if (TinkerConstruct.isModLoaded()) {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(TinkerConstruct.ID, "strangeFood", 1, 0), 0.10f);
-            beeSpecies.addSpecialty(GT_ModHandler.getModItem(TinkerConstruct.ID, "slime.gel", 1, 2), 0.02f);
+            beeSpecies.addProduct(GTModHandler.getModItem(TinkerConstruct.ID, "strangeFood", 1, 0), 0.10f);
+            beeSpecies.addSpecialty(GTModHandler.getModItem(TinkerConstruct.ID, "slime.gel", 1, 2), 0.02f);
         }
     }, template -> {
         AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.MUSHROOMS);
@@ -158,11 +157,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         if (TinkerConstruct.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(TinkerConstruct.ID, "slime.gel"), 1);
     }),
-    PEAT(GT_BranchDefinition.ORGANIC, "Peat", true, new Color(0x906237), new Color(0x58300B), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LIGNIE), 0.30f);
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.15f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(Forestry.ID, "peat", 1, 0), 0.15f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(Forestry.ID, "mulch", 1, 0), 0.05f);
+    PEAT(GTBranchDefinition.ORGANIC, "Peat", true, new Color(0x906237), new Color(0x58300B), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.LIGNIE), 0.30f);
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.15f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(Forestry.ID, "peat", 1, 0), 0.15f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(Forestry.ID, "mulch", 1, 0), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> {
@@ -172,10 +171,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER);
         AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE);
     }, dis -> dis.registerMutation(getSpecies(FORESTRY, "Rural"), CLAY, 10)),
-    STICKYRESIN(GT_BranchDefinition.ORGANIC, "StickyResin", true, new Color(0x2E8F5B), new Color(0xDCC289),
+    STICKYRESIN(GTBranchDefinition.ORGANIC, "StickyResin", true, new Color(0x2E8F5B), new Color(0xDCC289),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STICKY), 0.15f);
+            beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.STICKY), 0.15f);
             beeSpecies.addSpecialty(ItemList.IC2_Resin.get(1), 0.15f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
@@ -186,9 +185,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             IBeeMutationCustom tMutation = dis.registerMutation(SLIMEBALL, PEAT, 15);
             tMutation.requireResource("logRubber");
         }),
-    COAL(GT_BranchDefinition.ORGANIC, "Coal", true, new Color(0x666666), new Color(0x525252), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LIGNIE), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.COAL), 0.15f);
+    COAL(GTBranchDefinition.ORGANIC, "Coal", true, new Color(0x666666), new Color(0x525252), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.LIGNIE), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.COAL), 0.15f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> {
@@ -203,9 +202,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Industrious"), PEAT, 9);
         tMutation.requireResource("blockCoal");
     }),
-    OIL(GT_BranchDefinition.ORGANIC, "Oil", true, new Color(0x4C4C4C), new Color(0x333333), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OIL), 0.75f);
+    OIL(GTBranchDefinition.ORGANIC, "Oil", true, new Color(0x4C4C4C), new Color(0x333333), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.OIL), 0.75f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setHasEffect();
@@ -218,8 +217,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE);
         AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE);
     }, dis -> dis.registerMutation(COAL, STICKYRESIN, 4)),
-    SANDWICH(GT_BranchDefinition.ORGANIC, "Sandwich", true, new Color(0x32CD32), new Color(0xDAA520), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f);
+    SANDWICH(GTBranchDefinition.ORGANIC, "Sandwich", true, new Color(0x32CD32), new Color(0xDAA520), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f);
         beeSpecies.addSpecialty(ItemList.Food_Sliced_Cucumber.get(1), 0.05f);
         beeSpecies.addSpecialty(ItemList.Food_Sliced_Onion.get(1), 0.05f);
         beeSpecies.addSpecialty(ItemList.Food_Sliced_Tomato.get(1), 0.05f);
@@ -237,9 +236,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.WHEAT);
         AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER);
     }, dis -> dis.registerMutation(getSpecies(FORESTRY, "Agrarian"), getSpecies(MAGICBEES, "TCBatty"), 10)),
-    ASH(GT_BranchDefinition.ORGANIC, "Ash", true, new Color(0x1e1a18), new Color(0xc6c6c6), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ASH), 0.15f);
+    ASH(GTBranchDefinition.ORGANIC, "Ash", true, new Color(0x1e1a18), new Color(0xc6c6c6), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ASH), 0.15f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
     }, template -> {
@@ -252,9 +251,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(COAL, CLAY, 10);
         tMutation.restrictTemperature(HELLISH);
     }),
-    APATITE(GT_BranchDefinition.ORGANIC, "Apatite", true, new Color(0xc1c1f6), new Color(0x676784), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.APATITE), 0.15f);
+    APATITE(GTBranchDefinition.ORGANIC, "Apatite", true, new Color(0xc1c1f6), new Color(0x676784), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.APATITE), 0.15f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(WARM);
     }, template -> {
@@ -267,25 +266,24 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(ASH, COAL, 10);
         tMutation.requireResource("blockApatite");
     }),
-    FERTILIZER(GT_BranchDefinition.ORGANIC, "Fertilizer", true, new Color(0x7fcef5), new Color(0x654525),
-        beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f);
-            beeSpecies.addSpecialty(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1), 0.2f);
-            beeSpecies.addSpecialty(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1), 0.2f);
-            beeSpecies.addSpecialty(ItemList.FR_Fertilizer.get(1), 0.3f);
-            beeSpecies.addSpecialty(ItemList.IC2_Fertilizer.get(1), 0.3f);
-            beeSpecies.setHumidity(DAMP);
-            beeSpecies.setTemperature(WARM);
-        }, template -> {
-            AlleleHelper.instance.set(template, SPEED, Speed.FASTEST);
-            AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER);
-            AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.WHEAT);
-            AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER);
-        }, dis -> dis.registerMutation(ASH, APATITE, 8)),
+    FERTILIZER(GTBranchDefinition.ORGANIC, "Fertilizer", true, new Color(0x7fcef5), new Color(0x654525), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f);
+        beeSpecies.addSpecialty(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1), 0.2f);
+        beeSpecies.addSpecialty(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1), 0.2f);
+        beeSpecies.addSpecialty(ItemList.FR_Fertilizer.get(1), 0.3f);
+        beeSpecies.addSpecialty(ItemList.IC2_Fertilizer.get(1), 0.3f);
+        beeSpecies.setHumidity(DAMP);
+        beeSpecies.setTemperature(WARM);
+    }, template -> {
+        AlleleHelper.instance.set(template, SPEED, Speed.FASTEST);
+        AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER);
+        AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.WHEAT);
+        AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER);
+    }, dis -> dis.registerMutation(ASH, APATITE, 8)),
     // Phosphorus bee, Humidity: normal, Temperature: Hot, Parents: Apatite & Ash, Mutationrate: 12%, Combrate: 55%
-    PHOSPHORUS(GT_BranchDefinition.ORGANIC, "Phosphorus", false, new Color(0xFFC826), new Color(0xC1C1F6),
+    PHOSPHORUS(GTBranchDefinition.ORGANIC, "Phosphorus", false, new Color(0xFFC826), new Color(0xC1C1F6),
         beeSpecies -> {
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PHOSPHORUS), 0.35f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.PHOSPHORUS), 0.35f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(HOT);
             beeSpecies.setNocturnal();
@@ -293,12 +291,12 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
             IBeeMutationCustom tMutation = dis.registerMutation(APATITE, ASH, 12);
             tMutation.restrictTemperature(HOT);
-            GregTech_API.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTech_API.sBlockGem2, 8));
+            GregTechAPI.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTechAPI.sBlockGem2, 8));
         }),
     // Tea bee, Humidity: normal, Parents: Ash and Fertilizer, Mutationrate: 10%, combrate: 10%
-    TEA(GT_BranchDefinition.ORGANIC, "Tea", false, new Color(0x65D13A), new Color(0x9a9679), beeSpecies -> {
+    TEA(GTBranchDefinition.ORGANIC, "Tea", false, new Color(0x65D13A), new Color(0x9a9679), beeSpecies -> {
         beeSpecies.addProduct(
-            GT_ModHandler.getModItem(PamsHarvestCraft.ID, "tealeafItem", 1, ItemList.Crop_Drop_TeaLeaf.get(1)),
+            GTModHandler.getModItem(PamsHarvestCraft.ID, "tealeafItem", 1, ItemList.Crop_Drop_TeaLeaf.get(1)),
             0.10f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(NORMAL);
@@ -306,22 +304,22 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST),
         dis -> dis.registerMutation(FERTILIZER, ASH, 10)),
     // Mica bee, Humidity: normal, Parents: Silicon & PEAT, Mutationrate: 15%, Combrate: 25%
-    MICA(GT_BranchDefinition.ORGANIC, "Mica", false, new Color(0xFFC826), new Color(0xC1C1F6), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MICA), 0.25f);
+    MICA(GTBranchDefinition.ORGANIC, "Mica", false, new Color(0xFFC826), new Color(0xC1C1F6), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.MICA), 0.25f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(HOT);
         beeSpecies.setNocturnal();
         beeSpecies.setHasEffect();
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(PEAT, getSpecies(MAGICBEES, "Silicon"), 15);
-        GregTech_API.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTech_API.sBlockCasings5, 0));
+        GregTechAPI.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTechAPI.sBlockCasings5, 0));
     }),
 
     // gems
-    REDSTONE(GT_BranchDefinition.GEM, "Redstone", true, new Color(0x7D0F0F), new Color(0xD11919), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDSTONE), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.RAREEARTH), 0.15f);
+    REDSTONE(GTBranchDefinition.GEM, "Redstone", true, new Color(0x7D0F0F), new Color(0xD11919), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.STONE), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.REDSTONE), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.RAREEARTH), 0.15f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
@@ -329,9 +327,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             .registerMutation(getSpecies(FORESTRY, "Industrious"), getSpecies(FORESTRY, "Demonic"), 10);
         tMutation.requireResource("blockRedstone");
     }),
-    LAPIS(GT_BranchDefinition.GEM, "Lapis", true, new Color(0x1947D1), new Color(0x476CDA), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LAPIS), 0.15f);
+    LAPIS(GTBranchDefinition.GEM, "Lapis", true, new Color(0x1947D1), new Color(0x476CDA), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.STONE), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.LAPIS), 0.15f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
@@ -339,27 +337,27 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             .registerMutation(getSpecies(FORESTRY, "Demonic"), getSpecies(FORESTRY, "Imperial"), 10);
         tMutation.requireResource("blockLapis");
     }),
-    CERTUS(GT_BranchDefinition.GEM, "CertusQuartz", true, new Color(0x57CFFB), new Color(0xBBEEFF), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CERTUS), 0.15f);
+    CERTUS(GTBranchDefinition.GEM, "CertusQuartz", true, new Color(0x57CFFB), new Color(0xBBEEFF), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.STONE), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.CERTUS), 0.15f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Hermitic"), LAPIS, 10);
         tMutation.requireResource(GameRegistry.findBlock(AppliedEnergistics2.ID, "tile.BlockQuartz"), 0);
     }),
-    FLUIX(GT_BranchDefinition.GEM, "FluixDust", true, new Color(0xA375FF), new Color(0xB591FF), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FLUIX), 0.15f);
+    FLUIX(GTBranchDefinition.GEM, "FluixDust", true, new Color(0xA375FF), new Color(0xB591FF), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.STONE), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.FLUIX), 0.15f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, LAPIS, 7);
         tMutation.requireResource(GameRegistry.findBlock(AppliedEnergistics2.ID, "tile.BlockFluix"), 0);
     }),
-    DIAMOND(GT_BranchDefinition.GEM, "Diamond", false, new Color(0xCCFFFF), new Color(0xA3CCCC), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DIAMOND), 0.15f);
+    DIAMOND(GTBranchDefinition.GEM, "Diamond", false, new Color(0xCCFFFF), new Color(0xA3CCCC), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.STONE), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.DIAMOND), 0.15f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(HOT);
         beeSpecies.setHasEffect();
@@ -367,37 +365,37 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(CERTUS, COAL, 3);
         tMutation.requireResource("blockDiamond");
     }),
-    RUBY(GT_BranchDefinition.GEM, "Ruby", false, new Color(0xE6005C), new Color(0xCC0052), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.RUBY), 0.15f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.REDGARNET), 0.05f);
+    RUBY(GTBranchDefinition.GEM, "Ruby", false, new Color(0xE6005C), new Color(0xCC0052), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.STONE), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.RUBY), 0.15f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.REDGARNET), 0.05f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(HOT);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, DIAMOND, 5);
         tMutation.requireResource("blockRuby");
     }),
-    SAPPHIRE(GT_BranchDefinition.GEM, "Sapphire", true, new Color(0x0033CC), new Color(0x00248F), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SAPPHIRE), 0.15f);
+    SAPPHIRE(GTBranchDefinition.GEM, "Sapphire", true, new Color(0x0033CC), new Color(0x00248F), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.STONE), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.SAPPHIRE), 0.15f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(CERTUS, LAPIS, 5);
-        tMutation.requireResource(GregTech_API.sBlockGem2, 12);
+        tMutation.requireResource(GregTechAPI.sBlockGem2, 12);
     }),
-    OLIVINE(GT_BranchDefinition.GEM, "Olivine", true, new Color(0x248F24), new Color(0xCCFFCC), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OLIVINE), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MAGNESIUM), 0.05f);
+    OLIVINE(GTBranchDefinition.GEM, "Olivine", true, new Color(0x248F24), new Color(0xCCFFCC), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.STONE), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.OLIVINE), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.MAGNESIUM), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER),
         dis -> dis.registerMutation(CERTUS, getSpecies(FORESTRY, "Ended"), 5)),
-    EMERALD(GT_BranchDefinition.GEM, "Emerald", false, new Color(0x248F24), new Color(0x2EB82E), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.EMERALD), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ALUMINIUM), 0.05f);
+    EMERALD(GTBranchDefinition.GEM, "Emerald", false, new Color(0x248F24), new Color(0x2EB82E), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.STONE), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.EMERALD), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ALUMINIUM), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(COLD);
         beeSpecies.setHasEffect();
@@ -405,10 +403,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(OLIVINE, DIAMOND, 4);
         tMutation.requireResource("blockEmerald");
     }),
-    REDGARNET(GT_BranchDefinition.GEM, "RedGarnet", false, new Color(0xBD4C4C), new Color(0xECCECE), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDGARNET), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PYROPE), 0.05f);
+    REDGARNET(GTBranchDefinition.GEM, "RedGarnet", false, new Color(0xBD4C4C), new Color(0xECCECE), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.STONE), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.REDGARNET), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.PYROPE), 0.05f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(WARM);
         beeSpecies.setHasEffect();
@@ -419,11 +417,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(DIAMOND, RUBY, 4);
         tMutation.requireResource("blockGarnetRed");
     }),
-    YELLOWGARNET(GT_BranchDefinition.GEM, "YellowGarnet", false, new Color(0xA3A341), new Color(0xEDEDCE),
+    YELLOWGARNET(GTBranchDefinition.GEM, "YellowGarnet", false, new Color(0xA3A341), new Color(0xEDEDCE),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.YELLOWGARNET), 0.15f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.GROSSULAR), 0.05f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.STONE), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.YELLOWGARNET), 0.15f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.GROSSULAR), 0.05f);
             beeSpecies.setHumidity(DAMP);
             beeSpecies.setTemperature(WARM);
             beeSpecies.setHasEffect();
@@ -434,9 +432,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             IBeeMutationCustom tMutation = dis.registerMutation(EMERALD, REDGARNET, 3);
             tMutation.requireResource("blockGarnetYellow");
         }),
-    FIRESTONE(GT_BranchDefinition.GEM, "Firestone", false, new Color(0xC00000), new Color(0xFF0000), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FIRESTONE), 0.15f);
+    FIRESTONE(GTBranchDefinition.GEM, "Firestone", false, new Color(0xC00000), new Color(0xFF0000), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.STONE), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.FIRESTONE), 0.15f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(WARM);
         beeSpecies.setHasEffect();
@@ -450,100 +448,100 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     }),
 
     // Metal Line
-    COPPER(GT_BranchDefinition.METAL, "Copper", true, new Color(0xFF6600), new Color(0xE65C00), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.COPPER), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.GOLD), 0.05f);
+    COPPER(GTBranchDefinition.METAL, "Copper", true, new Color(0xFF6600), new Color(0xE65C00), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.COPPER), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.GOLD), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Majestic"), CLAY, 13);
         tMutation.requireResource("blockCopper");
     }),
-    TIN(GT_BranchDefinition.METAL, "Tin", true, new Color(0xD4D4D4), new Color(0xDDDDDD), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TIN), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ZINC), 0.05f);
+    TIN(GTBranchDefinition.METAL, "Tin", true, new Color(0xD4D4D4), new Color(0xDDDDDD), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.TIN), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ZINC), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(CLAY, getSpecies(FORESTRY, "Diligent"), 13);
         tMutation.requireResource("blockTin");
     }),
-    LEAD(GT_BranchDefinition.METAL, "Lead", true, new Color(0x666699), new Color(0xA3A3CC), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LEAD), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SULFUR), 0.05f);
+    LEAD(GTBranchDefinition.METAL, "Lead", true, new Color(0x666699), new Color(0xA3A3CC), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.LEAD), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.SULFUR), 0.05f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(WARM);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(COAL, COPPER, 13);
         tMutation.requireResource("blockLead");
     }),
-    IRON(GT_BranchDefinition.METAL, "Iron", true, new Color(0xDA9147), new Color(0xDE9C59), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.IRON), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.TIN), 0.05f);
+    IRON(GTBranchDefinition.METAL, "Iron", true, new Color(0xDA9147), new Color(0xDE9C59), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.IRON), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.TIN), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(TIN, COPPER, 13);
         tMutation.requireResource("blockIron");
     }),
-    STEEL(GT_BranchDefinition.METAL, "Steel", true, new Color(0x808080), new Color(0x999999), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STEEL), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.IRON), 0.05f);
+    STEEL(GTBranchDefinition.METAL, "Steel", true, new Color(0x808080), new Color(0x999999), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.STEEL), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.IRON), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(WARM);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(IRON, COAL, 10);
-        tMutation.requireResource(GregTech_API.sBlockMetal6, 13);
+        tMutation.requireResource(GregTechAPI.sBlockMetal6, 13);
     }),
-    NICKEL(GT_BranchDefinition.METAL, "Nickel", true, new Color(0x8585AD), new Color(0x8585AD), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NICKEL), 0.15f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PLATINUM), 0.02f);
+    NICKEL(GTBranchDefinition.METAL, "Nickel", true, new Color(0x8585AD), new Color(0x8585AD), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.NICKEL), 0.15f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.PLATINUM), 0.02f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(IRON, COPPER, 13);
         tMutation.requireResource("blockNickel");
     }),
-    ZINC(GT_BranchDefinition.METAL, "Zinc", true, new Color(0xF0DEF0), new Color(0xF2E1F2), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.ZINC), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.GALLIUM), 0.05f);
+    ZINC(GTBranchDefinition.METAL, "Zinc", true, new Color(0xF0DEF0), new Color(0xF2E1F2), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.ZINC), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.GALLIUM), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(IRON, TIN, 13);
         tMutation.requireResource("blockZinc");
     }),
-    SILVER(GT_BranchDefinition.METAL, "Silver", true, new Color(0xC2C2D6), new Color(0xCECEDE), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SILVER), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SULFUR), 0.05f);
+    SILVER(GTBranchDefinition.METAL, "Silver", true, new Color(0xC2C2D6), new Color(0xCECEDE), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SILVER), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.SULFUR), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(COLD);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(LEAD, TIN, 10);
         tMutation.requireResource("blockSilver");
     }),
-    CRYOLITE(GT_BranchDefinition.METAL, "Cryolite", true, new Color(0xBFEFFF), new Color(0x73B9D0), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CRYOLITE), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SILVER), 0.05f);
+    CRYOLITE(GTBranchDefinition.METAL, "Cryolite", true, new Color(0xBFEFFF), new Color(0x73B9D0), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.CRYOLITE), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.SILVER), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(WARM);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.FASTEST), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(LEAD, SILVER, 9);
         tMutation.requireResource("blockCryolite");
     }),
-    GOLD(GT_BranchDefinition.METAL, "Gold", true, new Color(0xEBC633), new Color(0xEDCC47), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.GOLD), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NICKEL), 0.05f);
+    GOLD(GTBranchDefinition.METAL, "Gold", true, new Color(0xEBC633), new Color(0xEDCC47), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.GOLD), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.NICKEL), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(WARM);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
@@ -551,9 +549,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.requireResource("blockGold");
         tMutation.restrictTemperature(HOT);
     }),
-    ARSENIC(GT_BranchDefinition.METAL, "Arsenic", true, new Color(0x736C52), new Color(0x292412), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.ARSENIC), 0.15f);
+    ARSENIC(GTBranchDefinition.METAL, "Arsenic", true, new Color(0x736C52), new Color(0x292412), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.ARSENIC), 0.15f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(WARM);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
@@ -562,28 +560,27 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     }),
 
     // Rare Metals
-    ALUMINIUM(GT_BranchDefinition.RAREMETAL, "Aluminium", true, new Color(0xB8B8FF), new Color(0xD6D6FF),
-        beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.ALUMINIUM), 0.15f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.BAUXITE), 0.05f);
-            beeSpecies.setHumidity(ARID);
-            beeSpecies.setTemperature(HOT);
-        }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
-            IBeeMutationCustom tMutation = dis.registerMutation(NICKEL, ZINC, 9);
-            tMutation.requireResource("blockAluminium");
-        }),
-    TITANIUM(GT_BranchDefinition.RAREMETAL, "Titanium", true, new Color(0xCC99FF), new Color(0xDBB8FF), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TITANIUM), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ALMANDINE), 0.05f);
+    ALUMINIUM(GTBranchDefinition.RAREMETAL, "Aluminium", true, new Color(0xB8B8FF), new Color(0xD6D6FF), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.ALUMINIUM), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.BAUXITE), 0.05f);
+        beeSpecies.setHumidity(ARID);
+        beeSpecies.setTemperature(HOT);
+    }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
+        IBeeMutationCustom tMutation = dis.registerMutation(NICKEL, ZINC, 9);
+        tMutation.requireResource("blockAluminium");
+    }),
+    TITANIUM(GTBranchDefinition.RAREMETAL, "Titanium", true, new Color(0xCC99FF), new Color(0xDBB8FF), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.TITANIUM), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ALMANDINE), 0.05f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, ALUMINIUM, 5);
-        tMutation.requireResource(GregTech_API.sBlockMetal7, 9);
+        tMutation.requireResource(GregTechAPI.sBlockMetal7, 9);
     }),
-    GLOWSTONE(GT_BranchDefinition.RAREMETAL, "Glowstone", false, new Color(0xE5CA2A), new Color(0xFFBC5E),
+    GLOWSTONE(GTBranchDefinition.RAREMETAL, "Glowstone", false, new Color(0xE5CA2A), new Color(0xFFBC5E),
         beeSpecies -> {
             beeSpecies.addSpecialty(Materials.Glowstone.getDust(1), 0.20f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
@@ -591,7 +588,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             beeSpecies.setHasEffect();
         }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.NORMAL),
         dis -> dis.registerMutation(REDSTONE, GOLD, 10)),
-    SUNNARIUM(GT_BranchDefinition.RAREMETAL, "Sunnarium", false, new Color(0xFFBC5E), new Color(0xE5CA2A),
+    SUNNARIUM(GTBranchDefinition.RAREMETAL, "Sunnarium", false, new Color(0xFFBC5E), new Color(0xE5CA2A),
         beeSpecies -> {
             beeSpecies.addProduct(Materials.Glowstone.getDust(1), 0.30f);
             beeSpecies.addSpecialty(Materials.Sunnarium.getDust(1), 0.05f);
@@ -600,98 +597,97 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             beeSpecies.setHasEffect();
         }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST), dis -> {
             IBeeMutationCustom tMutation = dis.registerMutation(GLOWSTONE, GOLD, 5);
-            GregTech_API.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTech_API.sBlockCasings1, 15));
+            GregTechAPI.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTechAPI.sBlockCasings1, 15));
         }),
-    CHROME(GT_BranchDefinition.RAREMETAL, "Chrome", true, new Color(0xEBA1EB), new Color(0xF2C3F2), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CHROME), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MAGNESIUM), 0.05f);
+    CHROME(GTBranchDefinition.RAREMETAL, "Chrome", true, new Color(0xEBA1EB), new Color(0xF2C3F2), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.CHROME), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.MAGNESIUM), 0.05f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(TITANIUM, RUBY, 5);
-        tMutation.requireResource(GregTech_API.sBlockMetal2, 3);
+        tMutation.requireResource(GregTechAPI.sBlockMetal2, 3);
     }),
-    MANGANESE(GT_BranchDefinition.RAREMETAL, "Manganese", true, new Color(0xD5D5D5), new Color(0xAAAAAA),
-        beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MANGANESE), 0.15f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.IRON), 0.05f);
-            beeSpecies.setHumidity(ARID);
-            beeSpecies.setTemperature(HOT);
-        }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
-            IBeeMutationCustom tMutation = dis.registerMutation(TITANIUM, ALUMINIUM, 5);
-            tMutation.requireResource(GregTech_API.sBlockMetal4, 6);
-        }),
-    TUNGSTEN(GT_BranchDefinition.RAREMETAL, "Tungsten", false, new Color(0x5C5C8A), new Color(0x7D7DA1), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TUNGSTEN), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MOLYBDENUM), 0.05f);
+    MANGANESE(GTBranchDefinition.RAREMETAL, "Manganese", true, new Color(0xD5D5D5), new Color(0xAAAAAA), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.MANGANESE), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.IRON), 0.05f);
+        beeSpecies.setHumidity(ARID);
+        beeSpecies.setTemperature(HOT);
+    }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
+        IBeeMutationCustom tMutation = dis.registerMutation(TITANIUM, ALUMINIUM, 5);
+        tMutation.requireResource(GregTechAPI.sBlockMetal4, 6);
+    }),
+    TUNGSTEN(GTBranchDefinition.RAREMETAL, "Tungsten", false, new Color(0x5C5C8A), new Color(0x7D7DA1), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.TUNGSTEN), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.MOLYBDENUM), 0.05f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Heroic"), MANGANESE, 5);
-        tMutation.requireResource(GregTech_API.sBlockMetal7, 11);
+        tMutation.requireResource(GregTechAPI.sBlockMetal7, 11);
     }),
-    PLATINUM(GT_BranchDefinition.RAREMETAL, "Platinum", false, new Color(0xE6E6E6), new Color(0xFFFFCC), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PLATINUM), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.IRIDIUM), 0.02f);
+    PLATINUM(GTBranchDefinition.RAREMETAL, "Platinum", false, new Color(0xE6E6E6), new Color(0xFFFFCC), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.PLATINUM), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.IRIDIUM), 0.02f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(DIAMOND, CHROME, 5);
         tMutation.requireResource("blockNickel");
     }),
-    IRIDIUM(GT_BranchDefinition.RAREMETAL, "Iridium", false, new Color(0xDADADA), new Color(0xD1D1E0), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.IRIDIUM), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OSMIUM), 0.05f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PALLADIUM), 0.30f);
+    IRIDIUM(GTBranchDefinition.RAREMETAL, "Iridium", false, new Color(0xDADADA), new Color(0xD1D1E0), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.IRIDIUM), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.OSMIUM), 0.05f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.PALLADIUM), 0.30f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HELLISH);
         beeSpecies.setHasEffect();
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(TUNGSTEN, PLATINUM, 5);
-        tMutation.requireResource(GregTech_API.sBlockMetal3, 12);
+        tMutation.requireResource(GregTechAPI.sBlockMetal3, 12);
     }),
-    OSMIUM(GT_BranchDefinition.RAREMETAL, "Osmium", false, new Color(0x2B2BDA), new Color(0x8B8B8B), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OSMIUM), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.IRIDIUM), 0.05f);
+    OSMIUM(GTBranchDefinition.RAREMETAL, "Osmium", false, new Color(0x2B2BDA), new Color(0x8B8B8B), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.OSMIUM), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.IRIDIUM), 0.05f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(COLD);
         beeSpecies.setHasEffect();
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(TUNGSTEN, PLATINUM, 5);
-        tMutation.requireResource(GregTech_API.sBlockMetal5, 9);
+        tMutation.requireResource(GregTechAPI.sBlockMetal5, 9);
     }),
-    SALTY(GT_BranchDefinition.RAREMETAL, "Salt", true, new Color(0xF0C8C8), new Color(0xFAFAFA), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SALT), 0.35f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LITHIUM), 0.05f);
-        beeSpecies.addSpecialty(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Borax, 1L), 0.1f);
+    SALTY(GTBranchDefinition.RAREMETAL, "Salt", true, new Color(0xF0C8C8), new Color(0xFAFAFA), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.SALT), 0.35f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.LITHIUM), 0.05f);
+        beeSpecies.addSpecialty(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Borax, 1L), 0.1f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(WARM);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(CLAY, ALUMINIUM, 5);
         tMutation.requireResource("blockSalt");
     }),
-    LITHIUM(GT_BranchDefinition.RAREMETAL, "Lithium", false, new Color(0xF0328C), new Color(0xE1DCFF), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LITHIUM), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SALT), 0.05f);
+    LITHIUM(GTBranchDefinition.RAREMETAL, "Lithium", false, new Color(0xF0328C), new Color(0xE1DCFF), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.LITHIUM), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.SALT), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(COLD);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(SALTY, ALUMINIUM, 5);
         tMutation.requireResource("frameGtLithium");
     }),
-    ELECTROTINE(GT_BranchDefinition.RAREMETAL, "Electrotine", false, new Color(0x1E90FF), new Color(0x3CB4C8),
+    ELECTROTINE(GTBranchDefinition.RAREMETAL, "Electrotine", false, new Color(0x1E90FF), new Color(0x3CB4C8),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ELECTROTINE), 0.15f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDSTONE), 0.05f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ELECTROTINE), 0.15f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.REDSTONE), 0.05f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(HOT);
         }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> {
@@ -699,33 +695,33 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             tMutation.requireResource("blockElectrotine");
         }),
     // Sulfur bee, Humidity: normal, Temperature: Hot, Parents: PEAT & Ash, Mutationrate: 15%, Combrate: 80%
-    SULFUR(GT_BranchDefinition.RAREMETAL, "Sulfur", false, new Color(0x1E90FF), new Color(0x3CB4C8), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SULFUR), 0.70f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FIRESTONE), 0.15f);
+    SULFUR(GTBranchDefinition.RAREMETAL, "Sulfur", false, new Color(0x1E90FF), new Color(0x3CB4C8), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SULFUR), 0.70f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.FIRESTONE), 0.15f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(HOT);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.NORMAL),
         dis -> dis.registerMutation(ASH, PEAT, 15)),
 
-    INDIUM(GT_BranchDefinition.RAREMETAL, "Indium", false, new Color(0xFFA9FF), new Color(0x8F5D99), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INDIUM), 0.05f);
+    INDIUM(GTBranchDefinition.RAREMETAL, "Indium", false, new Color(0xFFA9FF), new Color(0x8F5D99), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.INDIUM), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(HOT);
     }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(LEAD, OSMIUM, 1);
         tMutation.requireResource("blockIndium");
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(39, "Venus")); // Venus Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(39, "Venus")); // Venus Dim
         // Harder mutation that isn't dim locked
         tMutation = dis.registerMutation(SILVER, OSMIUM, 1);
         tMutation.requireResource("blockCinobiteA243");
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(60, "Bedrock")); // Thaumic Tinkerer
-                                                                                               // Bedrock Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(60, "Bedrock")); // Thaumic Tinkerer
+                                                                                              // Bedrock Dim
     }),
 
     // IC2
-    COOLANT(GT_BranchDefinition.IC2, "Coolant", false, new Color(0x144F5A), new Color(0x2494A2), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 4), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.COOLANT), 0.15f);
+    COOLANT(GTBranchDefinition.IC2, "Coolant", false, new Color(0x144F5A), new Color(0x2494A2), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 4), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.COOLANT), 0.15f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(COLD);
         beeSpecies.setHasEffect();
@@ -741,14 +737,14 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             .registerMutation(getSpecies(FORESTRY, "Icy"), getSpecies(FORESTRY, "Glacial"), 10);
         tMutation.requireResource(
             Block.getBlockFromItem(
-                GT_ModHandler.getModItem(IndustrialCraft2.ID, "fluidCoolant", 1)
+                GTModHandler.getModItem(IndustrialCraft2.ID, "fluidCoolant", 1)
                     .getItem()),
             0);
         tMutation.restrictTemperature(ICY);
     }),
-    ENERGY(GT_BranchDefinition.IC2, "Energy", false, new Color(0xC11F1F), new Color(0xEBB9B9), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 12), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENERGY), 0.15f);
+    ENERGY(GTBranchDefinition.IC2, "Energy", false, new Color(0xC11F1F), new Color(0xEBB9B9), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 12), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ENERGY), 0.15f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(WARM);
         beeSpecies.setHasEffect();
@@ -765,15 +761,15 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             .registerMutation(getSpecies(FORESTRY, "Demonic"), getSpecies(EXTRABEES, "volcanic"), 10);
         tMutation.requireResource(
             Block.getBlockFromItem(
-                GT_ModHandler.getModItem(IndustrialCraft2.ID, "fluidHotCoolant", 1)
+                GTModHandler.getModItem(IndustrialCraft2.ID, "fluidHotCoolant", 1)
                     .getItem()),
             0);
-        tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(128, "Boneyard Biome")); // Boneyard Biome
+        tMutation.addMutationCondition(new GTBees.BiomeIDMutationCondition(128, "Boneyard Biome")); // Boneyard Biome
     }),
-    LAPOTRON(GT_BranchDefinition.IC2, "Lapotron", false, new Color(0x6478FF), new Color(0x1414FF), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LAPIS), 0.20f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENERGY), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LAPOTRON), 0.10f);
+    LAPOTRON(GTBranchDefinition.IC2, "Lapotron", false, new Color(0x6478FF), new Color(0x1414FF), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.LAPIS), 0.20f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ENERGY), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.LAPOTRON), 0.10f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setHasEffect();
@@ -789,11 +785,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(LAPIS, ENERGY, 6);
         tMutation.requireResource("blockLapis");
         tMutation.restrictTemperature(ICY);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(28, "Moon")); // moon dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(28, "Moon")); // moon dim
     }),
-    PYROTHEUM(GT_BranchDefinition.IC2, "Pyrotheum", false, new Color(0xffebc4), new Color(0xe36400), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.ENERGY), 0.20f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PYROTHEUM), 0.15f);
+    PYROTHEUM(GTBranchDefinition.IC2, "Pyrotheum", false, new Color(0xffebc4), new Color(0xe36400), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.ENERGY), 0.20f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.PYROTHEUM), 0.15f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HELLISH);
         beeSpecies.setHasEffect();
@@ -809,9 +805,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, ENERGY, 4);
         tMutation.restrictTemperature(HELLISH);
     }),
-    CRYOTHEUM(GT_BranchDefinition.IC2, "Cryotheum", false, new Color(0x2660ff), new Color(0x5af7ff), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BLIZZ), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CRYOTHEUM), 0.20f);
+    CRYOTHEUM(GTBranchDefinition.IC2, "Cryotheum", false, new Color(0x2660ff), new Color(0x5af7ff), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.BLIZZ), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.CRYOTHEUM), 0.20f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setHasEffect();
@@ -827,8 +823,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, COOLANT, 4);
         tMutation.restrictTemperature(ICY);
     }),
-    Explosive(GT_BranchDefinition.IC2, "explosive", false, new Color(0x7E270F), new Color(0x747474), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getIC2Item("industrialTnt", 1L), 0.2f);
+    Explosive(GTBranchDefinition.IC2, "explosive", false, new Color(0x7E270F), new Color(0x747474), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getIC2Item("industrialTnt", 1L), 0.2f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HELLISH);
         beeSpecies.setHasEffect();
@@ -845,9 +841,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.requireResource(GameRegistry.findBlock(IndustrialCraft2.ID, "blockITNT"), 0);
     }),
     // Alloy
-    REDALLOY(GT_BranchDefinition.GTALLOY, "RedAlloy", false, new Color(0xE60000), new Color(0xB80000), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDALLOY), 0.15f);
+    REDALLOY(GTBranchDefinition.GTALLOY, "RedAlloy", false, new Color(0xE60000), new Color(0xB80000), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.REDALLOY), 0.15f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> {
@@ -857,10 +853,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(COPPER, REDSTONE, 10);
         tMutation.requireResource("blockRedAlloy");
     }),
-    REDSTONEALLOY(GT_BranchDefinition.GTALLOY, "RedStoneAlloy", false, new Color(0xA50808), new Color(0xE80000),
+    REDSTONEALLOY(GTBranchDefinition.GTALLOY, "RedStoneAlloy", false, new Color(0xA50808), new Color(0xE80000),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDSTONEALLOY), 0.15f);
+            beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.REDSTONEALLOY), 0.15f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }, template -> {
@@ -870,10 +866,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, REDALLOY, 8);
             tMutation.requireResource("blockRedstoneAlloy");
         }),
-    CONDUCTIVEIRON(GT_BranchDefinition.GTALLOY, "ConductiveIron", false, new Color(0xCEADA3), new Color(0x817671),
+    CONDUCTIVEIRON(GTBranchDefinition.GTALLOY, "ConductiveIron", false, new Color(0xCEADA3), new Color(0x817671),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CONDUCTIVEIRON), 0.15f);
+            beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.CONDUCTIVEIRON), 0.15f);
             beeSpecies.setHumidity(DAMP);
             beeSpecies.setTemperature(WARM);
             beeSpecies.setHasEffect();
@@ -884,10 +880,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             IBeeMutationCustom tMutation = dis.registerMutation(REDSTONEALLOY, IRON, 8);
             tMutation.requireResource("blockConductiveIron");
         }),
-    ENERGETICALLOY(GT_BranchDefinition.GTALLOY, "EnergeticAlloy", false, new Color(0xFF9933), new Color(0xFFAD5C),
+    ENERGETICALLOY(GTBranchDefinition.GTALLOY, "EnergeticAlloy", false, new Color(0xFF9933), new Color(0xFFAD5C),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENERGETICALLOY), 0.15f);
+            beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ENERGETICALLOY), 0.15f);
             beeSpecies.setHumidity(DAMP);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }, template -> {
@@ -897,10 +893,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             IBeeMutationCustom tMutation = dis.registerMutation(REDSTONEALLOY, getSpecies(FORESTRY, "Demonic"), 9);
             tMutation.requireResource("blockEnergeticAlloy");
         }),
-    VIBRANTALLOY(GT_BranchDefinition.GTALLOY, "VibrantAlloy", false, new Color(0x86A12D), new Color(0xC4F2AE),
+    VIBRANTALLOY(GTBranchDefinition.GTALLOY, "VibrantAlloy", false, new Color(0x86A12D), new Color(0xC4F2AE),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.VIBRANTALLOY), 0.15f);
+            beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.VIBRANTALLOY), 0.15f);
             beeSpecies.setHumidity(DAMP);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
             beeSpecies.setHasEffect();
@@ -913,10 +909,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             tMutation.requireResource("blockVibrantAlloy");
             tMutation.restrictTemperature(HOT, HELLISH);
         }),
-    ELECTRICALSTEEL(GT_BranchDefinition.GTALLOY, "ElectricalSteel", false, new Color(0x787878), new Color(0xD8D8D8),
+    ELECTRICALSTEEL(GTBranchDefinition.GTALLOY, "ElectricalSteel", false, new Color(0x787878), new Color(0xD8D8D8),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ELECTRICALSTEEL), 0.15f);
+            beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ELECTRICALSTEEL), 0.15f);
             beeSpecies.setHumidity(DAMP);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }, template -> {
@@ -926,9 +922,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             IBeeMutationCustom tMutation = dis.registerMutation(STEEL, getSpecies(FORESTRY, "Demonic"), 9);
             tMutation.requireResource("blockElectricalSteel");
         }),
-    DARKSTEEL(GT_BranchDefinition.GTALLOY, "DarkSteel", false, new Color(0x252525), new Color(0x443B44), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DARKSTEEL), 0.15f);
+    DARKSTEEL(GTBranchDefinition.GTALLOY, "DarkSteel", false, new Color(0x252525), new Color(0x443B44), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.DARKSTEEL), 0.15f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(COLD);
     }, template -> {
@@ -938,10 +934,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(ELECTRICALSTEEL, getSpecies(FORESTRY, "Demonic"), 7);
         tMutation.requireResource("blockDarkSteel");
     }),
-    PULSATINGIRON(GT_BranchDefinition.GTALLOY, "PulsatingIron", false, new Color(0x6DD284), new Color(0x006600),
+    PULSATINGIRON(GTBranchDefinition.GTALLOY, "PulsatingIron", false, new Color(0x6DD284), new Color(0x006600),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PULSATINGIRON), 0.15f);
+            beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.PULSATINGIRON), 0.15f);
             beeSpecies.setHumidity(DAMP);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }, template -> {
@@ -951,12 +947,12 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             IBeeMutationCustom tMutation = dis.registerMutation(REDALLOY, getSpecies(FORESTRY, "Ended"), 9);
             tMutation.requireResource("blockPulsatingIron");
         }),
-    STAINLESSSTEEL(GT_BranchDefinition.GTALLOY, "StainlessSteel", false, new Color(0xC8C8DC), new Color(0x778899),
+    STAINLESSSTEEL(GTBranchDefinition.GTALLOY, "StainlessSteel", false, new Color(0xC8C8DC), new Color(0x778899),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STEEL), 0.10f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STAINLESSSTEEL), 0.15f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CHROME), 0.05f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.STEEL), 0.10f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.STAINLESSSTEEL), 0.15f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.CHROME), 0.05f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(HOT);
         }, template -> {
@@ -967,24 +963,24 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             IBeeMutationCustom tMutation = dis.registerMutation(CHROME, STEEL, 9);
             tMutation.requireResource("blockStainlessSteel");
         }),
-    ENDERIUM(GT_BranchDefinition.GTALLOY, "Enderium", false, new Color(0x599087), new Color(0x2E8B57), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDERIUM), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CHROME), 0.05f);
+    ENDERIUM(GTBranchDefinition.GTALLOY, "Enderium", false, new Color(0x599087), new Color(0x2E8B57), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ENDERIUM), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.CHROME), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(HOT);
     }, template -> {
-        AlleleHelper.instance.set(template, SPEED, GT_Bees.speedBlinding);
+        AlleleHelper.instance.set(template, SPEED, GTBees.speedBlinding);
         AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "teleport"));
         AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST);
     }, dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(PLATINUM, getSpecies(FORESTRY, "Phantasmal"), 3);
         tMutation.requireResource("blockEnderium");
     }),
-    BEDROCKIUM(GT_BranchDefinition.GTALLOY, "Bedrockium", false, new Color(0x0C0C0C), new Color(0xC6C6C6),
+    BEDROCKIUM(GTBranchDefinition.GTALLOY, "Bedrockium", false, new Color(0x0C0C0C), new Color(0xC6C6C6),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.20f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.BEDROCKIUM), 0.55f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.20f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.BEDROCKIUM), 0.55f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(HOT);
         }, template -> {
@@ -998,10 +994,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         }),
 
     // thaumic
-    THAUMIUMDUST(GT_BranchDefinition.THAUMIC, "ThaumiumDust", true, new Color(0x7A007A), new Color(0x5C005C),
+    THAUMIUMDUST(GTBranchDefinition.THAUMIC, "ThaumiumDust", true, new Color(0x7A007A), new Color(0x5C005C),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.THAUMIUMDUST), 0.20f);
+            beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.THAUMIUMDUST), 0.20f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }, template -> {
@@ -1015,13 +1011,13 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             IBeeMutationCustom tMutation = dis
                 .registerMutation(getSpecies(MAGICBEES, "TCFire"), getSpecies(FORESTRY, "Edenic"), 10);
             tMutation.requireResource("blockThaumium");
-            tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(192, "Magical Forest")); // magical
-                                                                                                         // forest
+            tMutation.addMutationCondition(new GTBees.BiomeIDMutationCondition(192, "Magical Forest")); // magical
+                                                                                                        // forest
         }),
-    THAUMIUMSHARD(GT_BranchDefinition.THAUMIC, "ThaumiumShard", true, new Color(0x9966FF), new Color(0xAD85FF),
+    THAUMIUMSHARD(GTBranchDefinition.THAUMIC, "ThaumiumShard", true, new Color(0x9966FF), new Color(0xAD85FF),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.THAUMIUMDUST), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.THAUMIUMSHARD), 0.20f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.THAUMIUMDUST), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.THAUMIUMSHARD), 0.20f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
             beeSpecies.setHasEffect();
@@ -1034,12 +1030,12 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectGlacial);
         }, dis -> {
             IBeeMutationCustom tMutation = dis.registerMutation(THAUMIUMDUST, getSpecies(MAGICBEES, "TCWater"), 10);
-            tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(192, "Magical Forest")); // magical
-                                                                                                         // forest
+            tMutation.addMutationCondition(new GTBees.BiomeIDMutationCondition(192, "Magical Forest")); // magical
+                                                                                                        // forest
         }),
-    AMBER(GT_BranchDefinition.THAUMIC, "Amber", true, new Color(0xEE7700), new Color(0x774B15), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.AMBER), 0.20f);
+    AMBER(GTBranchDefinition.THAUMIC, "Amber", true, new Color(0xEE7700), new Color(0x774B15), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.AMBER), 0.20f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setHasEffect();
@@ -1051,10 +1047,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(THAUMIUMDUST, STICKYRESIN, 10);
         tMutation.requireResource("blockAmber");
     }),
-    QUICKSILVER(GT_BranchDefinition.THAUMIC, "Quicksilver", true, new Color(0x7A007A), new Color(0x5C005C),
+    QUICKSILVER(GTBranchDefinition.THAUMIC, "Quicksilver", true, new Color(0x7A007A), new Color(0x5C005C),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.QUICKSILVER), 0.20f);
+            beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.QUICKSILVER), 0.20f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
             beeSpecies.setHasEffect();
@@ -1064,10 +1060,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.JUNGLE);
             AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectMiasmic);
         }, dis -> dis.registerMutation(THAUMIUMDUST, SILVER, 10)),
-    SALISMUNDUS(GT_BranchDefinition.THAUMIC, "SalisMundus", true, new Color(0xF7ADDE), new Color(0x592582),
+    SALISMUNDUS(GTBranchDefinition.THAUMIC, "SalisMundus", true, new Color(0xF7ADDE), new Color(0x592582),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.20f);
+            beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.SALISMUNDUS), 0.20f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
             beeSpecies.setHasEffect();
@@ -1080,12 +1076,12 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             AlleleHelper.instance.set(template, SPEED, Speed.SLOWER);
         }, dis -> {
             IBeeMutationCustom tMutation = dis.registerMutation(THAUMIUMDUST, THAUMIUMSHARD, 8);
-            tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(192, "Magical Forest")); // magical
-                                                                                                         // forest
+            tMutation.addMutationCondition(new GTBees.BiomeIDMutationCondition(192, "Magical Forest")); // magical
+                                                                                                        // forest
         }),
-    TAINTED(GT_BranchDefinition.THAUMIC, "Tainted", true, new Color(0x904BB8), new Color(0xE800FF), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.TAINTED), 0.20f);
+    TAINTED(GTBranchDefinition.THAUMIC, "Tainted", true, new Color(0x904BB8), new Color(0xE800FF), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.TAINTED), 0.20f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setHasEffect();
@@ -1100,11 +1096,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         AlleleHelper.instance.set(template, FLOWER_PROVIDER, getFlowers(EXTRABEES, "rock"));
     }, dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(THAUMIUMDUST, THAUMIUMSHARD, 7);
-        tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(193, "Tainted Land")); // Tainted Land
+        tMutation.addMutationCondition(new GTBees.BiomeIDMutationCondition(193, "Tainted Land")); // Tainted Land
     }),
-    MITHRIL(GT_BranchDefinition.THAUMIC, "Mithril", true, new Color(0xF0E68C), new Color(0xFFFFD2), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PLATINUM), 0.20f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MITHRIL), 0.125f);
+    MITHRIL(GTBranchDefinition.THAUMIC, "Mithril", true, new Color(0xF0E68C), new Color(0xFFFFD2), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.PLATINUM), 0.20f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.MITHRIL), 0.125f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> {
@@ -1119,16 +1115,16 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     }, new Consumer<>() {
 
         @Override
-        public void accept(GT_BeeDefinition dis) {
+        public void accept(GTBeeDefinition dis) {
             IBeeMutationCustom tMutation = dis.registerMutation(IO, PLATINUM, 7);
-            tMutation.requireResource(GregTech_API.sBlockMetal4, 10);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(36, "IO")); // IO Dim
+            tMutation.requireResource(GregTechAPI.sBlockMetal4, 10);
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(36, "IO")); // IO Dim
         }
     }),
-    ASTRALSILVER(GT_BranchDefinition.THAUMIC, "AstralSilver", true, new Color(0xAFEEEE), new Color(0xE6E6FF),
+    ASTRALSILVER(GTBranchDefinition.THAUMIC, "AstralSilver", true, new Color(0xAFEEEE), new Color(0xE6E6FF),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SILVER), 0.20f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ASTRALSILVER), 0.125f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SILVER), 0.20f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ASTRALSILVER), 0.125f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }, template -> {
@@ -1142,29 +1138,28 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             AlleleHelper.instance.set(template, FLOWER_PROVIDER, getFlowers(EXTRABEES, "rock"));
         }, dis -> {
             IBeeMutationCustom tMutation = dis.registerMutation(SILVER, IRON, 3);
-            tMutation.requireResource(GregTech_API.sBlockMetal1, 6);
+            tMutation.requireResource(GregTechAPI.sBlockMetal1, 6);
         }),
-    THAUMINITE(GT_BranchDefinition.THAUMIC, "Thauminite", true, new Color(0x2E2D79), new Color(0x7581E0),
-        beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(MagicBees.ID, "comb", 1, 19), 0.20f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.THAUMINITE), 0.125f);
-            beeSpecies.setHumidity(EnumHumidity.NORMAL);
-            beeSpecies.setTemperature(EnumTemperature.NORMAL);
-            beeSpecies.setHasEffect();
-        }, template -> {
-            AlleleHelper.instance.set(template, SPEED, Speed.SLOWER);
-            AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT);
-            AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOW);
-            AlleleHelper.instance.set(template, NOCTURNAL, true);
-        }, dis -> {
-            IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(MAGICBEES, "TCOrder"), THAUMIUMDUST, 8);
-            if (ThaumicBases.isModLoaded())
-                tMutation.requireResource(GameRegistry.findBlock(ThaumicBases.ID, "thauminiteBlock"), 0);
-        }),
-    SHADOWMETAL(GT_BranchDefinition.THAUMIC, "ShadowMetal", true, new Color(0x100322), new Color(0x100342),
+    THAUMINITE(GTBranchDefinition.THAUMIC, "Thauminite", true, new Color(0x2E2D79), new Color(0x7581E0), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(MagicBees.ID, "comb", 1, 19), 0.20f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.THAUMINITE), 0.125f);
+        beeSpecies.setHumidity(EnumHumidity.NORMAL);
+        beeSpecies.setTemperature(EnumTemperature.NORMAL);
+        beeSpecies.setHasEffect();
+    }, template -> {
+        AlleleHelper.instance.set(template, SPEED, Speed.SLOWER);
+        AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT);
+        AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOW);
+        AlleleHelper.instance.set(template, NOCTURNAL, true);
+    }, dis -> {
+        IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(MAGICBEES, "TCOrder"), THAUMIUMDUST, 8);
+        if (ThaumicBases.isModLoaded())
+            tMutation.requireResource(GameRegistry.findBlock(ThaumicBases.ID, "thauminiteBlock"), 0);
+    }),
+    SHADOWMETAL(GTBranchDefinition.THAUMIC, "ShadowMetal", true, new Color(0x100322), new Color(0x100342),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(MagicBees.ID, "comb", 1, 20), 0.20f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SHADOWMETAL), 0.125f);
+            beeSpecies.addProduct(GTModHandler.getModItem(MagicBees.ID, "comb", 1, 20), 0.20f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.SHADOWMETAL), 0.125f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
             beeSpecies.setHasEffect();
@@ -1182,9 +1177,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
                 tMutation.requireResource("blockShadow");
             }
         }),
-    DIVIDED(GT_BranchDefinition.THAUMIC, "Unstable", true, new Color(0xF0F0F0), new Color(0xDCDCDC), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 61), 0.20f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DIVIDED), 0.125f);
+    DIVIDED(GTBranchDefinition.THAUMIC, "Unstable", true, new Color(0xF0F0F0), new Color(0xDCDCDC), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 61), 0.20f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.DIVIDED), 0.125f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setHasEffect();
@@ -1198,10 +1193,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         if (ExtraUtilities.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(ExtraUtilities.ID, "decorativeBlock1"), 5);
     }),
-    CAELESTIS(GT_BranchDefinition.THAUMIC, "Caelestis", true, new Color(0xF0F0F0), new Color(0xDCDCDC), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CAELESTISRED), 0.60f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CAELESTISBLUE), 0.60f);
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CAELESTISGREEN), 0.60f);
+    CAELESTIS(GTBranchDefinition.THAUMIC, "Caelestis", true, new Color(0xF0F0F0), new Color(0xDCDCDC), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.CAELESTISRED), 0.60f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.CAELESTISBLUE), 0.60f);
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.CAELESTISGREEN), 0.60f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setHasEffect();
@@ -1211,29 +1206,28 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOW);
         AlleleHelper.instance.set(template, NOCTURNAL, true);
     }, dis -> dis.registerMutation(DIAMOND, DIVIDED, 10)),
-    SPARKELING(GT_BranchDefinition.THAUMIC, "NetherStar", true, new Color(0x7A007A), new Color(0xFFFFFF),
-        beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(MagicBees.ID, "miscResources", 1, 3), 0.20f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SPARKLING), 0.125f);
-            beeSpecies.setHumidity(EnumHumidity.NORMAL);
-            beeSpecies.setTemperature(EnumTemperature.NORMAL);
-        }, template -> {
-            AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.DOWN_2);
-            AlleleHelper.instance.set(template, NOCTURNAL, true);
-            AlleleHelper.instance.set(template, CAVE_DWELLING, true);
-            AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.NETHER);
-            AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT);
-            AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectAggressive);
-            AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE);
-        }, dis -> {
-            IBeeMutationCustom tMutation = dis
-                .registerMutation(getSpecies(MAGICBEES, "Withering"), getSpecies(MAGICBEES, "Draconic"), 1);
-            tMutation.requireResource(GregTech_API.sBlockGem3, 3);
-            tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(9, "END Biome")); // sky end biome
-        }),
+    SPARKELING(GTBranchDefinition.THAUMIC, "NetherStar", true, new Color(0x7A007A), new Color(0xFFFFFF), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(MagicBees.ID, "miscResources", 1, 3), 0.20f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.SPARKLING), 0.125f);
+        beeSpecies.setHumidity(EnumHumidity.NORMAL);
+        beeSpecies.setTemperature(EnumTemperature.NORMAL);
+    }, template -> {
+        AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.DOWN_2);
+        AlleleHelper.instance.set(template, NOCTURNAL, true);
+        AlleleHelper.instance.set(template, CAVE_DWELLING, true);
+        AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.NETHER);
+        AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT);
+        AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectAggressive);
+        AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE);
+    }, dis -> {
+        IBeeMutationCustom tMutation = dis
+            .registerMutation(getSpecies(MAGICBEES, "Withering"), getSpecies(MAGICBEES, "Draconic"), 1);
+        tMutation.requireResource(GregTechAPI.sBlockGem3, 3);
+        tMutation.addMutationCondition(new GTBees.BiomeIDMutationCondition(9, "END Biome")); // sky end biome
+    }),
 
-    ESSENTIA(GT_BranchDefinition.THAUMIC, "Essentia", true, new Color(0x7A007A), new Color(0xFFFFFF), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(MagicBees.ID, "miscResources", 1, 3), 0.20f);
+    ESSENTIA(GTBranchDefinition.THAUMIC, "Essentia", true, new Color(0x7A007A), new Color(0xFFFFFF), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(MagicBees.ID, "miscResources", 1, 3), 0.20f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> {
@@ -1247,12 +1241,12 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 6);
     }),
 
-    DRAKE(GT_BranchDefinition.THAUMIC, "Drake", true, new Color(0x100322), new Color(0x7A007A), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.DRACONIC), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.AWAKENEDDRACONIUM), 0.20f);
+    DRAKE(GTBranchDefinition.THAUMIC, "Drake", true, new Color(0x100322), new Color(0x7A007A), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.DRACONIC), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.AWAKENEDDRACONIUM), 0.20f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(HELLISH);
-        beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance);
+        beeSpecies.setJubilanceProvider(JubilanceMegaApiary.instance);
     }, template -> {
         AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.DOWN_3);
         AlleleHelper.instance.set(template, CAVE_DWELLING, false);
@@ -1260,13 +1254,13 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectDrunkard);
     }, dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(ESSENTIA, THAUMINITE, 5);
-        GregTech_API.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTech_API.sBlockCasings5, 8));
+        GregTechAPI.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTechAPI.sBlockCasings5, 8));
     }),
 
     // radioctive
-    URANIUM(GT_BranchDefinition.RADIOACTIVE, "Uranium", true, new Color(0x19AF19), new Color(0x169E16), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.URANIUM), 0.15f);
+    URANIUM(GTBranchDefinition.RADIOACTIVE, "Uranium", true, new Color(0x19AF19), new Color(0x169E16), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.URANIUM), 0.15f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(COLD);
         beeSpecies.setNocturnal();
@@ -1275,13 +1269,13 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST);
     }, dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Avenging"), PLATINUM, 3);
-        tMutation.requireResource(GregTech_API.sBlockMetal7, 14);
+        tMutation.requireResource(GregTechAPI.sBlockMetal7, 14);
     }),
-    PLUTONIUM(GT_BranchDefinition.RADIOACTIVE, "Plutonium", true, new Color(0x570000), new Color(0x240000),
+    PLUTONIUM(GTBranchDefinition.RADIOACTIVE, "Plutonium", true, new Color(0x570000), new Color(0x240000),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LEAD), 0.15f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PLUTONIUM), 0.15f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.LEAD), 0.15f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.PLUTONIUM), 0.15f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(ICY);
             beeSpecies.setNocturnal();
@@ -1290,12 +1284,12 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST);
         }, dis -> {
             IBeeMutationCustom tMutation = dis.registerMutation(URANIUM, EMERALD, 3);
-            tMutation.requireResource(GregTech_API.sBlockMetal5, 13);
+            tMutation.requireResource(GregTechAPI.sBlockMetal5, 13);
         }),
-    NAQUADAH(GT_BranchDefinition.RADIOACTIVE, "Naquadah", false, new Color(0x003300), new Color(0x002400),
+    NAQUADAH(GTBranchDefinition.RADIOACTIVE, "Naquadah", false, new Color(0x003300), new Color(0x002400),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NAQUADAH), 0.15f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.NAQUADAH), 0.15f);
             beeSpecies.setHumidity(ARID);
             beeSpecies.setTemperature(ICY);
             beeSpecies.setNocturnal();
@@ -1305,13 +1299,13 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST);
         }, dis -> {
             IBeeMutationCustom tMutation = dis.registerMutation(PLUTONIUM, IRIDIUM, 3);
-            tMutation.requireResource(GregTech_API.sBlockMetal4, 12);
+            tMutation.requireResource(GregTechAPI.sBlockMetal4, 12);
         }),
-    NAQUADRIA(GT_BranchDefinition.RADIOACTIVE, "Naquadria", false, new Color(0x000000), new Color(0x002400),
+    NAQUADRIA(GTBranchDefinition.RADIOACTIVE, "Naquadria", false, new Color(0x000000), new Color(0x002400),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NAQUADAH), 0.20f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NAQUADRIA), 0.15f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SLAG), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.NAQUADAH), 0.20f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.NAQUADRIA), 0.15f);
             beeSpecies.setHumidity(ARID);
             beeSpecies.setTemperature(ICY);
             beeSpecies.setNocturnal();
@@ -1321,10 +1315,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST);
         }, dis -> {
             IBeeMutationCustom tMutation = dis.registerMutation(PLUTONIUM, IRIDIUM, 8, 10);
-            tMutation.requireResource(GregTech_API.sBlockMetal4, 15);
+            tMutation.requireResource(GregTechAPI.sBlockMetal4, 15);
         }),
-    DOB(GT_BranchDefinition.RADIOACTIVE, "DOB", false, new Color(0x003300), new Color(0x002400), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.DOB), 0.75f);
+    DOB(GTBranchDefinition.RADIOACTIVE, "DOB", false, new Color(0x003300), new Color(0x002400), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.DOB), 0.75f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setNocturnal();
@@ -1336,10 +1330,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(NAQUADAH, THAUMIUMSHARD, 2);
         if (AdvancedSolarPanel.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(AdvancedSolarPanel.ID, "BlockAdvSolarPanel"), 2);
-        tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(9, "END Biome")); // sky end biome
+        tMutation.addMutationCondition(new GTBees.BiomeIDMutationCondition(9, "END Biome")); // sky end biome
     }),
-    THORIUM(GT_BranchDefinition.RADIOACTIVE, "Thorium", false, new Color(0x005000), new Color(0x001E00), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.THORIUM), 0.75f);
+    THORIUM(GTBranchDefinition.RADIOACTIVE, "Thorium", false, new Color(0x005000), new Color(0x001E00), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.THORIUM), 0.75f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(COLD);
         beeSpecies.setNocturnal();
@@ -1349,11 +1343,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     }, dis -> {
         IMutationCustom tMutation = dis.registerMutation(COAL, URANIUM, 3)
             .setIsSecret();
-        tMutation.requireResource(GregTech_API.sBlockMetal7, 5);
+        tMutation.requireResource(GregTechAPI.sBlockMetal7, 5);
     }),
-    LUTETIUM(GT_BranchDefinition.RADIOACTIVE, "Lutetium", false, new Color(0xE6FFE6), new Color(0xFFFFFF),
+    LUTETIUM(GTBranchDefinition.RADIOACTIVE, "Lutetium", false, new Color(0xE6FFE6), new Color(0xFFFFFF),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LUTETIUM), 0.15f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.LUTETIUM), 0.15f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
             beeSpecies.setNocturnal();
@@ -1364,28 +1358,28 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         }, dis -> {
             IMutationCustom tMutation = dis.registerMutation(THORIUM, getSpecies(EXTRABEES, "rotten"), 1)
                 .setIsSecret();
-            tMutation.requireResource(GregTech_API.sBlockMetal4, 3);
+            tMutation.requireResource(GregTechAPI.sBlockMetal4, 3);
         }),
-    AMERICIUM(GT_BranchDefinition.RADIOACTIVE, "Americium", false, new Color(0xE6E6FF), new Color(0xC8C8C8),
+    AMERICIUM(GTBranchDefinition.RADIOACTIVE, "Americium", false, new Color(0xE6E6FF), new Color(0xC8C8C8),
         beeSpecies -> {
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.AMERICIUM), 0.075f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.AMERICIUM), 0.075f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
             beeSpecies.setNocturnal();
             beeSpecies.setHasEffect();
             // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB
-            beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance);
+            beeSpecies.setJubilanceProvider(JubilanceMegaApiary.instance);
         }, template -> {
             AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST);
             AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST);
         }, dis -> {
             IMutationCustom tMutation = dis.registerMutation(LUTETIUM, CHROME, 5, 4)
                 .setIsSecret();
-            GregTech_API.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTech_API.sBlockMachines, 32020));
+            GregTechAPI.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTechAPI.sBlockMachines, 32020));
         }),
-    NEUTRONIUM(GT_BranchDefinition.RADIOACTIVE, "Neutronium", false, new Color(0xFFF0F0), new Color(0xFAFAFA),
+    NEUTRONIUM(GTBranchDefinition.RADIOACTIVE, "Neutronium", false, new Color(0xFFF0F0), new Color(0xFAFAFA),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEUTRONIUM), 0.02f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.NEUTRONIUM), 0.02f);
             beeSpecies.setHumidity(DAMP);
             beeSpecies.setTemperature(HELLISH);
             beeSpecies.setHasEffect();
@@ -1396,12 +1390,12 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         }, dis -> {
             IMutationCustom tMutation = dis.registerMutation(NAQUADRIA, AMERICIUM, 2, 2)
                 .setIsSecret();
-            tMutation.requireResource(GregTech_API.sBlockMetal5, 2);
+            tMutation.requireResource(GregTechAPI.sBlockMetal5, 2);
         }),
     // Twilight
-    NAGA(GT_BranchDefinition.TWILIGHT, "Naga", true, new Color(0x0D5A0D), new Color(0x28874B), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.02f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NAGA), 0.10f);
+    NAGA(GTBranchDefinition.TWILIGHT, "Naga", true, new Color(0x0D5A0D), new Color(0x28874B), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SALISMUNDUS), 0.02f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.NAGA), 0.10f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setHasEffect();
@@ -1413,9 +1407,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             .registerMutation(getSpecies(MAGICBEES, "Eldritch"), getSpecies(FORESTRY, "Imperial"), 8);
         tMutation.restrictHumidity(DAMP);
     }),
-    LICH(GT_BranchDefinition.TWILIGHT, "Lich", true, new Color(0xC5C5C5), new Color(0x5C605E), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.04f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LICH), 0.10f);
+    LICH(GTBranchDefinition.TWILIGHT, "Lich", true, new Color(0xC5C5C5), new Color(0x5C605E), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SALISMUNDUS), 0.04f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.LICH), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setHasEffect();
@@ -1426,9 +1420,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(MAGICBEES, "Supernatural"), NAGA, 7);
         tMutation.restrictHumidity(ARID);
     }),
-    HYDRA(GT_BranchDefinition.TWILIGHT, "Hydra", true, new Color(0x872836), new Color(0xB8132C), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.06f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.HYDRA), 0.10f);
+    HYDRA(GTBranchDefinition.TWILIGHT, "Hydra", true, new Color(0x872836), new Color(0xB8132C), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SALISMUNDUS), 0.06f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.HYDRA), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HELLISH);
         beeSpecies.setHasEffect();
@@ -1437,11 +1431,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST);
     }, dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(LICH, getSpecies(MAGICBEES, "TCFire"), 6);
-        tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(138, "Undergarden")); // undergarden biome
+        tMutation.addMutationCondition(new GTBees.BiomeIDMutationCondition(138, "Undergarden")); // undergarden biome
     }),
-    URGHAST(GT_BranchDefinition.TWILIGHT, "UrGhast", true, new Color(0xA7041C), new Color(0x7C0618), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.08f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.URGHAST), 0.10f);
+    URGHAST(GTBranchDefinition.TWILIGHT, "UrGhast", true, new Color(0xA7041C), new Color(0x7C0618), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SALISMUNDUS), 0.08f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.URGHAST), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HELLISH);
         beeSpecies.setHasEffect();
@@ -1455,9 +1449,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCosmeticSolid"), 4);
         tMutation.restrictTemperature(HELLISH);
     }),
-    SNOWQUEEN(GT_BranchDefinition.TWILIGHT, "SnowQueen", true, new Color(0xD02001), new Color(0x9C0018), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SNOWQUEEN), 0.10f);
+    SNOWQUEEN(GTBranchDefinition.TWILIGHT, "SnowQueen", true, new Color(0xD02001), new Color(0x9C0018), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SALISMUNDUS), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.SNOWQUEEN), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setHasEffect();
@@ -1469,9 +1463,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.restrictTemperature(ICY);
     }),
     // HEE
-    ENDDUST(GT_BranchDefinition.HEE, "End Dust", true, new Color(0xCC00FA), new Color(0x003A7D), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDDUST), 0.10f);
+    ENDDUST(GTBranchDefinition.HEE, "End Dust", true, new Color(0xCC00FA), new Color(0x003A7D), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ENDDUST), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setHasEffect();
@@ -1481,13 +1475,13 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.restrictHumidity(ARID);
         if (HardcoreEnderExpansion.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "end_powder_ore"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(1, "End")); // End Dim
     }),
-    ENDIUM(GT_BranchDefinition.HEE, "Endium", true, new Color(0xa0ffff), new Color(0x2F5A6C), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDIUM), 0.10f);
-        beeSpecies.addSpecialty(GT_Bees.propolis.getStackForType(PropolisType.Endium), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.drop.getStackForType(DropType.ENDERGOO), 0.10f);
+    ENDIUM(GTBranchDefinition.HEE, "Endium", true, new Color(0xa0ffff), new Color(0x2F5A6C), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ENDIUM), 0.10f);
+        beeSpecies.addSpecialty(GTBees.propolis.getStackForType(PropolisType.Endium), 0.15f);
+        beeSpecies.addSpecialty(GTBees.drop.getStackForType(DropType.ENDERGOO), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setHasEffect();
@@ -1495,16 +1489,16 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Ended"), THAUMIUMDUST, 8);
         tMutation.restrictHumidity(ARID);
         if (HardcoreEnderExpansion.isModLoaded()) tMutation.requireResource("blockHeeEndium");
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(1, "End")); // End Dim
     }),
-    STARDUST(GT_BranchDefinition.HEE, "Star Dust", true, new Color(0xffff00), new Color(0xDCBE13), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STARDUST), 0.10f);
+    STARDUST(GTBranchDefinition.HEE, "Star Dust", true, new Color(0xffff00), new Color(0xDCBE13), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.STARDUST), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setHasEffect();
     }, template -> {
-        AlleleHelper.instance.set(template, SPEED, GT_Bees.speedBlinding);
+        AlleleHelper.instance.set(template, SPEED, GTBees.speedBlinding);
         AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST);
         AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOWER);
     }, dis -> {
@@ -1512,11 +1506,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.restrictHumidity(ARID);
         if (HardcoreEnderExpansion.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "stardust_ore"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(1, "End")); // End Dim
     }),
-    ECTOPLASMA(GT_BranchDefinition.HEE, "Ectoplasma", true, new Color(0xDCB0E5), new Color(0x381C40), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ECTOPLASMA), 0.10f);
+    ECTOPLASMA(GTBranchDefinition.HEE, "Ectoplasma", true, new Color(0xDCB0E5), new Color(0x381C40), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ECTOPLASMA), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setHasEffect();
@@ -1529,12 +1523,12 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.restrictHumidity(ARID);
         if (HardcoreEnderExpansion.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "spooky_log"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(1, "End")); // End Dim
     }),
-    ARCANESHARDS(GT_BranchDefinition.HEE, "Arcane Shards", true, new Color(0x9010AD), new Color(0x333D82),
+    ARCANESHARDS(GTBranchDefinition.HEE, "Arcane Shards", true, new Color(0x9010AD), new Color(0x333D82),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ARCANESHARD), 0.10f);
+            beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ARCANESHARD), 0.10f);
             beeSpecies.setHumidity(ARID);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
             beeSpecies.setHasEffect();
@@ -1547,12 +1541,12 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             tMutation.restrictHumidity(ARID);
             if (HardcoreEnderExpansion.isModLoaded())
                 tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "laboratory_floor"), 0);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(1, "End")); // End Dim
         }),
-    DRAGONESSENCE(GT_BranchDefinition.HEE, "Dragonessence", true, new Color(0xFFA12B), new Color(0x911ECE),
+    DRAGONESSENCE(GTBranchDefinition.HEE, "Dragonessence", true, new Color(0xFFA12B), new Color(0x911ECE),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DRAGONESSENCE), 0.10f);
+            beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.DRAGONESSENCE), 0.10f);
             beeSpecies.setHumidity(ARID);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
             beeSpecies.setHasEffect();
@@ -1566,11 +1560,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             tMutation.restrictHumidity(ARID);
             if (HardcoreEnderExpansion.isModLoaded())
                 tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "essence_altar"), 1);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(1, "End")); // End Dim
         }),
-    FIREESSENCE(GT_BranchDefinition.HEE, "Fireessence", true, new Color(0xD41238), new Color(0xFFA157), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FIREESSENSE), 0.10f);
+    FIREESSENCE(GTBranchDefinition.HEE, "Fireessence", true, new Color(0xD41238), new Color(0xFFA157), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.FIREESSENSE), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HELLISH);
         beeSpecies.setHasEffect();
@@ -1584,30 +1578,29 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.restrictHumidity(ARID);
         if (HardcoreEnderExpansion.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "essence_altar"), 2);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(1, "End")); // End Dim
     }),
-    ENDERMANHEAD(GT_BranchDefinition.HEE, "EndermanHead", true, new Color(0x161616), new Color(0x6200e7),
-        beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDERMAN), 0.10f);
-            beeSpecies.setHumidity(ARID);
-            beeSpecies.setTemperature(EnumTemperature.NORMAL);
-            beeSpecies.setHasEffect();
-        }, template -> {
-            AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER);
-            AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "teleport"));
-            AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.UP_1);
-            AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.UP_1);
-        }, dis -> {
-            IBeeMutationCustom tMutation = dis.registerMutation(ENDERIUM, STARDUST, 4);
-            tMutation.restrictHumidity(ARID);
-            if (HardcoreEnderExpansion.isModLoaded())
-                tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "ender_goo"), 0);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim
-        }),
-    SILVERFISH(GT_BranchDefinition.HEE, "Silverfisch", true, new Color(0xEE053D), new Color(0x000000), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SILVERFISH), 0.10f);
+    ENDERMANHEAD(GTBranchDefinition.HEE, "EndermanHead", true, new Color(0x161616), new Color(0x6200e7), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ENDERMAN), 0.10f);
+        beeSpecies.setHumidity(ARID);
+        beeSpecies.setTemperature(EnumTemperature.NORMAL);
+        beeSpecies.setHasEffect();
+    }, template -> {
+        AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER);
+        AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "teleport"));
+        AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.UP_1);
+        AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.UP_1);
+    }, dis -> {
+        IBeeMutationCustom tMutation = dis.registerMutation(ENDERIUM, STARDUST, 4);
+        tMutation.restrictHumidity(ARID);
+        if (HardcoreEnderExpansion.isModLoaded())
+            tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "ender_goo"), 0);
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(1, "End")); // End Dim
+    }),
+    SILVERFISH(GTBranchDefinition.HEE, "Silverfisch", true, new Color(0xEE053D), new Color(0x000000), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.SILVERFISH), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setHasEffect();
@@ -1621,17 +1614,17 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.restrictHumidity(ARID);
         if (HardcoreEnderExpansion.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "ender_goo"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(1, "End")); // End Dim
     }),
-    RUNE(GT_BranchDefinition.HEE, "Rune", true, new Color(0xE31010), new Color(0x0104D9), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.RUNEI), 0.025f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.RUNEII), 0.0125f);
+    RUNE(GTBranchDefinition.HEE, "Rune", true, new Color(0xE31010), new Color(0x0104D9), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.RUNEI), 0.025f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.RUNEII), 0.0125f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HELLISH);
         beeSpecies.setHasEffect();
     }, template -> {
-        AlleleHelper.instance.set(template, LIFESPAN, GT_Bees.superLife);
+        AlleleHelper.instance.set(template, LIFESPAN, GTBees.superLife);
         AlleleHelper.instance.set(template, EFFECT, getEffect(MAGICBEES, "SlowSpeed"));
         AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE);
         AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE);
@@ -1641,11 +1634,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.restrictHumidity(ARID);
         if (EnderStorage.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(EnderStorage.ID, "enderChest"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(1, "End")); // End Dim
     }),
     // Walrus Bee, 100% Combchance, Parents: Catty and Watery
-    WALRUS(GT_BranchDefinition.PLANET, "Walrus", true, new Color(0xD6D580), new Color(0xB5CFC9), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.WALRUS), 1.00f);
+    WALRUS(GTBranchDefinition.PLANET, "Walrus", true, new Color(0xD6D580), new Color(0xB5CFC9), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.WALRUS), 1.00f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setHasEffect();
@@ -1662,9 +1655,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             tMutation.requireResource(GameRegistry.findBlock(ExtraCells2.ID, "walrus"), 0);
         }
     }),
-    MACHINIST(GT_BranchDefinition.ORGANIC, "Machinist", true, new Color(85, 37, 130), new Color(253, 185, 39),
+    MACHINIST(GTBranchDefinition.ORGANIC, "Machinist", true, new Color(85, 37, 130), new Color(253, 185, 39),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MACHINIST), 0.2f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.MACHINIST), 0.2f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(NORMAL);
             beeSpecies.setHasEffect();
@@ -1674,17 +1667,17 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.BOTH_1);
             AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1);
             AlleleHelper.instance.set(template, NOCTURNAL, true);
-            AlleleHelper.instance.set(template, FLOWER_PROVIDER, GT_Flowers.FLAMING);
+            AlleleHelper.instance.set(template, FLOWER_PROVIDER, GTFlowers.FLAMING);
             AlleleHelper.instance.set(template, FERTILITY, Fertility.MAXIMUM);
             AlleleHelper.instance.set(template, EFFECT, getEffect(GREGTECH, "MachineBoost"));
         }, dis -> {
             IBeeMutationCustom tMutation = dis
                 .registerMutation(getSpecies(FORESTRY, "Industrious"), getSpecies(FORESTRY, "Imperial"), 1);
-            tMutation.addMutationCondition(new GT_Bees.ActiveGTMachineMutationCondition());
+            tMutation.addMutationCondition(new GTBees.ActiveGTMachineMutationCondition());
         }),
     // Space Bees
-    SPACE(GT_BranchDefinition.SPACE, "Space", true, new Color(0x003366), new Color(0xC0C0C0), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.02f);
+    SPACE(GTBranchDefinition.SPACE, "Space", true, new Color(0x003366), new Color(0xC0C0C0), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SPACE), 0.02f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setNocturnal();
@@ -1693,70 +1686,70 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             .registerMutation(getSpecies(FORESTRY, "Industrious"), getSpecies(FORESTRY, "Heroic"), 10);
         tMutation.restrictTemperature(ICY);
     }),
-    METEORICIRON(GT_BranchDefinition.SPACE, "MeteoricIron", true, new Color(0x321928), new Color(0x643250),
+    METEORICIRON(GTBranchDefinition.SPACE, "MeteoricIron", true, new Color(0x321928), new Color(0x643250),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.04f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.METEORICIRON), 0.10f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SPACE), 0.04f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.METEORICIRON), 0.10f);
             beeSpecies.setHumidity(ARID);
             beeSpecies.setTemperature(HOT);
             beeSpecies.setNocturnal();
         }, template -> {}, dis -> {
             IBeeMutationCustom tMutation = dis.registerMutation(SPACE, IRON, 9);
-            tMutation.requireResource(GregTech_API.sBlockMetal4, 7);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(28, "Moon")); // Moon Dim
+            tMutation.requireResource(GregTechAPI.sBlockMetal4, 7);
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(28, "Moon")); // Moon Dim
         }),
-    DESH(GT_BranchDefinition.SPACE, "Desh", false, new Color(0x323232), new Color(0x282828), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.06f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DESH), 0.10f);
+    DESH(GTBranchDefinition.SPACE, "Desh", false, new Color(0x323232), new Color(0x282828), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SPACE), 0.06f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.DESH), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
         beeSpecies.setNocturnal();
     }, template -> AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectIgnition), new Consumer<>() {
 
         @Override
-        public void accept(GT_BeeDefinition dis) {
+        public void accept(GTBeeDefinition dis) {
             IBeeMutationCustom tMutation = dis.registerMutation(MARS, TITANIUM, 9);
-            tMutation.requireResource(GregTech_API.sBlockMetal2, 12);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(29, "Mars")); // Mars Dim
+            tMutation.requireResource(GregTechAPI.sBlockMetal2, 12);
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(29, "Mars")); // Mars Dim
         }
     }),
-    LEDOX(GT_BranchDefinition.SPACE, "Ledox", false, new Color(0x0000CD), new Color(0x0074FF), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.10f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LEDOX), 0.10f);
+    LEDOX(GTBranchDefinition.SPACE, "Ledox", false, new Color(0x0000CD), new Color(0x0074FF), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SPACE), 0.10f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.LEDOX), 0.10f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(COLD);
         beeSpecies.setHasEffect();
     }, template -> AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "freezing")), new Consumer<>() {
 
         @Override
-        public void accept(GT_BeeDefinition dis) {
+        public void accept(GTBeeDefinition dis) {
             IBeeMutationCustom tMutation = dis.registerMutation(CALLISTO, LEAD, 7);
             if (NewHorizonsCoreMod.isModLoaded())
                 tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.Ledox"), 0);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(35, "Europa")); // Europa Dim
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(35, "Europa")); // Europa Dim
         }
     }),
-    CALLISTOICE(GT_BranchDefinition.SPACE, "CallistoIce", false, new Color(0x0074FF), new Color(0x1EB1FF),
+    CALLISTOICE(GTBranchDefinition.SPACE, "CallistoIce", false, new Color(0x0074FF), new Color(0x1EB1FF),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.10f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CALLISTOICE), 0.10f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SPACE), 0.10f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.CALLISTOICE), 0.10f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(ICY);
             beeSpecies.setHasEffect();
         }, template -> AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "freezing")), new Consumer<>() {
 
             @Override
-            public void accept(GT_BeeDefinition dis) {
+            public void accept(GTBeeDefinition dis) {
                 IBeeMutationCustom tMutation = dis.registerMutation(CALLISTO, getSpecies(EXTRABEES, "freezing"), 7);
                 if (NewHorizonsCoreMod.isModLoaded())
                     tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.CallistoColdIce"), 0);
-                tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(45, "Callisto")); // Callisto
+                tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(45, "Callisto")); // Callisto
                 // Dim
             }
         }),
-    MYTRYL(GT_BranchDefinition.SPACE, "Mytryl", false, new Color(0xDAA520), new Color(0xF26404), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.16f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MYTRYL), 0.10f);
+    MYTRYL(GTBranchDefinition.SPACE, "Mytryl", false, new Color(0xDAA520), new Color(0xF26404), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SPACE), 0.16f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.MYTRYL), 0.10f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setNocturnal();
@@ -1764,16 +1757,16 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     }, template -> {}, new Consumer<>() {
 
         @Override
-        public void accept(GT_BeeDefinition dis) {
+        public void accept(GTBeeDefinition dis) {
             IBeeMutationCustom tMutation = dis.registerMutation(IO, MITHRIL, 6);
             if (NewHorizonsCoreMod.isModLoaded())
                 tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.Mytryl"), 0);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(36, "IO")); // IO Dim
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(36, "IO")); // IO Dim
         }
     }),
-    QUANTIUM(GT_BranchDefinition.SPACE, "Quantium", false, new Color(0x00FF00), new Color(0x00D10B), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.16f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.QUANTIUM), 0.10f);
+    QUANTIUM(GTBranchDefinition.SPACE, "Quantium", false, new Color(0x00FF00), new Color(0x00D10B), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SPACE), 0.16f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.QUANTIUM), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
         beeSpecies.setNocturnal();
@@ -1781,33 +1774,33 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     }, template -> {}, new Consumer<>() {
 
         @Override
-        public void accept(GT_BeeDefinition dis) {
+        public void accept(GTBeeDefinition dis) {
             IBeeMutationCustom tMutation = dis.registerMutation(VENUS, OSMIUM, 6);
             if (NewHorizonsCoreMod.isModLoaded())
                 tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.Quantinum"), 0);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(39, "Venus")); // Venus Dim
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(39, "Venus")); // Venus Dim
         }
     }),
-    ORIHARUKON(GT_BranchDefinition.SPACE, "Oriharukon", false, new Color(0x228B22), new Color(0x677D68), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.26f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ORIHARUKON), 0.10f);
+    ORIHARUKON(GTBranchDefinition.SPACE, "Oriharukon", false, new Color(0x228B22), new Color(0x677D68), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SPACE), 0.26f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ORIHARUKON), 0.10f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(COLD);
         beeSpecies.setHasEffect();
     }, template -> {}, new Consumer<>() {
 
         @Override
-        public void accept(GT_BeeDefinition dis) {
+        public void accept(GTBeeDefinition dis) {
             IBeeMutationCustom tMutation = dis.registerMutation(LEAD, OBERON, 5);
             if (GalaxySpace.isModLoaded())
                 tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "metalsblock"), 6);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(46, "Oberon")); // Oberon Dim
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(46, "Oberon")); // Oberon Dim
         }
     }),
-    INFUSEDGOLD(GT_BranchDefinition.SPACE, "Infused Gold", false, new Color(0x80641E), new Color(0xFFC83C),
+    INFUSEDGOLD(GTBranchDefinition.SPACE, "Infused Gold", false, new Color(0x80641E), new Color(0xFFC83C),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.GOLD), 0.20f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.INFUSEDGOLD), 0.30f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.GOLD), 0.20f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.INFUSEDGOLD), 0.30f);
             beeSpecies.setHumidity(DAMP);
             beeSpecies.setTemperature(ICY);
             beeSpecies.setNocturnal();
@@ -1815,16 +1808,16 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         }, template -> {}, new Consumer<>() {
 
             @Override
-            public void accept(GT_BeeDefinition dis) {
+            public void accept(GTBeeDefinition dis) {
                 IBeeMutationCustom tMutation = dis.registerMutation(GOLD, HAUMEA, 5);
-                tMutation.requireResource(GregTech_API.sBlockMetal3, 10);
-                tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(83, "Haumea")); // Haumea Dim
+                tMutation.requireResource(GregTechAPI.sBlockMetal3, 10);
+                tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(83, "Haumea")); // Haumea Dim
             }
         }),
-    MYSTERIOUSCRYSTAL(GT_BranchDefinition.SPACE, "MysteriousCrystal", false, new Color(0x3CB371), new Color(0x16856C),
+    MYSTERIOUSCRYSTAL(GTBranchDefinition.SPACE, "MysteriousCrystal", false, new Color(0x3CB371), new Color(0x16856C),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.42f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.MYSTERIOUSCRYSTAL), 0.30f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SPACE), 0.42f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.MYSTERIOUSCRYSTAL), 0.30f);
             beeSpecies.setHumidity(ARID);
             beeSpecies.setTemperature(ICY);
             beeSpecies.setNocturnal();
@@ -1832,18 +1825,18 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         }, template -> {}, new Consumer<>() {
 
             @Override
-            public void accept(GT_BeeDefinition dis) {
+            public void accept(GTBeeDefinition dis) {
                 IBeeMutationCustom tMutation = dis.registerMutation(ENCELADUS, EMERALD, 3);
                 if (NewHorizonsCoreMod.isModLoaded()) tMutation
                     .requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.MysteriousCrystal"), 0);
-                tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(41, "Enceladus")); // Enceladus
+                tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(41, "Enceladus")); // Enceladus
                 // Dim
             }
         }),
-    BLACKPLUTONIUM(GT_BranchDefinition.SPACE, "BlackPlutonium", false, new Color(0x000000), new Color(0x323232),
+    BLACKPLUTONIUM(GTBranchDefinition.SPACE, "BlackPlutonium", false, new Color(0x000000), new Color(0x323232),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.68f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.BLACKPLUTONIUM), 0.10f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SPACE), 0.68f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.BLACKPLUTONIUM), 0.10f);
             beeSpecies.setHumidity(ARID);
             beeSpecies.setTemperature(HELLISH);
             beeSpecies.setNocturnal();
@@ -1851,34 +1844,34 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         }, template -> {}, new Consumer<>() {
 
             @Override
-            public void accept(GT_BeeDefinition dis) {
+            public void accept(GTBeeDefinition dis) {
                 IBeeMutationCustom tMutation = dis.registerMutation(PLUTO, PLUTONIUM, 2);
                 if (NewHorizonsCoreMod.isModLoaded())
                     tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.BlackPlutonium"), 0);
-                tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(49, "Pluto")); // Pluto Dim
+                tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(49, "Pluto")); // Pluto Dim
             }
         }),
-    TRINIUM(GT_BranchDefinition.SPACE, "Trinium", false, new Color(0xB0E0E6), new Color(0xC8C8D2), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TRINIUM), 0.75f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.QUANTIUM), 0.10f);
+    TRINIUM(GTBranchDefinition.SPACE, "Trinium", false, new Color(0xB0E0E6), new Color(0xC8C8D2), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.TRINIUM), 0.75f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.QUANTIUM), 0.10f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(COLD);
         beeSpecies.setNocturnal();
         beeSpecies.setHasEffect();
-    }, template -> AlleleHelper.instance.set(template, SPEED, GT_Bees.speedBlinding), new Consumer<>() {
+    }, template -> AlleleHelper.instance.set(template, SPEED, GTBees.speedBlinding), new Consumer<>() {
 
         @Override
-        public void accept(GT_BeeDefinition dis) {
+        public void accept(GTBeeDefinition dis) {
             IBeeMutationCustom tMutation = dis.registerMutation(ENCELADUS, IRIDIUM, 4);
-            tMutation.requireResource(GregTech_API.sBlockMetal4, 9);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(41, "Enceladus")); // Enceladus Dim
+            tMutation.requireResource(GregTechAPI.sBlockMetal4, 9);
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(41, "Enceladus")); // Enceladus Dim
         }
     }),
     // Planet Line
-    MOON(GT_BranchDefinition.PLANET, "Moon", false, new Color(0x373735), new Color(0x7E7E78), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MOON), 0.35f);
+    MOON(GTBranchDefinition.PLANET, "Moon", false, new Color(0x373735), new Color(0x7E7E78), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.MOON), 0.35f);
         if (NewHorizonsCoreMod.isModLoaded())
-            beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MoonStoneDust", 1, 0), 0.10f);
+            beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MoonStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(COLD);
         beeSpecies.setNocturnal();
@@ -1888,11 +1881,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         if (GalacticraftCore.isModLoaded()) {
             tMutation.requireResource(GameRegistry.findBlock(GalacticraftCore.ID, "tile.moonBlock"), 4);
         }
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(28, "Moon")); // Moon Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(28, "Moon")); // Moon Dim
     }),
-    MARS(GT_BranchDefinition.PLANET, "Mars", false, new Color(0x220D05), new Color(0x3A1505), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.35f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MarsStoneDust", 1, 0), 0.10f);
+    MARS(GTBranchDefinition.PLANET, "Mars", false, new Color(0x220D05), new Color(0x3A1505), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.MARS), 0.35f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MarsStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
         beeSpecies.setNocturnal();
@@ -1902,12 +1895,12 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         if (GalacticraftMars.isModLoaded()) {
             tMutation.requireResource(GameRegistry.findBlock(GalacticraftMars.ID, "tile.mars"), 5);
         }
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(29, "Mars")); // Mars Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(29, "Mars")); // Mars Dim
     }),
-    PHOBOS(GT_BranchDefinition.PLANET, "Phobos", true, new Color(0x220D05), new Color(0x7a5706), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.25f);
+    PHOBOS(GTBranchDefinition.PLANET, "Phobos", true, new Color(0x220D05), new Color(0x7a5706), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.MARS), 0.25f);
         if (NewHorizonsCoreMod.isModLoaded()) beeSpecies
-            .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PhobosStoneDust", 1, 0), 0.10f);
+            .addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PhobosStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
         beeSpecies.setNocturnal();
@@ -1915,11 +1908,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(MARS, MOON, 20);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "phobosblocks"), 2);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(38, "Phobos")); // Phobos Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(38, "Phobos")); // Phobos Dim
     }),
-    DEIMOS(GT_BranchDefinition.PLANET, "Deimos", true, new Color(0x220D05), new Color(0x7a3206), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.25f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.DeimosStoneDust", 1, 0), 0.10f);
+    DEIMOS(GTBranchDefinition.PLANET, "Deimos", true, new Color(0x220D05), new Color(0x7a3206), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.MARS), 0.25f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.DeimosStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(HOT);
         beeSpecies.setNocturnal();
@@ -1927,11 +1920,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(MARS, SPACE, 20);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "deimosblocks"), 1);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(40, "Deimos")); // Deimos Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(40, "Deimos")); // Deimos Dim
     }),
-    CERES(GT_BranchDefinition.PLANET, "Ceres", true, new Color(0x3ca5b7), new Color(0x1e7267), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CeresStoneDust", 1, 0), 0.10f);
+    CERES(GTBranchDefinition.PLANET, "Ceres", true, new Color(0x3ca5b7), new Color(0x1e7267), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.JUPITER), 0.25f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CeresStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
         beeSpecies.setNocturnal();
@@ -1939,16 +1932,16 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(MARS, METEORICIRON, 20);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "ceresblocks"), 1);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(42, "Ceres")); // Ceres Dim
-    }),
-    JUPITER(GT_BranchDefinition.PLANET, "Jupiter", false, new Color(0x734B2E), new Color(0xD0CBC4), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.35f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1, 0), 0.05f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoIceDust", 1, 0), 0.05f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1, 0), 0.05f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1, 0), 0.05f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1, 0), 0.05f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1, 0), 0.05f);
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(42, "Ceres")); // Ceres Dim
+    }),
+    JUPITER(GTBranchDefinition.PLANET, "Jupiter", false, new Color(0x734B2E), new Color(0xD0CBC4), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.JUPITER), 0.35f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1, 0), 0.05f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoIceDust", 1, 0), 0.05f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1, 0), 0.05f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1, 0), 0.05f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1, 0), 0.05f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1, 0), 0.05f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
         beeSpecies.setNocturnal();
@@ -1957,23 +1950,23 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(MARS, DESH, 15);
         if (NewHorizonsCoreMod.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.Ledox"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteroids")); // Asteroid Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(30, "Asteroids")); // Asteroid Dim
     }),
-    IO(GT_BranchDefinition.PLANET, "IO", true, new Color(0x734B2E), new Color(0xe5701b), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1, 0), 0.10f);
+    IO(GTBranchDefinition.PLANET, "IO", true, new Color(0x734B2E), new Color(0xe5701b), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.JUPITER), 0.25f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HELLISH);
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, getSpecies(EXTRABEES, "volcanic"), 15);
         tMutation.restrictTemperature(HELLISH);
         if (GalaxySpace.isModLoaded()) tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "ioblocks"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(36, "IO")); // IO Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(36, "IO")); // IO Dim
     }),
-    EUROPA(GT_BranchDefinition.PLANET, "Europa", true, new Color(0x5982ea), new Color(0x0b36a3), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1, 0), 0.10f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1, 0), 0.10f);
+    EUROPA(GTBranchDefinition.PLANET, "Europa", true, new Color(0x5982ea), new Color(0x0b36a3), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.JUPITER), 0.25f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1, 0), 0.10f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setNocturnal();
@@ -1982,23 +1975,23 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.restrictTemperature(ICY);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "europagrunt"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(35, "Europa")); // Europa Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(35, "Europa")); // Europa Dim
     }),
-    GANYMEDE(GT_BranchDefinition.PLANET, "Ganymede", true, new Color(0x3d1b10), new Color(0x190c07), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1, 0), 0.10f);
+    GANYMEDE(GTBranchDefinition.PLANET, "Ganymede", true, new Color(0x3d1b10), new Color(0x190c07), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.JUPITER), 0.25f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(COLD);
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, TITANIUM, 15);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "ganymedeblocks"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(43, "Ganymede")); // Ganymede Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(43, "Ganymede")); // Ganymede Dim
     }),
-    CALLISTO(GT_BranchDefinition.PLANET, "Callisto", true, new Color(0x0f333d), new Color(0x0d84a5), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1, 0), 0.10f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoIceDust", 1, 0), 0.10f);
+    CALLISTO(GTBranchDefinition.PLANET, "Callisto", true, new Color(0x0f333d), new Color(0x0d84a5), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.JUPITER), 0.25f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1, 0), 0.10f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoIceDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setNocturnal();
@@ -2006,14 +1999,13 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, getSpecies(EXTRABEES, "artic"), 15);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "callistoblocks"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(45, "Callisto")); // Callisto Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(45, "Callisto")); // Callisto Dim
     }),
-    SATURN(GT_BranchDefinition.PLANET, "Saturn", false, new Color(0xD2A472), new Color(0xF8C37B), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.35f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1, 0), 0.05f);
-        beeSpecies
-            .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1, 0), 0.05f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusIceDust", 1, 0), 0.05f);
+    SATURN(GTBranchDefinition.PLANET, "Saturn", false, new Color(0xD2A472), new Color(0xF8C37B), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SATURN), 0.35f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1, 0), 0.05f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1, 0), 0.05f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusIceDust", 1, 0), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(COLD);
         beeSpecies.setHasEffect();
@@ -2021,13 +2013,12 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, LEDOX, 25, 2);
         if (NewHorizonsCoreMod.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.Quantinum"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteriods")); // Asteriods Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(30, "Asteriods")); // Asteriods Dim
     }),
-    ENCELADUS(GT_BranchDefinition.PLANET, "Enceladus", true, new Color(0xD2A472), new Color(0x193fa0), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.25f);
-        beeSpecies
-            .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1, 0), 0.10f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusIceDust", 1, 0), 0.10f);
+    ENCELADUS(GTBranchDefinition.PLANET, "Enceladus", true, new Color(0xD2A472), new Color(0x193fa0), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SATURN), 0.25f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1, 0), 0.10f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusIceDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setHasEffect();
@@ -2035,23 +2026,23 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(SATURN, CHROME, 25, 2);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "enceladusblocks"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(41, "Enceladus")); // Enceladus Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(41, "Enceladus")); // Enceladus Dim
     }),
-    TITAN(GT_BranchDefinition.PLANET, "Titan", true, new Color(0xa0641b), new Color(0x7c1024), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.25f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1, 0), 0.10f);
+    TITAN(GTBranchDefinition.PLANET, "Titan", true, new Color(0xa0641b), new Color(0x7c1024), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SATURN), 0.25f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(SATURN, NICKEL, 25, 2);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "titanblocks"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(44, "Titan")); // Titan Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(44, "Titan")); // Titan Dim
     }),
-    URANUS(GT_BranchDefinition.PLANET, "Uranus", false, new Color(0x75C0C9), new Color(0x84D8EC), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.35f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1, 0), 0.05f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1, 0), 0.05f);
+    URANUS(GTBranchDefinition.PLANET, "Uranus", false, new Color(0x75C0C9), new Color(0x84D8EC), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.URANUS), 0.35f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1, 0), 0.05f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1, 0), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setHasEffect();
@@ -2059,11 +2050,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(SATURN, TRINIUM, 10);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "metalsblock"), 6);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteroids")); // Asteroids Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(30, "Asteroids")); // Asteroids Dim
     }),
-    MIRANDA(GT_BranchDefinition.PLANET, "Miranda", true, new Color(0x75C0C9), new Color(0x0d211c), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.25f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1, 0), 0.10f);
+    MIRANDA(GTBranchDefinition.PLANET, "Miranda", true, new Color(0x75C0C9), new Color(0x0d211c), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.URANUS), 0.25f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setNocturnal();
@@ -2071,23 +2062,23 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(URANUS, TIN, 10);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "mirandablocks"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(86, "Miranda")); // Miranda Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(86, "Miranda")); // Miranda Dim
     }),
-    OBERON(GT_BranchDefinition.PLANET, "Oberon", true, new Color(0x4A4033), new Color(0xB5A288), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.25f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1, 0), 0.10f);
+    OBERON(GTBranchDefinition.PLANET, "Oberon", true, new Color(0x4A4033), new Color(0xB5A288), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.URANUS), 0.25f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(ICY);
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(URANUS, IRIDIUM, 10);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "oberonblocks"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(46, "Oberon")); // Oberon Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(46, "Oberon")); // Oberon Dim
     }),
-    NEPTUNE(GT_BranchDefinition.PLANET, "Neptune", false, new Color(0x334CFF), new Color(0x576DFF), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUNE), 0.35f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1, 0), 0.05f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1, 0), 0.05f);
+    NEPTUNE(GTBranchDefinition.PLANET, "Neptune", false, new Color(0x334CFF), new Color(0x576DFF), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.NEPTUNE), 0.35f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1, 0), 0.05f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1, 0), 0.05f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(COLD);
         beeSpecies.setNocturnal();
@@ -2096,11 +2087,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(URANUS, ORIHARUKON, 7);
         if (NewHorizonsCoreMod.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.MysteriousCrystal"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteroids")); // Asteroids Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(30, "Asteroids")); // Asteroids Dim
     }),
-    PROTEUS(GT_BranchDefinition.PLANET, "Proteus", true, new Color(0x334CFF), new Color(0x592610), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUNE), 0.25f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1, 0), 0.10f);
+    PROTEUS(GTBranchDefinition.PLANET, "Proteus", true, new Color(0x334CFF), new Color(0x592610), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.NEPTUNE), 0.25f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(COLD);
         beeSpecies.setNocturnal();
@@ -2108,11 +2099,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(NEPTUNE, COPPER, 7);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "proteusblocks"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(47, "Proteus")); // Proteus Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(47, "Proteus")); // Proteus Dim
     }),
-    TRITON(GT_BranchDefinition.PLANET, "Triton", true, new Color(0x334CFF), new Color(0x421118), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUNE), 0.25f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1, 0), 0.10f);
+    TRITON(GTBranchDefinition.PLANET, "Triton", true, new Color(0x334CFF), new Color(0x421118), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.NEPTUNE), 0.25f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setNocturnal();
@@ -2120,12 +2111,12 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(NEPTUNE, GOLD, 7);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "tritonblocks"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(48, "Triton")); // Triton Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(48, "Triton")); // Triton Dim
     }),
-    PLUTO(GT_BranchDefinition.PLANET, "Pluto", false, new Color(0x34271E), new Color(0x69503D), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PLUTO), 0.35f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoStoneDust", 1, 0), 0.10f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoIceDust", 1, 0), 0.10f);
+    PLUTO(GTBranchDefinition.PLANET, "Pluto", false, new Color(0x34271E), new Color(0x69503D), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.PLUTO), 0.35f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoStoneDust", 1, 0), 0.10f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoIceDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setNocturnal();
@@ -2134,34 +2125,34 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(NEPTUNE, PLUTONIUM, 5);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "plutoblocks"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(49, "Pluto")); // Pluto Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(49, "Pluto")); // Pluto Dim
     }),
-    HAUMEA(GT_BranchDefinition.PLANET, "Haumea", false, new Color(0x1C1413), new Color(0x392B28), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.HAUMEA), 0.35f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HaumeaStoneDust", 1, 0), 0.10f);
+    HAUMEA(GTBranchDefinition.PLANET, "Haumea", false, new Color(0x1C1413), new Color(0x392B28), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.HAUMEA), 0.35f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HaumeaStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(ICY);
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(PLUTO, NAQUADAH, 7, 2);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "haumeablocks"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(83, "Haumea")); // Haumea Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(83, "Haumea")); // Haumea Dim
     }),
-    MAKEMAKE(GT_BranchDefinition.PLANET, "MakeMake", false, new Color(0x301811), new Color(0x120A07), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MAKEMAKE), 0.35f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MakeMakeStoneDust", 1, 0), 0.10f);
+    MAKEMAKE(GTBranchDefinition.PLANET, "MakeMake", false, new Color(0x301811), new Color(0x120A07), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.MAKEMAKE), 0.35f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MakeMakeStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(PLUTO, NAQUADRIA, 7, 2);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "makemakegrunt"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(25, "MakeMake")); // MakeMake Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(25, "MakeMake")); // MakeMake Dim
     }),
-    CENTAURI(GT_BranchDefinition.PLANET, "Centauri", false, new Color(0x2F2A14), new Color(0xB06B32), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CENTAURI), 0.35f);
+    CENTAURI(GTBranchDefinition.PLANET, "Centauri", false, new Color(0x2F2A14), new Color(0xB06B32), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.CENTAURI), 0.35f);
         beeSpecies
-            .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriASurfaceDust", 1, 0), 0.05f);
+            .addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriASurfaceDust", 1, 0), 0.05f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HELLISH);
         beeSpecies.setHasEffect();
@@ -2169,27 +2160,27 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, DESH, 3);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "acentauribbgrunt"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim
     }),
-    ACENTAURI(GT_BranchDefinition.PLANET, "aCentauri", false, new Color(0x2F2A14), new Color(0xa01e14), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CENTAURI), 0.25f);
+    ACENTAURI(GTBranchDefinition.PLANET, "aCentauri", false, new Color(0x2F2A14), new Color(0xa01e14), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.CENTAURI), 0.25f);
         beeSpecies
-            .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriASurfaceDust", 1, 0), 0.10f);
+            .addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriASurfaceDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HELLISH);
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), new Consumer<>() {
 
         @Override
-        public void accept(GT_BeeDefinition dis) {
+        public void accept(GTBeeDefinition dis) {
             IBeeMutationCustom tMutation = dis.registerMutation(CENTAURI, INFINITYCATALYST, 3);
             if (GalaxySpace.isModLoaded())
                 tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "acentauribbgrunt"), 0);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(31, "aCentauri")); // aCentauri Dim
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(31, "aCentauri")); // aCentauri Dim
         }
     }),
-    TCETI(GT_BranchDefinition.PLANET, "tCeti", false, new Color(0x46241A), new Color(0x7B412F), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TCETI), 0.35f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, 0), 0.05f);
+    TCETI(GTBranchDefinition.PLANET, "tCeti", false, new Color(0x46241A), new Color(0x7B412F), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.TCETI), 0.35f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, 0), 0.05f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setNocturnal();
@@ -2198,11 +2189,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, HAUMEA, 5, 2);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "tcetieblocks"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim
     }),
-    TCETIE(GT_BranchDefinition.PLANET, "tCetiE", false, new Color(0x2d561b), new Color(0x0c0f60), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TCETI), 0.25f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, 0), 0.10f);
+    TCETIE(GTBranchDefinition.PLANET, "tCetiE", false, new Color(0x2d561b), new Color(0x0c0f60), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.TCETI), 0.25f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setHasEffect();
@@ -2210,12 +2201,12 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(TCETI, getSpecies(MAGICBEES, "TCWater"), 5, 2);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "tcetieblocks"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(85, "tCeti E")); // tCeti E Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(85, "tCeti E")); // tCeti E Dim
     }),
     // Parents: TCETI and TCETIE, 25% combchance, needs Damp Humidity and Normal temperature. Is Mycophilic
-    SEAWEED(GT_BranchDefinition.PLANET, "SeaWeed", true, new Color(0xCBCBCB), new Color(0x83FF83), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SEAWEED), 0.25f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, 0), 0.15f);
+    SEAWEED(GTBranchDefinition.PLANET, "SeaWeed", true, new Color(0xCBCBCB), new Color(0x83FF83), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SEAWEED), 0.25f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, 0), 0.15f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setHasEffect();
@@ -2230,15 +2221,13 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(TCETI, TCETIE, 5, 2);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "tcetieblocks"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(85, "tCeti E")); // tCeti E Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(85, "tCeti E")); // tCeti E Dim
     }),
 
-    BARNARDA(GT_BranchDefinition.PLANET, "Barnarda", false, new Color(0x0D5A0D), new Color(0xE6C18D), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.35f);
-        beeSpecies
-            .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1, 0), 0.05f);
-        beeSpecies
-            .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1, 0), 0.05f);
+    BARNARDA(GTBranchDefinition.PLANET, "Barnarda", false, new Color(0x0D5A0D), new Color(0xE6C18D), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.BARNARDA), 0.35f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1, 0), 0.05f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1, 0), 0.05f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
         beeSpecies.setHasEffect();
@@ -2246,10 +2235,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, THORIUM, 3, 2);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "barnardaEgrunt"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim
     }),
-    BARNARDAC(GT_BranchDefinition.PLANET, "BarnardaC", false, new Color(0x0D5A0D), new Color(0x473f0a), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.25f);
+    BARNARDAC(GTBranchDefinition.PLANET, "BarnardaC", false, new Color(0x0D5A0D), new Color(0x473f0a), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.BARNARDA), 0.25f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
     }, template -> {
@@ -2259,38 +2248,36 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(BARNARDA, AMERICIUM, 3, 2);
         if (GalaxySpace.isModLoaded()) {
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "barnardaEgrunt"), 0);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(32, "Barnarda C")); // Barnarda C Dim
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(32, "Barnarda C")); // Barnarda C Dim
         }
     }),
-    BARNARDAE(GT_BranchDefinition.PLANET, "BarnardaE", false, new Color(0x0D5A0D), new Color(0x4c1f0a), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.25f);
-        beeSpecies
-            .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1, 0), 0.10f);
+    BARNARDAE(GTBranchDefinition.PLANET, "BarnardaE", false, new Color(0x0D5A0D), new Color(0x4c1f0a), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.BARNARDA), 0.25f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(BARNARDA, DIVIDED, 3, 2);
         if (GalaxySpace.isModLoaded()) {
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "barnardaEgrunt"), 0);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(81, "Barnard E")); // "Barnard E Dim
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(81, "Barnard E")); // "Barnard E Dim
         }
     }),
-    BARNARDAF(GT_BranchDefinition.PLANET, "BarnardaF", false, new Color(0x0D5A0D), new Color(0x1e0b49), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.25f);
-        beeSpecies
-            .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1, 0), 0.10f);
+    BARNARDAF(GTBranchDefinition.PLANET, "BarnardaF", false, new Color(0x0D5A0D), new Color(0x1e0b49), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.BARNARDA), 0.25f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(BARNARDA, NEUTRONIUM, 3, 2);
         if (GalaxySpace.isModLoaded()) {
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "barnardaFgrunt"), 0);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(82, "Barnard F")); // "Barnard F Dim
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(82, "Barnard F")); // "Barnard F Dim
         }
     }),
-    VEGA(GT_BranchDefinition.PLANET, "Vega", false, new Color(0x1A2036), new Color(0xB5C0DE), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.VEGA), 0.35f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1, 0), 0.05f);
+    VEGA(GTBranchDefinition.PLANET, "Vega", false, new Color(0x1A2036), new Color(0xB5C0DE), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.VEGA), 0.35f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1, 0), 0.05f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(COLD);
         beeSpecies.setHasEffect();
@@ -2298,25 +2285,25 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, NAQUADAH, 2);
         if (GalaxySpace.isModLoaded()) {
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "vegabgrunt"), 0);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt
-                                                                                                       // Dim
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt
+                                                                                                      // Dim
         }
     }),
-    VEGAB(GT_BranchDefinition.PLANET, "VegaB", false, new Color(0x1A2036), new Color(0x81e261), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.VEGA), 0.35f);
-        if (NewHorizonsCoreMod.isModLoaded()) beeSpecies
-            .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1, 0), 0.10f);
+    VEGAB(GTBranchDefinition.PLANET, "VegaB", false, new Color(0x1A2036), new Color(0x81e261), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.VEGA), 0.35f);
+        if (NewHorizonsCoreMod.isModLoaded())
+            beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1, 0), 0.10f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(COLD);
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(VEGA, NAQUADRIA, 2);
         if (GalaxySpace.isModLoaded()) {
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "vegabgrunt"), 0);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(84, "VegaB")); // VegaB Dim
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(84, "VegaB")); // VegaB Dim
         }
     }),
-    MERCURY(GT_BranchDefinition.PLANET, "Mercury", false, new Color(0x4A4033), new Color(0xB5A288), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MERCURY), 0.35f);
+    MERCURY(GTBranchDefinition.PLANET, "Mercury", false, new Color(0x4A4033), new Color(0xB5A288), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.MERCURY), 0.35f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HELLISH);
         beeSpecies.setHasEffect();
@@ -2324,10 +2311,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, TUNGSTEN, 25, 2);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "mercuryblocks"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(37, "Mercury")); // Mercury Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(37, "Mercury")); // Mercury Dim
     }),
-    VENUS(GT_BranchDefinition.PLANET, "Venus", false, new Color(0x4A4033), new Color(0xB5A288), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.VENUS), 0.35f);
+    VENUS(GTBranchDefinition.PLANET, "Venus", false, new Color(0x4A4033), new Color(0xB5A288), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.VENUS), 0.35f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HELLISH);
         beeSpecies.setHasEffect();
@@ -2335,33 +2322,33 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, MITHRIL, 25, 2);
         if (GalaxySpace.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "venusblocks"), 0);
-        tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(39, "Venus")); // Venus Dim
+        tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(39, "Venus")); // Venus Dim
     }),
 
     // Infinity Line
-    COSMICNEUTRONIUM(GT_BranchDefinition.PLANET, "CosmicNeutronium", false, new Color(0x484848), new Color(0x323232),
+    COSMICNEUTRONIUM(GTBranchDefinition.PLANET, "CosmicNeutronium", false, new Color(0x484848), new Color(0x323232),
         beeSpecies -> {
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.COSMICNEUTRONIUM), 0.375f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.COSMICNEUTRONIUM), 0.375f);
             beeSpecies.setHumidity(DAMP);
             beeSpecies.setTemperature(ICY);
             beeSpecies.setNocturnal();
             beeSpecies.setHasEffect();
             // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB
-            beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance);
+            beeSpecies.setJubilanceProvider(JubilanceMegaApiary.instance);
         }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
             IBeeMutationCustom tMutation = dis.registerMutation(NEUTRONIUM, BARNARDAF, 7, 10);
             if (Avaritia.isModLoaded())
                 tMutation.requireResource(GameRegistry.findBlock(Avaritia.ID, "Resource_Block"), 0);
         }),
-    INFINITYCATALYST(GT_BranchDefinition.PLANET, "InfinityCatalyst", false, new Color(0xFFFFFF), new Color(0xFFFFFF),
+    INFINITYCATALYST(GTBranchDefinition.PLANET, "InfinityCatalyst", false, new Color(0xFFFFFF), new Color(0xFFFFFF),
         beeSpecies -> {
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.INFINITYCATALYST), 0.015f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.INFINITYCATALYST), 0.015f);
             beeSpecies.setHumidity(DAMP);
             beeSpecies.setTemperature(HELLISH);
             beeSpecies.setNocturnal();
             beeSpecies.setHasEffect();
             // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB
-            beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance);
+            beeSpecies.setJubilanceProvider(JubilanceMegaApiary.instance);
         }, template -> {
             AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST);
             AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "blindness"));
@@ -2372,27 +2359,27 @@ public enum GT_BeeDefinition implements IBeeDefinition {
                 tMutation.requireResource(GameRegistry.findBlock(Avaritia.ID, "Resource_Block"), 1);
             }
         }),
-    INFINITY(GT_BranchDefinition.PLANET, "Infinity", false, new Color(0xFFFFFF), new Color(0xFFFFFF), beeSpecies -> {
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.INFINITY), 0.015f);
+    INFINITY(GTBranchDefinition.PLANET, "Infinity", false, new Color(0xFFFFFF), new Color(0xFFFFFF), beeSpecies -> {
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.INFINITY), 0.015f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setNocturnal();
         beeSpecies.setHasEffect();
         // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB
-        beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance);
+        beeSpecies.setJubilanceProvider(JubilanceMegaApiary.instance);
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(INFINITYCATALYST, COSMICNEUTRONIUM, 1, 10);
         if (AvaritiaAddons.isModLoaded()) {
             tMutation.requireResource(GameRegistry.findBlock(AvaritiaAddons.ID, "InfinityChest"), 0);
         }
     }),
-    KEVLAR(GT_BranchDefinition.IC2, "Kevlar", false, new Color(0x2d542f), new Color(0xa2baa3), beeSpecies -> {
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.KEVLAR), 0.075f);
+    KEVLAR(GTBranchDefinition.IC2, "Kevlar", false, new Color(0x2d542f), new Color(0xa2baa3), beeSpecies -> {
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.KEVLAR), 0.075f);
         beeSpecies.addSpecialty(MaterialsKevlar.Kevlar.getNuggets(1), 0.01f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(COLD);
         beeSpecies.setHasEffect();
-        beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance);
+        beeSpecies.setJubilanceProvider(JubilanceMegaApiary.instance);
     }, template -> {
         AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST);
         AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST);
@@ -2404,13 +2391,13 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     }, dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(OIL, INFINITYCATALYST, 4);
         // UHV Replicator (UU-Matter)
-        GregTech_API.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTech_API.sBlockMachines, 11003));
+        GregTechAPI.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTechAPI.sBlockMachines, 11003));
     }),
 
     // Noble Gas Line
     // Helium bee, Humidity: normal, Temperature: Icy, Parents: Space & Mars, Mutationrate: 10%, Combrate: 50%
-    HELIUM(GT_BranchDefinition.NOBLEGAS, "Helium", false, new Color(0xFFA9FF), new Color(0xC8B8B4), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.HELIUM), 0.35f);
+    HELIUM(GTBranchDefinition.NOBLEGAS, "Helium", false, new Color(0xFFA9FF), new Color(0xC8B8B4), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.HELIUM), 0.35f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setNocturnal();
@@ -2420,8 +2407,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.restrictTemperature(ICY);
     }),
     // Argon bee, Humidity: normal, Temperature: Icy, Parents: Helium & Phobos, Mutationrate: 8%, Combrate: 50%
-    ARGON(GT_BranchDefinition.NOBLEGAS, "Argon", false, new Color(0x89D9E1), new Color(0xBDA5C2), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.ARGON), 0.35f);
+    ARGON(GTBranchDefinition.NOBLEGAS, "Argon", false, new Color(0x89D9E1), new Color(0xBDA5C2), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.ARGON), 0.35f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setNocturnal();
@@ -2431,8 +2418,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.restrictTemperature(ICY);
     }),
     // Neon bee, Humidity: normal, Temperature: Icy, Parents: Xenon & Ceres, Mutationrate: 6%, Combrate: 50%
-    NEON(GT_BranchDefinition.NOBLEGAS, "Neon", false, new Color(0xFFC826), new Color(0xFF7200), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEON), 0.35f);
+    NEON(GTBranchDefinition.NOBLEGAS, "Neon", false, new Color(0xFFC826), new Color(0xFF7200), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.NEON), 0.35f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setNocturnal();
@@ -2442,8 +2429,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.restrictTemperature(ICY);
     }),
     // Krypton bee, Humidity: normal, Temperature: Icy, Parents: Neon & Jupiter, Mutationrate: 4%, Combrate: 50%
-    KRYPTON(GT_BranchDefinition.NOBLEGAS, "Krypton", false, new Color(0x8A97B0), new Color(0x160822), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.KRYPTON), 0.35f);
+    KRYPTON(GTBranchDefinition.NOBLEGAS, "Krypton", false, new Color(0x8A97B0), new Color(0x160822), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.KRYPTON), 0.35f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setNocturnal();
@@ -2453,22 +2440,22 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.restrictTemperature(ICY);
     }),
     // Xenon bee, Humidity: normal, Temperature: Icy, Parents: Argon & Deimos, Mutationrate: 6%, Combrate: 50%
-    XENON(GT_BranchDefinition.NOBLEGAS, "Xenon", false, new Color(0x8A97B0), new Color(0x160822), beeSpecies -> {
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.XENON), 0.525f);
+    XENON(GTBranchDefinition.NOBLEGAS, "Xenon", false, new Color(0x8A97B0), new Color(0x160822), beeSpecies -> {
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.XENON), 0.525f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setNocturnal();
         beeSpecies.setHasEffect();
         // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB
-        beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance);
+        beeSpecies.setJubilanceProvider(JubilanceMegaApiary.instance);
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(KRYPTON, SNOWQUEEN, 2);
         tMutation.restrictTemperature(ICY);
     }),
     // Oxygen bee, Humidity: normal, Temperature: Icy, Parents: Space & Callisto, Mutationrate: 15%, Combrate: 50%
-    OXYGEN(GT_BranchDefinition.NOBLEGAS, "Oxygen", false, new Color(0xFFFFFF), new Color(0x8F8FFF), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.OXYGEN), 0.45f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.HYDROGEN), 0.20f);
+    OXYGEN(GTBranchDefinition.NOBLEGAS, "Oxygen", false, new Color(0xFFFFFF), new Color(0x8F8FFF), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.OXYGEN), 0.45f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.HYDROGEN), 0.20f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setNocturnal();
@@ -2478,9 +2465,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.restrictTemperature(ICY);
     }),
     // Hydrogen bee, Humidity: normal, Temperature: Icy, Parents: Oxygen & Watery, Mutationrate: 15%, Combrate: 50%
-    HYDROGEN(GT_BranchDefinition.NOBLEGAS, "Oxygen", false, new Color(0xFFFFFF), new Color(0xFF1493), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.HYDROGEN), 0.45f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NITROGEN), 0.20f);
+    HYDROGEN(GTBranchDefinition.NOBLEGAS, "Oxygen", false, new Color(0xFFFFFF), new Color(0xFF1493), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.HYDROGEN), 0.45f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.NITROGEN), 0.20f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setNocturnal();
@@ -2490,9 +2477,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.restrictTemperature(ICY);
     }),
     // Nitrogen bee, Humidity: normal, Temperature: Icy, Parents: Oxygen & Hydrogen, Mutationrate: 15%, Combrate: 50%
-    NITROGEN(GT_BranchDefinition.NOBLEGAS, "Nitrogen", false, new Color(0xFFC832), new Color(0xA52A2A), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NITROGEN), 0.45f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FLUORINE), 0.20f);
+    NITROGEN(GTBranchDefinition.NOBLEGAS, "Nitrogen", false, new Color(0xFFC832), new Color(0xA52A2A), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.NITROGEN), 0.45f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.FLUORINE), 0.20f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setNocturnal();
@@ -2502,9 +2489,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.restrictTemperature(ICY);
     }),
     // Fluorine bee, Humidity: normal, Temperature: Icy, Parents: Nitrogen & Hydrogen, Mutationrate: 15%, Combrate: 50%
-    FLUORINE(GT_BranchDefinition.NOBLEGAS, "Fluorine", false, new Color(0x86AFF0), new Color(0xFF6D00), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.FLUORINE), 0.45f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OXYGEN), 0.20f);
+    FLUORINE(GTBranchDefinition.NOBLEGAS, "Fluorine", false, new Color(0x86AFF0), new Color(0xFF6D00), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.FLUORINE), 0.45f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.OXYGEN), 0.20f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(ICY);
         beeSpecies.setNocturnal();
@@ -2514,18 +2501,18 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         tMutation.restrictTemperature(ICY);
     }),
     // Europium line, needed after fluorine definition
-    RAREEARTH(GT_BranchDefinition.RAREMETAL, "RareEarth", false, new Color(0x555643), new Color(0x343428),
+    RAREEARTH(GTBranchDefinition.RAREMETAL, "RareEarth", false, new Color(0x555643), new Color(0x343428),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.RAREEARTH), 0.20f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NEODYMIUM), 0.05f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.RAREEARTH), 0.20f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.NEODYMIUM), 0.05f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(NORMAL);
         }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST),
         dis -> dis.registerMutation(FLUORINE, REDSTONE, 10)),
-    NEODYMIUM(GT_BranchDefinition.RAREMETAL, "Neodymium", false, new Color(0x555555), new Color(0x4F4F4F),
+    NEODYMIUM(GTBranchDefinition.RAREMETAL, "Neodymium", false, new Color(0x555555), new Color(0x4F4F4F),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.RAREEARTH), 0.15f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NEODYMIUM), 0.15f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.RAREEARTH), 0.15f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.NEODYMIUM), 0.15f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(HOT);
         }, template -> {
@@ -2533,27 +2520,27 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST);
         }, dis -> {
             IBeeMutationCustom tMutation = dis.registerMutation(RAREEARTH, IRON, 10);
-            tMutation.requireResource(GregTech_API.sBlockMetal5, 0);
+            tMutation.requireResource(GregTechAPI.sBlockMetal5, 0);
         }),
-    EUROPIUM(GT_BranchDefinition.RAREMETAL, "Europium", false, new Color(0xDAA0E2), new Color(0xAB7EB1), beeSpecies -> {
+    EUROPIUM(GTBranchDefinition.RAREMETAL, "Europium", false, new Color(0xDAA0E2), new Color(0xAB7EB1), beeSpecies -> {
         beeSpecies.addProduct(WerkstoffMaterialPool.EuropiumIIIOxide.get(OrePrefixes.dust, 1), 0.10F);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.EUROPIUM), 0.075f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.EUROPIUM), 0.075f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(HOT);
         beeSpecies.setNocturnal();
         // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB
-        beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance);
+        beeSpecies.setJubilanceProvider(JubilanceMegaApiary.instance);
     }, template -> {
         AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST);
         AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST);
     }, dis -> {
         IBeeMutationCustom tMutation = dis.registerMutation(NEODYMIUM, HYDROGEN, 5, 4);
         // Compact fusion reactor mark 1 controller
-        GregTech_API.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTech_API.sBlockMachines, 32019));
+        GregTechAPI.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTechAPI.sBlockMachines, 32019));
     }),
     // infused Shards line
-    AIR(GT_BranchDefinition.INFUSEDSHARD, "Air", false, new Color(0xFFFF7E), new Color(0x60602F), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDAER), 0.30f);
+    AIR(GTBranchDefinition.INFUSEDSHARD, "Air", false, new Color(0xFFFF7E), new Color(0x60602F), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.INFUSEDAER), 0.30f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setHasEffect();
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
@@ -2563,8 +2550,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         if (Thaumcraft.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 0);
     }),
-    FIRE(GT_BranchDefinition.INFUSEDSHARD, "Fire", false, new Color(0xED3801), new Color(0x3B0E00), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDIGNIS), 0.30f);
+    FIRE(GTBranchDefinition.INFUSEDSHARD, "Fire", false, new Color(0xED3801), new Color(0x3B0E00), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.INFUSEDIGNIS), 0.30f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setHasEffect();
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
@@ -2573,8 +2560,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         if (Thaumcraft.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 1);
     }),
-    WATER(GT_BranchDefinition.INFUSEDSHARD, "Water", false, new Color(0x0090FF), new Color(0x002542), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDAQUA), 0.30f);
+    WATER(GTBranchDefinition.INFUSEDSHARD, "Water", false, new Color(0x0090FF), new Color(0x002542), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.INFUSEDAQUA), 0.30f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setHasEffect();
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
@@ -2583,8 +2570,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         if (Thaumcraft.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 2);
     }),
-    EARTH(GT_BranchDefinition.INFUSEDSHARD, "Earth", false, new Color(0x008600), new Color(0x003300), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDTERRA), 0.30f);
+    EARTH(GTBranchDefinition.INFUSEDSHARD, "Earth", false, new Color(0x008600), new Color(0x003300), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.INFUSEDTERRA), 0.30f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setHasEffect();
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
@@ -2593,8 +2580,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         if (Thaumcraft.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 3);
     }),
-    ORDER(GT_BranchDefinition.INFUSEDSHARD, "Order", false, new Color(0x8A97B0), new Color(0x5C5F62), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDORDO), 0.30f);
+    ORDER(GTBranchDefinition.INFUSEDSHARD, "Order", false, new Color(0x8A97B0), new Color(0x5C5F62), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.INFUSEDORDO), 0.30f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setHasEffect();
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
@@ -2603,8 +2590,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         if (Thaumcraft.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 4);
     }),
-    CHAOS(GT_BranchDefinition.INFUSEDSHARD, "Chaos", false, new Color(0x2E2E41), new Color(0x232129), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDPERDITIO), 0.30f);
+    CHAOS(GTBranchDefinition.INFUSEDSHARD, "Chaos", false, new Color(0x2E2E41), new Color(0x232129), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.INFUSEDPERDITIO), 0.30f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setHasEffect();
     }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
@@ -2613,61 +2600,61 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         if (Thaumcraft.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 5);
     }),
-    NETHERSHARD(GT_BranchDefinition.INFUSEDSHARD, "NetherShard", false, new Color(0xBE0135), new Color(0x350211),
+    NETHERSHARD(GTBranchDefinition.INFUSEDSHARD, "NetherShard", false, new Color(0xBE0135), new Color(0x350211),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NETHERSHARD), 0.30f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.NETHERSHARD), 0.30f);
             beeSpecies.setHumidity(ARID);
             beeSpecies.setTemperature(HOT);
             beeSpecies.setHasEffect();
         }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
             IBeeMutationCustom tMutation = dis.registerMutation(CHAOS, FIRE, 15);
-            GregTech_API.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTech_API.sBlockGem3, 3));
+            GregTechAPI.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTechAPI.sBlockGem3, 3));
         }),
-    ENDSHARD(GT_BranchDefinition.INFUSEDSHARD, "EnderShard", false, new Color(0x2E2E41), new Color(0x232129),
+    ENDSHARD(GTBranchDefinition.INFUSEDSHARD, "EnderShard", false, new Color(0x2E2E41), new Color(0x232129),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.ENDERSHARD), 0.30f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.ENDERSHARD), 0.30f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setNocturnal();
             beeSpecies.setHasEffect();
         }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
             IBeeMutationCustom tMutation = dis.registerMutation(NETHERSHARD, ENDDUST, 15);
             tMutation.restrictTemperature(ICY);
-            GregTech_API.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTech_API.sBlockGem1, 7));
+            GregTechAPI.sGTCompleteLoad.add(() -> tMutation.requireResource(GregTechAPI.sBlockGem1, 7));
         }),
     // Organic branch 2.0
-    UNKNOWNWATER(GT_BranchDefinition.ORGANIC, "UnknownLiquid", false, new Color(0x4333A5), new Color(0x36ABFF),
+    UNKNOWNWATER(GTBranchDefinition.ORGANIC, "UnknownLiquid", false, new Color(0x4333A5), new Color(0x36ABFF),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.UNKNOWNLIQUID), 0.20f);
+            beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.UNKNOWNLIQUID), 0.20f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setNocturnal();
             beeSpecies.setHasEffect();
         }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST),
         dis -> dis.registerMutation(INFINITYCATALYST, MYSTERIOUSCRYSTAL, 5)),
     // Endgame bees
-    JAEGERMEISTER(GT_BranchDefinition.ENDGAME, "JaegerMeister", false, new Color(0x05AD18), new Color(0xE7DAC3),
+    JAEGERMEISTER(GTBranchDefinition.ENDGAME, "JaegerMeister", false, new Color(0x05AD18), new Color(0xE7DAC3),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(CropsPlusPlus.ID, "BppPotions", 1L, 8), 0.01f);
+            beeSpecies.addProduct(GTModHandler.getModItem(CropsPlusPlus.ID, "BppPotions", 1L, 8), 0.01f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setNocturnal();
             beeSpecies.setHasEffect();
         }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> {
             IBeeMutationCustom tMutation = dis.registerMutation(INFINITYCATALYST, NAQUADRIA, 5);
-            tMutation.requireResource(GregTech_API.sBlockMachines, 4684);
-            tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(100, "Deep Dark")); // Deep Dark
-                                                                                                      // dim
+            tMutation.requireResource(GregTechAPI.sBlockMachines, 4684);
+            tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(100, "Deep Dark")); // Deep Dark
+                                                                                                     // dim
         });
 
-    private final GT_BranchDefinition branch;
-    private final GT_AlleleBeeSpecies species;
-    private final Consumer<GT_AlleleBeeSpecies> mSpeciesProperties;
+    private final GTBranchDefinition branch;
+    private final GTAlleleBeeSpecies species;
+    private final Consumer<GTAlleleBeeSpecies> mSpeciesProperties;
     private final Consumer<IAllele[]> mAlleles;
-    private final Consumer<GT_BeeDefinition> mMutations;
+    private final Consumer<GTBeeDefinition> mMutations;
     private IAllele[] template;
     private IBeeGenome genome;
 
-    GT_BeeDefinition(GT_BranchDefinition branch, String binomial, boolean dominant, Color primary, Color secondary,
-        Consumer<GT_AlleleBeeSpecies> aSpeciesProperties, Consumer<IAllele[]> aAlleles,
-        Consumer<GT_BeeDefinition> aMutations) {
+    GTBeeDefinition(GTBranchDefinition branch, String binomial, boolean dominant, Color primary, Color secondary,
+        Consumer<GTAlleleBeeSpecies> aSpeciesProperties, Consumer<IAllele[]> aAlleles,
+        Consumer<GTBeeDefinition> aMutations) {
         this.mAlleles = aAlleles;
         this.mMutations = aMutations;
         this.mSpeciesProperties = aSpeciesProperties;
@@ -2678,14 +2665,14 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         String uid = "gregtech.bee.species" + species;
         String description = "for.description." + lowercaseName;
         String name = "for.bees.species." + lowercaseName;
-        GT_LanguageManager.addStringLocalization("for.bees.species." + lowercaseName, species);
+        GTLanguageManager.addStringLocalization("for.bees.species." + lowercaseName, species);
 
-        String authority = GT_LanguageManager.getTranslation("for.bees.authority." + lowercaseName);
+        String authority = GTLanguageManager.getTranslation("for.bees.authority." + lowercaseName);
         if (authority.equals("for.bees.authority." + lowercaseName)) {
             authority = "GTNH";
         }
         this.branch = branch;
-        this.species = new GT_AlleleBeeSpecies(
+        this.species = new GTAlleleBeeSpecies(
             uid,
             dominant,
             name,
@@ -2698,10 +2685,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     }
 
     public static void initBees() {
-        for (GT_BeeDefinition bee : values()) {
+        for (GTBeeDefinition bee : values()) {
             bee.init();
         }
-        for (GT_BeeDefinition bee : values()) {
+        for (GTBeeDefinition bee : values()) {
             bee.registerMutations();
         }
     }
@@ -2744,7 +2731,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         return ret;
     }
 
-    private void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) {
+    private void setSpeciesProperties(GTAlleleBeeSpecies beeSpecies) {
         this.mSpeciesProperties.accept(beeSpecies);
     }
 
@@ -2772,15 +2759,15 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         return registerMutation(parent1, parent2, chance, 1f);
     }
 
-    private IBeeMutationCustom registerMutation(GT_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance) {
+    private IBeeMutationCustom registerMutation(GTBeeDefinition parent1, IAlleleBeeSpecies parent2, int chance) {
         return registerMutation(parent1, parent2, chance, 1f);
     }
 
-    private IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GT_BeeDefinition parent2, int chance) {
+    private IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GTBeeDefinition parent2, int chance) {
         return registerMutation(parent1, parent2, chance, 1f);
     }
 
-    private IBeeMutationCustom registerMutation(GT_BeeDefinition parent1, GT_BeeDefinition parent2, int chance) {
+    private IBeeMutationCustom registerMutation(GTBeeDefinition parent1, GTBeeDefinition parent2, int chance) {
         return registerMutation(parent1, parent2, chance, 1f);
     }
 
@@ -2791,20 +2778,20 @@ public enum GT_BeeDefinition implements IBeeDefinition {
      */
     private IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance,
         float chanceDivider) {
-        return new GT_Bee_Mutation(parent1, parent2, this.getTemplate(), chance, chanceDivider);
+        return new GTBeeMutation(parent1, parent2, this.getTemplate(), chance, chanceDivider);
     }
 
-    private IBeeMutationCustom registerMutation(GT_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance,
+    private IBeeMutationCustom registerMutation(GTBeeDefinition parent1, IAlleleBeeSpecies parent2, int chance,
         float chanceDivider) {
         return registerMutation(parent1.species, parent2, chance, chanceDivider);
     }
 
-    private IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GT_BeeDefinition parent2, int chance,
+    private IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GTBeeDefinition parent2, int chance,
         float chanceDivider) {
         return registerMutation(parent1, parent2.species, chance, chanceDivider);
     }
 
-    private IBeeMutationCustom registerMutation(GT_BeeDefinition parent1, GT_BeeDefinition parent2, int chance,
+    private IBeeMutationCustom registerMutation(GTBeeDefinition parent1, GTBeeDefinition parent2, int chance,
         float chanceDivider) {
         return registerMutation(parent1.species, parent2, chance, chanceDivider);
     }
diff --git a/src/main/java/gregtech/loaders/misc/GT_Bees.java b/src/main/java/gregtech/loaders/misc/GTBees.java
index a8246360cf..02fb6d19e5 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Bees.java
+++ b/src/main/java/gregtech/loaders/misc/GTBees.java
@@ -20,19 +20,19 @@ import forestry.api.genetics.IGenome;
 import forestry.api.genetics.IMutationCondition;
 import forestry.core.genetics.alleles.Allele;
 import forestry.core.utils.StringUtil;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.common.bees.GT_AlleleHelper;
+import gregtech.common.bees.GTAlleleHelper;
 import gregtech.common.items.ItemComb;
 import gregtech.common.items.ItemDrop;
 import gregtech.common.items.ItemPollen;
 import gregtech.common.items.ItemPropolis;
-import gregtech.loaders.misc.bees.GT_AlleleEffect;
-import gregtech.loaders.misc.bees.GT_EffectMachineBoost;
-import gregtech.loaders.misc.bees.GT_EffectTreeTwister;
-import gregtech.loaders.misc.bees.GT_Flowers;
+import gregtech.loaders.misc.bees.GTAlleleEffect;
+import gregtech.loaders.misc.bees.GTEffectMachineBoost;
+import gregtech.loaders.misc.bees.GTEffectTreeTwister;
+import gregtech.loaders.misc.bees.GTFlowers;
 
-public class GT_Bees {
+public class GTBees {
 
     public static IAlleleInteger noFertility;
     public static IAlleleInteger superFertility;
@@ -58,12 +58,12 @@ public class GT_Bees {
     public static ItemDrop drop;
     public static ItemComb combs;
 
-    public GT_Bees() {
-        if (!(Forestry.isModLoaded() && GT_Mod.gregtechproxy.mGTBees)) {
+    public GTBees() {
+        if (!(Forestry.isModLoaded() && GTMod.gregtechproxy.mGTBees)) {
             return;
         }
-        GT_Flowers.doInit();
-        GT_AlleleHelper.initialisation();
+        GTFlowers.doInit();
+        GTAlleleHelper.initialisation();
         setupGTAlleles();
         propolis = new ItemPropolis();
         propolis.initPropolisRecipes();
@@ -73,7 +73,7 @@ public class GT_Bees {
         combs = new ItemComb();
         combs.initCombsRecipes();
         combs.registerOreDict();
-        GT_BeeDefinition.initBees();
+        GTBeeDefinition.initBees();
 
     }
 
@@ -96,15 +96,15 @@ public class GT_Bees {
 
         blinkLife = new AlleleInteger("lifeBlink", 2, false, EnumBeeChromosome.LIFESPAN);
         superLife = new AlleleInteger("lifeEon", 600, false, EnumBeeChromosome.LIFESPAN);
-        machineBoostEffect = new GT_EffectMachineBoost();
+        machineBoostEffect = new GTEffectMachineBoost();
 
         if (GalaxySpace.isModLoaded() && TwilightForest.isModLoaded()) {
-            GT_Mod.GT_FML_LOGGER.info("treetwisterEffect: GalaxySpace and TwilightForest loaded, using default impl");
-            treetwisterEffect = new GT_EffectTreeTwister();
+            GTMod.GT_FML_LOGGER.info("treetwisterEffect: GalaxySpace and TwilightForest loaded, using default impl");
+            treetwisterEffect = new GTEffectTreeTwister();
         } else {
-            GT_Mod.GT_FML_LOGGER
+            GTMod.GT_FML_LOGGER
                 .info("treetwisterEffect: GalaxySpace or TwilightForest was not loaded, using fallback impl");
-            treetwisterEffect = GT_AlleleEffect.FORESTRY_BASE_EFFECT;
+            treetwisterEffect = GTAlleleEffect.FORESTRY_BASE_EFFECT;
         }
     }
 
diff --git a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java b/src/main/java/gregtech/loaders/misc/GTBranchDefinition.java
index 3eae8c73e2..9bc4acb114 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GTBranchDefinition.java
@@ -19,10 +19,10 @@ import static forestry.core.genetics.alleles.EnumAllele.Lifespan;
 import static forestry.core.genetics.alleles.EnumAllele.Speed;
 import static forestry.core.genetics.alleles.EnumAllele.Territory;
 import static forestry.core.genetics.alleles.EnumAllele.Tolerance;
-import static gregtech.loaders.misc.GT_BeeDefinition.getEffect;
-import static gregtech.loaders.misc.GT_BeeDefinition.getFlowers;
-import static gregtech.loaders.misc.GT_BeeDefinitionReference.EXTRABEES;
-import static gregtech.loaders.misc.GT_BeeDefinitionReference.MAGICBEES;
+import static gregtech.loaders.misc.GTBeeDefinition.getEffect;
+import static gregtech.loaders.misc.GTBeeDefinition.getFlowers;
+import static gregtech.loaders.misc.GTBeeDefinitionReference.EXTRABEES;
+import static gregtech.loaders.misc.GTBeeDefinitionReference.MAGICBEES;
 
 import java.util.Arrays;
 import java.util.function.Consumer;
@@ -34,7 +34,7 @@ import forestry.api.genetics.IClassification;
 import forestry.apiculture.genetics.alleles.AlleleEffect;
 import forestry.core.genetics.alleles.AlleleHelper;
 
-public enum GT_BranchDefinition {
+public enum GTBranchDefinition {
 
     ORGANIC("Fuelis", alleles -> {
         AlleleHelper.instance.set(alleles, TEMPERATURE_TOLERANCE, Tolerance.NONE);
@@ -94,7 +94,7 @@ public enum GT_BranchDefinition {
         AlleleHelper.instance.set(alleles, NOCTURNAL, false);
         AlleleHelper.instance.set(alleles, FLOWER_PROVIDER, Flowers.END);
         AlleleHelper.instance.set(alleles, FLOWERING, Flowering.AVERAGE);
-        AlleleHelper.instance.set(alleles, SPEED, GT_Bees.speedBlinding);
+        AlleleHelper.instance.set(alleles, SPEED, GTBees.speedBlinding);
         AlleleHelper.instance.set(alleles, SPEED, getEffect(EXTRABEES, "radioactive"));
     }),
     TWILIGHT("Nemoris Obscuri", alleles -> {
@@ -163,7 +163,7 @@ public enum GT_BranchDefinition {
     private final IClassification branch;
     private final Consumer<IAllele[]> mBranchProperties;
 
-    GT_BranchDefinition(String scientific, Consumer<IAllele[]> aBranchProperties) {
+    GTBranchDefinition(String scientific, Consumer<IAllele[]> aBranchProperties) {
         this.branch = BeeManager.beeFactory.createBranch(
             this.name()
                 .toLowerCase(),
diff --git a/src/main/java/gregtech/loaders/misc/GT_CoverLoader.java b/src/main/java/gregtech/loaders/misc/GT_CoverLoader.java
deleted file mode 100644
index dc83202724..0000000000
--- a/src/main/java/gregtech/loaders/misc/GT_CoverLoader.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package gregtech.loaders.misc;
-
-import static gregtech.api.enums.Textures.BlockIcons.VENT_ADVANCED;
-import static gregtech.api.enums.Textures.BlockIcons.VENT_NORMAL;
-
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.common.covers.GT_Cover_Vent;
-
-public class GT_CoverLoader implements Runnable {
-
-    @Override
-    public void run() {
-        for (byte i = 0; i < 16; i = (byte) (i + 1)) {
-            GregTech_API.registerCover(new ItemStack(Blocks.carpet, 1, i), TextureFactory.of(Blocks.wool, i), null);
-        }
-        GregTech_API.registerCover(
-            GT_ModHandler.getIC2Item("reactorVent", 1L, 1),
-            TextureFactory.of(VENT_NORMAL),
-            new GT_Cover_Vent(1));
-        GregTech_API.registerCover(
-            GT_ModHandler.getIC2Item("reactorVentCore", 1L, 1),
-            TextureFactory.of(VENT_NORMAL),
-            new GT_Cover_Vent(1));
-        GregTech_API.registerCover(
-            GT_ModHandler.getIC2Item("reactorVentGold", 1L, 1),
-            TextureFactory.of(VENT_ADVANCED),
-            new GT_Cover_Vent(2));
-        GregTech_API.registerCover(
-            GT_ModHandler.getIC2Item("reactorVentSpread", 1L),
-            TextureFactory.of(VENT_NORMAL),
-            new GT_Cover_Vent(2));
-        GregTech_API.registerCover(
-            GT_ModHandler.getIC2Item("reactorVentDiamond", 1L, 1),
-            TextureFactory.of(VENT_ADVANCED),
-            new GT_Cover_Vent(3));
-    }
-}
diff --git a/src/main/java/gregtech/loaders/misc/bees/GT_AlleleEffect.java b/src/main/java/gregtech/loaders/misc/bees/GTAlleleEffect.java
index 25198968d2..128e3dfeb1 100644
--- a/src/main/java/gregtech/loaders/misc/bees/GT_AlleleEffect.java
+++ b/src/main/java/gregtech/loaders/misc/bees/GTAlleleEffect.java
@@ -9,14 +9,14 @@ import forestry.api.genetics.IEffectData;
 import forestry.core.genetics.alleles.Allele;
 
 // helper class for implementing custom bee effects, based on MagicBees' implementation
-public abstract class GT_AlleleEffect extends Allele implements IAlleleBeeEffect {
+public abstract class GTAlleleEffect extends Allele implements IAlleleBeeEffect {
 
     public static final IAlleleBeeEffect FORESTRY_BASE_EFFECT = (IAlleleBeeEffect) AlleleManager.alleleRegistry
         .getAllele("forestry.effectNone");
     protected boolean combinable;
     protected int tickThrottle; // If set, this amount of ticks have to pass before an effect ticks
 
-    public GT_AlleleEffect(String id, boolean isDominant, int tickThrottle) {
+    public GTAlleleEffect(String id, boolean isDominant, int tickThrottle) {
         super("gregtech." + id, "gregtech." + id, isDominant);
         AlleleManager.alleleRegistry.registerAllele(this, EnumBeeChromosome.EFFECT);
         combinable = false;
@@ -28,7 +28,7 @@ public abstract class GT_AlleleEffect extends Allele implements IAlleleBeeEffect
         return combinable;
     }
 
-    public GT_AlleleEffect setIsCombinable(boolean canCombine) {
+    public GTAlleleEffect setIsCombinable(boolean canCombine) {
         combinable = canCombine;
         return this;
     }
diff --git a/src/main/java/gregtech/loaders/misc/bees/GT_EffectMachineBoost.java b/src/main/java/gregtech/loaders/misc/bees/GTEffectMachineBoost.java
index a50c0452bb..e0454e0d27 100644
--- a/src/main/java/gregtech/loaders/misc/bees/GT_EffectMachineBoost.java
+++ b/src/main/java/gregtech/loaders/misc/bees/GTEffectMachineBoost.java
@@ -11,11 +11,11 @@ import forestry.api.apiculture.IBeeModifier;
 import forestry.api.genetics.IEffectData;
 import forestry.core.genetics.EffectData;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
+import gregtech.api.metatileentity.implementations.MTETieredMachineBlock;
 
-public class GT_EffectMachineBoost extends GT_AlleleEffect {
+public class GTEffectMachineBoost extends GTAlleleEffect {
 
-    public GT_EffectMachineBoost() {
+    public GTEffectMachineBoost() {
         super("effectMachineBoost", false, 600);
     }
 
@@ -45,7 +45,7 @@ public class GT_EffectMachineBoost extends GT_AlleleEffect {
         // If gt machine of tier lower equal than ev, boost recipe by 2s
         TileEntity tileEntity = world.getTileEntity(xCoord, yCoord, zCoord);
         if (tileEntity instanceof BaseMetaTileEntity machine) {
-            if (machine.getMetaTileEntity() instanceof GT_MetaTileEntity_TieredMachineBlock tieredMachine) {
+            if (machine.getMetaTileEntity() instanceof MTETieredMachineBlock tieredMachine) {
                 if (tieredMachine.mTier <= 4) { // EV
                     if (machine.isActive() && machine.getMaxProgress() > 60) {
                         machine.increaseProgress(40);
diff --git a/src/main/java/gregtech/loaders/misc/bees/GT_EffectTreeTwister.java b/src/main/java/gregtech/loaders/misc/bees/GTEffectTreeTwister.java
index a36635db57..65c150bd1d 100644
--- a/src/main/java/gregtech/loaders/misc/bees/GT_EffectTreeTwister.java
+++ b/src/main/java/gregtech/loaders/misc/bees/GTEffectTreeTwister.java
@@ -15,10 +15,10 @@ import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.apiculture.IBeeModifier;
 import forestry.api.genetics.IEffectData;
-import gregtech.GT_Mod;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.GTMod;
+import gregtech.api.util.GTModHandler;
 
-public class GT_EffectTreeTwister extends GT_AlleleEffect {
+public class GTEffectTreeTwister extends GTAlleleEffect {
 
     private static final Integer[] ALLOWED_DIMS = { 2, // spectre
         112, // last millenium
@@ -26,20 +26,20 @@ public class GT_EffectTreeTwister extends GT_AlleleEffect {
         69, // pocket plane
     };
 
-    private static final ItemStack TF_TRANS_SAPLING = GT_ModHandler
+    private static final ItemStack TF_TRANS_SAPLING = GTModHandler
         .getModItem(TwilightForest.ID, "tile.TFSapling", 1, 6);
-    private static final ItemStack BARN_SAPLING = GT_ModHandler.getModItem(GalaxySpace.ID, "barnardaCsapling", 1, 1);
+    private static final ItemStack BARN_SAPLING = GTModHandler.getModItem(GalaxySpace.ID, "barnardaCsapling", 1, 1);
 
     static {
         if (TF_TRANS_SAPLING == null) {
-            GT_Mod.GT_FML_LOGGER.info("GT_EffectTreeTwister(): Could not get ItemStack for BarnardaC sapling");
+            GTMod.GT_FML_LOGGER.info("GT_EffectTreeTwister(): Could not get ItemStack for BarnardaC sapling");
         }
         if (BARN_SAPLING == null) {
-            GT_Mod.GT_FML_LOGGER.info("GT_EffectTreeTwister(): Could not get ItemStack for BarnardaC sapling");
+            GTMod.GT_FML_LOGGER.info("GT_EffectTreeTwister(): Could not get ItemStack for BarnardaC sapling");
         }
     }
 
-    public GT_EffectTreeTwister() {
+    public GTEffectTreeTwister() {
         super("effectTreetwister", false, 0);
     }
 
diff --git a/src/main/java/gregtech/loaders/misc/bees/GT_Flowers.java b/src/main/java/gregtech/loaders/misc/bees/GTFlowers.java
index d2ab1d6297..db96bfb454 100644
--- a/src/main/java/gregtech/loaders/misc/bees/GT_Flowers.java
+++ b/src/main/java/gregtech/loaders/misc/bees/GTFlowers.java
@@ -20,20 +20,20 @@ import forestry.api.genetics.IFlowerProvider;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.IPollinatable;
 import forestry.api.genetics.ISpeciesRoot;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
-public enum GT_Flowers implements IFlowerProvider, IAlleleFlowers, IChromosomeType {
+public enum GTFlowers implements IFlowerProvider, IAlleleFlowers, IChromosomeType {
 
     FLAMING;
 
     protected boolean dominant;
 
-    GT_Flowers() {
+    GTFlowers() {
         dominant = true;
     }
 
     public static void doInit() {
-        for (GT_Flowers effect : values()) {
+        for (GTFlowers effect : values()) {
             effect.register();
         }
     }
@@ -55,7 +55,7 @@ public enum GT_Flowers implements IFlowerProvider, IAlleleFlowers, IChromosomeTy
 
     @Override
     public String getDescription() {
-        return GT_LanguageManager.getTranslation("for.flowers." + name().toLowerCase());
+        return GTLanguageManager.getTranslation("for.flowers." + name().toLowerCase());
     }
 
     public void register() {
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java
index 2fb200216e..5a7316bfa3 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java
@@ -1,15 +1,15 @@
 package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingBeans implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -25,9 +25,9 @@ public class ProcessingBeans implements gregtech.api.interfaces.IOreRecipeRegist
             return;
         }
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, aStack))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
index b9926b188b..056feb0b33 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
@@ -4,21 +4,21 @@ import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
 import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
 
 import net.minecraft.item.ItemStack;
 
-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.MaterialsBotania;
 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.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -35,14 +35,14 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
         }
 
         if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV
-            && GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
+            && GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
 
             if (aMaterial == MaterialsBotania.Livingrock || aMaterial == MaterialsBotania.Livingwood
                 || aMaterial == MaterialsBotania.Dreamwood) {
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L))
                     .fluidInputs(
                         Materials.Water.getFluid(
                             Math.max(
@@ -52,11 +52,11 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L))
                     .fluidInputs(
-                        GT_ModHandler.getDistilledWater(
+                        GTModHandler.getDistilledWater(
                             Math.max(
                                 3,
                                 Math.min(750, ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS * 30 / 426))))
@@ -64,9 +64,9 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L))
                     .fluidInputs(
                         Materials.Lubricant.getFluid(
                             Math.max(
@@ -80,9 +80,9 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
 
             else if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) {
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L))
                     .fluidInputs(
                         Materials.Water.getFluid(
                             Math.max(
@@ -92,11 +92,11 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L))
                     .fluidInputs(
-                        GT_ModHandler.getDistilledWater(
+                        GTModHandler.getDistilledWater(
                             Math.max(
                                 3,
                                 Math.min(750, ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS * 30 / 426))))
@@ -104,9 +104,9 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L))
                     .fluidInputs(
                         Materials.Lubricant.getFluid(
                             Math.max(
@@ -118,18 +118,18 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
             }
         }
 
-        ItemStack tStack1 = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L);
-        ItemStack tStack2 = GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L);
-        ItemStack tStack3 = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L);
+        ItemStack tStack1 = GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L);
+        ItemStack tStack2 = GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L);
+        ItemStack tStack3 = GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L);
 
-        GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1, aStack));
+        GTModHandler.removeRecipeDelayed(GTUtility.copyAmount(1, aStack));
 
-        if (tStack1 != null) GT_ModHandler
+        if (tStack1 != null) GTModHandler
             .removeRecipeDelayed(tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1);
-        if (tStack2 != null) GT_ModHandler
+        if (tStack2 != null) GTModHandler
             .removeRecipeDelayed(tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2);
         if (tStack3 != null) {
-            GT_ModHandler
+            GTModHandler
                 .removeRecipeDelayed(tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3);
         }
 
@@ -137,9 +137,9 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
             if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) {
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(ItemList.Shape_Mold_Block.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))
                         .fluidInputs(aMaterial.getMolten(1296L))
                         .duration(14 * SECONDS + 8 * TICKS)
                         .eut(8)
@@ -153,7 +153,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
         if (tStack3 != null) tStack3.stackSize = 9;
 
         if (tStack2 != null) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(aStack)
                 .itemOutputs(tStack2)
                 .duration(5 * SECONDS)
@@ -163,17 +163,17 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
 
         if (tStack2 != null && aMaterial != Materials.NetherQuartz) {
             if (tStack3 != null)
-                GT_ModHandler.addShapelessCraftingRecipe(tStack3, new Object[] { OrePrefixes.block.get(aMaterial) });
-            GT_ModHandler.addShapelessCraftingRecipe(tStack2, new Object[] { OrePrefixes.block.get(aMaterial) });
+                GTModHandler.addShapelessCraftingRecipe(tStack3, new Object[] { OrePrefixes.block.get(aMaterial) });
+            GTModHandler.addShapelessCraftingRecipe(tStack2, new Object[] { OrePrefixes.block.get(aMaterial) });
             if (tStack1 != null)
-                GT_ModHandler.addShapelessCraftingRecipe(tStack1, new Object[] { OrePrefixes.block.get(aMaterial) });
+                GTModHandler.addShapelessCraftingRecipe(tStack1, new Object[] { OrePrefixes.block.get(aMaterial) });
         }
 
         if (!OrePrefixes.block.isIgnored(aMaterial) && tStack1 != null) {
             // 9 ingots -> 1 block
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 9L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 9L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))
                 .duration(15 * SECONDS)
                 .eut(calculateRecipeEU(aMaterial, 2))
                 .addTo(compressorRecipes);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java
index 0d28c417a8..3df65eb483 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java
@@ -6,9 +6,9 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Proxy;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
+import gregtech.common.GTProxy;
 
 public class ProcessingBolt implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -35,9 +35,9 @@ public class ProcessingBolt implements gregtech.api.interfaces.IOreRecipeRegistr
             return;
         }
 
-        GT_ModHandler.addCraftingRecipe(
-            GT_Utility.copyAmount(2, aStack),
-            GT_Proxy.tBits,
+        GTModHandler.addCraftingRecipe(
+            GTUtility.copyAmount(2, aStack),
+            GTProxy.tBits,
             new Object[] { "s ", " X", 'X', OrePrefixes.stick.get(aMaterial) });
 
     }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java
index dcdbda4508..62c1c7cc5c 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java
@@ -1,14 +1,14 @@
 package gregtech.loaders.oreprocessing;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
 import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes;
 import static gregtech.api.recipe.RecipeMaps.extractorRecipes;
 import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE;
+import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
 
 import java.util.ArrayList;
 
@@ -20,11 +20,11 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
 import gregtech.api.interfaces.IOreRecipeRegistrator;
 import gregtech.api.objects.MaterialStack;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_RecipeConstants;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTRecipeConstants;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingCell implements IOreRecipeRegistrator {
 
@@ -39,7 +39,7 @@ public class ProcessingCell implements IOreRecipeRegistrator {
         switch (aPrefix) {
             case cell -> {
                 if (aMaterial == Materials.Empty) {
-                    GT_ModHandler.removeRecipeByOutputDelayed(aStack);
+                    GTModHandler.removeRecipeByOutputDelayed(aStack);
                     if (aModName.equalsIgnoreCase("AtomicScience")) {
                         RA.stdBuilder()
                             .itemInputs(ItemList.Cell_Empty.get(1L))
@@ -50,15 +50,15 @@ public class ProcessingCell implements IOreRecipeRegistrator {
                     }
                 } else {
                     if (aMaterial.mFuelPower > 0) {
-                        GT_RecipeBuilder recipeBuilder = RA.stdBuilder();
-                        recipeBuilder.itemInputs(GT_Utility.copyAmount(1, aStack));
-                        if (GT_Utility.getFluidForFilledItem(aStack, true) == null
-                            && GT_Utility.getContainerItem(aStack, true) != null) {
-                            recipeBuilder.itemOutputs(GT_Utility.getContainerItem(aStack, true));
+                        GTRecipeBuilder recipeBuilder = RA.stdBuilder();
+                        recipeBuilder.itemInputs(GTUtility.copyAmount(1, aStack));
+                        if (GTUtility.getFluidForFilledItem(aStack, true) == null
+                            && GTUtility.getContainerItem(aStack, true) != null) {
+                            recipeBuilder.itemOutputs(GTUtility.getContainerItem(aStack, true));
                         }
                         recipeBuilder.metadata(FUEL_VALUE, aMaterial.mFuelPower)
                             .metadata(FUEL_TYPE, aMaterial.mFuelType)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                     }
                     if (!((aMaterial.mMaterialList.size() > 0) && ((aMaterial.mExtraData & 0x3) != 0))) {
                         break;
@@ -69,8 +69,8 @@ public class ProcessingCell implements IOreRecipeRegistrator {
                         tAllAmount = (int) (tAllAmount + tMat2.mAmount);
                     }
                     long tItemAmount = 0L;
-                    long tCapsuleCount = (long) GT_ModHandler
-                        .getCapsuleCellContainerCountMultipliedWithStackSize(aStack) * -tAllAmount;
+                    long tCapsuleCount = (long) GTModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(aStack)
+                        * -tAllAmount;
                     long tDensityMultiplier = aMaterial.getDensity() > 3628800L ? aMaterial.getDensity() / 3628800L
                         : 1L;
                     ArrayList<ItemStack> tList = new ArrayList<>();
@@ -83,9 +83,9 @@ public class ProcessingCell implements IOreRecipeRegistrator {
                         if (tMat.mMaterial == Materials.Air) {
                             tStack = ItemList.Cell_Air.get(tMat.mAmount * tDensityMultiplier / 2L);
                         } else {
-                            tStack = GT_OreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount);
+                            tStack = GTOreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount);
                             if (tStack == null) {
-                                tStack = GT_OreDictUnificator.get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount);
+                                tStack = GTOreDictUnificator.get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount);
                             }
                         }
                         if (tItemAmount + tMat.mAmount * 3628800L > aStack.getMaxStackSize() * aMaterial.getDensity()) {
@@ -100,15 +100,15 @@ public class ProcessingCell implements IOreRecipeRegistrator {
 
                         tStack.stackSize = ((int) (tStack.stackSize * tDensityMultiplier));
                         while ((tStack.stackSize > 64)
-                            && (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L < 0L
+                            && (tCapsuleCount + GTModHandler.getCapsuleCellContainerCount(tStack) * 64L < 0L
                                 ? tList.size() < 5
                                 : tList.size() < 6)
-                            && (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L <= 64L)) {
-                            tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L;
-                            tList.add(GT_Utility.copyAmount(64, tStack));
+                            && (tCapsuleCount + GTModHandler.getCapsuleCellContainerCount(tStack) * 64L <= 64L)) {
+                            tCapsuleCount += GTModHandler.getCapsuleCellContainerCount(tStack) * 64L;
+                            tList.add(GTUtility.copyAmount(64, tStack));
                             tStack.stackSize -= 64;
                         }
-                        int tThisCapsuleCount = GT_ModHandler
+                        int tThisCapsuleCount = GTModHandler
                             .getCapsuleCellContainerCountMultipliedWithStackSize(tStack);
                         if (tStack.stackSize > 0 && tCapsuleCount + tThisCapsuleCount <= 64L) {
                             if (tCapsuleCount + tThisCapsuleCount < 0L ? tList.size() < 5 : tList.size() < 6) {
@@ -118,7 +118,7 @@ public class ProcessingCell implements IOreRecipeRegistrator {
                         }
                     }
 
-                    tItemAmount = GT_Utility.ceilDiv(tItemAmount * tDensityMultiplier, aMaterial.getDensity());
+                    tItemAmount = GTUtility.ceilDiv(tItemAmount * tDensityMultiplier, aMaterial.getDensity());
 
                     if (tList.size() <= 0) {
                         break;
@@ -127,15 +127,15 @@ public class ProcessingCell implements IOreRecipeRegistrator {
                     if ((aMaterial.mExtraData & 0x1) != 0) {
 
                         // Electrolyzer recipe
-                        if (GT_Utility.getFluidForFilledItem(aStack, true) == null) {
+                        if (GTUtility.getFluidForFilledItem(aStack, true) == null) {
                             // dust stuffed cell e.g. Phosphate, Phosphorous Pentoxide
-                            GT_RecipeBuilder recipeBuilder = RA.stdBuilder();
+                            GTRecipeBuilder recipeBuilder = RA.stdBuilder();
                             if (tCapsuleCount > 0L) {
                                 recipeBuilder.itemInputs(
-                                    GT_Utility.copyAmount(tItemAmount, aStack),
+                                    GTUtility.copyAmount(tItemAmount, aStack),
                                     ItemList.Cell_Empty.get(tCapsuleCount));
                             } else {
-                                recipeBuilder.itemInputs(GT_Utility.copyAmount(tItemAmount, aStack));
+                                recipeBuilder.itemInputs(GTUtility.copyAmount(tItemAmount, aStack));
                             }
                             if (tCapsuleCount < 0L) {
                                 tList.add(ItemList.Cell_Empty.get(-tCapsuleCount));
@@ -147,7 +147,7 @@ public class ProcessingCell implements IOreRecipeRegistrator {
                                 .addTo(electrolyzerRecipes);
                         } else {
                             long tCellBalance = tCapsuleCount + tItemAmount - 1;
-                            GT_RecipeBuilder recipeBuilder = RA.stdBuilder();
+                            GTRecipeBuilder recipeBuilder = RA.stdBuilder();
                             if (tCellBalance > 0L) {
                                 recipeBuilder.itemInputs(aStack, ItemList.Cell_Empty.get(tCellBalance));
                             } else {
@@ -164,13 +164,13 @@ public class ProcessingCell implements IOreRecipeRegistrator {
                         }
                     }
                     if ((aMaterial.mExtraData & 0x2) != 0) {
-                        GT_RecipeBuilder recipeBuilder = RA.stdBuilder();
+                        GTRecipeBuilder recipeBuilder = RA.stdBuilder();
                         if (tCapsuleCount > 0L) {
                             recipeBuilder.itemInputs(
-                                GT_Utility.copyAmount(tItemAmount, aStack),
+                                GTUtility.copyAmount(tItemAmount, aStack),
                                 ItemList.Cell_Empty.get(tCapsuleCount));
                         } else {
-                            recipeBuilder.itemInputs(GT_Utility.copyAmount(tItemAmount, aStack));
+                            recipeBuilder.itemInputs(GTUtility.copyAmount(tItemAmount, aStack));
                         }
                         if (tCapsuleCount < 0L) {
                             tList.add(ItemList.Cell_Empty.get(-tCapsuleCount));
@@ -185,257 +185,257 @@ public class ProcessingCell implements IOreRecipeRegistrator {
             }
             case cellPlasma -> {
                 if (aMaterial == Materials.Empty) {
-                    GT_ModHandler.removeRecipeByOutputDelayed(aStack);
+                    GTModHandler.removeRecipeByOutputDelayed(aStack);
                 } else {
-                    GT_RecipeBuilder recipeBuilder = RA.stdBuilder();
-                    recipeBuilder.itemInputs(GT_Utility.copyAmount(1, aStack));
-                    if (GT_Utility.getFluidForFilledItem(aStack, true) == null
-                        && GT_Utility.getContainerItem(aStack, true) != null) {
-                        recipeBuilder.itemOutputs(GT_Utility.getContainerItem(aStack, true));
+                    GTRecipeBuilder recipeBuilder = RA.stdBuilder();
+                    recipeBuilder.itemInputs(GTUtility.copyAmount(1, aStack));
+                    if (GTUtility.getFluidForFilledItem(aStack, true) == null
+                        && GTUtility.getContainerItem(aStack, true) != null) {
+                        recipeBuilder.itemOutputs(GTUtility.getContainerItem(aStack, true));
                     }
                     // Switch case to set manual values for specific plasmas and escape the formula based on mass
                     // when it doesn't make sense for powergen balance.
                     switch (aMaterial.mName) {
                         case "Aluminium" -> recipeBuilder.metadata(FUEL_VALUE, 159_744)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Americium" -> recipeBuilder.metadata(FUEL_VALUE, 501_760)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Antimony" -> recipeBuilder.metadata(FUEL_VALUE, 309_760)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Argon" -> recipeBuilder.metadata(FUEL_VALUE, 188_416)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Arsenic" -> recipeBuilder.metadata(FUEL_VALUE, 230_400)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Barium" -> recipeBuilder.metadata(FUEL_VALUE, 342_302)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Beryllium" -> recipeBuilder.metadata(FUEL_VALUE, 110_592)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Bismuth" -> recipeBuilder.metadata(FUEL_VALUE, 425_984)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Boron" -> recipeBuilder.metadata(FUEL_VALUE, 112_640)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Cadmium" -> recipeBuilder.metadata(FUEL_VALUE, 293_601)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Caesium" -> recipeBuilder.metadata(FUEL_VALUE, 332_513)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Calcium" -> recipeBuilder.metadata(FUEL_VALUE, 188_416)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Cerium" -> recipeBuilder.metadata(FUEL_VALUE, 346_931)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Chlorine" -> recipeBuilder.metadata(FUEL_VALUE, 172_032)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Chrome" -> recipeBuilder.metadata(FUEL_VALUE, 202_342)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Cobalt" -> recipeBuilder.metadata(FUEL_VALUE, 217_497)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Copper" -> recipeBuilder.metadata(FUEL_VALUE, 219_340)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Deuterium" -> recipeBuilder.metadata(FUEL_VALUE, 40_960)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Erbium" -> recipeBuilder.metadata(FUEL_VALUE, 376_217)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Europium" -> recipeBuilder.metadata(FUEL_VALUE, 355_635)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Fluorine" -> recipeBuilder.metadata(FUEL_VALUE, 147_456)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Force" -> recipeBuilder.metadata(FUEL_VALUE, 180_000)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Gadolinium" -> recipeBuilder.metadata(FUEL_VALUE, 366_551)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Gallium" -> recipeBuilder.metadata(FUEL_VALUE, 229_376)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Gold" -> recipeBuilder.metadata(FUEL_VALUE, 401_408)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Helium_3" -> recipeBuilder.metadata(FUEL_VALUE, 61_440)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Helium" -> recipeBuilder.metadata(FUEL_VALUE, 81_920)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Holmium" -> recipeBuilder.metadata(FUEL_VALUE, 376_176)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Hydrogen" -> recipeBuilder.metadata(FUEL_VALUE, 20_480)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Indium" -> recipeBuilder.metadata(FUEL_VALUE, 296_509)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Iridium" -> recipeBuilder.metadata(FUEL_VALUE, 397_148)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Iron" -> recipeBuilder.metadata(FUEL_VALUE, 206_438)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Lanthanum" -> recipeBuilder.metadata(FUEL_VALUE, 344_801)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Lead" -> recipeBuilder.metadata(FUEL_VALUE, 423_936)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Lithium" -> recipeBuilder.metadata(FUEL_VALUE, 100_352)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Lutetium" -> recipeBuilder.metadata(FUEL_VALUE, 381_296)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Magnesium" -> recipeBuilder.metadata(FUEL_VALUE, 152_371)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Manganese" -> recipeBuilder.metadata(FUEL_VALUE, 202_752)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Mercury" -> recipeBuilder.metadata(FUEL_VALUE, 409_600)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Molybdenum" -> recipeBuilder.metadata(FUEL_VALUE, 272_384)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Neodymium" -> recipeBuilder.metadata(FUEL_VALUE, 347_996)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Nickel" -> recipeBuilder.metadata(FUEL_VALUE, 213_811)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Niobium" -> recipeBuilder.metadata(FUEL_VALUE, 269_516)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Nitrogen" -> recipeBuilder.metadata(FUEL_VALUE, 129_024)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Osmium" -> recipeBuilder.metadata(FUEL_VALUE, 393_659)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Oxygen" -> recipeBuilder.metadata(FUEL_VALUE, 131_072)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Palladium" -> recipeBuilder.metadata(FUEL_VALUE, 282_214)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Phosphor" -> recipeBuilder.metadata(FUEL_VALUE, 165_888)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Platinum" -> recipeBuilder.metadata(FUEL_VALUE, 399_360)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Plutonium241" -> recipeBuilder.metadata(FUEL_VALUE, 497_664)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Plutonium" -> recipeBuilder.metadata(FUEL_VALUE, 503_808)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Potassium" -> recipeBuilder.metadata(FUEL_VALUE, 183_705)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Praseodymium" -> recipeBuilder.metadata(FUEL_VALUE, 346_931)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Promethium" -> recipeBuilder.metadata(FUEL_VALUE, 347_996)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Radon" -> recipeBuilder.metadata(FUEL_VALUE, 450_560)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Rubidium" -> recipeBuilder.metadata(FUEL_VALUE, 243_712)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Samarium" -> recipeBuilder.metadata(FUEL_VALUE, 353_280)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Scandium" -> recipeBuilder.metadata(FUEL_VALUE, 193_536)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Silicon" -> recipeBuilder.metadata(FUEL_VALUE, 160_563)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Silver" -> recipeBuilder.metadata(FUEL_VALUE, 282_685)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Sodium" -> recipeBuilder.metadata(FUEL_VALUE, 148_684)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Strontium" -> recipeBuilder.metadata(FUEL_VALUE, 249_446)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Sulfur" -> recipeBuilder.metadata(FUEL_VALUE, 170_393)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Tantalum" -> recipeBuilder.metadata(FUEL_VALUE, 384_000)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Terbium" -> recipeBuilder.metadata(FUEL_VALUE, 368_885)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Thorium" -> recipeBuilder.metadata(FUEL_VALUE, 471_040)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Thulium" -> recipeBuilder.metadata(FUEL_VALUE, 378_470)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Tin" -> recipeBuilder.metadata(FUEL_VALUE, 150_000)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Titanium" -> recipeBuilder.metadata(FUEL_VALUE, 196_608)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Tritium" -> recipeBuilder.metadata(FUEL_VALUE, 61_440)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Tungsten" -> recipeBuilder.metadata(FUEL_VALUE, 384_778)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Uranium235" -> recipeBuilder.metadata(FUEL_VALUE, 481_280)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Uranium" -> recipeBuilder.metadata(FUEL_VALUE, 487_424)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Vanadium" -> recipeBuilder.metadata(FUEL_VALUE, 198_451)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Ytterbium" -> recipeBuilder.metadata(FUEL_VALUE, 379_695)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Yttrium" -> recipeBuilder.metadata(FUEL_VALUE, 255_180)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         case "Zinc" -> recipeBuilder.metadata(FUEL_VALUE, 226_304)
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                         default -> recipeBuilder
                             .metadata(FUEL_VALUE, (int) Math.max(1024L, 1024L * aMaterial.getMass()))
                             .metadata(FUEL_TYPE, 4)
-                            .addTo(GT_RecipeConstants.Fuel);
+                            .addTo(GTRecipeConstants.Fuel);
                     }
-                    if (GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L) != null) {
+                    if (GTOreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L) != null) {
                         RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L))
+                            .itemInputs(GTUtility.copyAmount(1, aStack))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L))
                             .duration(((int) Math.max(aMaterial.getMass() * 2L, 1L)) * TICKS)
                             .eut(TierEU.RECIPE_MV)
                             .addTo(vacuumFreezerRecipes);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java
index c2a68c5bc2..bca59a3543 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java
@@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -18,13 +18,13 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi
     @Override
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
-        if (gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack) && aModName.equals(GregTech.ID)) return;
+        if (GTOreDictUnificator.isBlacklisted(aStack) && aModName.equals(GregTech.ID)) return;
         switch (aMaterial.mName) {
             case "Good", "Data", "Elite", "Master", "Ultimate", "Superconductor", "Infinite", "Bio" -> {
-                if (!GT_OreDictUnificator.isBlacklisted(aStack) && !aModName.equals(GregTech.ID))
-                    GT_ModHandler.removeRecipeByOutputDelayed(aStack);
+                if (!GTOreDictUnificator.isBlacklisted(aStack) && !aModName.equals(GregTech.ID))
+                    GTModHandler.removeRecipeByOutputDelayed(aStack);
             }
-            case "Primitive", "Basic", "Advanced" -> GT_ModHandler.removeRecipeByOutputDelayed(aStack);
+            case "Primitive", "Basic", "Advanced" -> GTModHandler.removeRecipeByOutputDelayed(aStack);
         }
     }
 }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java
index 4ef818df5b..00f901b6be 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java
@@ -2,12 +2,12 @@ package gregtech.loaders.oreprocessing;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IOreRecipeRegistrator;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GTModHandler;
 
 public class ProcessingCompressed implements IOreRecipeRegistrator {
 
@@ -18,8 +18,8 @@ public class ProcessingCompressed implements IOreRecipeRegistrator {
     @Override
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
-        GT_ModHandler.removeRecipeByOutputDelayed(aStack);
-        GregTech_API
+        GTModHandler.removeRecipeByOutputDelayed(aStack);
+        GregTechAPI
             .registerCover(aStack, TextureFactory.of(aMaterial.mIconSet.mTextures[72], aMaterial.mRGBa, false), null);
     }
 }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java
index 200ce743c9..861694e35a 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java
@@ -5,22 +5,22 @@ import static gregtech.api.enums.Mods.BuildCraftSilicon;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.WaferEngravingRecipes;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.WaferEngravingRecipes;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
-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.enums.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 @SuppressWarnings("RedundantLabeledSwitchRuleCodeBlock")
 public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeRegistrator {
@@ -34,8 +34,8 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg
         ItemStack aStack) {
         switch (aOreDictName) {
             case "craftingQuartz" -> {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(new ItemStack(Blocks.redstone_torch, 3, 32767), GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(new ItemStack(Blocks.redstone_torch, 3, 32767), GTUtility.copyAmount(1, aStack))
                     .itemOutputs(new ItemStack(net.minecraft.init.Items.comparator, 1, 0))
                     .fluidInputs(Materials.Concrete.getMolten(144L))
                     .duration(2 * SECONDS)
@@ -44,58 +44,58 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg
             }
             case "craftingLensBlue" -> {
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L),
-                        GT_Utility.copyAmount(0, aStack))
-                    .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13))
+                        GTOreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L),
+                        GTUtility.copyAmount(0, aStack))
+                    .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13))
                     .duration(1 * MINUTES + 40 * SECONDS)
                     .eut(TierEU.RECIPE_EV)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L),
-                        GT_Utility.copyAmount(0, aStack))
-                    .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13))
+                        GTOreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L),
+                        GTUtility.copyAmount(0, aStack))
+                    .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13))
                     .duration(1 * MINUTES + 40 * SECONDS)
                     .eut(TierEU.RECIPE_EV)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.IC2_LapotronCrystal.getWildcard(1L), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.IC2_LapotronCrystal.getWildcard(1L), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Parts_Crystal_Chip_Master.get(3L))
                     .requiresCleanRoom()
                     .duration(45 * SECONDS)
                     .eut(TierEU.RECIPE_HV)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Chip_CrystalCPU.get(1L), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Chip_CrystalCPU.get(1L), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Chip_CrystalSoC.get(1))
                     .requiresCleanRoom()
                     .duration(30 * SECONDS)
                     .eut(40000)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_PIC.get(1))
                     .requiresCleanRoom()
                     .duration(60 * SECONDS)
                     .eut(TierEU.RECIPE_HV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_PIC.get(4))
                     .requiresCleanRoom()
                     .duration(40 * SECONDS)
                     .eut(TierEU.RECIPE_EV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_QPIC.get(1))
                     .requiresCleanRoom()
                     .duration(2 * MINUTES)
@@ -105,57 +105,57 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg
             }
             case "craftingLensYellow" -> {
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L),
-                        GT_Utility.copyAmount(0, aStack))
-                    .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14))
+                        GTOreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L),
+                        GTUtility.copyAmount(0, aStack))
+                    .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14))
                     .duration(1 * MINUTES + 40 * SECONDS)
                     .eut(TierEU.RECIPE_EV)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L),
-                        GT_Utility.copyAmount(0, aStack))
-                    .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14))
+                        GTOreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L),
+                        GTUtility.copyAmount(0, aStack))
+                    .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14))
                     .duration(1 * MINUTES + 40 * SECONDS)
                     .eut(TierEU.RECIPE_EV)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_LPIC.get(1))
                     .duration(40 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_LPIC.get(4))
                     .requiresCleanRoom()
                     .duration(30 * SECONDS)
                     .eut(TierEU.RECIPE_HV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_SoC.get(1))
                     .requiresCleanRoom()
                     .duration(45 * SECONDS)
                     .eut(TierEU.RECIPE_EV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_SoC.get(4))
                     .requiresCleanRoom()
                     .duration(30 * SECONDS)
                     .eut(TierEU.RECIPE_IV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_SoC.get(8))
                     .requiresCleanRoom()
                     .duration(15 * SECONDS)
@@ -164,29 +164,29 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg
             }
             case "craftingLensOrange" -> {
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(1))
                     .duration(15 * SECONDS)
                     .eut(64)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(4))
                     .duration(15 * SECONDS)
                     .eut(256)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(16))
                     .duration(15 * SECONDS)
                     .eut(1024)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(64))
                     .duration(15 * SECONDS)
                     .eut(4096)
@@ -195,57 +195,57 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg
             }
             case "craftingLensCyan" -> {
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L),
-                        GT_Utility.copyAmount(0, aStack))
-                    .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15))
+                        GTOreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L),
+                        GTUtility.copyAmount(0, aStack))
+                    .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15))
                     .duration(1 * MINUTES + 40 * SECONDS)
                     .eut(TierEU.RECIPE_EV)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L),
-                        GT_Utility.copyAmount(0, aStack))
-                    .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15))
+                        GTOreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L),
+                        GTUtility.copyAmount(0, aStack))
+                    .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15))
                     .duration(1 * MINUTES + 40 * SECONDS)
                     .eut(TierEU.RECIPE_EV)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_Ram.get(1))
                     .duration(60 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_Ram.get(4))
                     .requiresCleanRoom()
                     .duration(45 * SECONDS)
                     .eut(TierEU.RECIPE_HV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_Ram.get(8))
                     .requiresCleanRoom()
                     .duration(30 * SECONDS)
                     .eut(TierEU.RECIPE_EV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_Ram.get(16))
                     .requiresCleanRoom()
                     .duration(15 * SECONDS)
                     .eut(TierEU.RECIPE_IV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_Ram.get(32))
                     .requiresCleanRoom()
                     .duration(7 * SECONDS + 10 * TICKS)
@@ -255,57 +255,57 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg
             }
             case "craftingLensRed" -> {
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Redstone, 1L),
-                        GT_Utility.copyAmount(0, aStack))
-                    .itemOutputs(GT_ModHandler.getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0))
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.Redstone, 1L),
+                        GTUtility.copyAmount(0, aStack))
+                    .itemOutputs(GTModHandler.getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0))
                     .duration(2 * SECONDS + 10 * TICKS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.foil, Materials.RedAlloy, 1L),
-                        GT_Utility.copyAmount(0, aStack))
-                    .itemOutputs(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EtchedLowVoltageWiring", 1L, 0))
+                        GTOreDictUnificator.get(OrePrefixes.foil, Materials.RedAlloy, 1L),
+                        GTUtility.copyAmount(0, aStack))
+                    .itemOutputs(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EtchedLowVoltageWiring", 1L, 0))
                     .duration(10 * SECONDS)
                     .eut(16)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_ILC.get(1))
                     .duration(60 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_ILC.get(4))
                     .requiresCleanRoom()
                     .duration(45 * SECONDS)
                     .eut(TierEU.RECIPE_HV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_ILC.get(8))
                     .requiresCleanRoom()
                     .duration(30 * SECONDS)
                     .eut(TierEU.RECIPE_EV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_NPIC.get(1))
                     .requiresCleanRoom()
                     .duration(1 * MINUTES + 30 * SECONDS)
                     .eut(TierEU.RECIPE_LuV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_NPIC.get(4))
                     .requiresCleanRoom()
                     .duration(1 * MINUTES + 15 * SECONDS)
@@ -315,54 +315,54 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg
             }
             case "craftingLensGreen" -> {
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Chip_CrystalCPU.get(1))
                     .requiresCleanRoom()
                     .duration(30 * SECONDS)
                     .eut(10000)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Chip_CrystalSoC.get(1L), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Chip_CrystalSoC.get(1L), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Chip_CrystalSoC2.get(1))
                     .requiresCleanRoom()
                     .duration(60 * SECONDS)
                     .eut(80000)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_ULPIC.get(2))
                     .duration(30 * SECONDS)
                     .eut(30)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_ULPIC.get(8))
                     .duration(30 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_SoC2.get(1))
                     .requiresCleanRoom()
                     .duration(1 * MINUTES + 30 * SECONDS)
                     .eut(TierEU.RECIPE_EV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_SoC2.get(2))
                     .requiresCleanRoom()
                     .duration(1 * MINUTES + 15 * SECONDS)
                     .eut(TierEU.RECIPE_IV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_SoC2.get(4))
                     .requiresCleanRoom()
                     .duration(60 * SECONDS)
@@ -371,88 +371,88 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg
             }
             case "craftingLensWhite" -> {
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L),
-                        GT_Utility.copyAmount(0, aStack))
-                    .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19))
+                        GTOreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L),
+                        GTUtility.copyAmount(0, aStack))
+                    .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19))
                     .duration(1 * MINUTES + 40 * SECONDS)
                     .eut(TierEU.RECIPE_EV)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L),
-                        GT_Utility.copyAmount(0, aStack))
-                    .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19))
+                        GTOreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L),
+                        GTUtility.copyAmount(0, aStack))
+                    .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19))
                     .duration(1 * MINUTES + 40 * SECONDS)
                     .eut(TierEU.RECIPE_EV)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(new ItemStack(Blocks.sandstone, 1, 2), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(new ItemStack(Blocks.sandstone, 1, 2), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(new ItemStack(Blocks.sandstone, 1, 1))
                     .duration(2 * SECONDS + 10 * TICKS)
                     .eut(16)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(new ItemStack(Blocks.stone, 1, 0), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(new ItemStack(Blocks.stone, 1, 0), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(new ItemStack(Blocks.stonebrick, 1, 3))
                     .duration(2 * SECONDS + 10 * TICKS)
                     .eut(16)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(new ItemStack(Blocks.quartz_block, 1, 0), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(new ItemStack(Blocks.quartz_block, 1, 0), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 1))
                     .duration(2 * SECONDS + 10 * TICKS)
                     .eut(16)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L),
-                        GT_Utility.copyAmount(0, aStack))
-                    .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L))
+                        GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L),
+                        GTUtility.copyAmount(0, aStack))
+                    .itemOutputs(GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L))
                     .duration(2 * SECONDS + 10 * TICKS)
                     .eut(16)
                     .addTo(laserEngraverRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_CPU.get(1))
                     .requiresCleanRoom()
                     .duration(60 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_CPU.get(4))
                     .requiresCleanRoom()
                     .duration(45 * SECONDS)
                     .eut(TierEU.RECIPE_HV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_CPU.get(8))
                     .requiresCleanRoom()
                     .duration(30 * SECONDS)
                     .eut(TierEU.RECIPE_EV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_CPU.get(16))
                     .requiresCleanRoom()
                     .duration(15 * SECONDS)
                     .eut(TierEU.RECIPE_IV)
                     .addTo(WaferEngravingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GTUtility.copyAmount(0, aStack))
                     .itemOutputs(ItemList.Circuit_Wafer_CPU.get(32))
                     .requiresCleanRoom()
                     .duration(7 * SECONDS + 10 * TICKS)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java
index 92b5ae9cda..b4db15db42 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java
@@ -5,19 +5,20 @@ import static gregtech.api.recipe.RecipeMaps.brewingRecipes;
 import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
 import static gregtech.api.recipe.RecipeMaps.slicerRecipes;
-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 net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-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.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -29,8 +30,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         net.minecraft.item.ItemStack aStack) {
         // Compressor recipes
-        GT_Values.RA.stdBuilder()
-            .itemInputs(gregtech.api.util.GT_Utility.copyAmount(8, aStack))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(8, aStack))
             .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
@@ -39,7 +40,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
         Fluid[] waterArray;
 
         if (IndustrialCraft2.isModLoaded()) {
-            waterArray = new Fluid[] { FluidRegistry.WATER, GT_ModHandler.getDistilledWater(1L)
+            waterArray = new Fluid[] { FluidRegistry.WATER, GTModHandler.getDistilledWater(1L)
                 .getFluid() };
         } else {
             waterArray = new Fluid[] { FluidRegistry.WATER };
@@ -48,7 +49,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
         switch (aOreDictName) {
             case "cropTea" -> {
                 for (Fluid tFluid : waterArray) {
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(aStack)
                         .fluidInputs(new FluidStack(tFluid, 750))
                         .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.tea"), 750))
@@ -59,7 +60,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
             }
             case "cropGrape" -> {
                 for (Fluid tFluid : waterArray) {
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(aStack)
                         .fluidInputs(new FluidStack(tFluid, 750))
                         .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.grapejuice"), 750))
@@ -68,27 +69,27 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
                         .addTo(brewingRecipes);
                 }
             }
-            case "cropChilipepper" -> GT_Values.RA.stdBuilder()
+            case "cropChilipepper" -> GTValues.RA.stdBuilder()
                 .itemInputs(aStack)
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L))
                 .duration(20 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
-            case "cropCoffee" -> GT_Values.RA.stdBuilder()
+            case "cropCoffee" -> GTValues.RA.stdBuilder()
                 .itemInputs(aStack)
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L))
                 .duration(20 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
             case "cropPotato" -> {
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(aStack, ItemList.Shape_Slicer_Flat.get(0))
                     .itemOutputs(ItemList.Food_Raw_PotatoChips.get(1L))
                     .duration(3 * SECONDS + 4 * TICKS)
                     .eut(4)
                     .addTo(slicerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(aStack, ItemList.Shape_Slicer_Stripes.get(0L))
                     .itemOutputs(ItemList.Food_Raw_Fries.get(1L))
                     .duration(3 * SECONDS + 4 * TICKS)
@@ -96,7 +97,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
                     .addTo(slicerRecipes);
 
                 for (Fluid tFluid : waterArray) {
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(aStack)
                         .fluidInputs(new FluidStack(tFluid, 750))
                         .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.potatojuice"), 750))
@@ -106,7 +107,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
                 }
             }
             case "cropLemon" -> {
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(aStack, ItemList.Shape_Slicer_Flat.get(0))
                     .itemOutputs(ItemList.Food_Sliced_Lemon.get(4L))
                     .duration(3 * SECONDS + 4 * TICKS)
@@ -114,7 +115,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
                     .addTo(slicerRecipes);
 
                 for (Fluid tFluid : waterArray) {
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(aStack)
                         .fluidInputs(new FluidStack(tFluid, 750))
                         .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.lemonjuice"), 750))
@@ -123,7 +124,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
                         .addTo(brewingRecipes);
                 }
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(aStack)
                     .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 750))
                     .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.leninade"), 750))
@@ -131,19 +132,19 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
                     .eut(4)
                     .addTo(brewingRecipes);
             }
-            case "cropTomato" -> GT_Values.RA.stdBuilder()
+            case "cropTomato" -> GTValues.RA.stdBuilder()
                 .itemInputs(aStack, ItemList.Shape_Slicer_Flat.get(0))
                 .itemOutputs(ItemList.Food_Sliced_Tomato.get(4L))
                 .duration(3 * SECONDS + 4 * TICKS)
                 .eut(4)
                 .addTo(slicerRecipes);
-            case "cropCucumber" -> GT_Values.RA.stdBuilder()
+            case "cropCucumber" -> GTValues.RA.stdBuilder()
                 .itemInputs(aStack, ItemList.Shape_Slicer_Flat.get(0))
                 .itemOutputs(ItemList.Food_Sliced_Cucumber.get(4L))
                 .duration(3 * SECONDS + 4 * TICKS)
                 .eut(4)
                 .addTo(slicerRecipes);
-            case "cropOnion" -> GT_Values.RA.stdBuilder()
+            case "cropOnion" -> GTValues.RA.stdBuilder()
                 .itemInputs(aStack, ItemList.Shape_Slicer_Flat.get(0))
                 .itemOutputs(ItemList.Food_Sliced_Onion.get(4L))
                 .duration(3 * SECONDS + 4 * TICKS)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java
index a730a1849b..ed80d04e99 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java
@@ -4,16 +4,16 @@ import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
 import static gregtech.api.recipe.RecipeMaps.sifterRecipes;
 import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes;
-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 net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -27,20 +27,20 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR
         ItemStack aStack) {
         switch (aPrefix) {
             case crushedCentrifuged -> {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L))
                     .duration(10 * TICKS)
                     .eut(16)
                     .addTo(hammerRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
-                        GT_OreDictUnificator.get(
+                        GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
+                        GTOreDictUnificator.get(
                             OrePrefixes.dust,
-                            GT_Utility.selectItemInList(2, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
+                            GTUtility.selectItemInList(2, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
                             1L))
                     .outputChances(10000, 1000)
                     .duration(20 * SECONDS)
@@ -48,52 +48,52 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR
                     .addTo(maceratorRecipes);
             }
             case crushedPurified -> {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(
+                        GTOreDictUnificator.get(
                             OrePrefixes.crushedCentrifuged,
                             aMaterial.mMacerateInto,
-                            GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
                             1L),
-                        GT_OreDictUnificator.get(
+                        GTOreDictUnificator.get(
                             OrePrefixes.dust,
-                            GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
+                            GTUtility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
                             1L))
                     .outputChances(10000, 1111)
                     .duration(25 * SECONDS)
                     .eut(48)
                     .addTo(thermalCentrifugeRecipes);
 
-                ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L);
+                ItemStack tGem = GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L);
                 if (tGem == null) {
                     break;
                 }
 
                 switch (aMaterial.mName) {
-                    case "Tanzanite", "Sapphire", "Olivine", "GreenSapphire", "Opal", "Amethyst", "Emerald", "Ruby", "Amber", "Diamond", "FoolsRuby", "BlueTopaz", "GarnetRed", "Topaz", "Jasper", "GarnetYellow" -> GT_Values.RA
+                    case "Tanzanite", "Sapphire", "Olivine", "GreenSapphire", "Opal", "Amethyst", "Emerald", "Ruby", "Amber", "Diamond", "FoolsRuby", "BlueTopaz", "GarnetRed", "Topaz", "Jasper", "GarnetYellow" -> GTValues.RA
                         .stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
                         .itemOutputs(
-                            GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L),
                             tGem,
-                            GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L))
+                            GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L))
                         .outputChances(300, 1200, 4500, 1400, 2800, 3500)
                         .duration(40 * SECONDS)
                         .eut(16)
                         .addTo(sifterRecipes);
-                    default -> GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
+                    default -> GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
                         .itemOutputs(
-                            GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L),
                             tGem,
-                            GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L))
+                            GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L))
                         .outputChances(100, 400, 1500, 2000, 4000, 5000)
                         .duration(40 * SECONDS)
                         .eut(16)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java
index ec8fd12a74..435573420d 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java
@@ -2,16 +2,16 @@ package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
-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 net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingCrystallized implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -27,20 +27,20 @@ public class ProcessingCrystallized implements gregtech.api.interfaces.IOreRecip
             return;
         }
 
-        if (GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1) == null) {
+        if (GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1) == null) {
             return;
         }
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, aStack))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L))
             .duration(10 * TICKS)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, aStack))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java
index ed152fc47f..a09cc2ca44 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java
@@ -1,22 +1,22 @@
 package gregtech.loaders.oreprocessing;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
 import static gregtech.api.recipe.RecipeMaps.oreWasherRecipes;
 import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import net.minecraft.item.ItemStack;
 
-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.SubTag;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -30,24 +30,24 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist
     @Override
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         net.minecraft.item.ItemStack aStack) {
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, aStack))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L))
             .duration(10)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, aStack))
             .itemOutputs(
-                GT_OreDictUnificator.get(
+                GTOreDictUnificator.get(
                     OrePrefixes.dustImpure,
                     aMaterial.mMacerateInto,
-                    GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
                     1L),
-                GT_OreDictUnificator.get(
+                GTOreDictUnificator.get(
                     OrePrefixes.dust,
-                    GT_Utility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
+                    GTUtility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
                     1L))
             .outputChances(10000, 1000)
             .duration(20 * SECONDS)
@@ -55,52 +55,52 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist
             .addTo(maceratorRecipes);
 
         RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
+            .itemInputs(GTUtility.copyAmount(1, aStack))
             .itemOutputs(
-                GT_OreDictUnificator.get(
+                GTOreDictUnificator.get(
                     aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure,
                     aMaterial,
                     1L),
-                GT_OreDictUnificator.get(
+                GTOreDictUnificator.get(
                     OrePrefixes.dust,
-                    GT_Utility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
+                    GTUtility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
                     1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L))
             .outputChances(100_00, 11_11, 100_00)
-            .fluidInputs(GT_ModHandler.getWater(1000))
+            .fluidInputs(GTModHandler.getWater(1000))
             .duration(25 * SECONDS)
             .eut(16)
             .addTo(oreWasherRecipes);
 
         RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
+            .itemInputs(GTUtility.copyAmount(1, aStack))
             .itemOutputs(
-                GT_OreDictUnificator.get(
+                GTOreDictUnificator.get(
                     aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure,
                     aMaterial,
                     1L),
-                GT_OreDictUnificator.get(
+                GTOreDictUnificator.get(
                     OrePrefixes.dust,
-                    GT_Utility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
+                    GTUtility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
                     1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L))
             .outputChances(100_00, 11_11, 100_00)
-            .fluidInputs(GT_ModHandler.getDistilledWater(200))
+            .fluidInputs(GTModHandler.getDistilledWater(200))
             .duration(15 * SECONDS)
             .eut(16)
             .addTo(oreWasherRecipes);
 
         OrePrefixes prefix = aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedCentrifuged : OrePrefixes.dust;
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, aStack))
             .itemOutputs(
-                GT_OreDictUnificator.get(prefix, aMaterial, 1L),
-                GT_OreDictUnificator.get(
+                GTOreDictUnificator.get(prefix, aMaterial, 1L),
+                GTOreDictUnificator.get(
                     OrePrefixes.dust,
-                    GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
+                    GTUtility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
                     1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L))
             .outputChances(10000, 1111, 10000)
             .duration(25 * SECONDS)
             .eut(48)
@@ -118,12 +118,12 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist
             : OrePrefixes.dustPure;
 
         if (byproduct.contains(SubTag.WASHING_MERCURY)) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, stack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, stack))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(chemicalBathPrefix, material, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L))
+                    GTOreDictUnificator.get(chemicalBathPrefix, material, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L))
                 .outputChances(10000, 7000, 4000)
                 .fluidInputs(Materials.Mercury.getFluid(1000L))
                 .duration(40 * SECONDS)
@@ -131,12 +131,12 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist
                 .addTo(chemicalBathRecipes);
         }
         if (byproduct.contains(SubTag.WASHING_MERCURY_99_PERCENT)) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, stack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, stack))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(chemicalBathPrefix, material, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L))
+                    GTOreDictUnificator.get(chemicalBathPrefix, material, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L))
                 .outputChances(10000, 9900, 4000)
                 .fluidInputs(Materials.Mercury.getFluid(1000L))
                 .duration(40 * SECONDS)
@@ -144,12 +144,12 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist
                 .addTo(chemicalBathRecipes);
         }
         if (byproduct.contains(SubTag.WASHING_SODIUMPERSULFATE)) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, stack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, stack))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(chemicalBathPrefix, material, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L))
+                    GTOreDictUnificator.get(chemicalBathPrefix, material, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L))
                 .outputChances(10000, 7000, 4000)
                 .fluidInputs(Materials.SodiumPersulfate.getFluid(100L))
                 .duration(40 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
index c8a3af1130..3398fda98d 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
@@ -9,12 +9,12 @@ import static gregtech.api.recipe.RecipeMaps.electroMagneticSeparatorRecipes;
 import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes;
 import static gregtech.api.recipe.RecipeMaps.implosionRecipes;
 import static gregtech.api.recipe.RecipeMaps.packagerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
+import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE;
+import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
 
 import java.util.ArrayList;
 
@@ -22,7 +22,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-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;
@@ -30,12 +30,12 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
 import gregtech.api.enums.TierEU;
 import gregtech.api.objects.MaterialStack;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_RecipeConstants;
-import gregtech.api.util.GT_RecipeRegistrator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTRecipeConstants;
+import gregtech.api.util.GTRecipeRegistrator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -54,26 +54,26 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
         switch (aPrefix) {
             case dust -> {
                 if (aMaterial.mFuelPower > 0) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
                         .metadata(FUEL_VALUE, aMaterial.mFuelPower)
                         .metadata(FUEL_TYPE, aMaterial.mFuelType)
-                        .addTo(GT_RecipeConstants.Fuel);
+                        .addTo(GTRecipeConstants.Fuel);
                 }
-                if ((GT_Utility.getFluidForFilledItem(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), true)
-                    == null) && (GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L) != null)) {
-                    GT_Values.RA.stdBuilder()
+                if ((GTUtility.getFluidForFilledItem(GTOreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), true)
+                    == null) && (GTOreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L) != null)) {
+                    GTValues.RA.stdBuilder()
                         .itemInputs(aStack, ItemList.Cell_Empty.get(1L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L))
                         .duration(5 * SECONDS)
                         .eut(1)
                         .addTo(cannerRecipes);
                 }
                 if (!aMaterial.mBlastFurnaceRequired) {
-                    GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null);
+                    GTRecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null);
                     if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) {
-                        GT_RecipeRegistrator.registerReverseArcSmelting(
-                            GT_Utility.copyAmount(1, aStack),
+                        GTRecipeRegistrator.registerReverseArcSmelting(
+                            GTUtility.copyAmount(1, aStack),
                             aMaterial,
                             aPrefix.mMaterialAmount,
                             null,
@@ -82,20 +82,20 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                     }
                 }
                 ItemStack tDustStack;
-                if ((null != (tDustStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L)))
+                if ((null != (tDustStack = GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L)))
                     && (!aMaterial.contains(SubTag.NO_SMELTING))) {
                     if (aMaterial.mBlastFurnaceRequired) {
-                        GT_ModHandler.removeFurnaceSmelting(aStack);
+                        GTModHandler.removeFurnaceSmelting(aStack);
                         if (aMaterial.mAutoGenerateBlastFurnaceRecipes) {
-                            GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+                            GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder();
                             recipeBuilder
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1));
+                                .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1));
                             if (aMaterial.mBlastFurnaceTemp > 1750) {
                                 recipeBuilder.itemOutputs(
-                                    GT_OreDictUnificator
+                                    GTOreDictUnificator
                                         .get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L));
                             } else {
-                                recipeBuilder.itemOutputs(GT_Utility.copyAmount(1, tDustStack));
+                                recipeBuilder.itemOutputs(GTUtility.copyAmount(1, tDustStack));
                             }
                             recipeBuilder
                                 .duration(
@@ -105,23 +105,23 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                                 .addTo(blastFurnaceRecipes);
                         }
                     } else {
-                        GT_ModHandler.addSmeltingRecipe(aStack, tDustStack);
+                        GTModHandler.addSmeltingRecipe(aStack, tDustStack);
                     }
                 } else if (!aMaterial.contains(SubTag.NO_WORKING)) {
                     if ((!OrePrefixes.block.isIgnored(aMaterial))
-                        && (null == GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))
-                        && GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L) != null) {
+                        && (null == GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))
+                        && GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L) != null) {
 
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(9, aStack))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(9, aStack))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))
                             .duration(15 * SECONDS)
                             .eut(2)
                             .addTo(compressorRecipes);
                     }
                     // This is so disgustingly bad.
                     if (((OrePrefixes.block.isIgnored(aMaterial))
-                        || (null == GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)))
+                        || (null == GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)))
                         && (aMaterial != Materials.GraniteRed)
                         && (aMaterial != Materials.GraniteBlack)
                         && (aMaterial != Materials.Basalt)
@@ -134,10 +134,10 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                         && (aMaterial != Materials.Clay)) {
                         // compressor recipe
                         {
-                            if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
-                                GT_Values.RA.stdBuilder()
-                                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                            if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
+                                GTValues.RA.stdBuilder()
+                                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                                     .duration(15 * SECONDS)
                                     .eut(2)
                                     .addTo(compressorRecipes);
@@ -155,9 +155,9 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                         if (tMat.mMaterial == Materials.Air) {
                             tDustStack = ItemList.Cell_Air.get(tMat.mAmount / 2L);
                         } else {
-                            tDustStack = GT_OreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount);
+                            tDustStack = GTOreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount);
                             if (tDustStack == null)
-                                tDustStack = GT_OreDictUnificator.get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount);
+                                tDustStack = GTOreDictUnificator.get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount);
                         }
                         if (tItemAmount + tMat.mAmount * 3628800L
                             <= aStack.getMaxStackSize() * aMaterial.getDensity()) {
@@ -165,17 +165,17 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                             if (tDustStack != null) {
                                 tDustStack.stackSize = ((int) (tDustStack.stackSize * tDensityMultiplier));
                                 while ((tDustStack.stackSize > 64) && (tList.size() < 6)
-                                    && (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCount(tDustStack) * 64L
+                                    && (tCapsuleCount + GTModHandler.getCapsuleCellContainerCount(tDustStack) * 64L
                                         <= 64L)) {
-                                    tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCount(tDustStack) * 64L;
-                                    tList.add(GT_Utility.copyAmount(64, tDustStack));
+                                    tCapsuleCount += GTModHandler.getCapsuleCellContainerCount(tDustStack) * 64L;
+                                    tList.add(GTUtility.copyAmount(64, tDustStack));
                                     tDustStack.stackSize -= 64;
                                 }
                                 if ((tDustStack.stackSize > 0) && (tList.size() < 6)
                                     && (tCapsuleCount
-                                        + GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack)
+                                        + GTModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack)
                                         <= 64L)) {
-                                    tCapsuleCount += GT_ModHandler
+                                    tCapsuleCount += GTModHandler
                                         .getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack);
                                     tList.add(tDustStack);
                                 }
@@ -189,9 +189,9 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                         int tList_sS = tList.size();
                         for (int i = 0; i < tList_sS; i++) {
                             if ((!ItemList.Cell_Air.isStackEqual(tList.get(i)))
-                                && ((tFluid = GT_Utility.getFluidForFilledItem(tList.get(i), true)) != null)) {
+                                && ((tFluid = GTUtility.getFluidForFilledItem(tList.get(i), true)) != null)) {
                                 tFluid.amount *= tList.get(i).stackSize;
-                                tCapsuleCount -= GT_ModHandler
+                                tCapsuleCount -= GTModHandler
                                     .getCapsuleCellContainerCountMultipliedWithStackSize(tList.get(i));
                                 tList.remove(i);
                                 break;
@@ -199,13 +199,13 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                         }
                         if ((aMaterial.mExtraData & 0x1) != 0) {
                             if (tList.size() > 0 || tFluid != null) {
-                                GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+                                GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder();
                                 if (tCapsuleCount > 0L) {
                                     recipeBuilder.itemInputs(
-                                        GT_Utility.copyAmount(tItemAmount, aStack),
+                                        GTUtility.copyAmount(tItemAmount, aStack),
                                         ItemList.Cell_Empty.get(tCapsuleCount));
                                 } else {
-                                    recipeBuilder.itemInputs(GT_Utility.copyAmount(tItemAmount, aStack));
+                                    recipeBuilder.itemInputs(GTUtility.copyAmount(tItemAmount, aStack));
                                 }
                                 if (tList.size() > 0) {
                                     ItemStack[] outputsArray = tList.toArray(new ItemStack[Math.min(tList.size(), 6)]);
@@ -222,13 +222,13 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                         }
                         if ((aMaterial.mExtraData & 0x2) != 0) {
                             if (tList.size() > 0 || tFluid != null) {
-                                GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+                                GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder();
                                 if (tCapsuleCount > 0L) {
                                     recipeBuilder.itemInputs(
-                                        GT_Utility.copyAmount(tItemAmount, aStack),
+                                        GTUtility.copyAmount(tItemAmount, aStack),
                                         ItemList.Cell_Empty.get(tCapsuleCount));
                                 } else {
-                                    recipeBuilder.itemInputs(GT_Utility.copyAmount(tItemAmount, aStack));
+                                    recipeBuilder.itemInputs(GTUtility.copyAmount(tItemAmount, aStack));
                                 }
                                 if (tList.size() > 0) {
                                     ItemStack[] outputsArray = tList.toArray(new ItemStack[Math.min(tList.size(), 6)]);
@@ -245,26 +245,26 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                     }
                 }
                 if (aMaterial.contains(SubTag.CRYSTALLISABLE)
-                    && GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))
+                    && GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))
                         .outputChances(7000)
                         .fluidInputs(Materials.Water.getFluid(200L))
                         .duration(1 * MINUTES + 40 * SECONDS)
                         .eut(24)
                         .addTo(autoclaveRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(2))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(2))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))
                         .outputChances(9000)
-                        .fluidInputs(GT_ModHandler.getDistilledWater(100L))
+                        .fluidInputs(GTModHandler.getDistilledWater(100L))
                         .duration(1 * MINUTES + 15 * SECONDS)
                         .eut(24)
                         .addTo(autoclaveRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))
                         .outputChances(10000)
                         .fluidInputs(Materials.Void.getMolten(36L))
                         .duration(1 * MINUTES)
@@ -275,65 +275,63 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                     case "NULL", "Mercury", "Coal":
                         break;
                     case "Glass":
-                        GT_ModHandler.addSmeltingRecipe(
-                            GT_Utility.copyAmount(1, aStack),
+                        GTModHandler.addSmeltingRecipe(
+                            GTUtility.copyAmount(1, aStack),
                             new ItemStack(net.minecraft.init.Blocks.glass));
                         break;
                     case "NetherQuartz":
                     case "Quartz":
                     case "CertusQuartz":
-                        GT_ModHandler.removeFurnaceSmelting(aStack);
+                        GTModHandler.removeFurnaceSmelting(aStack);
                         break;
                     case "MeatRaw":
-                        GT_ModHandler.addSmeltingRecipe(
-                            GT_Utility.copyAmount(1, aStack),
-                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1L));
+                        GTModHandler.addSmeltingRecipe(
+                            GTUtility.copyAmount(1, aStack),
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1L));
                         break;
                     case "Oilsands":
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack))
                             .fluidOutputs(Materials.OilHeavy.getFluid(1000))
                             .duration(33 * SECONDS)
                             .eut(8)
                             .addTo(centrifugeRecipes);
                         break;
                     case "HydratedCoal":
-                        GT_ModHandler.addSmeltingRecipe(
-                            GT_Utility.copyAmount(1, aStack),
-                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L));
+                        GTModHandler.addSmeltingRecipe(
+                            GTUtility.copyAmount(1, aStack),
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L));
                         break;
                     case "Diamond": {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(4, aStack), ItemList.Block_Powderbarrel.get(64))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(4, aStack), ItemList.Block_Powderbarrel.get(64))
                             .itemOutputs(
                                 ItemList.IC2_Industrial_Diamond.get(3L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L))
+                                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L))
                             .duration(1 * SECONDS)
                             .eut(TierEU.RECIPE_LV)
                             .addTo(implosionRecipes);
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(
-                                GT_Utility.copyAmount(4, aStack),
-                                GT_ModHandler.getIC2Item("dynamite", 16, null))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("dynamite", 16, null))
                             .itemOutputs(
                                 ItemList.IC2_Industrial_Diamond.get(3L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L))
+                                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L))
                             .duration(1 * SECONDS)
                             .eut(TierEU.RECIPE_LV)
                             .addTo(implosionRecipes);
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(4, aStack), new ItemStack(Blocks.tnt, 32))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(4, aStack), new ItemStack(Blocks.tnt, 32))
                             .itemOutputs(
                                 ItemList.IC2_Industrial_Diamond.get(3L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L))
+                                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L))
                             .duration(1 * SECONDS)
                             .eut(TierEU.RECIPE_LV)
                             .addTo(implosionRecipes);
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(4, aStack), GT_ModHandler.getIC2Item("industrialTnt", 8))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("industrialTnt", 8))
                             .itemOutputs(
                                 ItemList.IC2_Industrial_Diamond.get(3L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L))
+                                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L))
                             .duration(1 * SECONDS)
                             .eut(TierEU.RECIPE_LV)
                             .addTo(implosionRecipes);
@@ -349,37 +347,35 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                     case "BlueTopaz":
                     case "Tanzanite":
                     case "Amethyst": {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(4, aStack), ItemList.Block_Powderbarrel.get(48))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(4, aStack), ItemList.Block_Powderbarrel.get(48))
                             .itemOutputs(
-                                GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L))
+                                GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
+                                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L))
                             .duration(1 * SECONDS)
                             .eut(TierEU.RECIPE_LV)
                             .addTo(implosionRecipes);
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(
-                                GT_Utility.copyAmount(4, aStack),
-                                GT_ModHandler.getIC2Item("dynamite", 12, null))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("dynamite", 12, null))
                             .itemOutputs(
-                                GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L))
+                                GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
+                                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L))
                             .duration(1 * SECONDS)
                             .eut(TierEU.RECIPE_LV)
                             .addTo(implosionRecipes);
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(4, aStack), new ItemStack(Blocks.tnt, 24))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(4, aStack), new ItemStack(Blocks.tnt, 24))
                             .itemOutputs(
-                                GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L))
+                                GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
+                                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L))
                             .duration(1 * SECONDS)
                             .eut(TierEU.RECIPE_LV)
                             .addTo(implosionRecipes);
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(4, aStack), GT_ModHandler.getIC2Item("industrialTnt", 6))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("industrialTnt", 6))
                             .itemOutputs(
-                                GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L))
+                                GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
+                                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L))
                             .duration(1 * SECONDS)
                             .eut(TierEU.RECIPE_LV)
                             .addTo(implosionRecipes);
@@ -394,35 +390,35 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                     case "Forcicium":
                     case "Forcillium":
                     case "Force": {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(4, aStack), ItemList.Block_Powderbarrel.get(32))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(4, aStack), ItemList.Block_Powderbarrel.get(32))
                             .itemOutputs(
-                                GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L))
+                                GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
+                                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L))
                             .duration(1 * SECONDS)
                             .eut(TierEU.RECIPE_LV)
                             .addTo(implosionRecipes);
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(4, aStack), GT_ModHandler.getIC2Item("dynamite", 8, null))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("dynamite", 8, null))
                             .itemOutputs(
-                                GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L))
+                                GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
+                                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L))
                             .duration(1 * SECONDS)
                             .eut(TierEU.RECIPE_LV)
                             .addTo(implosionRecipes);
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(4, aStack), new ItemStack(Blocks.tnt, 16))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(4, aStack), new ItemStack(Blocks.tnt, 16))
                             .itemOutputs(
-                                GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L))
+                                GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
+                                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L))
                             .duration(1 * SECONDS)
                             .eut(TierEU.RECIPE_LV)
                             .addTo(implosionRecipes);
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(4, aStack), GT_ModHandler.getIC2Item("industrialTnt", 4))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("industrialTnt", 4))
                             .itemOutputs(
-                                GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L))
+                                GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
+                                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L))
                             .duration(1 * SECONDS)
                             .eut(TierEU.RECIPE_LV)
                             .addTo(implosionRecipes);
@@ -430,42 +426,42 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                 }
             }
             case dustPure, dustImpure, dustRefined -> {
-                Materials tByProduct = GT_Utility.selectItemInList(
+                Materials tByProduct = GTUtility.selectItemInList(
                     aPrefix == OrePrefixes.dustRefined ? 2 : aPrefix == OrePrefixes.dustPure ? 1 : 0,
                     aMaterial,
                     aMaterial.mOreByProducts);
                 if (aPrefix == OrePrefixes.dustPure) {
                     if (aMaterial.contains(SubTag.ELECTROMAGNETIC_SEPERATION_GOLD)) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack))
                             .itemOutputs(
-                                GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Gold, 1L),
-                                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 1L))
+                                GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L),
+                                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Gold, 1L),
+                                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 1L))
                             .outputChances(10000, 4000, 2000)
                             .duration(20 * SECONDS)
                             .eut(24)
                             .addTo(electroMagneticSeparatorRecipes);
                     }
                     if (aMaterial.contains(SubTag.ELECTROMAGNETIC_SEPERATION_IRON)) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack))
                             .itemOutputs(
-                                GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L),
-                                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1L))
+                                GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L),
+                                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L),
+                                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1L))
                             .outputChances(10000, 4000, 2000)
                             .duration(20 * SECONDS)
                             .eut(24)
                             .addTo(electroMagneticSeparatorRecipes);
                     }
                     if (aMaterial.contains(SubTag.ELECTROMAGNETIC_SEPERATION_NEODYMIUM)) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack))
                             .itemOutputs(
-                                GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neodymium, 1L),
-                                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Neodymium, 1L))
+                                GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L),
+                                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neodymium, 1L),
+                                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Neodymium, 1L))
                             .outputChances(10000, 4000, 2000)
                             .duration(20 * SECONDS)
                             .eut(24)
@@ -473,70 +469,70 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                     }
                 }
                 if (aMaterial.contains(SubTag.CRYSTALLISABLE)
-                    && GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))
+                    && GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))
                         .outputChances(9000)
                         .fluidInputs(Materials.Water.getFluid(200L))
                         .duration(1 * MINUTES + 40 * SECONDS)
                         .eut(24)
                         .addTo(autoclaveRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(2))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(2))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))
                         .outputChances(9500)
-                        .fluidInputs(GT_ModHandler.getDistilledWater(100L))
+                        .fluidInputs(GTModHandler.getDistilledWater(100L))
                         .duration(1 * MINUTES + 15 * SECONDS)
                         .eut(24)
                         .addTo(autoclaveRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))
                         .outputChances(10000)
                         .fluidInputs(Materials.Void.getMolten(36L))
                         .duration(1 * MINUTES)
                         .eut(24)
                         .addTo(autoclaveRecipes);
                 }
-                ItemStack tImpureStack = GT_OreDictUnificator.get(
+                ItemStack tImpureStack = GTOreDictUnificator.get(
                     OrePrefixes.dustTiny,
                     tByProduct,
-                    GT_OreDictUnificator.get(OrePrefixes.nugget, tByProduct, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.nugget, tByProduct, 1L),
                     1L);
                 if (tImpureStack == null) {
-                    tImpureStack = GT_OreDictUnificator.get(OrePrefixes.dustSmall, tByProduct, 1L);
+                    tImpureStack = GTOreDictUnificator.get(OrePrefixes.dustSmall, tByProduct, 1L);
                     if (tImpureStack == null) {
-                        tImpureStack = GT_OreDictUnificator.get(
+                        tImpureStack = GTOreDictUnificator.get(
                             OrePrefixes.dust,
                             tByProduct,
-                            GT_OreDictUnificator.get(OrePrefixes.gem, tByProduct, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.gem, tByProduct, 1L),
                             1L);
                         if (tImpureStack == null) {
-                            tImpureStack = GT_OreDictUnificator.get(OrePrefixes.cell, tByProduct, 1L);
+                            tImpureStack = GTOreDictUnificator.get(OrePrefixes.cell, tByProduct, 1L);
                             if (tImpureStack == null) {
-                                GT_Values.RA.stdBuilder()
-                                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L))
+                                GTValues.RA.stdBuilder()
+                                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L))
                                     .duration(Math.max(1L, aMaterial.getMass()))
                                     .eut(5)
                                     .addTo(centrifugeRecipes);
                             } else {
-                                FluidStack tFluid = GT_Utility.getFluidForFilledItem(tImpureStack, true);
+                                FluidStack tFluid = GTUtility.getFluidForFilledItem(tImpureStack, true);
                                 if (tFluid == null) {
-                                    GT_Values.RA.stdBuilder()
-                                        .itemInputs(GT_Utility.copyAmount(9, aStack), ItemList.Cell_Empty.get(1))
+                                    GTValues.RA.stdBuilder()
+                                        .itemInputs(GTUtility.copyAmount(9, aStack), ItemList.Cell_Empty.get(1))
                                         .itemOutputs(
-                                            GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 9L),
+                                            GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 9L),
                                             tImpureStack)
                                         .duration(Math.max(1L, aMaterial.getMass() * 72L))
                                         .eut(5)
                                         .addTo(centrifugeRecipes);
                                 } else {
                                     tFluid.amount /= 10;
-                                    GT_Values.RA.stdBuilder()
-                                        .itemInputs(GT_Utility.copyAmount(1, aStack))
-                                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L))
+                                    GTValues.RA.stdBuilder()
+                                        .itemInputs(GTUtility.copyAmount(1, aStack))
+                                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L))
                                         .fluidOutputs(tFluid)
                                         .duration(Math.max(1L, aMaterial.getMass() * 8L))
                                         .eut(5)
@@ -544,30 +540,30 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                                 }
                             }
                         } else {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(9, aStack))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 9L), tImpureStack)
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(9, aStack))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 9L), tImpureStack)
                                 .duration(Math.max(1L, aMaterial.getMass() * 72L))
                                 .eut(5)
                                 .addTo(centrifugeRecipes);
                         }
                     } else {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(2, aStack))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), tImpureStack)
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(2, aStack))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), tImpureStack)
                             .duration(Math.max(1L, aMaterial.getMass() * 16L))
                             .eut(5)
                             .addTo(centrifugeRecipes);
                     }
                 } else {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
                         .itemOutputs(
-                            GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L),
-                            GT_OreDictUnificator.get(
+                            GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L),
+                            GTOreDictUnificator.get(
                                 OrePrefixes.dust,
                                 tByProduct,
-                                GT_OreDictUnificator.get(OrePrefixes.nugget, tByProduct, 1L),
+                                GTOreDictUnificator.get(OrePrefixes.nugget, tByProduct, 1L),
                                 1L))
                         .outputChances(10000, 1111)
                         .duration(Math.max(1L, aMaterial.getMass() * 8L))
@@ -576,17 +572,17 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                 }
             }
             case dustSmall -> {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(4, aStack), ItemList.Schematic_Dust.get(0L))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(4, aStack), ItemList.Schematic_Dust.get(0L))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L))
                     .duration(1 * SECONDS)
                     .eut(4)
                     .addTo(packagerRecipes);
                 if (!aMaterial.mBlastFurnaceRequired) {
-                    GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null);
+                    GTRecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null);
                     if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) {
-                        GT_RecipeRegistrator.registerReverseArcSmelting(
-                            GT_Utility.copyAmount(1, aStack),
+                        GTRecipeRegistrator.registerReverseArcSmelting(
+                            GTUtility.copyAmount(1, aStack),
                             aMaterial,
                             aPrefix.mMaterialAmount,
                             null,
@@ -596,17 +592,17 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                 }
             }
             case dustTiny -> {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(9, aStack), ItemList.Schematic_Dust.get(0L))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(9, aStack), ItemList.Schematic_Dust.get(0L))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L))
                     .duration(1 * SECONDS)
                     .eut(4)
                     .addTo(packagerRecipes);
                 if (!aMaterial.mBlastFurnaceRequired) {
-                    GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null);
+                    GTRecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null);
                     if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) {
-                        GT_RecipeRegistrator.registerReverseArcSmelting(
-                            GT_Utility.copyAmount(1, aStack),
+                        GTRecipeRegistrator.registerReverseArcSmelting(
+                            GTUtility.copyAmount(1, aStack),
                             aMaterial,
                             aPrefix.mMaterialAmount,
                             null,
@@ -616,7 +612,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
                 }
                 if (!aMaterial.contains(SubTag.NO_SMELTING)) {
                     if (aMaterial.mBlastFurnaceRequired) {
-                        GT_ModHandler.removeFurnaceSmelting(aStack);
+                        GTModHandler.removeFurnaceSmelting(aStack);
                     }
                 }
             }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java
index 9661033e6a..5c2be8a785 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java
@@ -1,12 +1,12 @@
 package gregtech.loaders.oreprocessing;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
 import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeBuilder.WILDCARD;
-import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.WILDCARD;
+import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
 
 import java.util.Locale;
 
@@ -15,13 +15,13 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 
 import gregtech.api.enums.Dyes;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IOreRecipeRegistrator;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingDye implements IOreRecipeRegistrator {
 
@@ -33,7 +33,7 @@ public class ProcessingDye implements IOreRecipeRegistrator {
     public void registerOre(OrePrefixes prefix, Materials material, String oreDictName, String modName,
         ItemStack stack) {
         Dyes aDye = Dyes.get(oreDictName);
-        if ((aDye.mIndex >= 0) && (aDye.mIndex < 16) && (GT_Utility.getContainerItem(stack, true) == null)) {
+        if ((aDye.mIndex >= 0) && (aDye.mIndex < 16) && (GTUtility.getContainerItem(stack, true) == null)) {
             registerAlloySmelter(stack, aDye);
             registerMixer(stack, aDye);
             registerChemicalReactor(stack, aDye);
@@ -44,17 +44,17 @@ public class ProcessingDye implements IOreRecipeRegistrator {
         String fluidName = "dye.watermixed." + dye.name()
             .toLowerCase(Locale.ENGLISH);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, stack), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, stack), GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Water.getFluid(216L))
             .fluidOutputs(FluidRegistry.getFluidStack(fluidName, 192))
             .duration(16 * TICKS)
             .eut(4)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, stack), GT_Utility.getIntegratedCircuit(1))
-            .fluidInputs(GT_ModHandler.getDistilledWater(288L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, stack), GTUtility.getIntegratedCircuit(1))
+            .fluidInputs(GTModHandler.getDistilledWater(288L))
             .fluidOutputs(FluidRegistry.getFluidStack(fluidName, 216))
             .duration(16 * TICKS)
             .eut(4)
@@ -63,16 +63,14 @@ public class ProcessingDye implements IOreRecipeRegistrator {
 
     public void registerAlloySmelter(ItemStack stack, Dyes dye) {
         RA.stdBuilder()
-            .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 8L),
-                GT_Utility.copyAmount(1, stack))
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 8L), GTUtility.copyAmount(1, stack))
             .itemOutputs(new ItemStack(Blocks.stained_glass, 8, 15 - dye.mIndex))
             .duration(10 * SECONDS)
             .eut(8)
             .addTo(alloySmelterRecipes);
 
         RA.stdBuilder()
-            .itemInputs(new ItemStack(Blocks.glass, 8, WILDCARD), GT_Utility.copyAmount(1, stack))
+            .itemInputs(new ItemStack(Blocks.glass, 8, WILDCARD), GTUtility.copyAmount(1, stack))
             .itemOutputs(new ItemStack(Blocks.stained_glass, 8, 15 - dye.mIndex))
             .duration(10 * SECONDS)
             .eut(8)
@@ -83,8 +81,8 @@ public class ProcessingDye implements IOreRecipeRegistrator {
         String fluidName = "dye.chemical." + dye.name()
             .toLowerCase(Locale.ENGLISH);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, stack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, stack), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 2))
             .fluidInputs(Materials.SulfuricAcid.getFluid(432))
             .fluidOutputs(FluidRegistry.getFluidStack(fluidName, 288))
             .duration(30 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java
index cfd33f1ace..a9c40975e8 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java
@@ -5,10 +5,10 @@ import net.minecraft.item.ItemStack;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_RecipeRegistrator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Proxy;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTRecipeRegistrator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.GTProxy;
 
 public class ProcessingFineWire implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -20,13 +20,13 @@ public class ProcessingFineWire implements gregtech.api.interfaces.IOreRecipeReg
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
         if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMASHING)) {
-            GT_RecipeRegistrator.registerWiremillRecipes(aMaterial, 100, 4);
+            GTRecipeRegistrator.registerWiremillRecipes(aMaterial, 100, 4);
         }
         if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)
             && !aMaterial.contains(SubTag.NO_WORKING)) {
-            GT_ModHandler.addCraftingRecipe(
-                GT_Utility.copyAmount(1, aStack),
-                GT_Proxy.tBits,
+            GTModHandler.addCraftingRecipe(
+                GTUtility.copyAmount(1, aStack),
+                GTProxy.tBits,
                 new Object[] { "Xx", 'X', OrePrefixes.foil.get(aMaterial) });
         }
     }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java
index 9b46710b71..3839c38c66 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java
@@ -1,18 +1,18 @@
 package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.benderRecipes;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IOreRecipeRegistrator;
 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 ProcessingFoil implements IOreRecipeRegistrator {
 
@@ -28,18 +28,18 @@ public class ProcessingFoil implements IOreRecipeRegistrator {
     }
 
     private void registerBenderRecipe(Materials material) {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.copyAmount(1, GT_OreDictUnificator.get(OrePrefixes.plate, material, 4L)),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.foil, material, 4L))
+                GTUtility.copyAmount(1, GTOreDictUnificator.get(OrePrefixes.plate, material, 4L)),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.foil, material, 4L))
             .duration((int) Math.max(material.getMass(), 1L))
             .eut(calculateRecipeEU(material, 24))
             .addTo(benderRecipes);
     }
 
     private void registerCover(ItemStack stack, Materials material) {
-        GregTech_API
+        GregTechAPI
             .registerCover(stack, TextureFactory.of(material.mIconSet.mTextures[70], material.mRGBa, false), null);
     }
 }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java
index e7fc25038f..0c8119ded3 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java
@@ -4,18 +4,18 @@ import static gregtech.api.recipe.RecipeMaps.benderRecipes;
 import static gregtech.api.recipe.RecipeMaps.formingPressRecipes;
 import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
 import static gregtech.api.recipe.RecipeMaps.slicerRecipes;
-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 net.minecraft.item.ItemStack;
 
-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.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -29,10 +29,10 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr
         switch (aOreDictName) {
             case "foodCheese" -> {
                 registerSlicerRecipes(aStack);
-                GT_OreDictUnificator.addItemData(aStack, new gregtech.api.objects.ItemData(Materials.Cheese, 3628800L));
+                GTOreDictUnificator.addItemData(aStack, new gregtech.api.objects.ItemData(Materials.Cheese, 3628800L));
             }
             case "foodDough" -> {
-                GT_ModHandler.removeFurnaceSmelting(aStack);
+                GTModHandler.removeFurnaceSmelting(aStack);
                 registerBenderRecipes(aStack);
                 registerMixerRecipes(aStack);
                 registerFormingPressRecipes(aStack);
@@ -41,7 +41,7 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr
     }
 
     private void registerSlicerRecipes(ItemStack stack) {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(stack, ItemList.Shape_Slicer_Flat.get(0L))
             .itemOutputs(ItemList.Food_Sliced_Cheese.get(4L))
             .duration(3 * SECONDS + 4 * TICKS)
@@ -50,8 +50,8 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr
     }
 
     private void registerBenderRecipes(ItemStack stack) {
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, stack), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, stack), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Food_Flat_Dough.get(1L))
             .duration(16 * TICKS)
             .eut(4)
@@ -59,22 +59,22 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr
     }
 
     private void registerMixerRecipes(ItemStack stack) {
-        GT_Values.RA.stdBuilder()
-            .itemInputs(stack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(stack, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
             .itemOutputs(ItemList.Food_Dough_Sugar.get(2L))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(stack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(stack, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L))
             .itemOutputs(ItemList.Food_Dough_Chocolate.get(2L))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(stack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chocolate, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(stack, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chocolate, 1L))
             .itemOutputs(ItemList.Food_Dough_Chocolate.get(2L))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(8)
@@ -83,22 +83,22 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr
 
     private void registerFormingPressRecipes(ItemStack stack) {
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, stack), ItemList.Shape_Mold_Bun.get(0L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, stack), ItemList.Shape_Mold_Bun.get(0L))
             .itemOutputs(ItemList.Food_Raw_Bun.get(1L))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(formingPressRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(2, stack), ItemList.Shape_Mold_Bread.get(0L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(2, stack), ItemList.Shape_Mold_Bread.get(0L))
             .itemOutputs(ItemList.Food_Raw_Bread.get(1L))
             .duration(12 * SECONDS + 16 * TICKS)
             .eut(4)
             .addTo(formingPressRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(3, stack), ItemList.Shape_Mold_Baguette.get(0L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(3, stack), ItemList.Shape_Mold_Baguette.get(0L))
             .itemOutputs(ItemList.Food_Raw_Baguette.get(1L))
             .duration(19 * SECONDS + 4 * TICKS)
             .eut(4)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java
index aa973cddfe..d7ef154a9f 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java
@@ -1,23 +1,23 @@
 package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
-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.enums.SubTag;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Proxy;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.GTProxy;
 
 public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -31,12 +31,12 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr
         ItemStack aStack) {
         switch (aPrefix) {
             case gearGt -> {
-                GT_ModHandler.removeRecipeByOutputDelayed(aStack);
+                GTModHandler.removeRecipeByOutputDelayed(aStack);
                 if (aMaterial.mStandardMoltenFluid != null) {
                     if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) {
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(ItemList.Shape_Mold_Gear.get(0L))
-                            .itemOutputs(GT_OreDictUnificator.get(aPrefix, aMaterial, 1L))
+                            .itemOutputs(GTOreDictUnificator.get(aPrefix, aMaterial, 1L))
                             .fluidInputs(aMaterial.getMolten(576L))
                             .duration(6 * SECONDS + 8 * TICKS)
                             .eut(calculateRecipeEU(aMaterial, 8))
@@ -46,21 +46,21 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr
                 if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)
                     && !aMaterial.contains(SubTag.NO_WORKING)) {
                     switch (aMaterial.mName) {
-                        case "Wood" -> GT_ModHandler.addCraftingRecipe(
-                            GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L),
-                            GT_Proxy.tBits,
+                        case "Wood" -> GTModHandler.addCraftingRecipe(
+                            GTOreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L),
+                            GTProxy.tBits,
                             new Object[] { "SPS", "PsP", "SPS", 'P', OrePrefixes.plank.get(aMaterial), 'S',
                                 OrePrefixes.stick.get(aMaterial) });
-                        case "Stone" -> GT_ModHandler.addCraftingRecipe(
-                            GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L),
-                            GT_Proxy.tBits,
+                        case "Stone" -> GTModHandler.addCraftingRecipe(
+                            GTOreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L),
+                            GTProxy.tBits,
                             new Object[] { "SPS", "PfP", "SPS", 'P', OrePrefixes.stoneSmooth, 'S',
                                 new ItemStack(Blocks.stone_button, 1, 32767) });
                         default -> {
                             if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-                                GT_ModHandler.addCraftingRecipe(
-                                    GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L),
-                                    GT_Proxy.tBits,
+                                GTModHandler.addCraftingRecipe(
+                                    GTOreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L),
+                                    GTProxy.tBits,
                                     new Object[] { "SPS", "PwP", "SPS", 'P', OrePrefixes.plate.get(aMaterial), 'S',
                                         OrePrefixes.stick.get(aMaterial) });
                             }
@@ -71,9 +71,9 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr
             case gearGtSmall -> {
                 if (aMaterial.mStandardMoltenFluid != null) {
                     if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) {
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(ItemList.Shape_Mold_Gear_Small.get(0L))
-                            .itemOutputs(GT_Utility.copyAmount(1, aStack))
+                            .itemOutputs(GTUtility.copyAmount(1, aStack))
                             .fluidInputs(aMaterial.getMolten(144L))
                             .duration(16 * TICKS)
                             .eut(calculateRecipeEU(aMaterial, 8))
@@ -83,19 +83,19 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr
                 if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)
                     && !aMaterial.contains(SubTag.NO_WORKING)) {
                     switch (aMaterial.mName) {
-                        case "Wood" -> GT_ModHandler.addCraftingRecipe(
-                            GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L),
-                            GT_Proxy.tBits,
+                        case "Wood" -> GTModHandler.addCraftingRecipe(
+                            GTOreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L),
+                            GTProxy.tBits,
                             new Object[] { "P ", " s", 'P', OrePrefixes.plank.get(aMaterial) });
-                        case "Stone" -> GT_ModHandler.addCraftingRecipe(
-                            GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L),
-                            GT_Proxy.tBits,
+                        case "Stone" -> GTModHandler.addCraftingRecipe(
+                            GTOreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L),
+                            GTProxy.tBits,
                             new Object[] { "P ", " f", 'P', OrePrefixes.stoneSmooth });
                         default -> {
                             if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-                                GT_ModHandler.addCraftingRecipe(
-                                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L),
-                                    GT_Proxy.tBits,
+                                GTModHandler.addCraftingRecipe(
+                                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L),
+                                    GTProxy.tBits,
                                     new Object[] { " S ", "hPx", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P',
                                         OrePrefixes.plate.get(aMaterial) });
                             }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
index 76e60e18c5..2f92e58e56 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
@@ -6,28 +6,28 @@ import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.recipe.RecipeMaps.implosionRecipes;
 import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes;
 import static gregtech.api.recipe.RecipeMaps.latheRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE;
+import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-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.enums.SubTag;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeConstants;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Proxy;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeConstants;
+import gregtech.api.util.GTUtility;
+import gregtech.common.GTProxy;
 
 public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO COMPARE WITH GEM???
                                                                                       // generators
@@ -54,21 +54,21 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
             case gem -> {
                 // fuel recipes
                 if (aFuelPower) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
                         .metadata(FUEL_VALUE, aMaterial.mFuelPower * 2)
                         .metadata(FUEL_TYPE, aMaterial.mFuelType)
-                        .addTo(GT_RecipeConstants.Fuel);
+                        .addTo(GTRecipeConstants.Fuel);
                 }
 
                 if (!OrePrefixes.block.isIgnored(aMaterial)
-                    && GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L) != null) {
+                    && GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L) != null) {
                     // Compressor recipes
                     // need to avoid iridium exploit
                     if (aMaterial != Materials.Iridium) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(9, aStack))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(9, aStack))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))
                             .duration(15 * SECONDS)
                             .eut(2)
                             .addTo(compressorRecipes);
@@ -77,18 +77,18 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
 
                 // Smelting recipe
                 if (!aNoSmelting) {
-                    GT_ModHandler.addSmeltingRecipe(
-                        GT_Utility.copyAmount(1, aStack),
-                        GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L));
+                    GTModHandler.addSmeltingRecipe(
+                        GTUtility.copyAmount(1, aStack),
+                        GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L));
                 }
 
                 if (aNoSmashing) {
                     // Forge hammer recipes
                     {
-                        if (GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
+                        if (GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
                                 .itemInputs(aStack)
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L))
                                 .duration(3 * SECONDS + 4 * TICKS)
                                 .eut(16)
                                 .addTo(hammerRecipes);
@@ -98,11 +98,11 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
                     // Forge hammer recipes
                     {
                         // need to avoid iridium exploit
-                        if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null
+                        if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null
                             && aMaterial != Materials.Iridium) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                                 .duration(Math.max(aMaterialMass, 1L))
                                 .eut(calculateRecipeEU(aMaterial, 16))
                                 .addTo(hammerRecipes);
@@ -111,61 +111,61 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
 
                     // Bender recipes
                     if (aMaterial != Materials.Iridium) {
-                        if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
+                        if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
                             // Plate
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                                 .duration((int) Math.max(aMaterialMass * 2L, 1L))
                                 .eut(calculateRecipeEU(aMaterial, 24))
                                 .addTo(benderRecipes);
                         }
 
-                        if (GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L) != null) {
+                        if (GTOreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L) != null) {
                             // Double plates
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(2, aStack), GT_Utility.getIntegratedCircuit(2))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(2, aStack), GTUtility.getIntegratedCircuit(2))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L))
                                 .duration(Math.max(aMaterialMass * 2L, 1L))
                                 .eut(calculateRecipeEU(aMaterial, 96))
                                 .addTo(benderRecipes);
                         }
 
-                        if (GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L) != null) {
+                        if (GTOreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L) != null) {
                             // Triple plate
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(3, aStack), GT_Utility.getIntegratedCircuit(3))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(3, aStack), GTUtility.getIntegratedCircuit(3))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L))
                                 .duration(Math.max(aMaterialMass * 3L, 1L))
                                 .eut(calculateRecipeEU(aMaterial, 96))
                                 .addTo(benderRecipes);
                         }
 
-                        if (GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L) != null) {
+                        if (GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L) != null) {
                             // Quadruple plate
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(4, aStack), GT_Utility.getIntegratedCircuit(4))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(4, aStack), GTUtility.getIntegratedCircuit(4))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L))
                                 .duration(Math.max(aMaterialMass * 4L, 1L))
                                 .eut(calculateRecipeEU(aMaterial, 96))
                                 .addTo(benderRecipes);
                         }
 
-                        if (GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L) != null) {
+                        if (GTOreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L) != null) {
                             // Quintuple plate
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(5, aStack), GT_Utility.getIntegratedCircuit(5))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(5, aStack), GTUtility.getIntegratedCircuit(5))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L))
                                 .duration(Math.max(aMaterialMass * 5L, 1L))
                                 .eut(calculateRecipeEU(aMaterial, 96))
                                 .addTo(benderRecipes);
                         }
 
-                        if (GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L) != null) {
+                        if (GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L) != null) {
                             // dense plate
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(9, aStack), GT_Utility.getIntegratedCircuit(9))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(9, aStack), GTUtility.getIntegratedCircuit(9))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L))
                                 .duration(Math.max(aMaterialMass * 9L, 1L))
                                 .eut(calculateRecipeEU(aMaterial, 96))
                                 .addTo(benderRecipes);
@@ -175,13 +175,13 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
                 if (aNoWorking) {
                     if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                         // Lathe recipes
-                        if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L) != null
-                            && GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack))
+                        if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L) != null
+                            && GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack))
                                 .itemOutputs(
-                                    GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L),
-                                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L))
+                                    GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L),
+                                    GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L))
                                 .duration(((int) Math.max(aMaterialMass, 1L)) * TICKS)
                                 .eut(calculateRecipeEU(aMaterial, 16))
                                 .addTo(latheRecipes);
@@ -191,40 +191,40 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
                     if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) {
                         // Implosion compressor recipes
                         {
-                            if (GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1) != null) {
-                                GT_Values.RA.stdBuilder()
-                                    .itemInputs(GT_Utility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16))
+                            if (GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1) != null) {
+                                GTValues.RA.stdBuilder()
+                                    .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16))
                                     .itemOutputs(
-                                        GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1),
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+                                        GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1),
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
                                     .duration(1 * SECONDS)
                                     .eut(TierEU.RECIPE_LV)
                                     .addTo(implosionRecipes);
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(
-                                        GT_Utility.copyAmount(3, aStack),
-                                        GT_ModHandler.getIC2Item("dynamite", 4, null))
+                                        GTUtility.copyAmount(3, aStack),
+                                        GTModHandler.getIC2Item("dynamite", 4, null))
                                     .itemOutputs(
-                                        GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1),
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+                                        GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1),
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
                                     .duration(1 * SECONDS)
                                     .eut(TierEU.RECIPE_LV)
                                     .addTo(implosionRecipes);
-                                GT_Values.RA.stdBuilder()
-                                    .itemInputs(GT_Utility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8))
+                                GTValues.RA.stdBuilder()
+                                    .itemInputs(GTUtility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8))
                                     .itemOutputs(
-                                        GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1),
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+                                        GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1),
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
                                     .duration(1 * SECONDS)
                                     .eut(TierEU.RECIPE_LV)
                                     .addTo(implosionRecipes);
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(
-                                        GT_Utility.copyAmount(3, aStack),
-                                        GT_ModHandler.getIC2Item("industrialTnt", 2))
+                                        GTUtility.copyAmount(3, aStack),
+                                        GTModHandler.getIC2Item("industrialTnt", 2))
                                     .itemOutputs(
-                                        GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1),
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+                                        GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1),
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
                                     .duration(1 * SECONDS)
                                     .eut(TierEU.RECIPE_LV)
                                     .addTo(implosionRecipes);
@@ -233,22 +233,22 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
 
                         // Crafting recipes
                         {
-                            GT_ModHandler.addCraftingRecipe(
-                                GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L),
-                                GT_Proxy.tBits,
+                            GTModHandler.addCraftingRecipe(
+                                GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L),
+                                GTProxy.tBits,
                                 new Object[] { "h", "X", 'X', OrePrefixes.gemFlawless.get(aMaterial) });
 
                             if (aMaterial.contains(SubTag.SMELTING_TO_GEM)) {
-                                GT_ModHandler.addCraftingRecipe(
-                                    GT_Utility.copyAmount(1, aStack),
-                                    GT_Proxy.tBits,
+                                GTModHandler.addCraftingRecipe(
+                                    GTUtility.copyAmount(1, aStack),
+                                    GTProxy.tBits,
                                     new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.nugget.get(aMaterial) });
                             }
 
                             if (aSpecialRecipeReq) {
-                                GT_ModHandler.addCraftingRecipe(
-                                    GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L),
-                                    GT_Proxy.tBits,
+                                GTModHandler.addCraftingRecipe(
+                                    GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L),
+                                    GTProxy.tBits,
                                     new Object[] { "X", "m", 'X', OrePrefixes.gem.get(aMaterial) });
                             }
                         }
@@ -259,12 +259,12 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
                     // Laser engraver recipes
                     {
 
-                        if (GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1L) != null) {
+                        if (GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1L) != null) {
                             is.stackSize = 0;
 
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(3, aStack), is)
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1L))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(3, aStack), is)
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1L))
                                 .duration(60 * SECONDS)
                                 .eut(TierEU.RECIPE_HV)
                                 .addTo(laserEngraverRecipes);
@@ -276,22 +276,22 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
             case gemChipped -> {
                 // Fuel recipes
                 if (aFuelPower) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
                         .metadata(FUEL_VALUE, aMaterial.mFuelPower / 2)
                         .metadata(FUEL_TYPE, aMaterial.mFuelType)
-                        .addTo(GT_RecipeConstants.Fuel);
+                        .addTo(GTRecipeConstants.Fuel);
                 }
 
                 if (!aNoWorking) {
                     // Lathe recipes
-                    if (GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null
-                        && GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack))
+                    if (GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null
+                        && GTOreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1L) != null) {
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack))
                             .itemOutputs(
-                                GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1L))
+                                GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L),
+                                GTOreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1L))
                             .duration(((int) Math.max(aMaterialMass, 1L)) * TICKS)
                             .eut(8)
                             .addTo(latheRecipes);
@@ -300,40 +300,40 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
                     if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) {
                         // Implosion compressor recipes
                         {
-                            if (GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1) != null) {
-                                GT_Values.RA.stdBuilder()
-                                    .itemInputs(GT_Utility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16))
+                            if (GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1) != null) {
+                                GTValues.RA.stdBuilder()
+                                    .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16))
                                     .itemOutputs(
-                                        GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1),
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+                                        GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1),
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
                                     .duration(1 * SECONDS)
                                     .eut(TierEU.RECIPE_LV)
                                     .addTo(implosionRecipes);
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(
-                                        GT_Utility.copyAmount(3, aStack),
-                                        GT_ModHandler.getIC2Item("dynamite", 4, null))
+                                        GTUtility.copyAmount(3, aStack),
+                                        GTModHandler.getIC2Item("dynamite", 4, null))
                                     .itemOutputs(
-                                        GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1),
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+                                        GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1),
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
                                     .duration(1 * SECONDS)
                                     .eut(TierEU.RECIPE_LV)
                                     .addTo(implosionRecipes);
-                                GT_Values.RA.stdBuilder()
-                                    .itemInputs(GT_Utility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8))
+                                GTValues.RA.stdBuilder()
+                                    .itemInputs(GTUtility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8))
                                     .itemOutputs(
-                                        GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1),
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+                                        GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1),
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
                                     .duration(1 * SECONDS)
                                     .eut(TierEU.RECIPE_LV)
                                     .addTo(implosionRecipes);
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(
-                                        GT_Utility.copyAmount(3, aStack),
-                                        GT_ModHandler.getIC2Item("industrialTnt", 2))
+                                        GTUtility.copyAmount(3, aStack),
+                                        GTModHandler.getIC2Item("industrialTnt", 2))
                                     .itemOutputs(
-                                        GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1),
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+                                        GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1),
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
                                     .duration(1 * SECONDS)
                                     .eut(TierEU.RECIPE_LV)
                                     .addTo(implosionRecipes);
@@ -342,14 +342,14 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
 
                         // Crafting recipes
                         {
-                            GT_ModHandler.addCraftingRecipe(
-                                GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L),
-                                GT_Proxy.tBits,
+                            GTModHandler.addCraftingRecipe(
+                                GTOreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L),
+                                GTProxy.tBits,
                                 new Object[] { "h", "X", 'X', OrePrefixes.gemFlawed.get(aMaterial) });
                             if (aSpecialRecipeReq) {
-                                GT_ModHandler.addCraftingRecipe(
-                                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L),
-                                    GT_Proxy.tBits,
+                                GTModHandler.addCraftingRecipe(
+                                    GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L),
+                                    GTProxy.tBits,
                                     new Object[] { "X", "m", 'X', OrePrefixes.gemChipped.get(aMaterial) });
                             }
                         }
@@ -358,9 +358,9 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
                 for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver
                     is.stackSize = 0;
 
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(3, aStack), is)
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1L))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(3, aStack), is)
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1L))
                         .duration(30 * SECONDS)
                         .eut(30)
                         .addTo(laserEngraverRecipes);
@@ -370,11 +370,11 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
             case gemExquisite -> {
                 // Fuel recipes
                 if (aFuelPower) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
                         .metadata(FUEL_VALUE, aMaterial.mFuelPower * 8)
                         .metadata(FUEL_TYPE, aMaterial.mFuelType)
-                        .addTo(GT_RecipeConstants.Fuel);
+                        .addTo(GTRecipeConstants.Fuel);
                 }
 
                 if (!aNoWorking) {
@@ -382,9 +382,9 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
                         // Crafting recipes
                         {
                             if (aSpecialRecipeReq) {
-                                GT_ModHandler.addCraftingRecipe(
-                                    GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 4L),
-                                    GT_Proxy.tBits,
+                                GTModHandler.addCraftingRecipe(
+                                    GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 4L),
+                                    GTProxy.tBits,
                                     new Object[] { "X", "m", 'X', OrePrefixes.gemExquisite.get(aMaterial) });
                             }
                         }
@@ -393,9 +393,9 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
 
                 // Forge hammer recipes
                 {
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(aStack)
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L))
                         .duration(3 * SECONDS + 4 * TICKS)
                         .eut(16)
                         .addTo(hammerRecipes);
@@ -404,22 +404,22 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
             case gemFlawed -> {
                 // fuel recipes
                 if (aFuelPower) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
                         .metadata(FUEL_VALUE, aMaterial.mFuelPower)
                         .metadata(FUEL_TYPE, aMaterial.mFuelType)
-                        .addTo(GT_RecipeConstants.Fuel);
+                        .addTo(GTRecipeConstants.Fuel);
                 }
 
                 if (!aNoWorking) {
                     // Lathe recipes
-                    if (GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null
-                        && GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack))
+                    if (GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null
+                        && GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L) != null) {
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack))
                             .itemOutputs(
-                                GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 2L),
-                                GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L))
+                                GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 2L),
+                                GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L))
                             .duration(((int) Math.max(aMaterialMass, 1L)) * TICKS)
                             .eut(12)
                             .addTo(latheRecipes);
@@ -428,40 +428,40 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
                     if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) {
                         // Implosion compressor recipes
                         {
-                            if (GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1) != null) {
-                                GT_Values.RA.stdBuilder()
-                                    .itemInputs(GT_Utility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16))
+                            if (GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1) != null) {
+                                GTValues.RA.stdBuilder()
+                                    .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16))
                                     .itemOutputs(
-                                        GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1),
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+                                        GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1),
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
                                     .duration(1 * SECONDS)
                                     .eut(TierEU.RECIPE_LV)
                                     .addTo(implosionRecipes);
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(
-                                        GT_Utility.copyAmount(3, aStack),
-                                        GT_ModHandler.getIC2Item("dynamite", 4, null))
+                                        GTUtility.copyAmount(3, aStack),
+                                        GTModHandler.getIC2Item("dynamite", 4, null))
                                     .itemOutputs(
-                                        GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1),
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+                                        GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1),
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
                                     .duration(1 * SECONDS)
                                     .eut(TierEU.RECIPE_LV)
                                     .addTo(implosionRecipes);
-                                GT_Values.RA.stdBuilder()
-                                    .itemInputs(GT_Utility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8))
+                                GTValues.RA.stdBuilder()
+                                    .itemInputs(GTUtility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8))
                                     .itemOutputs(
-                                        GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1),
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+                                        GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1),
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
                                     .duration(1 * SECONDS)
                                     .eut(TierEU.RECIPE_LV)
                                     .addTo(implosionRecipes);
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(
-                                        GT_Utility.copyAmount(3, aStack),
-                                        GT_ModHandler.getIC2Item("industrialTnt", 2))
+                                        GTUtility.copyAmount(3, aStack),
+                                        GTModHandler.getIC2Item("industrialTnt", 2))
                                     .itemOutputs(
-                                        GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1),
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+                                        GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1),
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
                                     .duration(1 * SECONDS)
                                     .eut(TierEU.RECIPE_LV)
                                     .addTo(implosionRecipes);
@@ -470,22 +470,22 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
 
                         // Crafting recipes
                         {
-                            GT_ModHandler.addCraftingRecipe(
-                                GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L),
-                                GT_Proxy.tBits,
+                            GTModHandler.addCraftingRecipe(
+                                GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L),
+                                GTProxy.tBits,
                                 new Object[] { "h", "X", 'X', OrePrefixes.gem.get(aMaterial) });
                             if (aSpecialRecipeReq) {
-                                GT_ModHandler.addCraftingRecipe(
-                                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L),
-                                    GT_Proxy.tBits,
+                                GTModHandler.addCraftingRecipe(
+                                    GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L),
+                                    GTProxy.tBits,
                                     new Object[] { "X", "m", 'X', OrePrefixes.gemFlawed.get(aMaterial) });
                             }
                         }
                     }
                 }
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(aStack)
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L))
                     .duration(3 * SECONDS + 4 * TICKS)
                     .eut(16)
                     .addTo(hammerRecipes);
@@ -494,9 +494,9 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
 
                     is.stackSize = 0;
 
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(3, aStack), is)
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(3, aStack), is)
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))
                         .duration(30 * SECONDS)
                         .eut(TierEU.RECIPE_MV)
                         .addTo(laserEngraverRecipes);
@@ -507,22 +507,22 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
 
                 // Fuel recipes
                 if (aFuelPower) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
                         .metadata(FUEL_VALUE, aMaterial.mFuelPower * 4)
                         .metadata(FUEL_TYPE, aMaterial.mFuelType)
-                        .addTo(GT_RecipeConstants.Fuel);
+                        .addTo(GTRecipeConstants.Fuel);
                 }
 
                 if (!aNoWorking) {
                     // Lathe recipes
-                    if (GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L) != null
-                        && GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack))
+                    if (GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L) != null
+                        && GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L) != null) {
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack))
                             .itemOutputs(
-                                GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L),
-                                GT_OreDictUnificator.getDust(
+                                GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L),
+                                GTOreDictUnificator.getDust(
                                     aMaterial,
                                     aPrefix.mMaterialAmount - OrePrefixes.stickLong.mMaterialAmount))
                             .duration(((int) Math.max(aMaterialMass * 5L, 1L)) * TICKS)
@@ -533,40 +533,40 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
                     if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) {
                         // Implosion compressor recipes
                         {
-                            if (GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1) != null) {
-                                GT_Values.RA.stdBuilder()
-                                    .itemInputs(GT_Utility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16))
+                            if (GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1) != null) {
+                                GTValues.RA.stdBuilder()
+                                    .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16))
                                     .itemOutputs(
-                                        GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1),
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+                                        GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1),
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
                                     .duration(1 * SECONDS)
                                     .eut(TierEU.RECIPE_LV)
                                     .addTo(implosionRecipes);
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(
-                                        GT_Utility.copyAmount(3, aStack),
-                                        GT_ModHandler.getIC2Item("dynamite", 4, null))
+                                        GTUtility.copyAmount(3, aStack),
+                                        GTModHandler.getIC2Item("dynamite", 4, null))
                                     .itemOutputs(
-                                        GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1),
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+                                        GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1),
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
                                     .duration(1 * SECONDS)
                                     .eut(TierEU.RECIPE_LV)
                                     .addTo(implosionRecipes);
-                                GT_Values.RA.stdBuilder()
-                                    .itemInputs(GT_Utility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8))
+                                GTValues.RA.stdBuilder()
+                                    .itemInputs(GTUtility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8))
                                     .itemOutputs(
-                                        GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1),
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+                                        GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1),
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
                                     .duration(1 * SECONDS)
                                     .eut(TierEU.RECIPE_LV)
                                     .addTo(implosionRecipes);
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(
-                                        GT_Utility.copyAmount(3, aStack),
-                                        GT_ModHandler.getIC2Item("industrialTnt", 2))
+                                        GTUtility.copyAmount(3, aStack),
+                                        GTModHandler.getIC2Item("industrialTnt", 2))
                                     .itemOutputs(
-                                        GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1),
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+                                        GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1),
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
                                     .duration(1 * SECONDS)
                                     .eut(TierEU.RECIPE_LV)
                                     .addTo(implosionRecipes);
@@ -575,22 +575,22 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
 
                         // Crafting recipes
                         {
-                            GT_ModHandler.addCraftingRecipe(
-                                GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L),
-                                GT_Proxy.tBits,
+                            GTModHandler.addCraftingRecipe(
+                                GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L),
+                                GTProxy.tBits,
                                 new Object[] { "h", "X", 'X', OrePrefixes.gemExquisite.get(aMaterial) });
                             if (aSpecialRecipeReq) {
-                                GT_ModHandler.addCraftingRecipe(
-                                    GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L),
-                                    GT_Proxy.tBits,
+                                GTModHandler.addCraftingRecipe(
+                                    GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L),
+                                    GTProxy.tBits,
                                     new Object[] { "X", "m", 'X', OrePrefixes.gemFlawless.get(aMaterial) });
                             }
                         }
                     }
                 }
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(aStack)
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L))
                     .duration(3 * SECONDS + 4 * TICKS)
                     .eut(16)
                     .addTo(hammerRecipes);
@@ -598,9 +598,9 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
                 for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver
 
                     is.stackSize = 0;
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(3, aStack), is)
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(3, aStack), is)
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L))
                         .duration(2 * MINUTES)
                         .eut(TierEU.RECIPE_EV)
                         .addTo(laserEngraverRecipes);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java
index 0be31a7e1d..7d27c2ee16 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java
@@ -4,27 +4,27 @@ import static gregtech.api.recipe.RecipeMaps.benderRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE;
+import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
 
 import net.minecraft.item.ItemStack;
 
-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.enums.SubTag;
 import gregtech.api.enums.TierEU;
 import gregtech.api.enums.ToolDictNames;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeConstants;
-import gregtech.api.util.GT_RecipeRegistrator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Proxy;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeConstants;
+import gregtech.api.util.GTRecipeRegistrator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.GTProxy;
 
 public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -51,19 +51,19 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
             case ingot -> {
                 // Fuel recipe
                 if (aMaterial.mFuelPower > 0) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
                         .metadata(FUEL_VALUE, aMaterial.mFuelPower)
                         .metadata(FUEL_TYPE, aMaterial.mFuelType)
-                        .addTo(GT_RecipeConstants.Fuel);
+                        .addTo(GTRecipeConstants.Fuel);
                 }
                 if (aMaterial.mStandardMoltenFluid != null
                     && !(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) {
                     // Fluid solidifier recipes
 
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(ItemList.Shape_Mold_Ingot.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L))
                         .fluidInputs(aMaterial.getMolten(144L))
                         .duration(1 * SECONDS + 12 * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8))
@@ -71,12 +71,12 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
                 }
                 // Reverse recipes
                 {
-                    GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null);
-                    GT_RecipeRegistrator
+                    GTRecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null);
+                    GTRecipeRegistrator
                         .registerReverseMacerating(aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false);
                     if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) {
-                        GT_RecipeRegistrator.registerReverseArcSmelting(
-                            GT_Utility.copyAmount(1, aStack),
+                        GTRecipeRegistrator.registerReverseArcSmelting(
+                            GTUtility.copyAmount(1, aStack),
                             aMaterial,
                             aPrefix.mMaterialAmount,
                             null,
@@ -84,26 +84,26 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
                             null);
                     }
                 }
-                ItemStack tStack = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L);
+                ItemStack tStack = GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L);
                 if ((tStack != null) && ((aMaterial.mBlastFurnaceRequired) || aNoSmelting)) {
-                    GT_ModHandler.removeFurnaceSmelting(tStack);
+                    GTModHandler.removeFurnaceSmelting(tStack);
                 }
                 if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)
                     && !aMaterial.contains(SubTag.NO_WORKING)
                     && !aMaterial.contains(SubTag.SMELTING_TO_GEM)
                     && aMaterial.contains(SubTag.MORTAR_GRINDABLE)) {
-                    GT_ModHandler.addShapelessCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    GTModHandler.addShapelessCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { ToolDictNames.craftingToolMortar, OrePrefixes.ingot.get(aMaterial) });
                 }
                 if (!aNoSmashing) {
                     // Forge hammer recipes
                     if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV
-                        && GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(3, aStack))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L))
+                        && GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(3, aStack))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L))
                             .duration(Math.max(aMaterialMass, 1L))
                             .eut(calculateRecipeEU(aMaterial, 16))
                             .addTo(hammerRecipes);
@@ -113,64 +113,64 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
 
                     // Bender recipes
                     {
-                        if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                        if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                                 .duration(Math.max(aMaterialMass, 1L))
                                 .eut(calculateRecipeEU(aMaterial, 24))
                                 .addTo(benderRecipes);
                         }
 
-                        if (GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(2, aStack), GT_Utility.getIntegratedCircuit(2))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L))
+                        if (GTOreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(2, aStack), GTUtility.getIntegratedCircuit(2))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L))
                                 .duration(Math.max(aMaterialMass * 2L, 1L))
                                 .eut(calculateRecipeEU(aMaterial, 96))
                                 .addTo(benderRecipes);
                         }
 
-                        if (GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(3, aStack), GT_Utility.getIntegratedCircuit(3))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L))
+                        if (GTOreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(3, aStack), GTUtility.getIntegratedCircuit(3))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L))
                                 .duration(Math.max(aMaterialMass * 3L, 1L))
                                 .eut(calculateRecipeEU(aMaterial, 96))
                                 .addTo(benderRecipes);
                         }
 
-                        if (GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(4, aStack), GT_Utility.getIntegratedCircuit(4))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L))
+                        if (GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(4, aStack), GTUtility.getIntegratedCircuit(4))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L))
                                 .duration(Math.max(aMaterialMass * 4L, 1L))
                                 .eut(calculateRecipeEU(aMaterial, 96))
                                 .addTo(benderRecipes);
                         }
 
-                        if (GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(5, aStack), GT_Utility.getIntegratedCircuit(5))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L))
+                        if (GTOreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(5, aStack), GTUtility.getIntegratedCircuit(5))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L))
                                 .duration(Math.max(aMaterialMass * 5L, 1L))
                                 .eut(calculateRecipeEU(aMaterial, 96))
                                 .addTo(benderRecipes);
                         }
 
-                        if (GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(9, aStack), GT_Utility.getIntegratedCircuit(9))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L))
+                        if (GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(9, aStack), GTUtility.getIntegratedCircuit(9))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L))
                                 .duration(Math.max(aMaterialMass * 9L, 1L))
                                 .eut(calculateRecipeEU(aMaterial, 96))
                                 .addTo(benderRecipes);
                         }
 
-                        if (GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(10))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 4L))
+                        if (GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(10))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, 4L))
                                 .duration(Math.max(aMaterialMass * 2L, 1L))
                                 .eut(calculateRecipeEU(aMaterial, 24))
                                 .addTo(benderRecipes);
@@ -182,16 +182,16 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
                 if (!aNoSmashing || aStretchy) {
                     // bender recipes
                     {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L))
                             .duration(Math.max(aMaterialMass, 1L))
                             .eut(calculateRecipeEU(aMaterial, 96))
                             .addTo(benderRecipes);
 
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(2, aStack), GT_Utility.getIntegratedCircuit(2))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(2, aStack), GTUtility.getIntegratedCircuit(2))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L))
                             .duration(Math.max(aMaterialMass * 2L, 1L))
                             .eut(calculateRecipeEU(aMaterial, 96))
                             .addTo(benderRecipes);
@@ -199,9 +199,9 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
 
                     // Enable crafting with hammer if tier is < IV.
                     if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq) {
-                        GT_ModHandler.addCraftingRecipe(
-                            GT_OreDictUnificator.get(OrePrefixes.ingotDouble, aMaterial, 1L),
-                            GT_Proxy.tBits,
+                        GTModHandler.addCraftingRecipe(
+                            GTOreDictUnificator.get(OrePrefixes.ingotDouble, aMaterial, 1L),
+                            GTProxy.tBits,
                             new Object[] { "I", "I", "h", 'I', OrePrefixes.ingot.get(aMaterial) });
                     }
                 }
@@ -210,25 +210,25 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
                 if (!aNoSmashing || aStretchy) {
                     // Bender recipes
                     {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L))
                             .duration(Math.max(aMaterialMass, 1L))
                             .eut(calculateRecipeEU(aMaterial, 96))
                             .addTo(benderRecipes);
 
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(3, aStack), GT_Utility.getIntegratedCircuit(3))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(3, aStack), GTUtility.getIntegratedCircuit(3))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L))
                             .duration(Math.max(aMaterialMass * 3L, 1L))
                             .eut(calculateRecipeEU(aMaterial, 96))
                             .addTo(benderRecipes);
                     }
 
                     if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq) {
-                        GT_ModHandler.addCraftingRecipe(
-                            GT_OreDictUnificator.get(OrePrefixes.ingotTriple, aMaterial, 1L),
-                            GT_Proxy.tBits,
+                        GTModHandler.addCraftingRecipe(
+                            GTOreDictUnificator.get(OrePrefixes.ingotTriple, aMaterial, 1L),
+                            GTProxy.tBits,
                             new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotDouble.get(aMaterial), 'B',
                                 OrePrefixes.ingot.get(aMaterial) });
                     }
@@ -238,9 +238,9 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
                 if (!aNoSmashing || aStretchy) {
                     // Bender recipes
                     {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L))
                             .duration(Math.max(aMaterialMass, 1L))
                             .eut(calculateRecipeEU(aMaterial, 96))
                             .addTo(benderRecipes);
@@ -248,9 +248,9 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
 
                     // If tier < IV add manual crafting.
                     if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq) {
-                        GT_ModHandler.addCraftingRecipe(
-                            GT_OreDictUnificator.get(OrePrefixes.ingotQuadruple, aMaterial, 1L),
-                            GT_Proxy.tBits,
+                        GTModHandler.addCraftingRecipe(
+                            GTOreDictUnificator.get(OrePrefixes.ingotQuadruple, aMaterial, 1L),
+                            GTProxy.tBits,
                             new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotTriple.get(aMaterial), 'B',
                                 OrePrefixes.ingot.get(aMaterial) });
                     }
@@ -260,9 +260,9 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
                 if (!aNoSmashing || aStretchy) {
                     // Bender recipes
                     {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L))
                             .duration(Math.max(aMaterialMass, 1L))
                             .eut(calculateRecipeEU(aMaterial, 96))
                             .addTo(benderRecipes);
@@ -270,9 +270,9 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
 
                     // Crafting recipes
                     if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq) {
-                        GT_ModHandler.addCraftingRecipe(
-                            GT_OreDictUnificator.get(OrePrefixes.ingotQuintuple, aMaterial, 1L),
-                            GT_Proxy.tBits,
+                        GTModHandler.addCraftingRecipe(
+                            GTOreDictUnificator.get(OrePrefixes.ingotQuintuple, aMaterial, 1L),
+                            GTProxy.tBits,
                             new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotQuadruple.get(aMaterial), 'B',
                                 OrePrefixes.ingot.get(aMaterial) });
                     }
@@ -280,11 +280,11 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
             }
             case ingotHot -> {
                 if (aMaterial.mAutoGenerateVacuumFreezerRecipes
-                    && GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) {
+                    && GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) {
                     // Vacuum freezer recipes
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L))
                         .duration(((int) Math.max(aMaterialMass * 3L, 1L)) * TICKS)
                         .eut(TierEU.RECIPE_MV)
                         .addTo(vacuumFreezerRecipes);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java
index 6a132e2dba..cd453943d2 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java
@@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.objects.ItemData;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class ProcessingItem implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -16,29 +16,29 @@ public class ProcessingItem implements gregtech.api.interfaces.IOreRecipeRegistr
     @Override
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
-        if (GT_OreDictUnificator.getItemData(aStack) == null && !aOreDictName.equals("itemCertusQuartz")
+        if (GTOreDictUnificator.getItemData(aStack) == null && !aOreDictName.equals("itemCertusQuartz")
             && !aOreDictName.equals("itemNetherQuartz")) {
             switch (aOreDictName) {
                 case "itemSilicon":
-                    GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Silicon, 3628800L));
+                    GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Silicon, 3628800L));
                 case "itemWheat":
-                    GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Wheat, 3628800L));
+                    GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Wheat, 3628800L));
                 case "itemManganese":
-                    GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Manganese, 3628800L));
+                    GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Manganese, 3628800L));
                 case "itemSalt":
-                    GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Salt, 3628800L));
+                    GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Salt, 3628800L));
                 case "itemMagnesium":
-                    GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Magnesium, 3628800L));
+                    GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Magnesium, 3628800L));
                 case "itemPhosphorite":
-                    GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.TricalciumPhosphate, 3628800L));
+                    GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.TricalciumPhosphate, 3628800L));
                 case "itemSulfur":
-                    GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Sulfur, 3628800L));
+                    GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Sulfur, 3628800L));
                 case "itemAluminum":
-                    GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Aluminium, 3628800L));
+                    GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Aluminium, 3628800L));
                 case "itemSaltpeter":
-                    GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Saltpeter, 3628800L));
+                    GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Saltpeter, 3628800L));
                 case "itemUranium":
-                    GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Uranium, 3628800L));
+                    GTOreDictUnificator.addItemData(aStack, new ItemData(Materials.Uranium, 3628800L));
             }
         }
     }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java
index c3f73f7966..9576262818 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java
@@ -2,20 +2,21 @@ package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
 import static gregtech.api.recipe.RecipeMaps.latheRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.TierEU;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeBuilder;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.common.covers.CoverLens;
 
 @SuppressWarnings("RedundantLabeledSwitchRuleCodeBlock")
 public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistrator {
@@ -29,56 +30,56 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr
         ItemStack aStack) {
         switch (aMaterial.mName) {
             case "Diamond", "Glass" -> {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L))
                     .duration(1 * MINUTES)
                     .eut(TierEU.RECIPE_LV)
                     .addTo(latheRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 3L),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.lens, aMaterial, 3L),
+                        GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L))
                     .duration(2 * MINUTES)
                     .eut(16)
                     .addTo(latheRecipes);
             }
             case "ChromaticGlass" -> {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L))
                     .duration(10 * MINUTES)
                     .eut(TierEU.RECIPE_UHV)
                     .addTo(compressorRecipes);
             }
             default -> {
-                if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
-                    GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
-                    recipeBuilder.itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L));
-                    if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L) == null) {
-                        recipeBuilder.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L));
+                if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
+                    GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder();
+                    recipeBuilder.itemInputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L));
+                    if (GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L) == null) {
+                        recipeBuilder.itemOutputs(GTOreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L));
                     } else {
                         recipeBuilder.itemOutputs(
-                            GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L));
+                            GTOreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L));
                     }
                     recipeBuilder.duration(1 * MINUTES)
                         .eut(TierEU.RECIPE_MV)
                         .addTo(latheRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L) != null) {
-                    GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
-                    recipeBuilder.itemInputs(GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L));
-                    if (GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L) == null) {
-                        recipeBuilder.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L));
+                if (GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L) != null) {
+                    GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder();
+                    recipeBuilder.itemInputs(GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L));
+                    if (GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L) == null) {
+                        recipeBuilder.itemOutputs(GTOreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L));
                     } else {
                         recipeBuilder.itemOutputs(
-                            GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L));
+                            GTOreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L));
                     }
                     recipeBuilder.duration(2 * MINUTES)
                         .eut(TierEU.RECIPE_LV)
@@ -86,10 +87,10 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr
                 }
                 final ITexture lensCoverTexture = TextureFactory
                     .of(Textures.BlockIcons.OVERLAY_LENS, aMaterial.mRGBa, false);
-                GregTech_API.registerCover(
+                GregTechAPI.registerCover(
                     aStack,
                     TextureFactory.of(Textures.BlockIcons.MACHINE_CASINGS[2][0], lensCoverTexture),
-                    new gregtech.common.covers.GT_Cover_Lens(aMaterial.mColor.mIndex, lensCoverTexture));
+                    new CoverLens(aMaterial.mColor.mIndex, lensCoverTexture));
             }
         }
     }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java
index 5985e24dc7..f60987ec9e 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java
@@ -9,21 +9,21 @@ import static gregtech.api.recipe.RecipeMaps.extractorRecipes;
 import static gregtech.api.recipe.RecipeMaps.latheRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
 import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes;
-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 net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-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.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.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -35,86 +35,85 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
         if (aOreDictName.equals("logRubber")) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(2))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(
                     ItemList.IC2_Resin.get(1L),
-                    GT_ModHandler.getIC2Item("plantBall", 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
+                    GTModHandler.getIC2Item("plantBall", 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
                 .outputChances(5000, 3750, 2500, 2500)
                 .fluidOutputs(Materials.Methane.getGas(60L))
                 .duration(10 * SECONDS)
                 .eut(20)
                 .addTo(centrifugeRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, aStack))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, aStack))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L))
                 .duration(15 * SECONDS)
                 .eut(2)
                 .addTo(extractorRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, aStack))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L), ItemList.IC2_Resin.get(1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, aStack))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L), ItemList.IC2_Resin.get(1L))
                 .outputChances(10000, 3300)
                 .duration(20 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
         } else {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1))
                 .fluidOutputs(Materials.Methane.getGas(60L))
                 .duration(10 * SECONDS)
                 .eut(20)
                 .addTo(centrifugeRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, aStack))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
                 .outputChances(10000, 8000)
                 .duration(20 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
         }
 
-        GT_ModHandler.addCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L),
-            gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
-            new Object[] { "sLf", 'L', GT_Utility.copyAmount(1, aStack) });
+        GTModHandler.addCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L),
+            GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
+            new Object[] { "sLf", 'L', GTUtility.copyAmount(1, aStack) });
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, aStack))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 4L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
+                GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 4L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
             .duration(8 * SECONDS)
             .eut(7)
             .addTo(latheRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.FR_Stick.get(1L))
             .fluidInputs(Materials.SeedOil.getFluid(50L))
             .duration(16 * TICKS)
             .eut(7)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(8, aStack), GT_Utility.getIntegratedCircuit(8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(8, aStack), GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.FR_Casing_Impregnated.get(1L))
             .fluidInputs(Materials.SeedOil.getFluid(250L))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
-            .itemOutputs(GT_ModHandler.getModItem(Railcraft.ID, "cube", 1L, 8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, aStack))
+            .itemOutputs(GTModHandler.getModItem(Railcraft.ID, "cube", 1L, 8))
             .fluidInputs(Materials.Creosote.getFluid(750L))
             .duration(16 * TICKS)
             .eut(TierEU.ULV)
@@ -123,172 +122,171 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
         short aMeta = (short) aStack.getItemDamage();
 
         if (aMeta == Short.MAX_VALUE) {
-            if ((GT_Utility.areStacksEqual(
-                GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1, aStack), false, null),
+            if ((GTUtility.areStacksEqual(
+                GTModHandler.getSmeltingOutput(GTUtility.copyAmount(1, aStack), false, null),
                 new ItemStack(Items.coal, 1, 1)))) {
                 addPyrolyeOvenRecipes(aStack);
-                GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1, aStack));
+                GTModHandler.removeFurnaceSmelting(GTUtility.copyAmount(1, aStack));
             }
             for (int i = 0; i < 32767; i++) {
-                if ((GT_Utility.areStacksEqual(
-                    GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null),
+                if ((GTUtility.areStacksEqual(
+                    GTModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null),
                     new ItemStack(Items.coal, 1, 1)))) {
                     addPyrolyeOvenRecipes(aStack);
-                    GT_ModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i));
+                    GTModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i));
                 }
-                ItemStack tStack = GT_ModHandler.getRecipeOutput(new ItemStack(aStack.getItem(), 1, i));
+                ItemStack tStack = GTModHandler.getRecipeOutput(new ItemStack(aStack.getItem(), 1, i));
                 if (tStack == null) {
                     if (i >= 16) {
                         break;
                     }
                 } else {
-                    ItemStack tPlanks = GT_Utility.copyOrNull(tStack);
+                    ItemStack tPlanks = GTUtility.copyOrNull(tStack);
                     if (tPlanks != null) {
                         tPlanks.stackSize = (tPlanks.stackSize * 3 / 2);
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(new ItemStack(aStack.getItem(), 1, i))
                             .itemOutputs(
-                                GT_Utility.copyOrNull(tPlanks),
-                                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
+                                GTUtility.copyOrNull(tPlanks),
+                                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
                             .fluidInputs(Materials.Lubricant.getFluid(1L))
                             .duration(10 * SECONDS)
                             .eut(8)
                             .addTo(cutterRecipes);
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(new ItemStack(aStack.getItem(), 1, i))
                             .itemOutputs(
-                                GT_Utility.copyAmount(
-                                    GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
+                                GTUtility.copyAmount(
+                                    GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
                                     tStack),
-                                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
+                                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
                             .fluidInputs(Materials.Water.getFluid(Math.min(1000, 200 * 8 / 320)))
                             .duration(20 * SECONDS)
                             .eut(8)
                             .addTo(cutterRecipes);
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(new ItemStack(aStack.getItem(), 1, i))
                             .itemOutputs(
-                                GT_Utility.copyAmount(
-                                    GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
+                                GTUtility.copyAmount(
+                                    GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
                                     tStack),
-                                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
-                            .fluidInputs(GT_ModHandler.getDistilledWater(3))
+                                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
+                            .fluidInputs(GTModHandler.getDistilledWater(3))
                             .duration(20 * SECONDS)
                             .eut(8)
                             .addTo(cutterRecipes);
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(new ItemStack(aStack.getItem(), 1, i))
                             .itemOutputs(
-                                GT_Utility.copyAmount(
-                                    GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
+                                GTUtility.copyAmount(
+                                    GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
                                     tStack),
-                                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
+                                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
                             .fluidInputs(Materials.Lubricant.getFluid(1))
                             .duration(10 * SECONDS)
                             .eut(8)
                             .addTo(cutterRecipes);
-                        GT_ModHandler.removeRecipeDelayed(new ItemStack(aStack.getItem(), 1, i));
-                        GT_ModHandler.addCraftingRecipe(
-                            GT_Utility.copyAmount(
-                                GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
+                        GTModHandler.removeRecipeDelayed(new ItemStack(aStack.getItem(), 1, i));
+                        GTModHandler.addCraftingRecipe(
+                            GTUtility.copyAmount(
+                                GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
                                 tStack),
-                            GT_ModHandler.RecipeBits.BUFFERED,
+                            GTModHandler.RecipeBits.BUFFERED,
                             new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) });
-                        GT_ModHandler.addShapelessCraftingRecipe(
-                            GT_Utility
-                                .copyAmount(tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack),
-                            GT_ModHandler.RecipeBits.BUFFERED,
+                        GTModHandler.addShapelessCraftingRecipe(
+                            GTUtility
+                                .copyAmount(tStack.stackSize / (GTMod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack),
+                            GTModHandler.RecipeBits.BUFFERED,
                             new Object[] { new ItemStack(aStack.getItem(), 1, i) });
                     }
                 }
             }
         } else {
-            if ((GT_Utility.areStacksEqual(
-                GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1, aStack), false, null),
+            if ((GTUtility.areStacksEqual(
+                GTModHandler.getSmeltingOutput(GTUtility.copyAmount(1, aStack), false, null),
                 new ItemStack(Items.coal, 1, 1)))) {
                 addPyrolyeOvenRecipes(aStack);
-                GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1, aStack));
+                GTModHandler.removeFurnaceSmelting(GTUtility.copyAmount(1, aStack));
             }
-            ItemStack tStack = GT_ModHandler.getRecipeOutput(GT_Utility.copyAmount(1, aStack));
+            ItemStack tStack = GTModHandler.getRecipeOutput(GTUtility.copyAmount(1, aStack));
             if (tStack != null) {
-                ItemStack tPlanks = GT_Utility.copyOrNull(tStack);
+                ItemStack tPlanks = GTUtility.copyOrNull(tStack);
                 if (tPlanks != null) {
                     tPlanks.stackSize = (tPlanks.stackSize * 3 / 2);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
                         .itemOutputs(
-                            GT_Utility.copyOrNull(tPlanks),
-                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
+                            GTUtility.copyOrNull(tPlanks),
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
                         .fluidInputs(Materials.Lubricant.getFluid(1L))
                         .duration(10 * SECONDS)
                         .eut(8)
                         .addTo(cutterRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
                         .itemOutputs(
-                            GT_Utility.copyAmount(
-                                GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
+                            GTUtility.copyAmount(
+                                GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
                                 tStack),
-                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
                         .fluidInputs(Materials.Water.getFluid(Math.min(1000, 200 * 8 / 320)))
                         .duration(20 * SECONDS)
                         .eut(8)
                         .addTo(cutterRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
                         .itemOutputs(
-                            GT_Utility.copyAmount(
-                                GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
+                            GTUtility.copyAmount(
+                                GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
                                 tStack),
-                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
-                        .fluidInputs(GT_ModHandler.getDistilledWater(3))
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
+                        .fluidInputs(GTModHandler.getDistilledWater(3))
                         .duration(20 * SECONDS)
                         .eut(8)
                         .addTo(cutterRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
                         .itemOutputs(
-                            GT_Utility.copyAmount(
-                                GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
+                            GTUtility.copyAmount(
+                                GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
                                 tStack),
-                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
                         .fluidInputs(Materials.Lubricant.getFluid(1))
                         .duration(10 * SECONDS)
                         .eut(8)
                         .addTo(cutterRecipes);
-                    GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1, aStack));
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_Utility.copyAmount(
-                            GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
+                    GTModHandler.removeRecipeDelayed(GTUtility.copyAmount(1, aStack));
+                    GTModHandler.addCraftingRecipe(
+                        GTUtility.copyAmount(
+                            GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
                             tStack),
-                        new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1, aStack) });
-                    GT_ModHandler.addShapelessCraftingRecipe(
-                        GT_Utility
-                            .copyAmount(tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack),
-                        new Object[] { GT_Utility.copyAmount(1, aStack) });
+                        new Object[] { "s", "L", 'L', GTUtility.copyAmount(1, aStack) });
+                    GTModHandler.addShapelessCraftingRecipe(
+                        GTUtility.copyAmount(tStack.stackSize / (GTMod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack),
+                        new Object[] { GTUtility.copyAmount(1, aStack) });
                 }
             }
         }
 
-        if ((GT_Utility.areStacksEqual(
-            GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1, aStack), false, null),
+        if ((GTUtility.areStacksEqual(
+            GTModHandler.getSmeltingOutput(GTUtility.copyAmount(1, aStack), false, null),
             new ItemStack(Items.coal, 1, 1)))) {
             addPyrolyeOvenRecipes(aStack);
-            GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1, aStack));
+            GTModHandler.removeFurnaceSmelting(GTUtility.copyAmount(1, aStack));
         }
     }
 
     public static void addPyrolyeOvenRecipes(ItemStack logStack) {
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Charcoal.getGems(20))
             .fluidOutputs(Materials.Creosote.getFluid(4000))
             .duration(32 * SECONDS)
             .eut(64)
             .noOptimize()
             .addTo(pyrolyseRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Charcoal.getGems(20))
             .fluidInputs(Materials.Nitrogen.getGas(1000))
             .fluidOutputs(Materials.Creosote.getFluid(4000))
@@ -296,16 +294,16 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
             .eut(96)
             .noOptimize()
             .addTo(pyrolyseRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(3))
             .itemOutputs(Materials.Charcoal.getGems(20))
             .fluidOutputs(Materials.CharcoalByproducts.getGas(4000))
             .duration(32 * SECONDS)
             .eut(64)
             .noOptimize()
             .addTo(pyrolyseRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(4))
             .itemOutputs(Materials.Charcoal.getGems(20))
             .fluidInputs(Materials.Nitrogen.getGas(1000))
             .fluidOutputs(Materials.CharcoalByproducts.getGas(4000))
@@ -313,16 +311,16 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
             .eut(96)
             .noOptimize()
             .addTo(pyrolyseRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(5))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(5))
             .itemOutputs(Materials.Charcoal.getGems(20))
             .fluidOutputs(Materials.WoodGas.getGas(1500))
             .duration(32 * SECONDS)
             .eut(64)
             .noOptimize()
             .addTo(pyrolyseRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(6))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(6))
             .itemOutputs(Materials.Charcoal.getGems(20))
             .fluidInputs(Materials.Nitrogen.getGas(1000))
             .fluidOutputs(Materials.WoodGas.getGas(1500))
@@ -330,16 +328,16 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
             .eut(96)
             .noOptimize()
             .addTo(pyrolyseRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(7))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(7))
             .itemOutputs(Materials.Charcoal.getGems(20))
             .fluidOutputs(Materials.WoodVinegar.getFluid(3000))
             .duration(32 * SECONDS)
             .eut(64)
             .noOptimize()
             .addTo(pyrolyseRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(8))
             .itemOutputs(Materials.Charcoal.getGems(20))
             .fluidInputs(Materials.Nitrogen.getGas(1000))
             .fluidOutputs(Materials.WoodVinegar.getFluid(3000))
@@ -347,16 +345,16 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
             .eut(96)
             .noOptimize()
             .addTo(pyrolyseRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(9))
             .itemOutputs(Materials.Charcoal.getGems(20))
             .fluidOutputs(Materials.WoodTar.getFluid(1500))
             .duration(32 * SECONDS)
             .eut(64)
             .noOptimize()
             .addTo(pyrolyseRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(10))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(10))
             .itemOutputs(Materials.Charcoal.getGems(20))
             .fluidInputs(Materials.Nitrogen.getGas(1000))
             .fluidOutputs(Materials.WoodTar.getFluid(1500))
@@ -364,8 +362,8 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
             .eut(96)
             .noOptimize()
             .addTo(pyrolyseRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(16, logStack), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(16, logStack), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Ash.getDust(4))
             .fluidOutputs(Materials.OilHeavy.getFluid(200))
             .duration(16 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
index 8d7ca9e518..624730af3e 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
@@ -2,23 +2,23 @@ package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
 
 import net.minecraft.item.ItemStack;
 
-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.enums.SubTag;
 import gregtech.api.enums.TierEU;
 import gregtech.api.recipe.RecipeCategories;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeRegistrator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeRegistrator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -31,21 +31,21 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis
         ItemStack aStack) {
 
         if (aMaterial.contains(SubTag.SMELTING_TO_GEM)
-            && GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial.mSmeltInto, 1L) != null) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(9, aStack), ItemList.Shape_Mold_Ball.get(0L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial.mSmeltInto, 1L))
+            && GTOreDictUnificator.get(OrePrefixes.gem, aMaterial.mSmeltInto, 1L) != null) {
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(9, aStack), ItemList.Shape_Mold_Ball.get(0L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, aMaterial.mSmeltInto, 1L))
                 .duration(10 * SECONDS)
                 .eut(calculateRecipeEU(aMaterial, 2))
                 .addTo(alloySmelterRecipes);
         }
 
         if ((!aMaterial.contains(SubTag.SMELTING_TO_GEM))
-            && GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L) != null
+            && GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L) != null
             && aMaterial != Materials.Aluminium) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(9, aStack), ItemList.Shape_Mold_Ingot.get(0L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(9, aStack), ItemList.Shape_Mold_Ingot.get(0L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L))
                 .duration(10 * SECONDS)
                 .eut(calculateRecipeEU(aMaterial, 2))
                 .recipeCategory(RecipeCategories.alloySmelterMolding)
@@ -54,9 +54,9 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis
 
         if (aMaterial.mStandardMoltenFluid != null) {
             if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) {
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(ItemList.Shape_Mold_Nugget.get(0L))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L))
                     .fluidInputs(aMaterial.getMolten(16L))
                     .duration(16 * TICKS)
                     .eut(calculateRecipeEU(aMaterial, 4))
@@ -64,24 +64,24 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis
             }
         }
 
-        GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null);
-        GT_RecipeRegistrator
+        GTRecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null);
+        GTRecipeRegistrator
             .registerReverseMacerating(aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false);
         if (!aMaterial.contains(SubTag.NO_SMELTING)
-            && GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) {
-            GT_Values.RA.stdBuilder()
+            && GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) {
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L),
                     ItemList.Shape_Mold_Nugget.get(0L))
-                .itemOutputs(GT_Utility.copyAmount(9, aStack))
+                .itemOutputs(GTUtility.copyAmount(9, aStack))
                 .duration(5 * SECONDS)
                 .eut(calculateRecipeEU(aMaterial, 1))
                 .recipeCategory(RecipeCategories.alloySmelterMolding)
                 .addTo(alloySmelterRecipes);
             if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 8L),
-                    GT_ModHandler.RecipeBits.BUFFERED,
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.nugget, aMaterial, 8L),
+                    GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "sI ", 'I', OrePrefixes.ingot.get(aMaterial) });
             }
         }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
index 79342a460d..4d0b405fea 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
@@ -4,22 +4,22 @@ import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
 import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
 
 import java.util.ArrayList;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -41,21 +41,21 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
         // For Sake of god of balance!
 
         // Dense ore
-        if (GT_Mod.gregtechproxy.mRichOreYieldMultiplier) {
+        if (GTMod.gregtechproxy.mRichOreYieldMultiplier) {
             tIsRich = (aPrefix == OrePrefixes.oreRich) || (aPrefix == OrePrefixes.oreDense);
         }
         // NetherOre
-        if (GT_Mod.gregtechproxy.mNetherOreYieldMultiplier && !tIsRich) {
+        if (GTMod.gregtechproxy.mNetherOreYieldMultiplier && !tIsRich) {
             tIsRich = (aPrefix == OrePrefixes.oreNetherrack) || (aPrefix == OrePrefixes.oreNether);
         }
         // EndOre
-        if (GT_Mod.gregtechproxy.mEndOreYieldMultiplier && !tIsRich) {
+        if (GTMod.gregtechproxy.mEndOreYieldMultiplier && !tIsRich) {
             tIsRich = (aPrefix == OrePrefixes.oreEndstone) || (aPrefix == OrePrefixes.oreEnd);
         }
 
         if (aMaterial == Materials.Oilsands) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, aStack))
                 .itemOutputs(new ItemStack(net.minecraft.init.Blocks.sand, 1, 0))
                 .outputChances(tIsRich ? 2000 : 4000)
                 .fluidOutputs(Materials.OilHeavy.getFluid(tIsRich ? 4000L : 2000L))
@@ -63,67 +63,67 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
                 .eut(TierEU.RECIPE_LV)
                 .addTo(centrifugeRecipes);
         } else {
-            registerStandardOreRecipes(aPrefix, aMaterial, GT_Utility.copyAmount(1, aStack), tIsRich ? 2 : 1);
+            registerStandardOreRecipes(aPrefix, aMaterial, GTUtility.copyAmount(1, aStack), tIsRich ? 2 : 1);
         }
     }
 
     private boolean registerStandardOreRecipes(OrePrefixes aPrefix, Materials aMaterial, ItemStack aOreStack,
         int aMultiplier) {
         if ((aOreStack == null) || (aMaterial == null)) return false;
-        GT_ModHandler
-            .addValuableOre(GT_Utility.getBlockFromStack(aOreStack), aOreStack.getItemDamage(), aMaterial.mOreValue);
+        GTModHandler
+            .addValuableOre(GTUtility.getBlockFromStack(aOreStack), aOreStack.getItemDamage(), aMaterial.mOreValue);
         Materials tMaterial = aMaterial.mOreReplacement;
         Materials tPrimaryByMaterial = null;
         aMultiplier = Math.max(1, aMultiplier);
-        aOreStack = GT_Utility.copyAmount(1, aOreStack);
+        aOreStack = GTUtility.copyAmount(1, aOreStack);
         aOreStack.stackSize = 1;
 
-        ItemStack tIngot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L);
-        ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, tMaterial, 1L);
+        ItemStack tIngot = GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L);
+        ItemStack tGem = GTOreDictUnificator.get(OrePrefixes.gem, tMaterial, 1L);
         ItemStack tSmeltInto = tIngot
             == null
                 ? null
                 : aMaterial.contains(SubTag.SMELTING_TO_GEM)
-                    ? GT_OreDictUnificator.get(
+                    ? GTOreDictUnificator.get(
                         OrePrefixes.gem,
                         tMaterial.mDirectSmelting,
-                        GT_OreDictUnificator.get(
+                        GTOreDictUnificator.get(
                             OrePrefixes.crystal,
                             tMaterial.mDirectSmelting,
-                            GT_OreDictUnificator.get(
+                            GTOreDictUnificator.get(
                                 OrePrefixes.gem,
                                 tMaterial,
-                                GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L),
+                                GTOreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L),
                                 1L),
                             1L),
                         1L)
                     : tIngot;
 
-        ItemStack tDust = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, tGem, 1L);
-        ItemStack tCleaned = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L);
-        ItemStack tCrushed = GT_OreDictUnificator
+        ItemStack tDust = GTOreDictUnificator.get(OrePrefixes.dust, tMaterial, tGem, 1L);
+        ItemStack tCleaned = GTOreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L);
+        ItemStack tCrushed = GTOreDictUnificator
             .get(OrePrefixes.crushed, tMaterial, (long) aMaterial.mOreMultiplier * aMultiplier);
         ItemStack tPrimaryByProduct = null;
 
         if (tCrushed == null) {
-            tCrushed = GT_OreDictUnificator.get(
+            tCrushed = GTOreDictUnificator.get(
                 OrePrefixes.dustImpure,
                 tMaterial,
-                GT_Utility.copyAmount(aMaterial.mOreMultiplier * aMultiplier, tCleaned, tDust, tGem),
+                GTUtility.copyAmount(aMaterial.mOreMultiplier * aMultiplier, tCleaned, tDust, tGem),
                 (long) aMaterial.mOreMultiplier * aMultiplier);
         }
 
         for (Materials tMat : aMaterial.mOreByProducts) {
-            GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
+            GTOreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
             if (tPrimaryByProduct == null) {
                 tPrimaryByMaterial = tMat;
-                tPrimaryByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
-                if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator
-                    .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L);
+                tPrimaryByProduct = GTOreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
+                if (GTOreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GTOreDictUnificator
+                    .get(OrePrefixes.dustTiny, tMat, GTOreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L);
             }
-            GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
-            if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator
-                .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L);
+            GTOreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
+            if (GTOreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GTOreDictUnificator
+                .get(OrePrefixes.dustTiny, tMat, GTOreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L);
         }
 
         if (tPrimaryByMaterial == null) tPrimaryByMaterial = tMaterial;
@@ -132,33 +132,33 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
 
         if (tSmeltInto != null) {
             if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) {
-                GT_ModHandler.removeFurnaceSmelting(aOreStack);
+                GTModHandler.removeFurnaceSmelting(aOreStack);
             } else {
-                tHasSmelting = GT_ModHandler.addSmeltingRecipe(
+                tHasSmelting = GTModHandler.addSmeltingRecipe(
                     aOreStack,
-                    GT_Utility.copyAmount(aMultiplier * aMaterial.mSmeltingMultiplier, tSmeltInto));
+                    GTUtility.copyAmount(aMultiplier * aMaterial.mSmeltingMultiplier, tSmeltInto));
             }
 
             if (aMaterial.contains(SubTag.BLASTFURNACE_CALCITE_TRIPLE)) {
                 if (aMaterial.mAutoGenerateBlastFurnaceRecipes) {
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
                             aOreStack,
-                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier))
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier))
                         .itemOutputs(
-                            GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto),
-                            GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L))
+                            GTUtility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto),
+                            GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L))
                         .duration(tSmeltInto.stackSize * 25 * SECONDS)
                         .eut(TierEU.RECIPE_MV)
                         .metadata(COIL_HEAT, 1500)
                         .addTo(blastFurnaceRecipes);
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
                             aOreStack,
-                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier))
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier))
                         .itemOutputs(
-                            GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto),
-                            GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L))
+                            GTUtility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto),
+                            GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L))
                         .duration(tSmeltInto.stackSize * 25 * SECONDS)
                         .eut(TierEU.RECIPE_MV)
                         .metadata(COIL_HEAT, 1500)
@@ -166,24 +166,24 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
                 }
             } else if (aMaterial.contains(SubTag.BLASTFURNACE_CALCITE_DOUBLE)) {
                 if (aMaterial.mAutoGenerateBlastFurnaceRecipes) {
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
                             aOreStack,
-                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier))
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier))
                         .itemOutputs(
-                            GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto),
-                            GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L))
+                            GTUtility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto),
+                            GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L))
                         .duration(tSmeltInto.stackSize * 25 * SECONDS)
                         .eut(TierEU.RECIPE_MV)
                         .metadata(COIL_HEAT, 1500)
                         .addTo(blastFurnaceRecipes);
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
                             aOreStack,
-                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier))
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier))
                         .itemOutputs(
-                            GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto),
-                            GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L))
+                            GTUtility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto),
+                            GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L))
                         .duration(tSmeltInto.stackSize * 25 * SECONDS)
                         .eut(TierEU.RECIPE_MV)
                         .metadata(COIL_HEAT, 1500)
@@ -193,18 +193,18 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
         }
 
         if (!tHasSmelting) {
-            GT_ModHandler.addSmeltingRecipe(
+            GTModHandler.addSmeltingRecipe(
                 aOreStack,
-                GT_OreDictUnificator.get(
+                GTOreDictUnificator.get(
                     OrePrefixes.gem,
                     tMaterial.mDirectSmelting,
                     Math.max(1, aMultiplier * aMaterial.mSmeltingMultiplier / 2)));
         }
 
         if (tCrushed != null) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(aOreStack)
-                .itemOutputs(GT_Utility.copy(GT_Utility.copyAmount(tCrushed.stackSize, tGem), tCrushed))
+                .itemOutputs(GTUtility.copy(GTUtility.copyAmount(tCrushed.stackSize, tGem), tCrushed))
                 .duration(10)
                 .eut(16)
                 .addTo(hammerRecipes);
@@ -212,19 +212,19 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
             int chanceOre2 = tPrimaryByProduct == null ? 0
                 : tPrimaryByProduct.stackSize * 10 * aMultiplier * aMaterial.mByProductMultiplier;
             chanceOre2 = 100 * chanceOre2; // converting to the GT format, 100% is 10000
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(aOreStack)
                 .itemOutputs(
-                    GT_Utility.mul(2, tCrushed),
-                    tMaterial.contains(SubTag.PULVERIZING_CINNABAR) ? GT_OreDictUnificator.get(
+                    GTUtility.mul(2, tCrushed),
+                    tMaterial.contains(SubTag.PULVERIZING_CINNABAR) ? GTOreDictUnificator.get(
                         OrePrefixes.crystal,
                         Materials.Cinnabar,
-                        GT_OreDictUnificator
-                            .get(OrePrefixes.gem, tPrimaryByMaterial, GT_Utility.copyAmount(1, tPrimaryByProduct), 1L),
+                        GTOreDictUnificator
+                            .get(OrePrefixes.gem, tPrimaryByMaterial, GTUtility.copyAmount(1, tPrimaryByProduct), 1L),
                         1L)
-                        : GT_OreDictUnificator
-                            .get(OrePrefixes.gem, tPrimaryByMaterial, GT_Utility.copyAmount(1, tPrimaryByProduct), 1L),
-                    GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial))
+                        : GTOreDictUnificator
+                            .get(OrePrefixes.gem, tPrimaryByMaterial, GTUtility.copyAmount(1, tPrimaryByProduct), 1L),
+                    GTOreDictUnificator.getDust(aPrefix.mSecondaryMaterial))
                 .outputChances(10000, chanceOre2, 5000)
                 .duration(20 * SECONDS)
                 .eut(2)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java
index ac9106d31b..d71b4a61f4 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java
@@ -2,17 +2,17 @@ package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import net.minecraft.item.ItemStack;
 
-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.SubTag;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingOrePoor implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -43,30 +43,30 @@ public class ProcessingOrePoor implements gregtech.api.interfaces.IOreRecipeRegi
                 break;
         }
         if (aMaterial != null) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, aStack))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, aMultiplier))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, aStack))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, aMultiplier))
                 .duration(10)
                 .eut(16)
                 .addTo(hammerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, aStack))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 2 * aMultiplier),
-                    GT_OreDictUnificator.get(
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 2 * aMultiplier),
+                    GTOreDictUnificator.get(
                         OrePrefixes.dustTiny,
-                        GT_Utility.selectItemInList(0, aMaterial, aMaterial.mOreByProducts),
+                        GTUtility.selectItemInList(0, aMaterial, aMaterial.mOreByProducts),
                         1L),
-                    GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial))
+                    GTOreDictUnificator.getDust(aPrefix.mSecondaryMaterial))
                 .outputChances(10000, 100 * 5 * aMultiplier, 10000)
                 .duration(20 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
 
-            if (aMaterial.contains(SubTag.NO_SMELTING)) GT_ModHandler.addSmeltingRecipe(
-                GT_Utility.copyAmount(1, aStack),
-                GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial.mDirectSmelting, aMultiplier));
+            if (aMaterial.contains(SubTag.NO_SMELTING)) GTModHandler.addSmeltingRecipe(
+                GTUtility.copyAmount(1, aStack),
+                GTOreDictUnificator.get(OrePrefixes.nugget, aMaterial.mDirectSmelting, aMultiplier));
         }
     }
 }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java
index 93458ee467..315bdcd6dd 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java
@@ -2,24 +2,24 @@ package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
 import static gregtech.api.recipe.RecipeMaps.primitiveBlastRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.ADDITIVE_AMOUNT;
-import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.ADDITIVE_AMOUNT;
+import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
 import gregtech.api.enums.TierEU;
-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.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -34,24 +34,24 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe
     @Override
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
-        GT_ModHandler.removeFurnaceSmelting(aStack);
+        GTModHandler.removeFurnaceSmelting(aStack);
         if (!aMaterial.contains(SubTag.NO_SMELTING)) {
             if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) {
                 if (aMaterial.mBlastFurnaceTemp < 1000 && aMaterial.mDirectSmelting.mBlastFurnaceTemp < 1000)
                     if (aMaterial.mAutoGenerateBlastFurnaceRecipes
-                        && GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) {
-                            GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+                        && GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) {
+                            GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder();
                             recipeBuilder
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1));
+                                .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1));
                             if (aMaterial.mBlastFurnaceTemp > 1750) {
                                 recipeBuilder.itemOutputs(
-                                    GT_OreDictUnificator.get(
+                                    GTOreDictUnificator.get(
                                         OrePrefixes.ingotHot,
                                         aMaterial,
-                                        GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L),
+                                        GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L),
                                         1L));
                             } else {
-                                recipeBuilder.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L));
+                                recipeBuilder.itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L));
                             }
                             recipeBuilder
                                 .duration(Math.max(aMaterial.getMass() / 4L, 1L) * aMaterial.mBlastFurnaceTemp * TICKS)
@@ -70,7 +70,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe
                             outputSize = 10;
                             outputPrefix = OrePrefixes.nugget;
                         } else {
-                            if (GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) {
+                            if (GTMod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) {
                                 outputSize = 6;
                                 outputPrefix = OrePrefixes.nugget;
                             } else {
@@ -80,18 +80,18 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe
                         }
                         break;
                     case dust:
-                        int outputAmount = GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre ? 2 : 3;
+                        int outputAmount = GTMod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre ? 2 : 3;
                         if (aMaterial.mDirectSmelting != aMaterial) {
                             if (!aMaterial.contains(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE)
                                 && aMaterial.mDirectSmelting.getIngots(1) != null) {
-                                GT_Values.RA.stdBuilder()
-                                    .itemInputs(GT_Utility.copyAmount(2, aStack))
+                                GTValues.RA.stdBuilder()
+                                    .itemInputs(GTUtility.copyAmount(2, aStack))
                                     .itemOutputs(aMaterial.mDirectSmelting.getIngots(outputAmount))
                                     .duration(2 * MINUTES)
                                     .metadata(ADDITIVE_AMOUNT, 2)
                                     .addTo(primitiveBlastRecipes);
                             } else if (aMaterial == Materials.Chalcopyrite) {
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(aMaterial.getDust(2), new ItemStack(Blocks.sand, 2))
                                     .itemOutputs(
                                         aMaterial.mDirectSmelting.getIngots(outputAmount),
@@ -99,7 +99,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe
                                     .duration(2 * MINUTES)
                                     .metadata(ADDITIVE_AMOUNT, 2)
                                     .addTo(primitiveBlastRecipes);
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(aMaterial.getDust(2), Materials.Glass.getDust(2))
                                     .itemOutputs(
                                         aMaterial.mDirectSmelting.getIngots(outputAmount),
@@ -107,7 +107,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe
                                     .duration(2 * MINUTES)
                                     .metadata(ADDITIVE_AMOUNT, 2)
                                     .addTo(primitiveBlastRecipes);
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(aMaterial.getDust(2), Materials.SiliconDioxide.getDust(2))
                                     .itemOutputs(
                                         aMaterial.mDirectSmelting.getIngots(outputAmount),
@@ -115,7 +115,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe
                                     .duration(2 * MINUTES)
                                     .metadata(ADDITIVE_AMOUNT, 2)
                                     .addTo(primitiveBlastRecipes);
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(aMaterial.getDust(2), Materials.Quartzite.getDust(4))
                                     .itemOutputs(
                                         aMaterial.mDirectSmelting.getIngots(outputAmount),
@@ -123,7 +123,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe
                                     .duration(2 * MINUTES)
                                     .metadata(ADDITIVE_AMOUNT, 2)
                                     .addTo(primitiveBlastRecipes);
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(aMaterial.getDust(2), Materials.NetherQuartz.getDust(2))
                                     .itemOutputs(
                                         aMaterial.mDirectSmelting.getIngots(outputAmount),
@@ -131,7 +131,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe
                                     .duration(2 * MINUTES)
                                     .metadata(ADDITIVE_AMOUNT, 2)
                                     .addTo(primitiveBlastRecipes);
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(aMaterial.getDust(2), Materials.CertusQuartz.getDust(2))
                                     .itemOutputs(
                                         aMaterial.mDirectSmelting.getIngots(outputAmount),
@@ -140,7 +140,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe
                                     .metadata(ADDITIVE_AMOUNT, 2)
                                     .addTo(primitiveBlastRecipes);
                             } else if (aMaterial == Materials.Tetrahedrite) {
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(aMaterial.getDust(2))
                                     .itemOutputs(
                                         aMaterial.mDirectSmelting.getIngots(outputAmount),
@@ -149,7 +149,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe
                                     .metadata(ADDITIVE_AMOUNT, 2)
                                     .addTo(primitiveBlastRecipes);
                             } else if (aMaterial == Materials.Galena) {
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(aMaterial.getDust(2))
                                     .itemOutputs(
                                         aMaterial.mDirectSmelting.getIngots(outputAmount),
@@ -166,7 +166,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe
                             outputPrefix = OrePrefixes.ingot;
                             outputSize = 1;
                         } else {
-                            if (GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) {
+                            if (GTMod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) {
                                 outputSize = 6;
                                 outputPrefix = OrePrefixes.nugget;
                             } else {
@@ -180,14 +180,14 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe
                         outputSize = 1;
                         break;
                 }
-                ItemStack tStack = GT_OreDictUnificator.get(outputPrefix, aMaterial.mDirectSmelting, outputSize);
-                if (tStack == null) tStack = GT_OreDictUnificator.get(
+                ItemStack tStack = GTOreDictUnificator.get(outputPrefix, aMaterial.mDirectSmelting, outputSize);
+                if (tStack == null) tStack = GTOreDictUnificator.get(
                     aMaterial.contains(SubTag.SMELTING_TO_GEM) ? OrePrefixes.gem : OrePrefixes.ingot,
                     aMaterial.mDirectSmelting,
                     1L);
                 if ((tStack == null) && (!aMaterial.contains(SubTag.SMELTING_TO_GEM)))
-                    tStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L);
-                GT_ModHandler.addSmeltingRecipe(aStack, tStack);
+                    tStack = GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L);
+                GTModHandler.addSmeltingRecipe(aStack, tStack);
             }
         }
     }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java
index 1f97e1e32a..b8a39737cc 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java
@@ -1,21 +1,21 @@
 package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
 
 import net.minecraft.item.ItemStack;
 
-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.SubTag;
 import gregtech.api.enums.TierEU;
 import gregtech.api.enums.ToolDictNames;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 @SuppressWarnings("RedundantLabeledSwitchRuleCodeBlock")
 public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistrator {
@@ -42,13 +42,13 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr
             case pipeHuge, pipeLarge, pipeMedium, pipeSmall, pipeTiny -> {
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 8L),
-                        GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 8L),
+                        GTModHandler.RecipeBits.BUFFERED,
                         new Object[] { "PPP", "h w", "PPP", 'P', OrePrefixes.plate.get(aMaterial) });
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 6L),
-                        GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 6L),
+                        GTModHandler.RecipeBits.BUFFERED,
                         new Object[] { "PWP", "P P", "PHP", 'P',
                             aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial)
                                 : OrePrefixes.plate.get(aMaterial),
@@ -57,9 +57,9 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr
                                 : ToolDictNames.craftingToolHardHammer,
                             'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw
                                 : ToolDictNames.craftingToolWrench });
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 2L),
-                        GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 2L),
+                        GTModHandler.RecipeBits.BUFFERED,
                         new Object[] { "PPP", "W H", "PPP", 'P',
                             aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial)
                                 : OrePrefixes.plate.get(aMaterial),
@@ -68,9 +68,9 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr
                                 : ToolDictNames.craftingToolHardHammer,
                             'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw
                                 : ToolDictNames.craftingToolWrench });
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L),
-                        GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L),
+                        GTModHandler.RecipeBits.BUFFERED,
                         new Object[] { "PHP", "P P", "PWP", 'P',
                             aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial)
                                 : OrePrefixes.plate.get(aMaterial),
@@ -79,21 +79,21 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr
                                 : ToolDictNames.craftingToolHardHammer,
                             'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw
                                 : ToolDictNames.craftingToolWrench });
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L),
-                        GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L),
+                        GTModHandler.RecipeBits.BUFFERED,
                         new Object[] { "DhD", "D D", "DwD", 'D', OrePrefixes.plateDouble.get(aMaterial) });
                 }
             }
             case pipeRestrictiveHuge, pipeRestrictiveLarge, pipeRestrictiveMedium, pipeRestrictiveSmall, pipeRestrictiveTiny -> {
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(
+                        GTOreDictUnificator.get(
                             OrePrefixes.ring,
                             Materials.Steel,
                             aPrefix.mSecondaryMaterial.mAmount / OrePrefixes.ring.mMaterialAmount),
-                        GT_OreDictUnificator.get(aOreDictName.replaceFirst("Restrictive", ""), null, 1L, false, true))
-                    .itemOutputs(GT_Utility.copyAmount(1, aStack))
+                        GTOreDictUnificator.get(aOreDictName.replaceFirst("Restrictive", ""), null, 1L, false, true))
+                    .itemOutputs(GTUtility.copyAmount(1, aStack))
                     .duration(
                         ((int) (aPrefix.mSecondaryMaterial.mAmount * 400L / OrePrefixes.ring.mMaterialAmount)) * TICKS)
                     .eut(4)
@@ -102,17 +102,17 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr
             case pipeQuadruple -> {
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1),
-                        GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1),
+                        GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED,
                         new Object[] { "MM ", "MM ", "   ", 'M',
-                            GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1) });
+                            GTOreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1) });
                 }
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 4),
-                        GT_Utility.getIntegratedCircuit(9))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1))
+                        GTOreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 4),
+                        GTUtility.getIntegratedCircuit(9))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1))
                     .duration(3 * SECONDS)
                     .eut(calculateRecipeEU(aMaterial, 4))
                     .addTo(assemblerRecipes);
@@ -120,17 +120,17 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr
             case pipeNonuple -> {
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_Utility.copyAmount(1, aStack),
-                        GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-                        new Object[] { "PPP", "PPP", "PPP", 'P', GT_OreDictUnificator
+                    GTModHandler.addCraftingRecipe(
+                        GTUtility.copyAmount(1, aStack),
+                        GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED,
+                        new Object[] { "PPP", "PPP", "PPP", 'P', GTOreDictUnificator
                             .get(aOreDictName.replaceFirst("Nonuple", "Small"), null, 1L, false, true) });
                 }
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 9),
-                        GT_Utility.getIntegratedCircuit(9))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, aMaterial, 1))
+                        GTOreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 9),
+                        GTUtility.getIntegratedCircuit(9))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeNonuple, aMaterial, 1))
                     .duration(3 * SECONDS)
                     .eut(calculateRecipeEU(aMaterial, 8))
                     .addTo(assemblerRecipes);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java
index 3b06babee6..e6a74aac19 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java
@@ -3,19 +3,19 @@ package gregtech.loaders.oreprocessing;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
 import static gregtech.api.recipe.RecipeMaps.latheRecipes;
-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 net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
-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.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -27,38 +27,38 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
         if (aOreDictName.startsWith("plankWood")) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, aStack))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, aStack))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2L))
                 .duration(10 * TICKS)
                 .eut(8)
                 .addTo(latheRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(1, aStack),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 1L))
+                    GTUtility.copyAmount(1, aStack),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 1L))
                 .itemOutputs(ItemList.Crate_Empty.get(1L))
                 .duration(10 * SECONDS)
                 .eut(1)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(1, aStack),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.WroughtIron, 1L))
+                    GTUtility.copyAmount(1, aStack),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.WroughtIron, 1L))
                 .itemOutputs(ItemList.Crate_Empty.get(1L))
                 .duration(10 * SECONDS)
                 .eut(1)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(1, aStack),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L))
+                    GTUtility.copyAmount(1, aStack),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L))
                 .itemOutputs(ItemList.Crate_Empty.get(1L))
                 .duration(10 * SECONDS)
                 .eut(1)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(8, aStack), GT_Utility.getIntegratedCircuit(8))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(8, aStack), GTUtility.getIntegratedCircuit(8))
                 .itemOutputs(new ItemStack(Blocks.chest, 1))
                 .duration(40 * SECONDS)
                 .eut(4)
@@ -66,69 +66,69 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist
 
             if (aStack.getItemDamage() == 32767) {
                 for (byte i = 0; i < 64; i = (byte) (i + 1)) {
-                    ItemStack tStack = GT_Utility.copyMetaData(i, aStack);
+                    ItemStack tStack = GTUtility.copyMetaData(i, aStack);
                     // Get Recipe and Output, add recipe to delayed removal
-                    ItemStack tOutput = GT_ModHandler.getRecipeOutput(tStack, tStack, tStack);
+                    ItemStack tOutput = GTModHandler.getRecipeOutput(tStack, tStack, tStack);
                     if ((tOutput != null) && (tOutput.stackSize >= 3)) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, tStack))
-                            .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, tStack))
+                            .itemOutputs(GTUtility.copyAmount(tOutput.stackSize / 3, tOutput))
                             .fluidInputs(Materials.Water.getFluid(4))
                             .duration(2 * 25 * TICKS)
                             .eut(4)
                             .addTo(cutterRecipes);
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, tStack))
-                            .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput))
-                            .fluidInputs(GT_ModHandler.getDistilledWater(3))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, tStack))
+                            .itemOutputs(GTUtility.copyAmount(tOutput.stackSize / 3, tOutput))
+                            .fluidInputs(GTModHandler.getDistilledWater(3))
                             .duration(2 * 25 * TICKS)
                             .eut(4)
                             .addTo(cutterRecipes);
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, tStack))
-                            .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, tStack))
+                            .itemOutputs(GTUtility.copyAmount(tOutput.stackSize / 3, tOutput))
                             .fluidInputs(Materials.Lubricant.getFluid(1))
                             .duration(25 * TICKS)
                             .eut(4)
                             .addTo(cutterRecipes);
-                        GT_ModHandler.removeRecipeDelayed(tStack, tStack, tStack);
-                        GT_ModHandler.addCraftingRecipe(
-                            GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput),
-                            GT_ModHandler.RecipeBits.BUFFERED,
+                        GTModHandler.removeRecipeDelayed(tStack, tStack, tStack);
+                        GTModHandler.addCraftingRecipe(
+                            GTUtility.copyAmount(tOutput.stackSize / 3, tOutput),
+                            GTModHandler.RecipeBits.BUFFERED,
                             new Object[] { "sP", 'P', tStack });
                     }
                     if ((tStack == null) && (i >= 16)) break;
                 }
             } else {
                 ItemStack tOutput = !aModName.equalsIgnoreCase("thaumcraft")
-                    ? GT_ModHandler.getRecipeOutput(aStack, aStack, aStack)
-                    : GT_ModHandler.getRecipeOutputNoOreDict(aStack, aStack, aStack);
+                    ? GTModHandler.getRecipeOutput(aStack, aStack, aStack)
+                    : GTModHandler.getRecipeOutputNoOreDict(aStack, aStack, aStack);
                 if ((tOutput != null) && (tOutput.stackSize >= 3)) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
-                        .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
+                        .itemOutputs(GTUtility.copyAmount(tOutput.stackSize / 3, tOutput))
                         .fluidInputs(Materials.Water.getFluid(4))
                         .duration(2 * 25)
                         .eut(4)
                         .addTo(cutterRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
-                        .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput))
-                        .fluidInputs(GT_ModHandler.getDistilledWater(3))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
+                        .itemOutputs(GTUtility.copyAmount(tOutput.stackSize / 3, tOutput))
+                        .fluidInputs(GTModHandler.getDistilledWater(3))
                         .duration(2 * 25)
                         .eut(4)
                         .addTo(cutterRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
-                        .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
+                        .itemOutputs(GTUtility.copyAmount(tOutput.stackSize / 3, tOutput))
                         .fluidInputs(Materials.Lubricant.getFluid(1))
                         .duration(25)
                         .eut(4)
                         .addTo(cutterRecipes);
-                    GT_ModHandler.removeRecipeDelayed(aStack, aStack, aStack);
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput),
-                        GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.removeRecipeDelayed(aStack, aStack, aStack);
+                    GTModHandler.addCraftingRecipe(
+                        GTUtility.copyAmount(tOutput.stackSize / 3, tOutput),
+                        GTModHandler.RecipeBits.BUFFERED,
                         new Object[] { "sP", 'P', aStack });
                 }
             }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
index 801eaa8354..574af24531 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
@@ -1,9 +1,9 @@
 package gregtech.loaders.oreprocessing;
 
-import static gregtech.api.enums.GT_Values.L;
-import static gregtech.api.enums.GT_Values.NI;
-import static gregtech.api.enums.GT_Values.RA;
-import static gregtech.api.enums.GT_Values.W;
+import static gregtech.api.enums.GTValues.L;
+import static gregtech.api.enums.GTValues.NI;
+import static gregtech.api.enums.GTValues.RA;
+import static gregtech.api.enums.GTValues.W;
 import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.benderRecipes;
@@ -11,24 +11,24 @@ import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
 import static gregtech.api.recipe.RecipeMaps.extruderRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
 import static gregtech.api.recipe.RecipeMaps.implosionRecipes;
-import static gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED;
-import static gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeBuilder.WILDCARD;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
-import static gregtech.common.GT_Proxy.tBits;
+import static gregtech.api.util.GTModHandler.RecipeBits.BUFFERED;
+import static gregtech.api.util.GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.WILDCARD;
+import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE;
+import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
+import static gregtech.common.GTProxy.tBits;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-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;
@@ -38,11 +38,11 @@ import gregtech.api.enums.TierEU;
 import gregtech.api.enums.ToolDictNames;
 import gregtech.api.recipe.RecipeCategories;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeConstants;
-import gregtech.api.util.GT_RecipeRegistrator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeConstants;
+import gregtech.api.util.GTRecipeRegistrator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -92,25 +92,25 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
 
         registerCover(aMaterial, aStack);
 
-        GT_ModHandler.removeRecipeByOutputDelayed(aStack);
-        GT_ModHandler.removeRecipeDelayed(aStack);
+        GTModHandler.removeRecipeByOutputDelayed(aStack);
+        GTModHandler.removeRecipeDelayed(aStack);
 
-        GT_Utility.removeSimpleIC2MachineRecipe(
-            GT_Utility.copyAmount(9, aStack),
-            GT_ModHandler.getCompressorRecipeList(),
-            GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L));
+        GTUtility.removeSimpleIC2MachineRecipe(
+            GTUtility.copyAmount(9, aStack),
+            GTModHandler.getCompressorRecipeList(),
+            GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L));
 
         if (aMaterial.mFuelPower > 0) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, aStack))
                 .metadata(FUEL_VALUE, aMaterial.mFuelPower)
                 .metadata(FUEL_TYPE, aMaterial.mFuelType)
-                .addTo(GT_RecipeConstants.Fuel);
+                .addTo(GTRecipeConstants.Fuel);
         }
 
         if (aMaterial.mStandardMoltenFluid != null
             && !(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Mold_Plate.get(0L))
                 .itemOutputs(aMaterial.getPlates(1))
                 .fluidInputs(aMaterial.getMolten(L))
@@ -119,14 +119,14 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
                 .addTo(fluidSolidifierRecipes);
         }
 
-        GT_ModHandler.addCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 2L),
+        GTModHandler.addCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, 2L),
             tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE
             new Object[] { "hX", 'X', OrePrefixes.plate.get(aMaterial) });
 
         if (aMaterial == Materials.Paper) {
-            GT_ModHandler.addCraftingRecipe(
-                GT_Utility.copyAmount(2, aStack),
+            GTModHandler.addCraftingRecipe(
+                GTUtility.copyAmount(2, aStack),
                 BUFFERED,
                 new Object[] { "XXX", 'X', new ItemStack(Items.reeds, 1, W) });
         }
@@ -136,27 +136,27 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
             if (!aNoSmashing) {
 
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-                    GT_ModHandler.addCraftingRecipe(
+                    GTModHandler.addCraftingRecipe(
                         aMaterial.getPlates(1),
                         tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE
                         new Object[] { "h", // craftingToolHardHammer
                             "X", "X", 'X', OrePrefixes.ingot.get(aMaterial) });
 
                     // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false
-                    GT_ModHandler.addCraftingRecipe(
+                    GTModHandler.addCraftingRecipe(
                         aMaterial.getPlates(1),
                         tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE
                         new Object[] { "H", // craftingToolForgeHammer
                             "X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', OrePrefixes.ingot.get(aMaterial) });
 
-                    GT_ModHandler.addCraftingRecipe(
+                    GTModHandler.addCraftingRecipe(
                         aMaterial.getPlates(1),
                         tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE
                         new Object[] { "h", // craftingToolHardHammer
                             "X", 'X', OrePrefixes.gem.get(aMaterial) });
 
                     // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false
-                    GT_ModHandler.addCraftingRecipe(
+                    GTModHandler.addCraftingRecipe(
                         aMaterial.getPlates(1),
                         tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE
                         new Object[] { "H", // craftingToolForgeHammer
@@ -167,7 +167,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
             if (aMaterial.contains(SubTag.MORTAR_GRINDABLE)) {
 
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-                    GT_ModHandler.addShapelessCraftingRecipe(
+                    GTModHandler.addShapelessCraftingRecipe(
                         aMaterial.getDust(1),
                         tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE
                         new Object[] { ToolDictNames.craftingToolMortar, OrePrefixes.plate.get(aMaterial) });
@@ -181,33 +181,33 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
 
         registerCover(aMaterial, aStack);
 
-        GT_ModHandler.removeRecipeByOutputDelayed(aStack);
+        GTModHandler.removeRecipeByOutputDelayed(aStack);
 
         if (!aNoSmashing || aMaterial.contains(SubTag.STRETCHY)) {
             // 2 double -> 1 quadruple plate
-            if (GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L) != null) {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(2, aStack), GT_Utility.getIntegratedCircuit(2))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L))
+            if (GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L) != null) {
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(2, aStack), GTUtility.getIntegratedCircuit(2))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L))
                     .duration(Math.max(aMaterialMass * 2L, 1L))
                     .eut(calculateRecipeEU(aMaterial, 96))
                     .addTo(benderRecipes);
             }
             // 2 plates -> 1 double plate
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L),
-                    GT_Utility.getIntegratedCircuit(2))
-                .itemOutputs(GT_Utility.copyAmount(1, aStack))
+                    GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L),
+                    GTUtility.getIntegratedCircuit(2))
+                .itemOutputs(GTUtility.copyAmount(1, aStack))
                 .duration(Math.max(aMaterialMass * 2L, 1L))
                 .eut(calculateRecipeEU(aMaterial, 96))
                 .addTo(benderRecipes);
         } else {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L),
-                    GT_Utility.getIntegratedCircuit(2))
-                .itemOutputs(GT_Utility.copyAmount(1, aStack))
+                    GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L),
+                    GTUtility.getIntegratedCircuit(2))
+                .itemOutputs(GTUtility.copyAmount(1, aStack))
                 .fluidInputs(Materials.Glue.getFluid(10L))
                 .duration(3 * SECONDS + 4 * TICKS)
                 .eut(8)
@@ -217,8 +217,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
         if (!aNoSmashing) {
             Object aPlateStack = OrePrefixes.plate.get(aMaterial);
             if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-                GT_ModHandler.addCraftingRecipe(
-                    GT_Utility.copyAmount(1, aStack),
+                GTModHandler.addCraftingRecipe(
+                    GTUtility.copyAmount(1, aStack),
                     DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED,
                     new Object[] { "I", "B", "h", // craftingToolHardHammer
                         'I', aPlateStack, 'B', aPlateStack });
@@ -231,33 +231,33 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
 
         registerCover(aMaterial, aStack);
 
-        GT_ModHandler.removeRecipeByOutputDelayed(aStack);
+        GTModHandler.removeRecipeByOutputDelayed(aStack);
 
         if (!aNoSmashing || aMaterial.contains(SubTag.STRETCHY)) {
-            if (GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L) != null) {
+            if (GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L) != null) {
                 // 3 triple plates -> 1 dense plate
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(3, aStack), GT_Utility.getIntegratedCircuit(3))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(3, aStack), GTUtility.getIntegratedCircuit(3))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L))
                     .duration(Math.max(aMaterialMass * 3L, 1L))
                     .eut(calculateRecipeEU(aMaterial, 96))
                     .addTo(benderRecipes);
             }
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L),
-                    GT_Utility.getIntegratedCircuit(3))
-                .itemOutputs(GT_Utility.copyAmount(1, aStack))
+                    GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L),
+                    GTUtility.getIntegratedCircuit(3))
+                .itemOutputs(GTUtility.copyAmount(1, aStack))
                 .duration(Math.max(aMaterialMass * 3L, 1L))
                 .eut(calculateRecipeEU(aMaterial, 96))
                 .addTo(benderRecipes);
         } else {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L),
-                    GT_Utility.getIntegratedCircuit(3))
-                .itemOutputs(GT_Utility.copyAmount(1, aStack))
+                    GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L),
+                    GTUtility.getIntegratedCircuit(3))
+                .itemOutputs(GTUtility.copyAmount(1, aStack))
                 .fluidInputs(Materials.Glue.getFluid(20L))
                 .duration(4 * SECONDS + 16 * TICKS)
                 .eut(8)
@@ -267,50 +267,50 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
         if (!aNoSmashing) {
             if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                 Object aPlateStack = OrePrefixes.plate.get(aMaterial);
-                GT_ModHandler.addCraftingRecipe(
-                    GT_Utility.copyAmount(1, aStack),
+                GTModHandler.addCraftingRecipe(
+                    GTUtility.copyAmount(1, aStack),
                     DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED,
                     new Object[] { "I", "B", "h", // craftingToolHardHammer
                         'I', OrePrefixes.plateDouble.get(aMaterial), 'B', aPlateStack });
 
-                GT_ModHandler.addShapelessCraftingRecipe(
-                    GT_Utility.copyAmount(1, aStack),
+                GTModHandler.addShapelessCraftingRecipe(
+                    GTUtility.copyAmount(1, aStack),
                     DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED,
                     new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, aPlateStack,
                         aPlateStack });
             }
         }
 
-        if (GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L) != null) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Block_Powderbarrel.get(4))
+        if (GTOreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L) != null) {
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Block_Powderbarrel.get(4))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L))
+                    GTOreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L))
                 .duration(1 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(implosionRecipes);
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, aStack), GT_ModHandler.getIC2Item("dynamite", 1, null))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, aStack), GTModHandler.getIC2Item("dynamite", 1, null))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L))
+                    GTOreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L))
                 .duration(1 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(implosionRecipes);
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, aStack), new ItemStack(Blocks.tnt, 2))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, aStack), new ItemStack(Blocks.tnt, 2))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L))
+                    GTOreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L))
                 .duration(1 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(implosionRecipes);
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, aStack), GT_ModHandler.getIC2Item("industrialTnt", 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, aStack), GTModHandler.getIC2Item("industrialTnt", 1))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L))
+                    GTOreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L))
                 .duration(1 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(implosionRecipes);
@@ -322,24 +322,24 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
 
         registerCover(aMaterial, aStack);
 
-        GT_ModHandler.removeRecipeByOutputDelayed(aStack);
+        GTModHandler.removeRecipeByOutputDelayed(aStack);
 
         if (!aNoSmashing || aMaterial.contains(SubTag.STRETCHY)) {
             // Quadruple plate
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L),
-                    GT_Utility.getIntegratedCircuit(4))
-                .itemOutputs(GT_Utility.copyAmount(1, aStack))
+                    GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L),
+                    GTUtility.getIntegratedCircuit(4))
+                .itemOutputs(GTUtility.copyAmount(1, aStack))
                 .duration(Math.max(aMaterialMass * 4L, 1L))
                 .eut(calculateRecipeEU(aMaterial, 96))
                 .addTo(benderRecipes);
         } else {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L),
-                    GT_Utility.getIntegratedCircuit(4))
-                .itemOutputs(GT_Utility.copyAmount(1, aStack))
+                    GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L),
+                    GTUtility.getIntegratedCircuit(4))
+                .itemOutputs(GTUtility.copyAmount(1, aStack))
                 .fluidInputs(Materials.Glue.getFluid(30L))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(8)
@@ -348,14 +348,14 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
         if (!aNoSmashing) {
             if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                 Object aPlateStack = OrePrefixes.plate.get(aMaterial);
-                GT_ModHandler.addCraftingRecipe(
-                    GT_Utility.copyAmount(1, aStack),
+                GTModHandler.addCraftingRecipe(
+                    GTUtility.copyAmount(1, aStack),
                     DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED,
                     new Object[] { "I", "B", "h", // craftingToolHardHammer
                         'I', OrePrefixes.plateTriple.get(aMaterial), 'B', aPlateStack });
 
-                GT_ModHandler.addShapelessCraftingRecipe(
-                    GT_Utility.copyAmount(1, aStack),
+                GTModHandler.addShapelessCraftingRecipe(
+                    GTUtility.copyAmount(1, aStack),
                     DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED,
                     new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, aPlateStack,
                         aPlateStack, aPlateStack });
@@ -368,24 +368,24 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
 
         registerCover(aMaterial, aStack);
 
-        GT_ModHandler.removeRecipeByOutputDelayed(aStack);
+        GTModHandler.removeRecipeByOutputDelayed(aStack);
 
         if (!aNoSmashing || aMaterial.contains(SubTag.STRETCHY)) {
             // quintuple plate
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L),
-                    GT_Utility.getIntegratedCircuit(5))
-                .itemOutputs(GT_Utility.copyAmount(1, aStack))
+                    GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L),
+                    GTUtility.getIntegratedCircuit(5))
+                .itemOutputs(GTUtility.copyAmount(1, aStack))
                 .duration(Math.max(aMaterialMass * 5L, 1L))
                 .eut(calculateRecipeEU(aMaterial, 96))
                 .addTo(benderRecipes);
         } else {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L),
-                    GT_Utility.getIntegratedCircuit(5))
-                .itemOutputs(GT_Utility.copyAmount(1, aStack))
+                    GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L),
+                    GTUtility.getIntegratedCircuit(5))
+                .itemOutputs(GTUtility.copyAmount(1, aStack))
                 .fluidInputs(Materials.Glue.getFluid(40L))
                 .duration(8 * SECONDS)
                 .eut(8)
@@ -394,14 +394,14 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
         if (!aNoSmashing) {
             if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                 Object aPlateStack = OrePrefixes.plate.get(aMaterial);
-                GT_ModHandler.addCraftingRecipe(
-                    GT_Utility.copyAmount(1, aStack),
+                GTModHandler.addCraftingRecipe(
+                    GTUtility.copyAmount(1, aStack),
                     DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED,
                     new Object[] { "I", "B", "h", // craftingToolHardHammer
                         'I', OrePrefixes.plateQuadruple.get(aMaterial), 'B', aPlateStack });
 
-                GT_ModHandler.addShapelessCraftingRecipe(
-                    GT_Utility.copyAmount(1, aStack),
+                GTModHandler.addShapelessCraftingRecipe(
+                    GTUtility.copyAmount(1, aStack),
                     DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED,
                     new Object[] { ToolDictNames.craftingToolForgeHammer, aPlateStack, aPlateStack, aPlateStack,
                         aPlateStack, aPlateStack });
@@ -414,15 +414,15 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
 
         registerCover(aMaterial, aStack);
 
-        GT_ModHandler.removeRecipeByOutputDelayed(aStack);
+        GTModHandler.removeRecipeByOutputDelayed(aStack);
 
         if (!aNoSmashing || aMaterial.contains(SubTag.STRETCHY)) {
             // Dense plate
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L),
-                    GT_Utility.getIntegratedCircuit(9))
-                .itemOutputs(GT_Utility.copyAmount(1, aStack))
+                    GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L),
+                    GTUtility.getIntegratedCircuit(9))
+                .itemOutputs(GTUtility.copyAmount(1, aStack))
                 .duration(Math.max(aMaterialMass * 9L, 1L))
                 .eut(calculateRecipeEU(aMaterial, 96))
                 .addTo(benderRecipes);
@@ -432,12 +432,12 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
     private void registerItemCasing(final OrePrefixes aPrefix, final Materials aMaterial, final ItemStack aStack,
         final boolean aNoSmashing) {
 
-        GT_ModHandler.removeRecipeByOutputDelayed(aStack);
+        GTModHandler.removeRecipeByOutputDelayed(aStack);
 
         if (aMaterial.mStandardMoltenFluid != null) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Mold_Casing.get(0L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L))
                 .fluidInputs(aMaterial.getMolten(L / 2))
                 .duration(16 * TICKS)
                 .eut(calculateRecipeEU(aMaterial, 8))
@@ -447,45 +447,45 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
         if (aMaterial.mUnificatable && aMaterial.mMaterialInto == aMaterial && !aNoSmashing) {
 
             if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L),
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L),
                     tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE
                     new Object[] { "h X", 'X', OrePrefixes.plate.get(aMaterial) });
 
                 // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L),
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L),
                     tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE
                     new Object[] { "H X", 'H', ToolDictNames.craftingToolForgeHammer, 'X',
                         OrePrefixes.plate.get(aMaterial) });
             }
         }
 
-        if (GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) {
-            GT_Values.RA.stdBuilder()
+        if (GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) {
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 2L),
                     ItemList.Shape_Mold_Casing.get(0L))
-                .itemOutputs(GT_Utility.copyAmount(3, aStack))
+                .itemOutputs(GTUtility.copyAmount(3, aStack))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(calculateRecipeEU(aMaterial, 15))
                 .recipeCategory(RecipeCategories.alloySmelterMolding)
                 .addTo(alloySmelterRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L),
                     ItemList.Shape_Extruder_Casing.get(0L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L))
                 .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS)
                 .eut(calculateRecipeEU(aMaterial, 45))
                 .addTo(extruderRecipes);
         }
 
-        if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L))
+        if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L))
                 .fluidInputs(
                     Materials.Water.getFluid(
                         Math.max(
@@ -497,11 +497,11 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
                 .eut(calculateRecipeEU(aMaterial, 16))
                 .addTo(cutterRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L))
                 .fluidInputs(
-                    GT_ModHandler.getDistilledWater(
+                    GTModHandler.getDistilledWater(
                         Math.max(
                             3,
                             Math.min(
@@ -511,9 +511,9 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
                 .eut(calculateRecipeEU(aMaterial, 16))
                 .addTo(cutterRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L))
                 .fluidInputs(
                     Materials.Lubricant.getFluid(
                         Math.max(
@@ -526,43 +526,43 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
                 .eut(calculateRecipeEU(aMaterial, 16))
                 .addTo(cutterRecipes);
         }
-        GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null);
+        GTRecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null);
     }
 
     private void registerPlateAlloy(final String aOreDictName, final ItemStack aStack) {
 
         switch (aOreDictName) {
             case "plateAlloyCarbon" -> {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_ModHandler.getIC2Item("generator", 1L), GT_Utility.copyAmount(4, aStack))
-                    .itemOutputs(GT_ModHandler.getIC2Item("windMill", 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTModHandler.getIC2Item("generator", 1L), GTUtility.copyAmount(4, aStack))
+                    .itemOutputs(GTModHandler.getIC2Item("windMill", 1L))
                     .duration(5 * MINUTES + 20 * SECONDS)
                     .eut(8)
                     .addTo(assemblerRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack), new ItemStack(Blocks.glass, 3, W))
-                    .itemOutputs(GT_ModHandler.getIC2Item("reinforcedGlass", 4L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack), new ItemStack(Blocks.glass, 3, W))
+                    .itemOutputs(GTModHandler.getIC2Item("reinforcedGlass", 4L))
                     .duration(20 * SECONDS)
                     .eut(4)
                     .addTo(alloySmelterRecipes);
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack), Materials.Glass.getDust(3))
-                    .itemOutputs(GT_ModHandler.getIC2Item("reinforcedGlass", 4L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack), Materials.Glass.getDust(3))
+                    .itemOutputs(GTModHandler.getIC2Item("reinforcedGlass", 4L))
                     .duration(20 * SECONDS)
                     .eut(4)
                     .addTo(alloySmelterRecipes);
             }
             case "plateAlloyAdvanced" -> {
                 RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack), new ItemStack(Blocks.glass, 3, WILDCARD))
-                    .itemOutputs(GT_ModHandler.getIC2Item("reinforcedGlass", 4L))
+                    .itemInputs(GTUtility.copyAmount(1, aStack), new ItemStack(Blocks.glass, 3, WILDCARD))
+                    .itemOutputs(GTModHandler.getIC2Item("reinforcedGlass", 4L))
                     .duration(20 * SECONDS)
                     .eut(4)
                     .addTo(alloySmelterRecipes);
                 RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack), Materials.Glass.getDust(3))
-                    .itemOutputs(GT_ModHandler.getIC2Item("reinforcedGlass", 4L))
+                    .itemInputs(GTUtility.copyAmount(1, aStack), Materials.Glass.getDust(3))
+                    .itemOutputs(GTModHandler.getIC2Item("reinforcedGlass", 4L))
                     .duration(20 * SECONDS)
                     .eut(4)
                     .addTo(alloySmelterRecipes);
@@ -570,7 +570,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
             case "plateAlloyIridium" ->
 
                 // Remove IC2 Shaped recipe for Iridium Reinforced Plate
-                GT_ModHandler.removeRecipeByOutputDelayed(aStack);
+                GTModHandler.removeRecipeByOutputDelayed(aStack);
             default -> {}
         }
     }
@@ -582,11 +582,11 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
         // Try different prefixes to use same smooth stones as older GT5U
         for (OrePrefixes orePrefix : new OrePrefixes[] { OrePrefixes.block, OrePrefixes.block_, OrePrefixes.stoneSmooth,
             OrePrefixes.stone }) {
-            if ((tStack = GT_OreDictUnificator.get(orePrefix, aMaterial, 1)) != NI) break;
+            if ((tStack = GTOreDictUnificator.get(orePrefix, aMaterial, 1)) != NI) break;
         }
 
         // Register the cover
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             aStack,
             // If there is an ItemStack of Block for Materials
             tStack == NI ?
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java
index 01262d32f4..40adf386f8 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java
@@ -2,15 +2,15 @@ package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingPure implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -23,24 +23,24 @@ public class ProcessingPure implements gregtech.api.interfaces.IOreRecipeRegistr
     @Override
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, aStack))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L))
             .duration(10)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, aStack))
             .itemOutputs(
-                GT_OreDictUnificator.get(
+                GTOreDictUnificator.get(
                     OrePrefixes.dustPure,
                     aMaterial.mMacerateInto,
-                    GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
                     1L),
-                GT_OreDictUnificator.get(
+                GTOreDictUnificator.get(
                     OrePrefixes.dust,
-                    GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
+                    GTUtility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
                     1L))
             .outputChances(10000, 1000)
             .duration(20 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java
index 2da9f4b865..902c46bd0b 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java
@@ -4,20 +4,20 @@ import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
 import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
 
 import net.minecraft.item.ItemStack;
 
-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.SubTag;
 import gregtech.api.enums.TierEU;
 import gregtech.api.enums.ToolDictNames;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -31,8 +31,8 @@ public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegis
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
         if (aMaterial == Materials.Oilsands) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, aStack))
                 .itemOutputs(new ItemStack(net.minecraft.init.Blocks.sand, 1, 0))
                 .outputChances(4000)
                 .fluidOutputs(Materials.OilHeavy.getFluid(2000L))
@@ -40,64 +40,64 @@ public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegis
                 .eut(TierEU.RECIPE_LV)
                 .addTo(centrifugeRecipes);
         } else {
-            registerStandardOreRecipes(aPrefix, aMaterial, GT_Utility.copyAmount(1, aStack), 1);
+            registerStandardOreRecipes(aPrefix, aMaterial, GTUtility.copyAmount(1, aStack), 1);
         }
     }
 
     private boolean registerStandardOreRecipes(OrePrefixes aPrefix, Materials aMaterial, ItemStack aOreStack,
         int aMultiplier) {
         if ((aOreStack == null) || (aMaterial == null)) return false;
-        GT_ModHandler
-            .addValuableOre(GT_Utility.getBlockFromStack(aOreStack), aOreStack.getItemDamage(), aMaterial.mOreValue);
+        GTModHandler
+            .addValuableOre(GTUtility.getBlockFromStack(aOreStack), aOreStack.getItemDamage(), aMaterial.mOreValue);
         Materials tMaterial = aMaterial.mOreReplacement;
         Materials tPrimaryByMaterial = null;
         aMultiplier = Math.max(1, aMultiplier);
-        aOreStack = GT_Utility.copyAmount(1, aOreStack);
+        aOreStack = GTUtility.copyAmount(1, aOreStack);
         aOreStack.stackSize = 1;
-        ItemStack tIngot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L);
-        ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, tMaterial, 1L);
+        ItemStack tIngot = GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L);
+        ItemStack tGem = GTOreDictUnificator.get(OrePrefixes.gem, tMaterial, 1L);
         ItemStack tSmeltInto = tIngot
             == null
                 ? null
                 : aMaterial.contains(SubTag.SMELTING_TO_GEM)
-                    ? GT_OreDictUnificator.get(
+                    ? GTOreDictUnificator.get(
                         OrePrefixes.gem,
                         tMaterial.mDirectSmelting,
-                        GT_OreDictUnificator.get(
+                        GTOreDictUnificator.get(
                             OrePrefixes.crystal,
                             tMaterial.mDirectSmelting,
-                            GT_OreDictUnificator.get(
+                            GTOreDictUnificator.get(
                                 OrePrefixes.gem,
                                 tMaterial,
-                                GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L),
+                                GTOreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L),
                                 1L),
                             1L),
                         1L)
                     : tIngot;
-        ItemStack tDust = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, tGem, 1L);
-        ItemStack tCleaned = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L);
-        ItemStack tCrushed = GT_OreDictUnificator.get(OrePrefixes.crushed, tMaterial, (long) aMaterial.mOreMultiplier);
+        ItemStack tDust = GTOreDictUnificator.get(OrePrefixes.dust, tMaterial, tGem, 1L);
+        ItemStack tCleaned = GTOreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L);
+        ItemStack tCrushed = GTOreDictUnificator.get(OrePrefixes.crushed, tMaterial, (long) aMaterial.mOreMultiplier);
         ItemStack tPrimaryByProduct = null;
 
         if (tCrushed == null) {
-            tCrushed = GT_OreDictUnificator.get(
+            tCrushed = GTOreDictUnificator.get(
                 OrePrefixes.dustImpure,
                 tMaterial,
-                GT_Utility.copyAmount(aMaterial.mOreMultiplier, tCleaned, tDust, tGem),
+                GTUtility.copyAmount(aMaterial.mOreMultiplier, tCleaned, tDust, tGem),
                 (long) aMaterial.mOreMultiplier);
         }
 
         for (Materials tMat : aMaterial.mOreByProducts) {
-            GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
+            GTOreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
             if (tPrimaryByProduct == null) {
                 tPrimaryByMaterial = tMat;
-                tPrimaryByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
-                if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator
-                    .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L);
+                tPrimaryByProduct = GTOreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
+                if (GTOreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GTOreDictUnificator
+                    .get(OrePrefixes.dustTiny, tMat, GTOreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L);
             }
-            GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
-            if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator
-                .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L);
+            GTOreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
+            if (GTOreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GTOreDictUnificator
+                .get(OrePrefixes.dustTiny, tMat, GTOreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L);
         }
 
         if (tPrimaryByMaterial == null) tPrimaryByMaterial = tMaterial;
@@ -106,32 +106,32 @@ public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegis
 
         if (tSmeltInto != null) {
             if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) {
-                GT_ModHandler.removeFurnaceSmelting(aOreStack);
+                GTModHandler.removeFurnaceSmelting(aOreStack);
             } else {
-                tHasSmelting = GT_ModHandler
-                    .addSmeltingRecipe(aOreStack, GT_Utility.copyAmount(aMaterial.mSmeltingMultiplier, tSmeltInto));
+                tHasSmelting = GTModHandler
+                    .addSmeltingRecipe(aOreStack, GTUtility.copyAmount(aMaterial.mSmeltingMultiplier, tSmeltInto));
             }
 
             if (aMaterial.contains(SubTag.BLASTFURNACE_CALCITE_TRIPLE)) {
                 if (aMaterial.mAutoGenerateBlastFurnaceRecipes) {
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
                             aOreStack,
-                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier))
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier))
                         .itemOutputs(
-                            GT_Utility.mul(3 * aMaterial.mSmeltingMultiplier, tSmeltInto),
-                            GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L))
+                            GTUtility.mul(3 * aMaterial.mSmeltingMultiplier, tSmeltInto),
+                            GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L))
                         .duration(tSmeltInto.stackSize * 25 * SECONDS)
                         .eut(TierEU.RECIPE_MV)
                         .metadata(COIL_HEAT, 1500)
                         .addTo(blastFurnaceRecipes);
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
                             aOreStack,
-                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier))
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier))
                         .itemOutputs(
-                            GT_Utility.mul(3 * aMaterial.mSmeltingMultiplier, tSmeltInto),
-                            GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L))
+                            GTUtility.mul(3 * aMaterial.mSmeltingMultiplier, tSmeltInto),
+                            GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L))
                         .duration(tSmeltInto.stackSize * 25 * SECONDS)
                         .eut(TierEU.RECIPE_MV)
                         .metadata(COIL_HEAT, 1500)
@@ -139,24 +139,24 @@ public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegis
                 }
             } else if (aMaterial.contains(SubTag.BLASTFURNACE_CALCITE_DOUBLE)) {
                 if (aMaterial.mAutoGenerateBlastFurnaceRecipes) {
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
                             aOreStack,
-                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier))
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier))
                         .itemOutputs(
-                            GT_Utility.mul(2 * aMaterial.mSmeltingMultiplier, tSmeltInto),
-                            GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L))
+                            GTUtility.mul(2 * aMaterial.mSmeltingMultiplier, tSmeltInto),
+                            GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L))
                         .duration(tSmeltInto.stackSize * 25 * SECONDS)
                         .eut(TierEU.RECIPE_MV)
                         .metadata(COIL_HEAT, 1500)
                         .addTo(blastFurnaceRecipes);
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
                             aOreStack,
-                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier))
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier))
                         .itemOutputs(
-                            GT_Utility.mul(2 * aMaterial.mSmeltingMultiplier, tSmeltInto),
-                            GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L))
+                            GTUtility.mul(2 * aMaterial.mSmeltingMultiplier, tSmeltInto),
+                            GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L))
                         .duration(tSmeltInto.stackSize * 25 * SECONDS)
                         .eut(TierEU.RECIPE_MV)
                         .metadata(COIL_HEAT, 1500)
@@ -166,20 +166,20 @@ public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegis
         }
 
         if (!tHasSmelting) {
-            GT_ModHandler.addSmeltingRecipe(
+            GTModHandler.addSmeltingRecipe(
                 aOreStack,
-                GT_OreDictUnificator
+                GTOreDictUnificator
                     .get(OrePrefixes.gem, tMaterial.mDirectSmelting, Math.max(1, aMaterial.mSmeltingMultiplier / 2)));
         }
 
         if (tCrushed != null) {
-            GT_ModHandler.addShapelessCraftingRecipe(
-                GT_Utility.mul(1, tCrushed),
+            GTModHandler.addShapelessCraftingRecipe(
+                GTUtility.mul(1, tCrushed),
                 new Object[] { aOreStack, ToolDictNames.craftingToolHardHammer });
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(aOreStack)
-                .itemOutputs(GT_Utility.copy(GT_Utility.copyAmount(tCrushed.stackSize, tGem), tCrushed))
+                .itemOutputs(GTUtility.copy(GTUtility.copyAmount(tCrushed.stackSize, tGem), tCrushed))
                 .duration(10)
                 .eut(16)
                 .addTo(hammerRecipes);
@@ -187,19 +187,19 @@ public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegis
             int chanceOre2 = tPrimaryByProduct == null ? 0
                 : tPrimaryByProduct.stackSize * 5 * aMaterial.mByProductMultiplier;
             chanceOre2 = 100 * chanceOre2; // converting to the GT format, 100% is 10000
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(aOreStack)
                 .itemOutputs(
-                    GT_Utility.mul(2, tCrushed),
-                    tMaterial.contains(SubTag.PULVERIZING_CINNABAR) ? GT_OreDictUnificator.get(
+                    GTUtility.mul(2, tCrushed),
+                    tMaterial.contains(SubTag.PULVERIZING_CINNABAR) ? GTOreDictUnificator.get(
                         OrePrefixes.crystal,
                         Materials.Cinnabar,
-                        GT_OreDictUnificator
-                            .get(OrePrefixes.gem, tPrimaryByMaterial, GT_Utility.copyAmount(1, tPrimaryByProduct), 1L),
+                        GTOreDictUnificator
+                            .get(OrePrefixes.gem, tPrimaryByMaterial, GTUtility.copyAmount(1, tPrimaryByProduct), 1L),
                         1L)
-                        : GT_OreDictUnificator
-                            .get(OrePrefixes.gem, tPrimaryByMaterial, GT_Utility.copyAmount(1, tPrimaryByProduct), 1L),
-                    GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial))
+                        : GTOreDictUnificator
+                            .get(OrePrefixes.gem, tPrimaryByMaterial, GTUtility.copyAmount(1, tPrimaryByProduct), 1L),
+                    GTOreDictUnificator.getDust(aPrefix.mSecondaryMaterial))
                 .outputChances(10000, chanceOre2, 5000)
                 .duration(20 * SECONDS)
                 .eut(2)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java
index bfa580b4c4..92daf2926b 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java
@@ -1,17 +1,17 @@
 package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.cannerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import net.minecraft.item.ItemStack;
 
-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.SubTag;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingRecycling implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -24,18 +24,18 @@ public class ProcessingRecycling implements gregtech.api.interfaces.IOreRecipeRe
     @Override
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
-        if ((aMaterial != Materials.Empty) && (GT_Utility.getFluidForFilledItem(aStack, true) == null)
+        if ((aMaterial != Materials.Empty) && (GTUtility.getFluidForFilledItem(aStack, true) == null)
             && !aMaterial.contains(SubTag.SMELTING_TO_FLUID)
-            && (GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L) != null)) {
-            GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+            && (GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L) != null)) {
+            GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder();
             recipeBuilder.itemInputs(aStack);
-            if (GT_Utility.getContainerItem(aStack, true) == null) {
+            if (GTUtility.getContainerItem(aStack, true) == null) {
                 recipeBuilder.itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, aPrefix.mMaterialAmount / 3628800L));
+                    GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, aPrefix.mMaterialAmount / 3628800L));
             } else {
                 recipeBuilder.itemOutputs(
-                    GT_Utility.getContainerItem(aStack, true),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, aPrefix.mMaterialAmount / 3628800L));
+                    GTUtility.getContainerItem(aStack, true),
+                    GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, aPrefix.mMaterialAmount / 3628800L));
             }
             recipeBuilder.duration(((int) Math.max(aMaterial.getMass() / 2L, 1L)) * TICKS)
                 .eut(2)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java
index 3548bd437b..f8c5a620b0 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java
@@ -3,21 +3,21 @@ package gregtech.loaders.oreprocessing;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.extruderRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
 
 import net.minecraft.item.ItemStack;
 
-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.enums.SubTag;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Proxy;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.GTProxy;
 
 public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -30,52 +30,52 @@ public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegist
         ItemStack aStack) {
         if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)
             && !aMaterial.contains(SubTag.NO_WORKING)) {
-            ItemStack tPlate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L);
-            ItemStack tRing = GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L);
-            if (GT_Utility.isStackValid(tPlate) && GT_Utility.isStackValid(tRing)) {
+            ItemStack tPlate = GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L);
+            ItemStack tRing = GTOreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L);
+            if (GTUtility.isStackValid(tPlate) && GTUtility.isStackValid(tRing)) {
 
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { "PhP", "SRf", "PdP", 'P',
                             aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial)
                                 : OrePrefixes.plate.get(aMaterial),
                             'R', OrePrefixes.ring.get(aMaterial), 'S', OrePrefixes.screw.get(aMaterial) });
                 }
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(tPlate.copy(), tRing.copy(), GTUtility.getIntegratedCircuit(4))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L))
                     .fluidInputs(Materials.Tin.getMolten(32))
                     .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS)
                     .eut(calculateRecipeEU(aMaterial, 24))
                     .addTo(assemblerRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(tPlate.copy(), tRing.copy(), GTUtility.getIntegratedCircuit(4))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L))
                     .fluidInputs(Materials.Lead.getMolten(48))
                     .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS)
                     .eut(calculateRecipeEU(aMaterial, 24))
                     .addTo(assemblerRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(tPlate.copy(), tRing.copy(), GTUtility.getIntegratedCircuit(4))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L))
                     .fluidInputs(Materials.SolderingAlloy.getMolten(16))
                     .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS)
                     .eut(calculateRecipeEU(aMaterial, 24))
                     .addTo(assemblerRecipes);
             }
 
-            if (GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) {
-                GT_Values.RA.stdBuilder()
+            if (GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) {
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 5L),
+                        GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 5L),
                         ItemList.Shape_Extruder_Rotor.get(0L))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L))
                     .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS)
                     .eut(calculateRecipeEU(aMaterial, 24))
                     .addTo(extruderRecipes);
@@ -83,9 +83,9 @@ public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegist
             if (aMaterial.mStandardMoltenFluid != null) {
                 if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) {
 
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(ItemList.Shape_Mold_Rotor.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L))
                         .fluidInputs(aMaterial.getMolten(612L))
                         .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 24))
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java
index 0eb2cb3dd0..95ca9eb48b 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java
@@ -1,19 +1,19 @@
 package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.latheRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import net.minecraft.item.ItemStack;
 
 import appeng.core.Api;
-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.SubTag;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Proxy;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.GTProxy;
 
 public class ProcessingRound implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -25,28 +25,28 @@ public class ProcessingRound implements gregtech.api.interfaces.IOreRecipeRegist
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
         if (!aMaterial.contains(SubTag.NO_WORKING)) {
-            if (GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L) != null) {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L))
-                    .itemOutputs(GT_Utility.copyAmount(1, aStack))
+            if (GTOreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L) != null) {
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L))
+                    .itemOutputs(GTUtility.copyAmount(1, aStack))
                     .duration(((int) Math.max(aMaterial.getMass() / 4L, 1L)) * TICKS)
                     .eut(8)
                     .addTo(latheRecipes);
             }
 
             if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)) {
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L),
-                    GT_Proxy.tBits,
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.round, aMaterial, 1L),
+                    GTProxy.tBits,
                     new Object[] { "fX", "Xh", 'X', OrePrefixes.nugget.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 4L),
-                    GT_Proxy.tBits,
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.round, aMaterial, 4L),
+                    GTProxy.tBits,
                     new Object[] { "fXh", 'X', OrePrefixes.ingot.get(aMaterial) });
             }
         }
         Api.INSTANCE.registries()
             .matterCannon()
-            .registerAmmo(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), aMaterial.getMass());
+            .registerAmmo(GTOreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), aMaterial.getMass());
     }
 }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java
index b1996d067f..7d9cdc338f 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java
@@ -1,17 +1,17 @@
 package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
-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.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingSand implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -23,10 +23,10 @@ public class ProcessingSand implements gregtech.api.interfaces.IOreRecipeRegistr
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
         if (aOreDictName.equals("sandOil")) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Cell_Empty.get(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Cell_Empty.get(1))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L),
                     new ItemStack(Blocks.sand, 1, 0))
                 .duration(50 * SECONDS)
                 .eut(5)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java
index f13c2aa9b5..3dc11940e7 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java
@@ -3,17 +3,17 @@ package gregtech.loaders.oreprocessing;
 import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
 import static gregtech.api.recipe.RecipeMaps.latheRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
-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 net.minecraft.item.ItemStack;
 
-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.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingSaplings implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -24,25 +24,25 @@ public class ProcessingSaplings implements gregtech.api.interfaces.IOreRecipeReg
     @Override
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, aStack))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(8, aStack))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(8, aStack))
             .itemOutputs(ItemList.IC2_Plantball.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, aStack))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Wood, 1L))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Wood, 1L))
             .duration(16 * TICKS)
             .eut(8)
             .addTo(latheRecipes);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java
index afafe8525d..23dd8ed407 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java
@@ -1,20 +1,20 @@
 package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.latheRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
 
 import net.minecraft.item.ItemStack;
 
-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.SubTag;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Proxy;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.GTProxy;
 
 public class ProcessingScrew implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -26,19 +26,19 @@ public class ProcessingScrew implements gregtech.api.interfaces.IOreRecipeRegist
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
         if (!aMaterial.contains(SubTag.NO_WORKING)) {
-            if (GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null) {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L))
-                    .itemOutputs(GT_Utility.copyAmount(1, aStack))
+            if (GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null) {
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L))
+                    .itemOutputs(GTUtility.copyAmount(1, aStack))
                     .duration(((int) Math.max(aMaterial.getMass() / 8L, 1L)) * TICKS)
                     .eut(calculateRecipeEU(aMaterial, 4))
                     .addTo(latheRecipes);
             }
             if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial))
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { "fX", "X ", 'X', OrePrefixes.bolt.get(aMaterial) });
                 }
         }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
index 5493aa9b8e..396cce0c8c 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
@@ -3,25 +3,25 @@ package gregtech.loaders.oreprocessing;
 import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
 import static gregtech.api.recipe.RecipeMaps.extruderRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-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.enums.SubTag;
 import gregtech.api.enums.TierEU;
 import gregtech.api.recipe.RecipeCategories;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Proxy;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.GTProxy;
 
 @SuppressWarnings("RedundantLabeledSwitchRuleCodeBlock")
 public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegistrator {
@@ -34,7 +34,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
     @Override
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
-        if (((aMaterial == Materials.Glass) || (GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null))
+        if (((aMaterial == Materials.Glass) || (GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null))
             && (!aMaterial.contains(SubTag.NO_SMELTING))) {
             long aMaterialMass = aMaterial.getMass();
             int tAmount = (int) (aPrefix.mMaterialAmount / 3628800L);
@@ -50,20 +50,20 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                     }
 
                 if (!OrePrefixes.block.isIgnored(aMaterial.mSmeltInto)
-                    && (GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, 1L) != null)
+                    && (GTOreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, 1L) != null)
                     && aMaterial != Materials.Ichorium) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(9, aStack), ItemList.Shape_Extruder_Block.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(9, aStack), ItemList.Shape_Extruder_Block.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount))
                         .duration((10 * tAmount) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
 
                     // Allow creation of alloy smelter recipes for material recycling if < IV tier.
                     if (tTrueVoltage < TierEU.IV) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(9, aStack), ItemList.Shape_Mold_Block.get(0L))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(9, aStack), ItemList.Shape_Mold_Block.get(0L))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount))
                             .duration((5 * tAmount) * TICKS)
                             .eut(calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier))
                             .recipeCategory(RecipeCategories.alloySmelterMolding)
@@ -71,74 +71,74 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                     }
                 }
                 if ((aPrefix != OrePrefixes.ingot || aMaterial != aMaterial.mSmeltInto)
-                    && GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Ingot.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, tAmount))
+                    && GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Ingot.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, tAmount))
                         .duration(10 * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Pipe_Tiny.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial.mSmeltInto, tAmount * 2))
+                if (GTOreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Pipe_Tiny.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial.mSmeltInto, tAmount * 2))
                         .duration((4 * tAmount) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Pipe_Small.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial.mSmeltInto, tAmount))
+                if (GTOreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Pipe_Small.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial.mSmeltInto, tAmount))
                         .duration((8 * tAmount) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(3, aStack), ItemList.Shape_Extruder_Pipe_Medium.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial.mSmeltInto, tAmount))
+                if (GTOreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Shape_Extruder_Pipe_Medium.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial.mSmeltInto, tAmount))
                         .duration((24 * tAmount) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(6, aStack), ItemList.Shape_Extruder_Pipe_Large.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial.mSmeltInto, tAmount))
+                if (GTOreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(6, aStack), ItemList.Shape_Extruder_Pipe_Large.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial.mSmeltInto, tAmount))
                         .duration((48 * tAmount) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(12, aStack), ItemList.Shape_Extruder_Pipe_Huge.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial.mSmeltInto, tAmount))
+                if (GTOreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(12, aStack), ItemList.Shape_Extruder_Pipe_Huge.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial.mSmeltInto, tAmount))
                         .duration((96 * tAmount) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Plate.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount))
+                if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Plate.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount))
                         .duration(((int) Math.max(aMaterialMass * tAmount, tAmount)) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Small_Gear.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial.mSmeltInto, tAmount))
+                if (GTOreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Small_Gear.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial.mSmeltInto, tAmount))
                         .duration(((int) Math.max(aMaterialMass * tAmount, tAmount)) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(6, aStack), ItemList.Shape_Extruder_Turbine_Blade.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial.mSmeltInto, tAmount))
+                if (GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(6, aStack), ItemList.Shape_Extruder_Turbine_Blade.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial.mSmeltInto, tAmount))
                         .duration(((int) Math.max(aMaterialMass * tAmount, tAmount)) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
@@ -146,109 +146,109 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
 
                 if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) {
                     if (aMaterial.mStandardMoltenFluid != null) {
-                        if (GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
+                        if (GTOreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
                                 .itemInputs(ItemList.Shape_Mold_Ring.get(0L))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L))
                                 .fluidInputs(aMaterial.getMolten(36L))
                                 .duration(5 * SECONDS)
                                 .eut(calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier))
                                 .addTo(fluidSolidifierRecipes);
                         }
-                        if (GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
+                        if (GTOreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
                                 .itemInputs(ItemList.Shape_Mold_Screw.get(0L))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L))
                                 .fluidInputs(aMaterial.getMolten(18L))
                                 .duration(2 * SECONDS + 10 * TICKS)
                                 .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier))
                                 .addTo(fluidSolidifierRecipes);
                         }
-                        if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
+                        if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
                                 .itemInputs(ItemList.Shape_Mold_Rod.get(0L))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L))
                                 .fluidInputs(aMaterial.getMolten(72L))
                                 .duration(7 * SECONDS + 10 * TICKS)
                                 .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                                 .addTo(fluidSolidifierRecipes);
                         }
-                        if (GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
+                        if (GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
                                 .itemInputs(ItemList.Shape_Mold_Bolt.get(0L))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L))
                                 .fluidInputs(aMaterial.getMolten(18L))
                                 .duration(2 * SECONDS + 10 * TICKS)
                                 .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier))
                                 .addTo(fluidSolidifierRecipes);
                         }
-                        if (GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
+                        if (GTOreDictUnificator.get(OrePrefixes.round, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
                                 .itemInputs(ItemList.Shape_Mold_Round.get(0L))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.round, aMaterial, 1L))
                                 .fluidInputs(aMaterial.getMolten(18L))
                                 .duration(2 * SECONDS + 10 * TICKS)
                                 .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier))
                                 .addTo(fluidSolidifierRecipes);
                         }
-                        if (GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
+                        if (GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
                                 .itemInputs(ItemList.Shape_Mold_Rod_Long.get(0L))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L))
                                 .fluidInputs(aMaterial.getMolten(144L))
                                 .duration(15 * SECONDS)
                                 .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                                 .addTo(fluidSolidifierRecipes);
                         }
-                        if (GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
+                        if (GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
                                 .itemInputs(ItemList.Shape_Mold_Turbine_Blade.get(0L))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L))
                                 .fluidInputs(aMaterial.getMolten(864L))
                                 .duration(20 * SECONDS)
                                 .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                                 .addTo(fluidSolidifierRecipes);
                         }
-                        if (GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
+                        if (GTOreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
                                 .itemInputs(ItemList.Shape_Mold_Pipe_Tiny.get(0L))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 1L))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 1L))
                                 .fluidInputs(aMaterial.getMolten(72L))
                                 .duration(1 * SECONDS)
                                 .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                                 .addTo(fluidSolidifierRecipes);
                         }
-                        if (GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
+                        if (GTOreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
                                 .itemInputs(ItemList.Shape_Mold_Pipe_Small.get(0L))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 1L))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 1L))
                                 .fluidInputs(aMaterial.getMolten(144L))
                                 .duration(2 * SECONDS)
                                 .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                                 .addTo(fluidSolidifierRecipes);
                         }
-                        if (GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
+                        if (GTOreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
                                 .itemInputs(ItemList.Shape_Mold_Pipe_Medium.get(0L))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1L))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1L))
                                 .fluidInputs(aMaterial.getMolten(432L))
                                 .duration(4 * SECONDS)
                                 .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                                 .addTo(fluidSolidifierRecipes);
                         }
-                        if (GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
+                        if (GTOreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
                                 .itemInputs(ItemList.Shape_Mold_Pipe_Large.get(0L))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L))
                                 .fluidInputs(aMaterial.getMolten(864L))
                                 .duration(8 * SECONDS)
                                 .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                                 .addTo(fluidSolidifierRecipes);
                         }
-                        if (GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
+                        if (GTOreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
                                 .itemInputs(ItemList.Shape_Mold_Pipe_Huge.get(0L))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L))
                                 .fluidInputs(aMaterial.getMolten(1728L))
                                 .duration(16 * SECONDS)
                                 .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
@@ -258,21 +258,21 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                 }
                 if (tAmount * 2 <= 64 && aMaterial != Materials.Obsidian) {
                     if (!(aMaterial == Materials.Aluminium)) {
-                        if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Rod.get(0L))
+                        if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, 1L) != null) {
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Rod.get(0L))
                                 .itemOutputs(
-                                    GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2))
+                                    GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2))
                                 .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS)
                                 .eut(calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier))
                                 .addTo(extruderRecipes);
                         }
                     } else {
-                        if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Rod.get(0L))
+                        if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, 1L) != null) {
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Rod.get(0L))
                                 .itemOutputs(
-                                    GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2))
+                                    GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2))
                                 .duration(10 * SECONDS)
                                 .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier))
                                 .addTo(extruderRecipes);
@@ -280,31 +280,31 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                     }
                 }
                 if (tAmount * 2 <= 64) {
-                    if (GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial.mSmeltInto, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Wire.get(0L))
+                    if (GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial.mSmeltInto, 1L) != null) {
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Wire.get(0L))
                             .itemOutputs(
-                                GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial.mSmeltInto, tAmount * 2))
+                                GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial.mSmeltInto, tAmount * 2))
                             .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS)
                             .eut(calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier))
                             .addTo(extruderRecipes);
                     }
                 }
                 if (tAmount * 8 <= 64) {
-                    if (GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial.mSmeltInto, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Bolt.get(0L))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial.mSmeltInto, tAmount * 8))
+                    if (GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial.mSmeltInto, 1L) != null) {
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Bolt.get(0L))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial.mSmeltInto, tAmount * 8))
                             .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS)
                             .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                             .addTo(extruderRecipes);
                     }
                 }
                 if (tAmount * 4 <= 64) {
-                    if (GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial.mSmeltInto, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Ring.get(0L))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial.mSmeltInto, tAmount * 4))
+                    if (GTOreDictUnificator.get(OrePrefixes.ring, aMaterial.mSmeltInto, 1L) != null) {
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Ring.get(0L))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ring, aMaterial.mSmeltInto, tAmount * 4))
                             .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS)
                             .eut(calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier))
                             .addTo(extruderRecipes);
@@ -313,86 +313,84 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                         && !aMaterial.contains(SubTag.NO_SMASHING)) {
                         // If material tier < IV then add manual recipe.
                         if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV
-                            && GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L) != null) {
-                            GT_ModHandler.addCraftingRecipe(
-                                GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L),
-                                GT_Proxy.tBits,
+                            && GTOreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L) != null) {
+                            GTModHandler.addCraftingRecipe(
+                                GTOreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L),
+                                GTProxy.tBits,
                                 new Object[] { "h ", "fX", 'X', OrePrefixes.stick.get(aMaterial) });
                         }
                     }
                 }
 
-                if (GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Extruder_Sword.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial.mSmeltInto, tAmount))
+                if (GTOreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Extruder_Sword.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial.mSmeltInto, tAmount))
                         .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(3, aStack), ItemList.Shape_Extruder_Pickaxe.get(0L))
+                if (GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Shape_Extruder_Pickaxe.get(0L))
                         .itemOutputs(
-                            GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial.mSmeltInto, tAmount))
+                            GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial.mSmeltInto, tAmount))
                         .duration(((int) Math.max(aMaterialMass * 3L * tAmount, tAmount)) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Shovel.get(0L))
-                        .itemOutputs(
-                            GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial.mSmeltInto, tAmount))
+                if (GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Shovel.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial.mSmeltInto, tAmount))
                         .duration(((int) Math.max(aMaterialMass * 1L * tAmount, tAmount)) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(3, aStack), ItemList.Shape_Extruder_Axe.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial.mSmeltInto, tAmount))
+                if (GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Shape_Extruder_Axe.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial.mSmeltInto, tAmount))
                         .duration(((int) Math.max(aMaterialMass * 3L * tAmount, tAmount)) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Extruder_Hoe.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial.mSmeltInto, tAmount))
+                if (GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Extruder_Hoe.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial.mSmeltInto, tAmount))
                         .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(6, aStack), ItemList.Shape_Extruder_Hammer.get(0L))
-                        .itemOutputs(
-                            GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial.mSmeltInto, tAmount))
+                if (GTOreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(6, aStack), ItemList.Shape_Extruder_Hammer.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial.mSmeltInto, tAmount))
                         .duration(((int) Math.max(aMaterialMass * 6L * tAmount, tAmount)) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Extruder_File.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial.mSmeltInto, tAmount))
+                if (GTOreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Extruder_File.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial.mSmeltInto, tAmount))
                         .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Extruder_Saw.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial.mSmeltInto, tAmount))
+                if (GTOreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Extruder_Saw.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial.mSmeltInto, tAmount))
                         .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(4, aStack), ItemList.Shape_Extruder_Gear.get(0L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount))
+                if (GTOreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(4, aStack), ItemList.Shape_Extruder_Gear.get(0L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount))
                         .duration(((int) Math.max(aMaterialMass * 5L * tAmount, tAmount)) * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier))
                         .addTo(extruderRecipes);
@@ -400,10 +398,10 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
 
                 if (!(aMaterial == Materials.StyreneButadieneRubber || aMaterial == Materials.Silicone)) {
                     if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-                        if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Mold_Plate.get(0L))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount))
+                        if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, 1L) != null) {
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Plate.get(0L))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount))
                                 .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS)
                                 .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier))
                                 .recipeCategory(RecipeCategories.alloySmelterMolding)
@@ -413,10 +411,10 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                 } else {
                     // If tier < IV then add ability to turn ingots into plates via alloy smelter.
                     if (tTrueVoltage < TierEU.IV) {
-                        if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Mold_Plate.get(0L))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount))
+                        if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, 1L) != null) {
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Mold_Plate.get(0L))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount))
                                 .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS)
                                 .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier))
                                 .recipeCategory(RecipeCategories.alloySmelterMolding)
@@ -427,10 +425,10 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
 
                 // If tier < IV then add ability to turn ingots into gears via alloy smelter.
                 if (tTrueVoltage < TierEU.IV) {
-                    if (GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(8, aStack), ItemList.Shape_Mold_Gear.get(0L))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount))
+                    if (GTOreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, 1L) != null) {
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(8, aStack), ItemList.Shape_Mold_Gear.get(0L))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount))
                             .duration(((int) Math.max(aMaterialMass * 10L * tAmount, tAmount)) * TICKS)
                             .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier))
                             .recipeCategory(RecipeCategories.alloySmelterMolding)
@@ -440,69 +438,69 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
 
                 switch (aMaterial.mSmeltInto.mName) {
                     case "Glass" -> {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Bottle.get(0L))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Bottle.get(0L))
                             .itemOutputs(new ItemStack(Items.glass_bottle, 1))
                             .duration((tAmount * 32) * TICKS)
                             .eut(16)
                             .addTo(extruderRecipes);
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Mold_Bottle.get(0L))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Mold_Bottle.get(0L))
                             .itemOutputs(new ItemStack(Items.glass_bottle, 1))
                             .duration((tAmount * 64) * TICKS)
                             .eut(4)
                             .addTo(alloySmelterRecipes);
                     }
                     case "Steel" -> {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Cell.get(0L))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Cell.get(0L))
                             .itemOutputs(ItemList.Cell_Empty.get(tAmount))
                             .duration((tAmount * 128) * TICKS)
                             .eut(TierEU.RECIPE_LV)
                             .addTo(extruderRecipes);
                         if (tAmount * 2 <= 64) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L))
-                                .itemOutputs(GT_ModHandler.getIC2Item("casingadviron", tAmount * 2))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L))
+                                .itemOutputs(GTModHandler.getIC2Item("casingadviron", tAmount * 2))
                                 .duration((tAmount * 32) * TICKS)
                                 .eut(3 * tVoltageMultiplier)
                                 .addTo(extruderRecipes);
                         }
                         if (tAmount * 2 <= 64) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L))
-                                .itemOutputs(GT_ModHandler.getIC2Item("casingadviron", tAmount * 3))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L))
+                                .itemOutputs(GTModHandler.getIC2Item("casingadviron", tAmount * 3))
                                 .duration((tAmount * 128) * TICKS)
                                 .eut(1 * tVoltageMultiplier)
                                 .addTo(alloySmelterRecipes);
                         }
                     }
                     case "Iron", "WroughtIron" -> {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Cell.get(0L))
-                            .itemOutputs(GT_ModHandler.getIC2Item("fuelRod", tAmount))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Cell.get(0L))
+                            .itemOutputs(GTModHandler.getIC2Item("fuelRod", tAmount))
                             .duration((tAmount * 128) * TICKS)
                             .eut(TierEU.RECIPE_LV)
                             .addTo(extruderRecipes);
                         if (tAmount * 2 <= 64) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L))
-                                .itemOutputs(GT_ModHandler.getIC2Item("casingiron", tAmount * 2))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L))
+                                .itemOutputs(GTModHandler.getIC2Item("casingiron", tAmount * 2))
                                 .duration((tAmount * 32) * TICKS)
                                 .eut(3 * tVoltageMultiplier)
                                 .addTo(extruderRecipes);
                         }
                         if (tAmount * 2 <= 64) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L))
-                                .itemOutputs(GT_ModHandler.getIC2Item("casingiron", tAmount * 3))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L))
+                                .itemOutputs(GTModHandler.getIC2Item("casingiron", tAmount * 3))
                                 .duration((tAmount * 128) * TICKS)
                                 .eut(1 * tVoltageMultiplier)
                                 .addTo(alloySmelterRecipes);
                         }
                         if (tAmount * 31 <= 64) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(31, aStack), ItemList.Shape_Mold_Anvil.get(0L))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(31, aStack), ItemList.Shape_Mold_Anvil.get(0L))
                                 .itemOutputs(new ItemStack(Blocks.anvil, 1, 0))
                                 .duration((tAmount * 512) * TICKS)
                                 .eut(4 * tVoltageMultiplier)
@@ -510,24 +508,24 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                         }
                     }
                     case "Tin" -> {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Extruder_Cell.get(0L))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Extruder_Cell.get(0L))
                             .itemOutputs(ItemList.Cell_Empty.get(tAmount))
                             .duration((tAmount * 128) * TICKS)
                             .eut(TierEU.RECIPE_LV)
                             .addTo(extruderRecipes);
                         if (tAmount * 2 <= 64) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L))
-                                .itemOutputs(GT_ModHandler.getIC2Item("casingtin", tAmount * 2))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L))
+                                .itemOutputs(GTModHandler.getIC2Item("casingtin", tAmount * 2))
                                 .duration((tAmount * 32) * TICKS)
                                 .eut(3 * tVoltageMultiplier)
                                 .addTo(extruderRecipes);
                         }
                         if (tAmount * 2 <= 64) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L))
-                                .itemOutputs(GT_ModHandler.getIC2Item("casingtin", tAmount * 3))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L))
+                                .itemOutputs(GTModHandler.getIC2Item("casingtin", tAmount * 3))
                                 .duration((tAmount * 128) * TICKS)
                                 .eut(1 * tVoltageMultiplier)
                                 .addTo(alloySmelterRecipes);
@@ -535,17 +533,17 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                     }
                     case "Lead" -> {
                         if (tAmount * 2 <= 64) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L))
-                                .itemOutputs(GT_ModHandler.getIC2Item("casinglead", tAmount * 2))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L))
+                                .itemOutputs(GTModHandler.getIC2Item("casinglead", tAmount * 2))
                                 .duration((tAmount * 32) * TICKS)
                                 .eut(3 * tVoltageMultiplier)
                                 .addTo(extruderRecipes);
                         }
                         if (tAmount * 2 <= 64) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L))
-                                .itemOutputs(GT_ModHandler.getIC2Item("casinglead", tAmount * 3))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L))
+                                .itemOutputs(GTModHandler.getIC2Item("casinglead", tAmount * 3))
                                 .duration((tAmount * 128) * TICKS)
                                 .eut(1 * tVoltageMultiplier)
                                 .addTo(alloySmelterRecipes);
@@ -553,17 +551,17 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                     }
                     case "Copper", "AnnealedCopper" -> {
                         if (tAmount * 2 <= 64) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L))
-                                .itemOutputs(GT_ModHandler.getIC2Item("casingcopper", tAmount * 2))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L))
+                                .itemOutputs(GTModHandler.getIC2Item("casingcopper", tAmount * 2))
                                 .duration((tAmount * 32) * TICKS)
                                 .eut(3 * tVoltageMultiplier)
                                 .addTo(extruderRecipes);
                         }
                         if (tAmount * 2 <= 64) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L))
-                                .itemOutputs(GT_ModHandler.getIC2Item("casingcopper", tAmount * 3))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L))
+                                .itemOutputs(GTModHandler.getIC2Item("casingcopper", tAmount * 3))
                                 .duration((tAmount * 128) * TICKS)
                                 .eut(1 * tVoltageMultiplier)
                                 .addTo(alloySmelterRecipes);
@@ -571,17 +569,17 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                     }
                     case "Bronze" -> {
                         if (tAmount * 2 <= 64) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L))
-                                .itemOutputs(GT_ModHandler.getIC2Item("casingbronze", tAmount * 2))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L))
+                                .itemOutputs(GTModHandler.getIC2Item("casingbronze", tAmount * 2))
                                 .duration((tAmount * 32) * TICKS)
                                 .eut(3 * tVoltageMultiplier)
                                 .addTo(extruderRecipes);
                         }
                         if (tAmount * 2 <= 64) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L))
-                                .itemOutputs(GT_ModHandler.getIC2Item("casingbronze", tAmount * 3))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L))
+                                .itemOutputs(GTModHandler.getIC2Item("casingbronze", tAmount * 3))
                                 .duration((tAmount * 128) * TICKS)
                                 .eut(1 * tVoltageMultiplier)
                                 .addTo(alloySmelterRecipes);
@@ -589,25 +587,25 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                     }
                     case "Gold" -> {
                         if (tAmount * 2 <= 64) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L))
-                                .itemOutputs(GT_ModHandler.getIC2Item("casinggold", tAmount * 2))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L))
+                                .itemOutputs(GTModHandler.getIC2Item("casinggold", tAmount * 2))
                                 .duration((tAmount * 32) * TICKS)
                                 .eut(3 * tVoltageMultiplier)
                                 .addTo(extruderRecipes);
                         }
                         if (tAmount * 2 <= 64) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L))
-                                .itemOutputs(GT_ModHandler.getIC2Item("casinggold", tAmount * 3))
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L))
+                                .itemOutputs(GTModHandler.getIC2Item("casinggold", tAmount * 3))
                                 .duration((tAmount * 128) * TICKS)
                                 .eut(1 * tVoltageMultiplier)
                                 .addTo(alloySmelterRecipes);
                         }
                     }
                     case "Polytetrafluoroethylene" -> {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.Shape_Extruder_Cell.get(0L))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Cell.get(0L))
                             .itemOutputs(ItemList.Cell_Empty.get(tAmount * 4))
                             .duration((tAmount * 128) * TICKS)
                             .eut(TierEU.RECIPE_LV)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java
index 35947755d3..d4f7ed4f7e 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java
@@ -2,15 +2,15 @@ package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.enums.Mods.Railcraft;
 import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import net.minecraft.item.ItemStack;
 
-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.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingSlab implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -23,8 +23,8 @@ public class ProcessingSlab implements gregtech.api.interfaces.IOreRecipeRegistr
         ItemStack aStack) {
         if (aOreDictName.startsWith("slabWood")) {
             if (Railcraft.isModLoaded()) {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(3, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(3, aStack))
                     .itemOutputs(ItemList.RC_Tie_Wood.get(3L))
                     .fluidInputs(Materials.Creosote.getFluid(300L))
                     .duration(10 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java
index e5aac7bfe7..d04ffd1190 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java
@@ -4,21 +4,21 @@ import static gregtech.api.recipe.RecipeMaps.benderRecipes;
 import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.recipe.RecipeMaps.latheRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
 
 import net.minecraft.item.ItemStack;
 
-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.SubTag;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Proxy;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.GTProxy;
 
 public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -30,33 +30,33 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
         if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-            GT_ModHandler.addCraftingRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L),
-                GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.addCraftingRecipe(
+                GTOreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L),
+                GTModHandler.RecipeBits.BUFFERED,
                 new Object[] { " s ", "fPx", 'P', OrePrefixes.stick.get(aMaterial) });
         }
         if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_WORKING)) {
 
-            if ((aMaterial.contains(SubTag.CRYSTAL) ? GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)
-                : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)) != null
-                && GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial.mMacerateInto, 1L) != null) {
-                GT_Values.RA.stdBuilder()
+            if ((aMaterial.contains(SubTag.CRYSTAL) ? GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)
+                : GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)) != null
+                && GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial.mMacerateInto, 1L) != null) {
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        aMaterial.contains(SubTag.CRYSTAL) ? GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)
-                            : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L))
+                        aMaterial.contains(SubTag.CRYSTAL) ? GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)
+                            : GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial.mMacerateInto, 2L))
+                        GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial.mMacerateInto, 2L))
                     .duration(((int) Math.max(aMaterial.getMass() * 5L, 1L)) * TICKS)
                     .eut(calculateRecipeEU(aMaterial, 16))
                     .addTo(latheRecipes);
             }
 
-            if (GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null) {
+            if (GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L) != null) {
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 4L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 4L))
                     .fluidInputs(
                         Materials.Water.getFluid(
                             Math.max(
@@ -70,11 +70,11 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist
                     .eut(calculateRecipeEU(aMaterial, 4))
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 4L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 4L))
                     .fluidInputs(
-                        GT_ModHandler.getDistilledWater(
+                        GTModHandler.getDistilledWater(
                             Math.max(
                                 3,
                                 Math.min(
@@ -86,9 +86,9 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist
                     .eut(calculateRecipeEU(aMaterial, 4))
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 4L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.bolt, aMaterial, 4L))
                     .fluidInputs(
                         Materials.Lubricant.getFluid(
                             Math.max(
@@ -104,13 +104,13 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist
 
             if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)) {
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L),
-                        GT_Proxy.tBits,
+                    GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L),
+                        GTProxy.tBits,
                         new Object[] { "s", "X", 'X', OrePrefixes.stickLong.get(aMaterial) });
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { "f ", " X", 'X', OrePrefixes.ingot.get(aMaterial) });
                 }
             }
@@ -118,20 +118,20 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist
         if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMASHING)) {
             // bender recipe
             {
-                if (GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L))
+                if (GTOreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L))
                         .duration(5 * SECONDS)
                         .eut(calculateRecipeEU(aMaterial, 8))
                         .addTo(benderRecipes);
                 }
             }
 
-            if (GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L) != null) {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(2, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L))
+            if (GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L) != null) {
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(2, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L))
                     .duration(Math.max(aMaterial.getMass(), 1L))
                     .eut(calculateRecipeEU(aMaterial, 16))
                     .addTo(hammerRecipes);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java
index 1f00300264..02253bb5a3 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java
@@ -2,21 +2,21 @@ package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.benderRecipes;
 import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
 
 import net.minecraft.item.ItemStack;
 
-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.SubTag;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Proxy;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.GTProxy;
 
 public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -28,17 +28,17 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
         if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-            GT_ModHandler.addCraftingRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L),
-                GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.addCraftingRecipe(
+                GTOreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L),
+                GTModHandler.RecipeBits.BUFFERED,
                 new Object[] { " s ", "fSx", " S ", 'S', OrePrefixes.stickLong.get(aMaterial) });
         }
         if (!aMaterial.contains(SubTag.NO_WORKING)) {
 
-            if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L) != null) {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L))
+            if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L) != null) {
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L))
                     .fluidInputs(
                         Materials.Water.getFluid(
                             Math.max(
@@ -51,11 +51,11 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe
                     .eut(calculateRecipeEU(aMaterial, 4))
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L))
                     .fluidInputs(
-                        GT_ModHandler.getDistilledWater(
+                        GTModHandler.getDistilledWater(
                             Math.max(
                                 3,
                                 Math.min(
@@ -66,9 +66,9 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe
                     .eut(calculateRecipeEU(aMaterial, 4))
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L))
                     .fluidInputs(
                         Materials.Lubricant.getFluid(
                             Math.max(
@@ -84,13 +84,13 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe
 
             if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) {
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { "sf", "G ", 'G', OrePrefixes.gemFlawless.get(aMaterial) });
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 2L),
-                        GT_Proxy.tBits,
+                    GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 2L),
+                        GTProxy.tBits,
                         new Object[] { "sf", "G ", 'G', OrePrefixes.gemExquisite.get(aMaterial) });
                 }
             }
@@ -98,10 +98,10 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe
         if (!aMaterial.contains(SubTag.NO_SMASHING)) {
             // Bender recipes
             {
-                if (GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L))
+                if (GTOreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L))
                         .duration(10 * SECONDS)
                         .eut(calculateRecipeEU(aMaterial, 16))
                         .addTo(benderRecipes);
@@ -110,9 +110,9 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe
 
             if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial))
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { "ShS", 'S', OrePrefixes.stick.get(aMaterial) });
                 }
         }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java
index 840f49b4dd..da21829d0c 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java
@@ -3,21 +3,21 @@ package gregtech.loaders.oreprocessing;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-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.interfaces.IOreRecipeRegistrator;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingStone implements IOreRecipeRegistrator {
 
@@ -28,11 +28,11 @@ public class ProcessingStone implements IOreRecipeRegistrator {
     @Override
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
-        Block aBlock = GT_Utility.getBlockFromStack(aStack);
+        Block aBlock = GTUtility.getBlockFromStack(aStack);
         switch (aMaterial.mName) {
             case "NULL":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(3, aStack), new ItemStack(Blocks.redstone_torch, 2))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(3, aStack), new ItemStack(Blocks.redstone_torch, 2))
                     .itemOutputs(new ItemStack(Items.repeater, 1))
                     .fluidInputs(Materials.Redstone.getMolten(144L))
                     .duration(5 * SECONDS)
@@ -40,38 +40,38 @@ public class ProcessingStone implements IOreRecipeRegistrator {
                     .addTo(assemblerRecipes);
                 break;
             case "Sand":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(new ItemStack(Blocks.sand, 1, 0))
                     .duration(20 * SECONDS)
                     .eut(2)
                     .addTo(maceratorRecipes);
                 break;
             case "Endstone":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.Endstone, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tungstate, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Endstone, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tungstate, 1L))
                     .outputChances(10000, 500)
                     .duration(20 * SECONDS)
                     .eut(2)
                     .addTo(maceratorRecipes);
                 break;
             case "Netherrack":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.Netherrack, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Netherrack, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 1L))
                     .outputChances(10000, 500)
                     .duration(20 * SECONDS)
                     .eut(2)
                     .addTo(maceratorRecipes);
                 break;
             case "NetherBrick":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(new ItemStack(Blocks.nether_brick_fence, 1))
                     .duration(5 * SECONDS)
                     .eut(4)
@@ -81,54 +81,54 @@ public class ProcessingStone implements IOreRecipeRegistrator {
                 if (aBlock != Blocks.air) aBlock.setResistance(20.0F);
                 break;
             case "Concrete":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                     .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, 200 * 30 / 320))))
                     .duration(10 * SECONDS)
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
-                    .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, 200 * 30 / 426))))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                    .fluidInputs(GTModHandler.getDistilledWater(Math.max(3, Math.min(750, 200 * 30 / 426))))
                     .duration(10 * SECONDS)
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                     .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, 100 * 30 / 1280))))
                     .duration(5 * SECONDS)
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L))
                     .duration(20 * SECONDS)
                     .eut(2)
                     .addTo(maceratorRecipes);
                 break;
             case "Rhyolite":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumFeldspar, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartz, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumFeldspar, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quartz, 1L))
                     .outputChances(10000, 2000)
                     .duration(20 * SECONDS)
                     .eut(2)
                     .addTo(maceratorRecipes);
                 break;
             case "Komatiite":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Biotite, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.Biotite, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1L))
                     .outputChances(10000, 500)
                     .duration(20 * SECONDS)
                     .eut(2)
@@ -136,44 +136,44 @@ public class ProcessingStone implements IOreRecipeRegistrator {
                 break;
             case "Dacite":
             case "Andesite":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L))
                     .outputChances(10000, 2000)
                     .duration(20 * SECONDS)
                     .eut(2)
                     .addTo(maceratorRecipes);
                 break;
             case "Gabbro":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumFeldspar, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Pyrite, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumFeldspar, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.Pyrite, 1L))
                     .outputChances(10000, 2000)
                     .duration(20 * SECONDS)
                     .eut(2)
                     .addTo(maceratorRecipes);
                 break;
             case "Eclogite":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Rutile, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Rutile, 1L))
                     .outputChances(10000, 1000)
                     .duration(20 * SECONDS)
                     .eut(2)
                     .addTo(maceratorRecipes);
                 break;
             case "Soapstone":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.Talc, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Chromite, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.Talc, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Chromite, 1L))
                     .outputChances(10000, 1000)
                     .duration(20 * SECONDS)
                     .eut(2)
@@ -181,11 +181,11 @@ public class ProcessingStone implements IOreRecipeRegistrator {
                 break;
             case "Greenschist":
             case "Blueschist":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Glauconite, 2L),
-                        GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Basalt, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Glauconite, 2L),
+                        GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Basalt, 1L))
                     .outputChances(10000, 1000)
                     .duration(20 * SECONDS)
                     .eut(2)
@@ -193,11 +193,11 @@ public class ProcessingStone implements IOreRecipeRegistrator {
                 break;
             case "Gneiss":
             case "Migmatite":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.GraniteBlack, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.dustImpure, Materials.GraniteBlack, 1L))
                     .outputChances(10000, 5000)
                     .duration(20 * SECONDS)
                     .eut(2)
@@ -205,69 +205,69 @@ public class ProcessingStone implements IOreRecipeRegistrator {
                 break;
             case "Redrock":
             case "Marble":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                     .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, 400 * 30 / 320))))
                     .duration(20 * SECONDS)
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
-                    .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426))))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                    .fluidInputs(GTModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426))))
                     .duration(20 * SECONDS)
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                     .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, 200 * 30 / 1280))))
                     .duration(10 * SECONDS)
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
             case "Basalt":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                     .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, 400 * 30 / 320))))
                     .duration(20 * SECONDS)
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
-                    .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426))))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                    .fluidInputs(GTModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426))))
                     .duration(20 * SECONDS)
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                     .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, 200 * 30 / 1280))))
                     .duration(10 * SECONDS)
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
             case "Quartzite":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L))
                     .outputChances(10000, 1000)
                     .duration(20 * SECONDS)
                     .eut(2)
                     .addTo(maceratorRecipes);
                 break;
             case "Flint":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 2L),
+                        GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 2L),
                         new ItemStack(Items.flint, 1))
                     .outputChances(10000, 5000)
                     .duration(20 * SECONDS)
@@ -275,70 +275,70 @@ public class ProcessingStone implements IOreRecipeRegistrator {
                     .addTo(maceratorRecipes);
                 break;
             case "GraniteBlack":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                     .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, 400 * 30 / 320))))
                     .duration(20 * SECONDS)
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
-                    .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426))))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                    .fluidInputs(GTModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426))))
                     .duration(20 * SECONDS)
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                     .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, 200 * 30 / 1280))))
                     .duration(10 * SECONDS)
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 1L))
                     .outputChances(10000, 100)
                     .duration(20 * SECONDS)
                     .eut(2)
                     .addTo(maceratorRecipes);
                 break;
             case "GraniteRed":
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                     .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, 400 * 30 / 320))))
                     .duration(20 * SECONDS)
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
-                    .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426))))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                    .fluidInputs(GTModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426))))
                     .duration(20 * SECONDS)
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
-                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                     .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, 200 * 30 / 1280))))
                     .duration(10 * SECONDS)
                     .eut(TierEU.RECIPE_LV)
                     .addTo(cutterRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1, aStack))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.copyAmount(1, aStack))
                     .itemOutputs(
-                        GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Uranium, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Uranium, 1L))
                     .outputChances(10000, 100)
                     .duration(20 * SECONDS)
                     .eut(2)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java
index fb9431e8e4..f764ebd4a8 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java
@@ -1,15 +1,15 @@
 package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingStoneCobble implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -20,8 +20,8 @@ public class ProcessingStoneCobble implements gregtech.api.interfaces.IOreRecipe
     @Override
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(8, aStack), GT_Utility.getIntegratedCircuit(8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(8, aStack), GTUtility.getIntegratedCircuit(8))
             .itemOutputs(new ItemStack(Blocks.furnace, 1))
             .duration(20 * SECONDS)
             .eut(4)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java
index db3175279d..888c6221af 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java
@@ -4,25 +4,25 @@ import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.extruderRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
 import static gregtech.api.recipe.RecipeMaps.formingPressRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
 
 import net.minecraft.item.ItemStack;
 
-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.enums.SubTag;
 import gregtech.api.enums.TierEU;
 import gregtech.api.enums.ToolDictNames;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Proxy;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.ID_MetaTool_01;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.GTProxy;
+import gregtech.common.items.IDMetaTool01;
+import gregtech.common.items.MetaGeneratedTool01;
 
 public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO COMPARE WITH OLD TOOL
                                                                                            // HEAD??? generator
@@ -58,460 +58,460 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg
             || aMaterial.contains(SubTag.SOFT);
         switch (aPrefix) {
             case toolHeadAxe -> {
-                GT_ModHandler.addShapelessCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE
-                        .getToolWithStats(ID_MetaTool_01.AXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
+                GTModHandler.addShapelessCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE
+                        .getToolWithStats(IDMetaTool01.AXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
                     new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) });
-                if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
+                if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L),
-                            GT_Utility.getIntegratedCircuit(2))
+                            GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L),
+                            GTUtility.getIntegratedCircuit(2))
                         .itemOutputs(
-                            GT_MetaGenerated_Tool_01.INSTANCE
-                                .getToolWithStats(ID_MetaTool_01.AXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null))
+                            MetaGeneratedTool01.INSTANCE
+                                .getToolWithStats(IDMetaTool01.AXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null))
                         .duration(10 * SECONDS)
                         .eut(TierEU.RECIPE_MV)
                         .addTo(assemblerRecipes);
                 }
-                if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L),
-                    GT_Proxy.tBits,
+                if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L),
+                    GTProxy.tBits,
                     new Object[] { "PIh", "P  ", "f  ", 'P', OrePrefixes.plate.get(aMaterial), 'I',
                         OrePrefixes.ingot.get(aMaterial) });
-                if (!aNoWorking) GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L),
-                    GT_Proxy.tBits,
+                if (!aNoWorking) GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L),
+                    GTProxy.tBits,
                     new Object[] { "GG ", "G  ", "f  ", 'G', OrePrefixes.gem.get(aMaterial) });
             }
             case toolHeadBuzzSaw -> {
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.BUZZSAW_LV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.BUZZSAW_LV.ID,
                         1,
                         aMaterial,
                         Materials.Steel,
                         new long[] { 100000L, 32L, 1L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.BUZZSAW_LV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.BUZZSAW_LV.ID,
                         1,
                         aMaterial,
                         Materials.Steel,
                         new long[] { 75000L, 32L, 1L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.BUZZSAW_LV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.BUZZSAW_LV.ID,
                         1,
                         aMaterial,
                         Materials.Steel,
                         new long[] { 50000L, 32L, 1L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.BUZZSAW_MV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.BUZZSAW_MV.ID,
                         1,
                         aMaterial,
                         Materials.Aluminium,
                         new long[] { 400000L, 128L, 2L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium),
                         'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B',
                         ItemList.Battery_RE_MV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.BUZZSAW_MV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.BUZZSAW_MV.ID,
                         1,
                         aMaterial,
                         Materials.Aluminium,
                         new long[] { 300000L, 128L, 2L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium),
                         'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B',
                         ItemList.Battery_RE_MV_Cadmium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.BUZZSAW_MV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.BUZZSAW_MV.ID,
                         1,
                         aMaterial,
                         Materials.Aluminium,
                         new long[] { 200000L, 128L, 2L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium),
                         'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B',
                         ItemList.Battery_RE_MV_Sodium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.BUZZSAW_HV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.BUZZSAW_HV.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 1600000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.BUZZSAW_HV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.BUZZSAW_HV.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 1200000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Cadmium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.BUZZSAW_HV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.BUZZSAW_HV.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 800000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Sodium.get(1L) });
-                if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.toolHeadBuzzSaw, aMaterial, 1L),
-                    GT_Proxy.tBits,
+                if (aSpecialRecipeReq2) GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.toolHeadBuzzSaw, aMaterial, 1L),
+                    GTProxy.tBits,
                     new Object[] { "wXh", "X X", "fXx", 'X', OrePrefixes.plate.get(aMaterial) });
             }
             case toolHeadChainsaw -> {
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.CHAINSAW_LV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.CHAINSAW_LV.ID,
                         1,
                         aMaterial,
                         Materials.Steel,
                         new long[] { 100000L, 32L, 1L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.CHAINSAW_LV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.CHAINSAW_LV.ID,
                         1,
                         aMaterial,
                         Materials.Steel,
                         new long[] { 75000L, 32L, 1L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.CHAINSAW_LV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.CHAINSAW_LV.ID,
                         1,
                         aMaterial,
                         Materials.Steel,
                         new long[] { 50000L, 32L, 1L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.CHAINSAW_MV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.CHAINSAW_MV.ID,
                         1,
                         aMaterial,
                         Materials.Aluminium,
                         new long[] { 400000L, 128L, 2L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium),
                         'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B',
                         ItemList.Battery_RE_MV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.CHAINSAW_MV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.CHAINSAW_MV.ID,
                         1,
                         aMaterial,
                         Materials.Aluminium,
                         new long[] { 300000L, 128L, 2L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium),
                         'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B',
                         ItemList.Battery_RE_MV_Cadmium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.CHAINSAW_MV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.CHAINSAW_MV.ID,
                         1,
                         aMaterial,
                         Materials.Aluminium,
                         new long[] { 200000L, 128L, 2L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium),
                         'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B',
                         ItemList.Battery_RE_MV_Sodium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.CHAINSAW_HV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.CHAINSAW_HV.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 1600000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.CHAINSAW_HV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.CHAINSAW_HV.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 1200000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Cadmium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.CHAINSAW_HV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.CHAINSAW_HV.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 800000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Sodium.get(1L) });
-                if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.toolHeadChainsaw, aMaterial, 1L),
-                    GT_Proxy.tBits,
+                if (aSpecialRecipeReq2) GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.toolHeadChainsaw, aMaterial, 1L),
+                    GTProxy.tBits,
                     new Object[] { "SRS", "XhX", "SRS", 'X', OrePrefixes.plate.get(aMaterial), 'S',
                         OrePrefixes.plate.get(Materials.Steel), 'R', OrePrefixes.ring.get(Materials.Steel) });
             }
             case toolHeadDrill -> {
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.DRILL_LV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.DRILL_LV.ID,
                         1,
                         aMaterial,
                         Materials.Steel,
                         new long[] { 100_000L, 32L, 1L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.DRILL_LV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.DRILL_LV.ID,
                         1,
                         aMaterial,
                         Materials.Steel,
                         new long[] { 75_000L, 32L, 1L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.DRILL_LV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.DRILL_LV.ID,
                         1,
                         aMaterial,
                         Materials.Steel,
                         new long[] { 50_000L, 32L, 1L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.DRILL_MV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.DRILL_MV.ID,
                         1,
                         aMaterial,
                         Materials.Aluminium,
                         new long[] { 400_000L, 128L, 2L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium),
                         'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B',
                         ItemList.Battery_RE_MV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.DRILL_MV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.DRILL_MV.ID,
                         1,
                         aMaterial,
                         Materials.Aluminium,
                         new long[] { 300_000L, 128L, 2L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium),
                         'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B',
                         ItemList.Battery_RE_MV_Cadmium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.DRILL_MV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.DRILL_MV.ID,
                         1,
                         aMaterial,
                         Materials.Aluminium,
                         new long[] { 200_000L, 128L, 2L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium),
                         'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B',
                         ItemList.Battery_RE_MV_Sodium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.DRILL_HV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.DRILL_HV.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 1_600_000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.DRILL_HV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.DRILL_HV.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 1_200_000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Cadmium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.DRILL_HV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.DRILL_HV.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 800_000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Sodium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.JACKHAMMER.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.JACKHAMMER.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 1_600_000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M',
                         ItemList.Electric_Piston_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'R',
                         OrePrefixes.spring.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.JACKHAMMER.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.JACKHAMMER.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 1_200_000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M',
                         ItemList.Electric_Piston_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'R',
                         OrePrefixes.spring.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Cadmium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.JACKHAMMER.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.JACKHAMMER.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 800_000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M',
                         ItemList.Electric_Piston_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'R',
                         OrePrefixes.spring.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Sodium.get(1L) });
                 if (aSpecialRecipeReq2) {
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { "XSX", "XSX", "ShS", 'X', OrePrefixes.plate.get(aMaterial), 'S',
                             OrePrefixes.plate.get(Materials.Steel) });
                     if (aMaterial.mStandardMoltenFluid != null) {
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(ItemList.Shape_Mold_ToolHeadDrill.get(0))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L))
                             .fluidInputs(aMaterial.getMolten(144 * 4))
                             .duration(5 * SECONDS)
                             .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV))
                             .addTo(fluidSolidifierRecipes);
                     }
-                    if (GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
+                    if (GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) {
+                        GTValues.RA.stdBuilder()
                             .itemInputs(
-                                GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 4L),
+                                GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 4L),
                                 ItemList.Shape_Extruder_ToolHeadDrill.get(0))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L))
                             .duration(5 * SECONDS)
                             .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV))
                             .addTo(extruderRecipes);
@@ -520,40 +520,36 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg
             }
             case toolHeadFile -> {
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-                    GT_ModHandler.addShapelessCraftingRecipe(
-                        GT_MetaGenerated_Tool_01.INSTANCE
-                            .getToolWithStats(ID_MetaTool_01.FILE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
+                    GTModHandler.addShapelessCraftingRecipe(
+                        MetaGeneratedTool01.INSTANCE
+                            .getToolWithStats(IDMetaTool01.FILE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
                         new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) });
 
                     if ((!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.BOUNCY))) {
                         if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-                            GT_ModHandler.addCraftingRecipe(
-                                GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                                    ID_MetaTool_01.FILE.ID,
+                            GTModHandler.addCraftingRecipe(
+                                MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                                    IDMetaTool01.FILE.ID,
                                     1,
                                     aMaterial,
                                     aMaterial.mHandleMaterial,
                                     null),
-                                GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                                    | GT_ModHandler.RecipeBits.BUFFERED,
+                                GTModHandler.RecipeBits.MIRRORED | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                                    | GTModHandler.RecipeBits.BUFFERED,
                                 new Object[] { "P", "P", "S", 'P', OrePrefixes.plate.get(aMaterial), 'S',
                                     OrePrefixes.stick.get(aMaterial.mHandleMaterial) });
                         }
                     }
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
+                if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial, 1L),
-                            GT_Utility.getIntegratedCircuit(15))
+                            GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial, 1L),
+                            GTUtility.getIntegratedCircuit(15))
                         .itemOutputs(
-                            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                                ID_MetaTool_01.FILE.ID,
-                                1,
-                                aMaterial,
-                                aMaterial.mHandleMaterial,
-                                null))
+                            MetaGeneratedTool01.INSTANCE
+                                .getToolWithStats(IDMetaTool01.FILE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null))
                         .duration(10 * SECONDS)
                         .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV))
                         .addTo(assemblerRecipes);
@@ -561,62 +557,62 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg
             }
             case toolHeadHoe -> {
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-                    GT_ModHandler.addShapelessCraftingRecipe(
-                        GT_MetaGenerated_Tool_01.INSTANCE
-                            .getToolWithStats(ID_MetaTool_01.HOE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
+                    GTModHandler.addShapelessCraftingRecipe(
+                        MetaGeneratedTool01.INSTANCE
+                            .getToolWithStats(IDMetaTool01.HOE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
                         new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) });
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
+                if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L),
-                            GT_Utility.getIntegratedCircuit(16))
+                            GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L),
+                            GTUtility.getIntegratedCircuit(16))
                         .itemOutputs(
-                            GT_MetaGenerated_Tool_01.INSTANCE
-                                .getToolWithStats(ID_MetaTool_01.HOE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null))
+                            MetaGeneratedTool01.INSTANCE
+                                .getToolWithStats(IDMetaTool01.HOE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null))
                         .duration(10 * SECONDS)
                         .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV))
                         .addTo(assemblerRecipes);
                 }
-                if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L),
-                    GT_Proxy.tBits,
+                if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L),
+                    GTProxy.tBits,
                     new Object[] { "PIh", "f  ", 'P', OrePrefixes.plate.get(aMaterial), 'I',
                         OrePrefixes.ingot.get(aMaterial) });
-                if (!aNoWorking) GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L),
-                    GT_Proxy.tBits,
+                if (!aNoWorking) GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L),
+                    GTProxy.tBits,
                     new Object[] { "GG ", "f  ", "   ", 'G', OrePrefixes.gem.get(aMaterial) });
             }
             case toolHeadPickaxe -> {
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
-                    GT_ModHandler.addShapelessCraftingRecipe(
-                        GT_MetaGenerated_Tool_01.INSTANCE
-                            .getToolWithStats(ID_MetaTool_01.PICKAXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
+                    GTModHandler.addShapelessCraftingRecipe(
+                        MetaGeneratedTool01.INSTANCE
+                            .getToolWithStats(IDMetaTool01.PICKAXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
                         new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) });
 
-                    if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { "PII", "f h", 'P', OrePrefixes.plate.get(aMaterial), 'I',
                             OrePrefixes.ingot.get(aMaterial) });
 
-                    if (!aNoWorking) GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    if (!aNoWorking) GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { "GGG", "f  ", 'G', OrePrefixes.gem.get(aMaterial) });
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
+                if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L),
-                            GT_Utility.getIntegratedCircuit(5))
+                            GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L),
+                            GTUtility.getIntegratedCircuit(5))
                         .itemOutputs(
-                            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                                ID_MetaTool_01.PICKAXE.ID,
+                            MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                                IDMetaTool01.PICKAXE.ID,
                                 1,
                                 aMaterial,
                                 aMaterial.mHandleMaterial,
@@ -629,34 +625,30 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg
             case toolHeadPlow -> {
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
-                    GT_ModHandler.addShapelessCraftingRecipe(
-                        GT_MetaGenerated_Tool_01.INSTANCE
-                            .getToolWithStats(ID_MetaTool_01.PLOW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
+                    GTModHandler.addShapelessCraftingRecipe(
+                        MetaGeneratedTool01.INSTANCE
+                            .getToolWithStats(IDMetaTool01.PLOW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
                         new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) });
 
-                    if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { "PP", "PP", "hf", 'P', OrePrefixes.plate.get(aMaterial) });
 
-                    if (!aNoWorking) GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    if (!aNoWorking) GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { "GG", "GG", " f", 'G', OrePrefixes.gem.get(aMaterial) });
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
+                if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L),
-                            GT_Utility.getIntegratedCircuit(6))
+                            GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L),
+                            GTUtility.getIntegratedCircuit(6))
                         .itemOutputs(
-                            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                                ID_MetaTool_01.PLOW.ID,
-                                1,
-                                aMaterial,
-                                aMaterial.mHandleMaterial,
-                                null))
+                            MetaGeneratedTool01.INSTANCE
+                                .getToolWithStats(IDMetaTool01.PLOW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null))
                         .duration(10 * SECONDS)
                         .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV))
                         .addTo(assemblerRecipes);
@@ -665,31 +657,31 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg
             case toolHeadSaw -> {
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
-                    GT_ModHandler.addShapelessCraftingRecipe(
-                        GT_MetaGenerated_Tool_01.INSTANCE
-                            .getToolWithStats(ID_MetaTool_01.SAW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
+                    GTModHandler.addShapelessCraftingRecipe(
+                        MetaGeneratedTool01.INSTANCE
+                            .getToolWithStats(IDMetaTool01.SAW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
                         new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) });
 
-                    if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { "PP ", "fh ", 'P', OrePrefixes.plate.get(aMaterial), 'I',
                             OrePrefixes.ingot.get(aMaterial) });
 
-                    if (!aNoWorking) GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    if (!aNoWorking) GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { "GGf", 'G', OrePrefixes.gem.get(aMaterial) });
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
+                if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L),
-                            GT_Utility.getIntegratedCircuit(7))
+                            GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L),
+                            GTUtility.getIntegratedCircuit(7))
                         .itemOutputs(
-                            GT_MetaGenerated_Tool_01.INSTANCE
-                                .getToolWithStats(ID_MetaTool_01.SAW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null))
+                            MetaGeneratedTool01.INSTANCE
+                                .getToolWithStats(IDMetaTool01.SAW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null))
                         .duration(10 * SECONDS)
                         .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV))
                         .addTo(assemblerRecipes);
@@ -698,54 +690,50 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg
             case toolHeadSense -> {
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
-                    GT_ModHandler.addShapelessCraftingRecipe(
-                        GT_MetaGenerated_Tool_01.INSTANCE
-                            .getToolWithStats(ID_MetaTool_01.SENSE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
+                    GTModHandler.addShapelessCraftingRecipe(
+                        MetaGeneratedTool01.INSTANCE
+                            .getToolWithStats(IDMetaTool01.SENSE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
                         new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) });
 
-                    if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { "PPI", "hf ", 'P', OrePrefixes.plate.get(aMaterial), 'I',
                             OrePrefixes.ingot.get(aMaterial) });
 
-                    if (!aNoWorking) GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    if (!aNoWorking) GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { "GGG", " f ", "   ", 'G', OrePrefixes.gem.get(aMaterial) });
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
+                if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L),
-                            GT_Utility.getIntegratedCircuit(8))
+                            GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L),
+                            GTUtility.getIntegratedCircuit(8))
                         .itemOutputs(
-                            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                                ID_MetaTool_01.SENSE.ID,
-                                1,
-                                aMaterial,
-                                aMaterial.mHandleMaterial,
-                                null))
+                            MetaGeneratedTool01.INSTANCE
+                                .getToolWithStats(IDMetaTool01.SENSE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null))
                         .duration(10 * SECONDS)
                         .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV))
                         .addTo(assemblerRecipes);
                 }
             }
             case toolHeadShovel -> {
-                GT_ModHandler.addShapelessCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE
-                        .getToolWithStats(ID_MetaTool_01.SHOVEL.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
+                GTModHandler.addShapelessCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE
+                        .getToolWithStats(IDMetaTool01.SHOVEL.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
                     new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) });
-                if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
+                if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L),
-                            GT_Utility.getIntegratedCircuit(9))
+                            GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L),
+                            GTUtility.getIntegratedCircuit(9))
                         .itemOutputs(
-                            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                                ID_MetaTool_01.SHOVEL.ID,
+                            MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                                IDMetaTool01.SHOVEL.ID,
                                 1,
                                 aMaterial,
                                 aMaterial.mHandleMaterial,
@@ -754,70 +742,66 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg
                         .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV))
                         .addTo(assemblerRecipes);
                 }
-                if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L),
-                    GT_Proxy.tBits,
+                if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L),
+                    GTProxy.tBits,
                     new Object[] { "fPh", 'P', OrePrefixes.plate.get(aMaterial), 'I',
                         OrePrefixes.ingot.get(aMaterial) });
-                if (!aNoWorking) GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L),
-                    GT_Proxy.tBits,
+                if (!aNoWorking) GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L),
+                    GTProxy.tBits,
                     new Object[] { "fG", 'G', OrePrefixes.gem.get(aMaterial) });
             }
             case toolHeadSword -> {
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
-                    GT_ModHandler.addShapelessCraftingRecipe(
-                        GT_MetaGenerated_Tool_01.INSTANCE
-                            .getToolWithStats(ID_MetaTool_01.SWORD.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
+                    GTModHandler.addShapelessCraftingRecipe(
+                        MetaGeneratedTool01.INSTANCE
+                            .getToolWithStats(IDMetaTool01.SWORD.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
                         new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) });
 
-                    if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { " P ", "fPh", 'P', OrePrefixes.plate.get(aMaterial), 'I',
                             OrePrefixes.ingot.get(aMaterial) });
 
-                    if (!aNoWorking) GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    if (!aNoWorking) GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { " G", "fG", 'G', OrePrefixes.gem.get(aMaterial) });
                 }
-                if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
+                if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L),
-                            GT_Utility.getIntegratedCircuit(10))
+                            GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L),
+                            GTUtility.getIntegratedCircuit(10))
                         .itemOutputs(
-                            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                                ID_MetaTool_01.SWORD.ID,
-                                1,
-                                aMaterial,
-                                aMaterial.mHandleMaterial,
-                                null))
+                            MetaGeneratedTool01.INSTANCE
+                                .getToolWithStats(IDMetaTool01.SWORD.ID, 1, aMaterial, aMaterial.mHandleMaterial, null))
                         .duration(10 * SECONDS)
                         .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV))
                         .addTo(assemblerRecipes);
                 }
             }
             case toolHeadUniversalSpade -> {
-                GT_ModHandler.addShapelessCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE
-                        .getToolWithStats(ID_MetaTool_01.UNIVERSALSPADE.ID, 1, aMaterial, aMaterial, null),
+                GTModHandler.addShapelessCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE
+                        .getToolWithStats(IDMetaTool01.UNIVERSALSPADE.ID, 1, aMaterial, aMaterial, null),
                     new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial), OrePrefixes.screw.get(aMaterial),
                         ToolDictNames.craftingToolScrewdriver });
-                if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null
-                    && GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
+                if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null
+                    && GTOreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L) != null) {
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L),
-                            GT_Utility.getIntegratedCircuit(11))
+                            GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L),
+                            GTUtility.getIntegratedCircuit(11))
                         .itemOutputs(
-                            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                                ID_MetaTool_01.UNIVERSALSPADE.ID,
+                            MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                                IDMetaTool01.UNIVERSALSPADE.ID,
                                 1,
                                 aMaterial,
                                 aMaterial.mHandleMaterial,
@@ -826,268 +810,268 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg
                         .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV))
                         .addTo(assemblerRecipes);
                 }
-                if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L),
-                    GT_Proxy.tBits,
+                if (aSpecialRecipeReq2) GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L),
+                    GTProxy.tBits,
                     new Object[] { "fX", 'X', OrePrefixes.toolHeadShovel.get(aMaterial) });
             }
             case toolHeadWrench -> {
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.WRENCH_LV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.WRENCH_LV.ID,
                         1,
                         aMaterial,
                         Materials.Steel,
                         new long[] { 100000L, 32L, 1L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.WRENCH_LV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.WRENCH_LV.ID,
                         1,
                         aMaterial,
                         Materials.Steel,
                         new long[] { 75000L, 32L, 1L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.WRENCH_LV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.WRENCH_LV.ID,
                         1,
                         aMaterial,
                         Materials.Steel,
                         new long[] { 50000L, 32L, 1L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.WRENCH_MV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.WRENCH_MV.ID,
                         1,
                         aMaterial,
                         Materials.Aluminium,
                         new long[] { 400000L, 128L, 2L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium),
                         'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B',
                         ItemList.Battery_RE_MV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.WRENCH_MV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.WRENCH_MV.ID,
                         1,
                         aMaterial,
                         Materials.Aluminium,
                         new long[] { 300000L, 128L, 2L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium),
                         'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B',
                         ItemList.Battery_RE_MV_Cadmium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.WRENCH_MV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.WRENCH_MV.ID,
                         1,
                         aMaterial,
                         Materials.Aluminium,
                         new long[] { 200000L, 128L, 2L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium),
                         'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B',
                         ItemList.Battery_RE_MV_Sodium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.WRENCH_HV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.WRENCH_HV.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 1600000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.WRENCH_HV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.WRENCH_HV.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 1200000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Cadmium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.WRENCH_HV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.WRENCH_HV.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 800000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S',
                         OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Sodium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.SCREWDRIVER_LV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.SCREWDRIVER_LV.ID,
                         1,
                         aMaterial,
                         Materials.Steel,
                         new long[] { 100000L, 32L, 1L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M',
                         ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P',
                         OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B',
                         ItemList.Battery_RE_LV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.SCREWDRIVER_LV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.SCREWDRIVER_LV.ID,
                         1,
                         aMaterial,
                         Materials.Steel,
                         new long[] { 75000L, 32L, 1L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M',
                         ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P',
                         OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B',
                         ItemList.Battery_RE_LV_Cadmium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.SCREWDRIVER_LV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.SCREWDRIVER_LV.ID,
                         1,
                         aMaterial,
                         Materials.Steel,
                         new long[] { 50000L, 32L, 1L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M',
                         ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P',
                         OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B',
                         ItemList.Battery_RE_LV_Sodium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.SCREWDRIVER_MV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.SCREWDRIVER_MV.ID,
                         1,
                         aMaterial,
                         Materials.Aluminium,
                         new long[] { 400000L, 128L, 2L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M',
                         ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P',
                         OrePrefixes.plate.get(Materials.Aluminium), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B',
                         ItemList.Battery_RE_MV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.SCREWDRIVER_MV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.SCREWDRIVER_MV.ID,
                         1,
                         aMaterial,
                         Materials.Aluminium,
                         new long[] { 300000L, 128L, 2L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M',
                         ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P',
                         OrePrefixes.plate.get(Materials.Aluminium), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B',
                         ItemList.Battery_RE_MV_Cadmium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.SCREWDRIVER_MV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.SCREWDRIVER_MV.ID,
                         1,
                         aMaterial,
                         Materials.Aluminium,
                         new long[] { 200000L, 128L, 2L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M',
                         ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P',
                         OrePrefixes.plate.get(Materials.Aluminium), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Sodium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.SCREWDRIVER_HV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.SCREWDRIVER_HV.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 1600000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M',
                         ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.SCREWDRIVER_HV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.SCREWDRIVER_HV.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 1200000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M',
                         ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Cadmium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.SCREWDRIVER_HV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.SCREWDRIVER_HV.ID,
                         1,
                         aMaterial,
                         Materials.StainlessSteel,
                         new long[] { 800000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                        | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+                        | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M',
                         ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P',
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'G',
                         OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B',
                         ItemList.Battery_RE_HV_Sodium.get(1L) });
-                if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.toolHeadWrench, aMaterial, 1L),
-                    GT_Proxy.tBits,
+                if (aSpecialRecipeReq2) GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.toolHeadWrench, aMaterial, 1L),
+                    GTProxy.tBits,
                     new Object[] { "hXW", "XRX", "WXd", 'X', OrePrefixes.plate.get(aMaterial), 'S',
                         OrePrefixes.plate.get(Materials.Steel), 'R', OrePrefixes.ring.get(Materials.Steel), 'W',
                         OrePrefixes.screw.get(Materials.Steel) });
             }
             case toolHeadHammer, toolHeadMallet -> {
-                if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
+                if (GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) {
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
-                            GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L),
-                            GT_Utility.getIntegratedCircuit(14))
+                            GTOreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L),
+                            GTOreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L),
+                            GTUtility.getIntegratedCircuit(14))
                         .itemOutputs(
-                            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                                aProducesSoftMallet ? ID_MetaTool_01.SOFTMALLET.ID : ID_MetaTool_01.HARDHAMMER.ID,
+                            MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                                aProducesSoftMallet ? IDMetaTool01.SOFTMALLET.ID : IDMetaTool01.HARDHAMMER.ID,
                                 1,
                                 aMaterial,
                                 aMaterial.mHandleMaterial,
@@ -1097,84 +1081,84 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg
                         .addTo(assemblerRecipes);
                 }
                 if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) {
-                    GT_ModHandler.addShapelessCraftingRecipe(
-                        GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                            aProducesSoftMallet ? ID_MetaTool_01.SOFTMALLET.ID : ID_MetaTool_01.HARDHAMMER.ID,
+                    GTModHandler.addShapelessCraftingRecipe(
+                        MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                            aProducesSoftMallet ? IDMetaTool01.SOFTMALLET.ID : IDMetaTool01.HARDHAMMER.ID,
                             1,
                             aMaterial,
                             aMaterial.mHandleMaterial,
                             null),
-                        GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                        GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
                         new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) });
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                            aProducesSoftMallet ? ID_MetaTool_01.SOFTMALLET.ID : ID_MetaTool_01.HARDHAMMER.ID,
+                    GTModHandler.addCraftingRecipe(
+                        MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                            aProducesSoftMallet ? IDMetaTool01.SOFTMALLET.ID : IDMetaTool01.HARDHAMMER.ID,
                             1,
                             aMaterial,
                             aMaterial.mHandleMaterial,
                             null),
-                        GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                        GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
                         new Object[] { "XX ", "XXS", "XX ", 'X',
                             aMaterial == Materials.Wood ? OrePrefixes.plank.get(Materials.Wood)
                                 : OrePrefixes.ingot.get(aMaterial),
                             'S', OrePrefixes.stick.get(aMaterial.mHandleMaterial) });
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                            aProducesSoftMallet ? ID_MetaTool_01.SOFTMALLET.ID : ID_MetaTool_01.HARDHAMMER.ID,
+                    GTModHandler.addCraftingRecipe(
+                        MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                            aProducesSoftMallet ? IDMetaTool01.SOFTMALLET.ID : IDMetaTool01.HARDHAMMER.ID,
                             1,
                             aMaterial,
                             aMaterial.mHandleMaterial,
                             null),
-                        GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                        GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
                         new Object[] { "XX ", "XXS", "XX ", 'X',
                             aMaterial == Materials.Wood ? OrePrefixes.plank.get(Materials.Wood)
                                 : OrePrefixes.gem.get(aMaterial),
                             'S', OrePrefixes.stick.get(aMaterial.mHandleMaterial) });
                 }
-                if (aPrefix == OrePrefixes.toolHeadHammer) if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L),
-                    GT_Proxy.tBits,
+                if (aPrefix == OrePrefixes.toolHeadHammer) if (aSpecialRecipeReq1) GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L),
+                    GTProxy.tBits,
                     new Object[] { "II ", "IIh", "II ", 'P', OrePrefixes.plate.get(aMaterial), 'I',
                         OrePrefixes.ingot.get(aMaterial) });
             }
             case turbineBlade -> {
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 4L),
-                        GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Magnalium, 1L))
-                    .itemOutputs(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(170, 1, aMaterial, aMaterial, null))
+                        GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 4L),
+                        GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Magnalium, 1L))
+                    .itemOutputs(MetaGeneratedTool01.INSTANCE.getToolWithStats(170, 1, aMaterial, aMaterial, null))
                     .duration(8 * SECONDS)
                     .eut(calculateRecipeEU(aMaterial, 100))
                     .addTo(assemblerRecipes);
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 8L),
-                        GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 1L))
-                    .itemOutputs(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(172, 1, aMaterial, aMaterial, null))
+                        GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 8L),
+                        GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 1L))
+                    .itemOutputs(MetaGeneratedTool01.INSTANCE.getToolWithStats(172, 1, aMaterial, aMaterial, null))
                     .duration(16 * SECONDS)
                     .eut(calculateRecipeEU(aMaterial, 400))
                     .addTo(assemblerRecipes);
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 12L),
-                        GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 1L))
-                    .itemOutputs(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(174, 1, aMaterial, aMaterial, null))
+                        GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 12L),
+                        GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 1L))
+                    .itemOutputs(MetaGeneratedTool01.INSTANCE.getToolWithStats(174, 1, aMaterial, aMaterial, null))
                     .duration(32 * SECONDS)
                     .eut(calculateRecipeEU(aMaterial, 1600))
                     .addTo(assemblerRecipes);
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 16L),
-                        GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Americium, 1L))
-                    .itemOutputs(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(176, 1, aMaterial, aMaterial, null))
+                        GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 16L),
+                        GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Americium, 1L))
+                    .itemOutputs(MetaGeneratedTool01.INSTANCE.getToolWithStats(176, 1, aMaterial, aMaterial, null))
                     .duration(1 * MINUTES + 4 * SECONDS)
                     .eut(calculateRecipeEU(aMaterial, 6400))
                     .addTo(assemblerRecipes);
                 if (aSpecialRecipeReq2) {
                     if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
-                        GT_ModHandler.addCraftingRecipe(
-                            GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L),
-                            GT_Proxy.tBits,
+                        GTModHandler.addCraftingRecipe(
+                            GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L),
+                            GTProxy.tBits,
                             new Object[] { "fPd", "SPS", " P ", 'P',
                                 aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial)
                                     : OrePrefixes.plateDouble.get(aMaterial),
@@ -1182,13 +1166,13 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg
                     }
 
                     // Turbine blades
-                    if (GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L) != null
-                        && GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
+                    if (GTOreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L) != null
+                        && GTOreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L) != null) {
+                        GTValues.RA.stdBuilder()
                             .itemInputs(
-                                GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 3L),
-                                GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 2L))
-                            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L))
+                                GTOreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 3L),
+                                GTOreDictUnificator.get(OrePrefixes.screw, aMaterial, 2L))
+                            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L))
                             .duration(10 * SECONDS)
                             .eut(calculateRecipeEU(aMaterial, 60))
                             .addTo(formingPressRecipes);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java
index cbb0ca3668..04aac52d4f 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java
@@ -8,9 +8,9 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.ID_MetaTool_01;
+import gregtech.api.util.GTModHandler;
+import gregtech.common.items.IDMetaTool01;
+import gregtech.common.items.MetaGeneratedTool01;
 
 public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -28,10 +28,10 @@ public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRe
         if (aMaterial != Materials.Rubber) {
             // Crafting recipes
             {
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE
-                        .getToolWithStats(ID_MetaTool_01.PLUNGER.ID, 1, aMaterial, aMaterial, null),
-                    GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE
+                        .getToolWithStats(IDMetaTool01.PLUNGER.ID, 1, aMaterial, aMaterial, null),
+                    GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "xRR", " SR", "S f", 'S', OrePrefixes.stick.get(aMaterial), 'R',
                         OrePrefixes.plate.get(Materials.AnyRubber) });
             }
@@ -41,89 +41,87 @@ public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRe
             && (!aMaterial.contains(SubTag.NO_SMASHING))) {
             // Crafting recipes
             {
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE
-                        .getToolWithStats(ID_MetaTool_01.WRENCH.ID, 1, aMaterial, aMaterial, null),
-                    GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE
+                        .getToolWithStats(IDMetaTool01.WRENCH.ID, 1, aMaterial, aMaterial, null),
+                    GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "IhI", "III", " I ", 'I', OrePrefixes.ingot.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE
-                        .getToolWithStats(ID_MetaTool_01.CROWBAR.ID, 1, aMaterial, aMaterial, null),
-                    GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE
+                        .getToolWithStats(IDMetaTool01.CROWBAR.ID, 1, aMaterial, aMaterial, null),
+                    GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "hDS", "DSD", "SDf", 'S', OrePrefixes.stick.get(aMaterial), 'D', Dyes.dyeBlue });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE
-                        .getToolWithStats(ID_MetaTool_01.SCREWDRIVER.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
-                    GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE
+                        .getToolWithStats(IDMetaTool01.SCREWDRIVER.ID, 1, aMaterial, aMaterial.mHandleMaterial, null),
+                    GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { " fS", " Sh", "W  ", 'S', OrePrefixes.stick.get(aMaterial), 'W',
                         OrePrefixes.stick.get(aMaterial.mHandleMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE
-                        .getToolWithStats(ID_MetaTool_01.WIRECUTTER.ID, 1, aMaterial, aMaterial, null),
-                    GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE
+                        .getToolWithStats(IDMetaTool01.WIRECUTTER.ID, 1, aMaterial, aMaterial, null),
+                    GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PfP", "hPd", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P',
                         OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE
-                        .getToolWithStats(ID_MetaTool_01.SCOOP.ID, 1, aMaterial, aMaterial, null),
-                    GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(IDMetaTool01.SCOOP.ID, 1, aMaterial, aMaterial, null),
+                    GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "SWS", "SSS", "xSh", 'S', OrePrefixes.stick.get(aMaterial), 'W',
                         new ItemStack(Blocks.wool, 1, 32767) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE
-                        .getToolWithStats(ID_MetaTool_01.BRANCHCUTTER.ID, 1, aMaterial, aMaterial, null),
-                    GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE
+                        .getToolWithStats(IDMetaTool01.BRANCHCUTTER.ID, 1, aMaterial, aMaterial, null),
+                    GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PfP", "PdP", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P',
                         OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE
-                        .getToolWithStats(ID_MetaTool_01.KNIFE.ID, 1, aMaterial, aMaterial, null),
-                    GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(IDMetaTool01.KNIFE.ID, 1, aMaterial, aMaterial, null),
+                    GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "fPh", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P',
                         OrePrefixes.plate.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE
-                        .getToolWithStats(ID_MetaTool_01.BUTCHERYKNIFE.ID, 1, aMaterial, aMaterial, null),
-                    GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE
+                        .getToolWithStats(IDMetaTool01.BUTCHERYKNIFE.ID, 1, aMaterial, aMaterial, null),
+                    GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "PPf", "PP ", "Sh ", 'S', OrePrefixes.stick.get(aMaterial), 'P',
                         OrePrefixes.plate.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.SOLDERING_IRON_LV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.SOLDERING_IRON_LV.ID,
                         1,
                         aMaterial,
                         Materials.Rubber,
                         new long[] { 100000L, 32L, 1L, -1L }),
-                    GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "LBf", "Sd ", "P  ", 'B', OrePrefixes.bolt.get(aMaterial), 'P',
                         OrePrefixes.plate.get(Materials.AnyRubber), 'S', OrePrefixes.stick.get(Materials.Iron), 'L',
                         ItemList.Battery_RE_LV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.SOLDERING_IRON_MV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.SOLDERING_IRON_MV.ID,
                         1,
                         aMaterial,
                         Materials.Rubber,
                         new long[] { 400000L, 128L, 2L, -1L }),
-                    GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "LBf", "Sd ", "P  ", 'B', OrePrefixes.bolt.get(aMaterial), 'P',
                         OrePrefixes.plate.get(Materials.AnyRubber), 'S', OrePrefixes.stick.get(Materials.Steel), 'L',
                         ItemList.Battery_RE_MV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                        ID_MetaTool_01.SOLDERING_IRON_HV.ID,
+                GTModHandler.addCraftingRecipe(
+                    MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                        IDMetaTool01.SOLDERING_IRON_HV.ID,
                         1,
                         aMaterial,
                         Materials.AnySyntheticRubber,
                         new long[] { 1600000L, 512L, 3L, -1L }),
-                    GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                    GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "LBf", "Sd ", "P  ", 'B', OrePrefixes.bolt.get(aMaterial), 'P',
                         OrePrefixes.plate.get(Materials.AnySyntheticRubber), 'S',
                         OrePrefixes.stick.get(Materials.StainlessSteel), 'L', ItemList.Battery_RE_HV_Lithium.get(1L) });
-                GT_ModHandler.addCraftingRecipe(
-                    (GT_MetaGenerated_Tool_01.INSTANCE
-                        .getToolWithStats(ID_MetaTool_01.POCKET_MULTITOOL.ID, 1, aMaterial, aMaterial, null)),
-                    GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                GTModHandler.addCraftingRecipe(
+                    (MetaGeneratedTool01.INSTANCE
+                        .getToolWithStats(IDMetaTool01.POCKET_MULTITOOL.ID, 1, aMaterial, aMaterial, null)),
+                    GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED,
                     new Object[] { "ABC", "DEF", "CFG", 'A', OrePrefixes.stickLong.get(aMaterial), 'B',
                         OrePrefixes.toolHeadSaw.get(aMaterial), 'C', OrePrefixes.ring.get(aMaterial), 'D',
                         OrePrefixes.toolHeadFile.get(aMaterial), 'E', OrePrefixes.plate.get(aMaterial), 'F',
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java
index 4e3febc469..8d72819d26 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java
@@ -2,18 +2,18 @@ package gregtech.loaders.oreprocessing;
 
 import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes;
 import static gregtech.api.recipe.RecipeMaps.polarizerRecipes;
-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 net.minecraft.item.ItemStack;
 
-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.interfaces.IOreRecipeRegistrator;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingTransforming implements IOreRecipeRegistrator {
 
@@ -35,13 +35,13 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
             case "Wood" ->
             // Chemical bath recipes
             {
-                if (GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
-                        .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L))
+                if (GTOreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
+                        .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L))
                         .fluidInputs(
                             Materials.SeedOil
-                                .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true)))
+                                .getFluid(GTUtility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true)))
                         .duration(5 * SECONDS)
                         .eut(TierEU.ULV)
                         .addTo(chemicalBathRecipes);
@@ -51,13 +51,13 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
             case "Iron" -> {
                 // Chemical bath recipes
                 {
-                    if (GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack))
-                            .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L))
+                    if (GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) {
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack))
+                            .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L))
                             .fluidInputs(
-                                Materials.FierySteel.getFluid(
-                                    GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true)))
+                                Materials.FierySteel
+                                    .getFluid(GTUtility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true)))
                             .duration(5 * SECONDS)
                             .eut(TierEU.ULV)
                             .addTo(chemicalBathRecipes);
@@ -66,11 +66,11 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
 
                 // Polarizer recipes
                 {
-                    if (GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack))
-                            .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L))
-                            .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS)
+                    if (GTOreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L) != null) {
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack))
+                            .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L))
+                            .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS)
                             .eut((int) TierEU.LV / 2)
                             .addTo(polarizerRecipes);
                     }
@@ -79,13 +79,13 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
             case "WroughtIron" -> {
                 // Chemical bath recipes
                 {
-                    if (GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack))
-                            .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L))
+                    if (GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) {
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack))
+                            .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L))
                             .fluidInputs(
-                                Materials.FierySteel.getFluid(
-                                    GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true)))
+                                Materials.FierySteel
+                                    .getFluid(GTUtility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true)))
                             .duration(5 * SECONDS)
                             .eut(TierEU.ULV)
                             .addTo(chemicalBathRecipes);
@@ -94,11 +94,11 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
 
                 // Polarizer recipes
                 {
-                    if (GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack))
-                            .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L))
-                            .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS)
+                    if (GTOreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L) != null) {
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack))
+                            .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L))
+                            .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS)
                             .eut((int) TierEU.LV / 2)
                             .addTo(polarizerRecipes);
                     }
@@ -107,13 +107,13 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
             case "Steel" -> {
                 // Chemical Bath recipes
                 {
-                    if (GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack))
-                            .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L))
+                    if (GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) {
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack))
+                            .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L))
                             .fluidInputs(
-                                Materials.FierySteel.getFluid(
-                                    GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true)))
+                                Materials.FierySteel
+                                    .getFluid(GTUtility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true)))
                             .duration(5 * SECONDS)
                             .eut(TierEU.ULV)
                             .addTo(chemicalBathRecipes);
@@ -122,11 +122,11 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
 
                 // Polarizer recipes
                 {
-                    if (GT_OreDictUnificator.get(aPrefix, Materials.SteelMagnetic, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1, aStack))
-                            .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.SteelMagnetic, 1L))
-                            .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS)
+                    if (GTOreDictUnificator.get(aPrefix, Materials.SteelMagnetic, 1L) != null) {
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(1, aStack))
+                            .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.SteelMagnetic, 1L))
+                            .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS)
                             .eut((int) TierEU.LV / 2)
                             .addTo(polarizerRecipes);
                     }
@@ -135,11 +135,11 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
             case "Neodymium" ->
             // Polarizer recipes
             {
-                if (GT_OreDictUnificator.get(aPrefix, Materials.NeodymiumMagnetic, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
-                        .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.NeodymiumMagnetic, 1L))
-                        .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS)
+                if (GTOreDictUnificator.get(aPrefix, Materials.NeodymiumMagnetic, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
+                        .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.NeodymiumMagnetic, 1L))
+                        .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS)
                         .eut((int) TierEU.HV / 2)
                         .addTo(polarizerRecipes);
                 }
@@ -147,11 +147,11 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
             case "Samarium" ->
             // Polarizer recipes
             {
-                if (GT_OreDictUnificator.get(aPrefix, Materials.SamariumMagnetic, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
-                        .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.SamariumMagnetic, 1L))
-                        .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS)
+                if (GTOreDictUnificator.get(aPrefix, Materials.SamariumMagnetic, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
+                        .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.SamariumMagnetic, 1L))
+                        .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS)
                         .eut((int) TierEU.IV / 2)
                         .addTo(polarizerRecipes);
                 }
@@ -160,11 +160,11 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
             case "TengamPurified" ->
             // Polarizer recipes
             {
-                if (GT_OreDictUnificator.get(aPrefix, Materials.TengamAttuned, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(1, aStack))
-                        .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.TengamAttuned, 1L))
-                        .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS)
+                if (GTOreDictUnificator.get(aPrefix, Materials.TengamAttuned, 1L) != null) {
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(1, aStack))
+                        .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.TengamAttuned, 1L))
+                        .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS)
                         .eut((int) TierEU.RECIPE_UHV)
                         .addTo(polarizerRecipes);
                 }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java
index 7635546d23..41f5511754 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java
@@ -1,15 +1,15 @@
 package gregtech.loaders.oreprocessing;
 
-import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
+import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE;
+import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_RecipeConstants;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipeConstants;
+import gregtech.api.util.GTUtility;
 
 public class ProcessingWax implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -21,11 +21,11 @@ public class ProcessingWax implements gregtech.api.interfaces.IOreRecipeRegistra
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
         if (aOreDictName.equals("waxMagical")) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(1, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(1, aStack))
                 .metadata(FUEL_VALUE, 6)
                 .metadata(FUEL_TYPE, 5)
-                .addTo(GT_RecipeConstants.Fuel);
+                .addTo(GTRecipeConstants.Fuel);
         }
     }
 }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
index 1f5bd5f1c2..c38c8fb72b 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
@@ -6,9 +6,9 @@ import static gregtech.api.recipe.RecipeMaps.benderRecipes;
 import static gregtech.api.recipe.RecipeMaps.packagerRecipes;
 import static gregtech.api.recipe.RecipeMaps.unpackagerRecipes;
 import static gregtech.api.recipe.RecipeMaps.wiremillRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
 
 import java.util.ArrayList;
 
@@ -16,16 +16,16 @@ import net.minecraft.item.ItemStack;
 
 import appeng.api.config.TunnelType;
 import appeng.core.Api;
-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.SubTag;
 import gregtech.api.enums.TierEU;
-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.GT_Proxy;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.GTProxy;
 
 public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistrator {
 
@@ -64,10 +64,10 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
                 if (!aMaterial.contains(SubTag.NO_SMASHING)) {
                     // Bender recipes
                     {
-                        if (GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L))
+                        if (GTOreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L))
                                 .duration(5 * SECONDS)
                                 .eut(calculateRecipeEU(aMaterial, 8))
                                 .addTo(benderRecipes);
@@ -76,10 +76,10 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
 
                     // Wiremill Recipes
                     {
-                        if (GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 1L) != null) {
-                            GT_Values.RA.stdBuilder()
-                                .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1))
-                                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 4L))
+                        if (GTOreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 1L) != null) {
+                            GTValues.RA.stdBuilder()
+                                .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1))
+                                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 4L))
                                 .duration(10 * SECONDS)
                                 .eut(calculateRecipeEU(aMaterial, 8))
                                 .addTo(wiremillRecipes);
@@ -91,42 +91,42 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
                 if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)
                     && !aMaterial.contains(SubTag.NO_WORKING)
                     && (aMaterial.getProcessingMaterialTierEU() < TierEU.IV)) {
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L),
-                        GT_Proxy.tBits,
+                    GTModHandler.addCraftingRecipe(
+                        GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L),
+                        GTProxy.tBits,
                         new Object[] { "Xx", 'X', OrePrefixes.plate.get(aMaterial) });
 
                 }
 
                 // Assembler recipes
                 {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(2, aStack), GT_Utility.getIntegratedCircuit(2))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(2, aStack), GTUtility.getIntegratedCircuit(2))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L))
                         .duration(7 * SECONDS + 10 * TICKS)
                         .eut(calculateRecipeEU(aMaterial, 8))
                         .addTo(assemblerRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(4, aStack), GT_Utility.getIntegratedCircuit(4))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(4, aStack), GTUtility.getIntegratedCircuit(4))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L))
                         .duration(10 * SECONDS)
                         .eut(calculateRecipeEU(aMaterial, 8))
                         .addTo(assemblerRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(8, aStack), GT_Utility.getIntegratedCircuit(8))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(8, aStack), GTUtility.getIntegratedCircuit(8))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L))
                         .duration(15 * SECONDS)
                         .eut(calculateRecipeEU(aMaterial, 8))
                         .addTo(assemblerRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(12, aStack), GT_Utility.getIntegratedCircuit(12))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(12, aStack), GTUtility.getIntegratedCircuit(12))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L))
                         .duration(20 * SECONDS)
                         .eut(calculateRecipeEU(aMaterial, 8))
                         .addTo(assemblerRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_Utility.copyAmount(16, aStack), GT_Utility.getIntegratedCircuit(16))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L))
+                    GTValues.RA.stdBuilder()
+                        .itemInputs(GTUtility.copyAmount(16, aStack), GTUtility.getIntegratedCircuit(16))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L))
                         .duration(25 * SECONDS)
                         .eut(calculateRecipeEU(aMaterial, 8))
                         .addTo(assemblerRecipes);
@@ -138,12 +138,12 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     // Shapeless crafting recipes
                     {
-                        GT_ModHandler.addShapelessCraftingRecipe(
-                            GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L),
+                        GTModHandler.addShapelessCraftingRecipe(
+                            GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L),
                             new Object[] { aOreDictName });
 
-                        GT_ModHandler.addShapelessCraftingRecipe(
-                            GT_Utility.copyAmount(1, aStack),
+                        GTModHandler.addShapelessCraftingRecipe(
+                            GTUtility.copyAmount(1, aStack),
                             new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) });
                     }
                 }
@@ -154,15 +154,15 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     // Shapeless crafting recipes
                     {
-                        GT_ModHandler.addShapelessCraftingRecipe(
-                            GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 4L),
+                        GTModHandler.addShapelessCraftingRecipe(
+                            GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 4L),
                             new Object[] { aOreDictName });
-                        GT_ModHandler.addShapelessCraftingRecipe(
-                            GT_Utility.copyAmount(1, aStack),
+                        GTModHandler.addShapelessCraftingRecipe(
+                            GTUtility.copyAmount(1, aStack),
                             new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial),
                                 OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) });
-                        GT_ModHandler.addShapelessCraftingRecipe(
-                            GT_Utility.copyAmount(1, aStack),
+                        GTModHandler.addShapelessCraftingRecipe(
+                            GTUtility.copyAmount(1, aStack),
                             new Object[] { OrePrefixes.wireGt02.get(aMaterial), OrePrefixes.wireGt02.get(aMaterial) });
                     }
                 }
@@ -173,17 +173,17 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     // Shapeless crafting recipes
                     {
-                        GT_ModHandler.addShapelessCraftingRecipe(
-                            GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 8L),
+                        GTModHandler.addShapelessCraftingRecipe(
+                            GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 8L),
                             new Object[] { aOreDictName });
-                        GT_ModHandler.addShapelessCraftingRecipe(
-                            GT_Utility.copyAmount(1, aStack),
+                        GTModHandler.addShapelessCraftingRecipe(
+                            GTUtility.copyAmount(1, aStack),
                             new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial),
                                 OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial),
                                 OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial),
                                 OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) });
-                        GT_ModHandler.addShapelessCraftingRecipe(
-                            GT_Utility.copyAmount(1, aStack),
+                        GTModHandler.addShapelessCraftingRecipe(
+                            GTUtility.copyAmount(1, aStack),
                             new Object[] { OrePrefixes.wireGt04.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) });
                     }
                 }
@@ -194,11 +194,11 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     // Shapeless crafting recipes
                     {
-                        GT_ModHandler.addShapelessCraftingRecipe(
-                            GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 12L),
+                        GTModHandler.addShapelessCraftingRecipe(
+                            GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 12L),
                             new Object[] { aOreDictName });
-                        GT_ModHandler.addShapelessCraftingRecipe(
-                            GT_Utility.copyAmount(1, aStack),
+                        GTModHandler.addShapelessCraftingRecipe(
+                            GTUtility.copyAmount(1, aStack),
                             new Object[] { OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) });
                     }
                 }
@@ -209,14 +209,14 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
                 if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     // Shapeless crafting recipes
                     {
-                        GT_ModHandler.addShapelessCraftingRecipe(
-                            GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 16L),
+                        GTModHandler.addShapelessCraftingRecipe(
+                            GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 16L),
                             new Object[] { aOreDictName });
-                        GT_ModHandler.addShapelessCraftingRecipe(
-                            GT_Utility.copyAmount(1, aStack),
+                        GTModHandler.addShapelessCraftingRecipe(
+                            GTUtility.copyAmount(1, aStack),
                             new Object[] { OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt08.get(aMaterial) });
-                        GT_ModHandler.addShapelessCraftingRecipe(
-                            GT_Utility.copyAmount(1, aStack),
+                        GTModHandler.addShapelessCraftingRecipe(
+                            GTUtility.copyAmount(1, aStack),
                             new Object[] { OrePrefixes.wireGt12.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) });
                     }
 
@@ -224,7 +224,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
                 }
             }
             default -> {
-                GT_Log.err.println(
+                GTLog.err.println(
                     "OrePrefix " + aPrefix.name() + " cannot be registered as a cable for Material " + aMaterial.mName);
                 return;
             }
@@ -241,72 +241,72 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
                 }
 
                 // shapeless crafting
-                if (GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) {
-                    GT_ModHandler.addShapelessCraftingRecipe(
-                        GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L),
+                if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) {
+                    GTModHandler.addShapelessCraftingRecipe(
+                        GTOreDictUnificator.get(correspondingCable, aMaterial, 1L),
                         craftingListRubber.toArray());
                 }
 
                 // Packer recipe
-                if (GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
+                if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) {
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_Utility.copyAmount(1, aStack),
-                            GT_OreDictUnificator.get(OrePrefixes.plate.get(Materials.Rubber), costMultiplier))
-                        .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L))
+                            GTUtility.copyAmount(1, aStack),
+                            GTOreDictUnificator.get(OrePrefixes.plate.get(Materials.Rubber), costMultiplier))
+                        .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L))
                         .duration(5 * SECONDS)
                         .eut(8)
                         .addTo(packagerRecipes);
                 }
                 // alloy smelter recipes
                 {
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L),
-                            GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cableGt01, aMaterial, 1L))
+                            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L),
+                            GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt01, aMaterial, 1L))
                         .duration(5 * SECONDS)
                         .eut(8)
                         .addTo(alloySmelterRecipes);
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L),
-                            GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cableGt02, aMaterial, 1L))
+                            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L),
+                            GTOreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt02, aMaterial, 1L))
                         .duration(10 * SECONDS)
                         .eut(16)
                         .addTo(alloySmelterRecipes);
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 4L),
-                            GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cableGt04, aMaterial, 1L))
+                            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 4L),
+                            GTOreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L))
+                        .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt04, aMaterial, 1L))
                         .duration(15 * SECONDS)
                         .eut(TierEU.RECIPE_LV)
                         .addTo(alloySmelterRecipes);
                 }
                 // Assembler recipes
                 {
-                    if (GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24))
-                            .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L))
+                    if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) {
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(aStack, GTUtility.getIntegratedCircuit(24))
+                            .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L))
                             .fluidInputs(Materials.Rubber.getMolten(144L * costMultiplier))
                             .duration(5 * SECONDS)
                             .eut(8)
                             .addTo(assemblerRecipes);
 
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24))
-                            .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(aStack, GTUtility.getIntegratedCircuit(24))
+                            .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L))
                             .fluidInputs(Materials.StyreneButadieneRubber.getMolten(108L * costMultiplier))
                             .duration(5 * SECONDS)
                             .eut(8)
                             .addTo(assemblerRecipes);
 
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24))
-                            .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(aStack, GTUtility.getIntegratedCircuit(24))
+                            .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L))
                             .fluidInputs(Materials.Silicone.getMolten(72L * costMultiplier))
                             .duration(5 * SECONDS)
                             .eut(8)
@@ -315,17 +315,17 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
                         for (Materials dielectric : dielectrics) {
                             for (Materials syntheticRubber : syntheticRubbers) {
 
-                                GT_Values.RA.stdBuilder()
-                                    .itemInputs(GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier))
-                                    .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L))
+                                GTValues.RA.stdBuilder()
+                                    .itemInputs(GTUtility.copyAmount(4, aStack), dielectric.getDust(costMultiplier))
+                                    .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 4L))
                                     .fluidInputs(syntheticRubber.getMolten(costMultiplier * 144L))
                                     .duration(20 * SECONDS)
                                     .eut(8)
                                     .addTo(assemblerRecipes);
 
-                                GT_Values.RA.stdBuilder()
+                                GTValues.RA.stdBuilder()
                                     .itemInputs(aStack, dielectric.getDustSmall(costMultiplier))
-                                    .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L))
+                                    .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L))
                                     .fluidInputs(syntheticRubber.getMolten(costMultiplier * 36L))
                                     .duration(5 * SECONDS)
                                     .eut(8)
@@ -337,29 +337,29 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
             }
             case "Iron", "Nickel", "Cupronickel", "Copper", "AnnealedCopper", "Kanthal", "Gold", "Electrum", "Silver", "Nichrome", "Steel", "BlackSteel", "Titanium", "Aluminium", "BlueAlloy", "NetherStar", "RedstoneAlloy" -> {
 
-                if (GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L) == null) {
+                if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) == null) {
                     break;
                 }
                 // Assembler recipes
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24))
-                    .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(aStack, GTUtility.getIntegratedCircuit(24))
+                    .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L))
                     .fluidInputs(Materials.Rubber.getMolten(144 * costMultiplier))
                     .duration(5 * SECONDS)
                     .eut(8)
                     .addTo(assemblerRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24))
-                    .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(aStack, GTUtility.getIntegratedCircuit(24))
+                    .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L))
                     .fluidInputs(Materials.StyreneButadieneRubber.getMolten(108 * costMultiplier))
                     .duration(5 * SECONDS)
                     .eut(8)
                     .addTo(assemblerRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24))
-                    .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(aStack, GTUtility.getIntegratedCircuit(24))
+                    .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L))
                     .fluidInputs(Materials.Silicone.getMolten(72 * costMultiplier))
                     .duration(5 * SECONDS)
                     .eut(8)
@@ -368,17 +368,17 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
                 for (Materials dielectric : dielectrics) {
                     for (Materials syntheticRubber : syntheticRubbers) {
 
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier))
-                            .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L))
+                        GTValues.RA.stdBuilder()
+                            .itemInputs(GTUtility.copyAmount(4, aStack), dielectric.getDust(costMultiplier))
+                            .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 4L))
                             .fluidInputs(syntheticRubber.getMolten(costMultiplier * 144L))
                             .duration(20 * SECONDS)
                             .eut(8)
                             .addTo(assemblerRecipes);
 
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(aStack, dielectric.getDustSmall(costMultiplier))
-                            .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L))
+                            .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L))
                             .fluidInputs(syntheticRubber.getMolten(costMultiplier * 36L))
                             .duration(5 * SECONDS)
                             .eut(8)
@@ -388,28 +388,28 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
             }
 
             default -> {
-                if (GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L) == null) {
+                if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) == null) {
                     break;
                 }
 
                 // Assembler recipes
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
                         aStack,
-                        GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier),
-                        GT_Utility.getIntegratedCircuit(24))
-                    .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier),
+                        GTUtility.getIntegratedCircuit(24))
+                    .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L))
                     .fluidInputs(Materials.Silicone.getMolten(costMultiplier * 72))
                     .duration(5 * SECONDS)
                     .eut(calculateRecipeEU(aMaterial, 8))
                     .addTo(assemblerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
                         aStack,
-                        GT_OreDictUnificator.get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier),
-                        GT_Utility.getIntegratedCircuit(24))
-                    .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L))
+                        GTOreDictUnificator.get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier),
+                        GTUtility.getIntegratedCircuit(24))
+                    .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L))
                     .fluidInputs(Materials.Silicone.getMolten(costMultiplier * 72))
                     .duration(5 * SECONDS)
                     .eut(calculateRecipeEU(aMaterial, 8))
@@ -418,44 +418,44 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
                 for (Materials dielectric : dielectrics) {
                     for (Materials syntheticRubber : syntheticRubbers) {
 
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(
-                                GT_Utility.copyAmount(4, aStack),
+                                GTUtility.copyAmount(4, aStack),
                                 dielectric.getDust(costMultiplier),
-                                GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier * 4L))
-                            .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L))
+                                GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier * 4L))
+                            .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 4L))
                             .fluidInputs(syntheticRubber.getMolten(costMultiplier * 144L))
                             .duration(20 * SECONDS)
                             .eut(calculateRecipeEU(aMaterial, 8))
                             .addTo(assemblerRecipes);
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(
-                                GT_Utility.copyAmount(4, aStack),
+                                GTUtility.copyAmount(4, aStack),
                                 dielectric.getDust(costMultiplier),
-                                GT_OreDictUnificator
+                                GTOreDictUnificator
                                     .get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier * 4L))
-                            .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L))
+                            .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 4L))
                             .fluidInputs(syntheticRubber.getMolten(costMultiplier * 144L))
                             .duration(20 * SECONDS)
                             .eut(calculateRecipeEU(aMaterial, 8))
                             .addTo(assemblerRecipes);
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(
                                 aStack,
                                 dielectric.getDustSmall(costMultiplier),
-                                GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier))
-                            .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L))
+                                GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier))
+                            .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L))
                             .fluidInputs(syntheticRubber.getMolten(costMultiplier * 36L))
                             .duration(5 * SECONDS)
                             .eut(calculateRecipeEU(aMaterial, 8))
                             .addTo(assemblerRecipes);
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(
                                 aStack,
                                 dielectric.getDustSmall(costMultiplier),
-                                GT_OreDictUnificator
+                                GTOreDictUnificator
                                     .get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier))
-                            .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L))
+                            .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L))
                             .fluidInputs(syntheticRubber.getMolten(costMultiplier * 36L))
                             .duration(5 * SECONDS)
                             .eut(calculateRecipeEU(aMaterial, 8))
@@ -465,16 +465,16 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
             }
         }
 
-        if (GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L))
-                .itemOutputs(GT_Utility.copyAmount(1, aStack))
+        if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) {
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L))
+                .itemOutputs(GTUtility.copyAmount(1, aStack))
                 .duration(5 * SECONDS)
                 .eut(calculateRecipeEU(aMaterial, 8))
                 .addTo(unpackagerRecipes);
         }
 
-        if (GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) {
+        if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) {
             AE2AddNetAttunementCable(aStack, correspondingCable, aMaterial);
         }
     }
@@ -500,7 +500,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
             .addNewAttunement(aStack, (TunnelType) tt);
         Api.INSTANCE.registries()
             .p2pTunnel()
-            .addNewAttunement(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), (TunnelType) tt);
+            .addNewAttunement(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L), (TunnelType) tt);
     }
     // end region
 }
diff --git a/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java b/src/main/java/gregtech/loaders/postload/BlockResistanceLoader.java
index b122646c92..264cd9e6b9 100644
--- a/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java
+++ b/src/main/java/gregtech/loaders/postload/BlockResistanceLoader.java
@@ -8,9 +8,9 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemAxe;
 import net.minecraft.item.ItemPickaxe;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_BlockResistanceLoader implements Runnable {
+public class BlockResistanceLoader implements Runnable {
 
     @Override
     @SuppressWarnings("unchecked")
@@ -28,15 +28,15 @@ public class GT_BlockResistanceLoader implements Runnable {
         Blocks.sponge.setHarvestLevel("axe", 0);
         Blocks.monster_egg.setHarvestLevel("pickaxe", 0);
 
-        GT_Utility.callMethod(Material.tnt, "func_85158_p", true, false, false);
-        GT_Utility.callMethod(Material.tnt, "setAdventureModeExempt", true, false, false);
+        GTUtility.callMethod(Material.tnt, "func_85158_p", true, false, false);
+        GTUtility.callMethod(Material.tnt, "setAdventureModeExempt", true, false, false);
 
-        Set<Block> tSet = (Set<Block>) GT_Utility.getFieldContent(ItemAxe.class, "field_150917_c", true, true);
+        Set<Block> tSet = (Set<Block>) GTUtility.getFieldContent(ItemAxe.class, "field_150917_c", true, true);
         tSet.add(Blocks.bed);
         tSet.add(Blocks.hay_block);
         tSet.add(Blocks.sponge);
 
-        tSet = (Set<Block>) GT_Utility.getFieldContent(ItemPickaxe.class, "field_150915_c", true, true);
+        tSet = (Set<Block>) GTUtility.getFieldContent(ItemPickaxe.class, "field_150915_c", true, true);
         tSet.add(Blocks.monster_egg);
         tSet.add(Blocks.tnt);
     }
diff --git a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java b/src/main/java/gregtech/loaders/postload/BookAndLootLoader.java
index a30962631e..e227d7f21a 100644
--- a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java
+++ b/src/main/java/gregtech/loaders/postload/BookAndLootLoader.java
@@ -5,19 +5,19 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraftforge.common.ChestGenHooks;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTOreDictUnificator;
 
-public class GT_BookAndLootLoader implements Runnable {
+public class BookAndLootLoader implements Runnable {
 
     @Override
     public void run() {
-        GT_Log.out.println("GT_Mod: Adding worldgenerated Chest Content.");
-        if (GT_Mod.gregtechproxy.mIncreaseDungeonLoot) {
+        GTLog.out.println("GTMod: Adding worldgenerated Chest Content.");
+        if (GTMod.gregtechproxy.mIncreaseDungeonLoot) {
             ChestGenHooks tChest = ChestGenHooks.getInfo("bonusChest");
             tChest.setMax(tChest.getMax() + 8);
             tChest.setMin(tChest.getMin() + 4);
@@ -59,84 +59,76 @@ public class GT_BookAndLootLoader implements Runnable {
         ChestGenHooks.addItem(
             "dungeonChest",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L),
                 1,
                 6,
                 120));
         ChestGenHooks.addItem(
             "dungeonChest",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Lead, 1L), 1, 6, 30));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Lead, 1L), 1, 6, 30));
         ChestGenHooks.addItem(
             "dungeonChest",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), 1, 6, 60));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), 1, 6, 60));
         ChestGenHooks.addItem(
             "dungeonChest",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L),
-                1,
-                6,
-                60));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), 1, 6, 60));
         ChestGenHooks.addItem(
             "dungeonChest",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Manganese, 1L),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Manganese, 1L),
                 1,
                 6,
                 60));
         ChestGenHooks.addItem(
             "dungeonChest",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DamascusSteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.DamascusSteel, 1L),
                 1,
                 6,
                 10));
         ChestGenHooks.addItem(
             "dungeonChest",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), 1, 6, 20));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), 1, 6, 20));
         ChestGenHooks.addItem(
             "dungeonChest",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 1, 6, 20));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 1, 6, 20));
         ChestGenHooks.addItem(
             "dungeonChest",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L),
-                1,
-                6,
-                20));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), 1, 6, 20));
         ChestGenHooks.addItem(
             "dungeonChest",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L),
                 1,
                 6,
                 20));
         ChestGenHooks.addItem(
             "dungeonChest",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), 1, 6, 20));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), 1, 6, 20));
         ChestGenHooks.addItem(
             "dungeonChest",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L),
                 1,
                 6,
                 40));
         ChestGenHooks.addItem(
             "dungeonChest",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L),
                 1,
                 6,
                 40));
         ChestGenHooks.addItem(
             "dungeonChest",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neodymium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Neodymium, 1L),
                 1,
                 6,
                 40));
         ChestGenHooks.addItem(
             "dungeonChest",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), 1, 3, 40));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), 1, 3, 40));
 
         ChestGenHooks.addItem(
             "pyramidDesertyChest",
@@ -144,44 +136,40 @@ public class GT_BookAndLootLoader implements Runnable {
         ChestGenHooks.addItem(
             "pyramidDesertyChest",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L),
                 4,
                 16,
                 12));
         ChestGenHooks.addItem(
             "pyramidDesertyChest",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Platinum, 1L),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Platinum, 1L),
                 2,
                 8,
                 4));
         ChestGenHooks.addItem(
             "pyramidDesertyChest",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 2, 8, 2));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 2, 8, 2));
         ChestGenHooks.addItem(
             "pyramidDesertyChest",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), 2, 8, 2));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), 2, 8, 2));
         ChestGenHooks.addItem(
             "pyramidDesertyChest",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L),
                 2,
                 8,
                 2));
         ChestGenHooks.addItem(
             "pyramidDesertyChest",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), 2, 8, 2));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), 2, 8, 2));
         ChestGenHooks.addItem(
             "pyramidDesertyChest",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L),
-                2,
-                8,
-                4));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), 2, 8, 4));
         ChestGenHooks.addItem(
             "pyramidDesertyChest",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L),
                 2,
                 8,
                 4));
@@ -195,37 +183,33 @@ public class GT_BookAndLootLoader implements Runnable {
         ChestGenHooks.addItem(
             "pyramidJungleChest",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L),
                 4,
                 16,
                 12));
         ChestGenHooks.addItem(
             "pyramidJungleChest",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 2, 8, 2));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 2, 8, 2));
         ChestGenHooks.addItem(
             "pyramidJungleChest",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), 2, 8, 2));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), 2, 8, 2));
         ChestGenHooks.addItem(
             "pyramidJungleChest",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L),
                 2,
                 8,
                 2));
         ChestGenHooks.addItem(
             "pyramidJungleChest",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), 2, 8, 2));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), 2, 8, 2));
         ChestGenHooks.addItem(
             "pyramidJungleChest",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L),
-                2,
-                8,
-                4));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), 2, 8, 4));
         ChestGenHooks.addItem(
             "pyramidJungleChest",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L),
                 2,
                 8,
                 4));
@@ -236,64 +220,56 @@ public class GT_BookAndLootLoader implements Runnable {
 
         ChestGenHooks.addItem(
             "mineshaftCorridor",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L),
-                1,
-                4,
-                12));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1L), 1, 4, 12));
         ChestGenHooks.addItem(
             "mineshaftCorridor",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Lead, 1L), 1, 4, 3));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Lead, 1L), 1, 4, 3));
         ChestGenHooks.addItem(
             "mineshaftCorridor",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), 1, 4, 6));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), 1, 4, 6));
         ChestGenHooks.addItem(
             "mineshaftCorridor",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), 1, 4, 6));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), 1, 4, 6));
         ChestGenHooks.addItem(
             "mineshaftCorridor",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), 1, 4, 2));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), 1, 4, 2));
         ChestGenHooks.addItem(
             "mineshaftCorridor",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L),
                 1,
                 4,
                 2));
         ChestGenHooks.addItem(
             "mineshaftCorridor",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), 1, 4, 2));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), 1, 4, 2));
         ChestGenHooks.addItem(
             "mineshaftCorridor",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L),
-                1,
-                4,
-                4));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.GarnetRed, 1L), 1, 4, 4));
         ChestGenHooks.addItem(
             "mineshaftCorridor",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.GarnetYellow, 1L),
                 1,
                 4,
                 4));
         ChestGenHooks.addItem(
             "mineshaftCorridor",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 1, 4, 2));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L), 1, 4, 2));
         ChestGenHooks.addItem(
             "mineshaftCorridor",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), 1, 4, 2));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), 1, 4, 2));
         ChestGenHooks.addItem(
             "mineshaftCorridor",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.DamascusSteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.DamascusSteel, 1L),
                 1,
                 4,
                 1));
         ChestGenHooks.addItem(
             "mineshaftCorridor",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.DamascusSteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.DamascusSteel, 1L),
                 1,
                 4,
                 1));
@@ -302,46 +278,38 @@ public class GT_BookAndLootLoader implements Runnable {
             .addItem("villageBlacksmith", new WeightedRandomChestContent(ItemList.McGuffium_239.get(1L), 1, 1, 1));
         ChestGenHooks.addItem(
             "villageBlacksmith",
-            new WeightedRandomChestContent(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), 1, 4, 6));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), 1, 4, 6));
         ChestGenHooks.addItem(
             "villageBlacksmith",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neodymium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Neodymium, 1L),
                 2,
                 8,
                 6));
         ChestGenHooks.addItem(
             "villageBlacksmith",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Manganese, 1L),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Manganese, 1L),
                 2,
                 8,
                 12));
         ChestGenHooks.addItem(
             "villageBlacksmith",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
-                4,
-                12,
-                12));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), 4, 12, 12));
         ChestGenHooks.addItem(
             "villageBlacksmith",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L),
                 4,
                 12,
                 12));
         ChestGenHooks.addItem(
             "villageBlacksmith",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Brass, 1L),
-                4,
-                12,
-                12));
+            new WeightedRandomChestContent(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Brass, 1L), 4, 12, 12));
         ChestGenHooks.addItem(
             "villageBlacksmith",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DamascusSteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.DamascusSteel, 1L),
                 4,
                 12,
                 1));
@@ -354,14 +322,14 @@ public class GT_BookAndLootLoader implements Runnable {
         ChestGenHooks.addItem(
             "strongholdCorridor",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.DamascusSteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.DamascusSteel, 1L),
                 1,
                 4,
                 6));
         ChestGenHooks.addItem(
             "strongholdCorridor",
             new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.DamascusSteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.DamascusSteel, 1L),
                 1,
                 4,
                 6));
diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/CraftingRecipeLoader.java
index fff50aff2f..ae41a07e97 100644
--- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/CraftingRecipeLoader.java
@@ -4,7 +4,7 @@ import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Mods.GraviSuite;
 import static gregtech.api.enums.Mods.IndustrialCraft2;
 import static gregtech.api.enums.Mods.NotEnoughItems;
-import static gregtech.api.util.GT_ModHandler.getModItem;
+import static gregtech.api.util.GTModHandler.getModItem;
 
 import java.util.Arrays;
 import java.util.List;
@@ -14,77 +14,76 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-
-import gregtech.GT_Mod;
+import bartworks.system.material.WerkstoffLoader;
+import gregtech.GTMod;
 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.ToolDictNames;
-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.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import ic2.core.Ic2Items;
 
-public class GT_CraftingRecipeLoader implements Runnable {
+public class CraftingRecipeLoader implements Runnable {
 
     private static final String aTextIron1 = "X X";
     private static final String aTextIron2 = "XXX";
-    private static final long bits_no_remove_buffered = GT_ModHandler.RecipeBits.NOT_REMOVABLE
-        | GT_ModHandler.RecipeBits.BUFFERED;
-    private static final long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE
-        | GT_ModHandler.RecipeBits.BUFFERED;
+    private static final long bits_no_remove_buffered = GTModHandler.RecipeBits.NOT_REMOVABLE
+        | GTModHandler.RecipeBits.BUFFERED;
+    private static final long bits = GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE
+        | GTModHandler.RecipeBits.BUFFERED;
     private static final String aTextPlateWrench = "PwP";
 
     @Override
     public void run() {
-        GT_Log.out.println("GT_Mod: Adding nerfed Vanilla Recipes.");
-        GT_ModHandler.addCraftingRecipe(
+        GTLog.out.println("GTMod: Adding nerfed Vanilla Recipes.");
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.bucket, 1),
-            bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
+            bits_no_remove_buffered | GTModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
             new Object[] { "XhX", " X ", 'X', OrePrefixes.plate.get(Materials.AnyIron) });
         ItemStack tMat = new ItemStack(Items.iron_ingot);
         {
             ItemStack tStack;
-            if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, null, null, null, null, null, null, null))) {
-                GT_ModHandler.addCraftingRecipe(
+            if (null != (tStack = GTModHandler.removeRecipe(tMat, tMat, null, null, null, null, null, null, null))) {
+                GTModHandler.addCraftingRecipe(
                     tStack,
-                    bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES,
+                    bits_no_remove_buffered | GTModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES,
                     new Object[] { "ShS", "XZX", "SdS", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'S',
                         OrePrefixes.screw.get(Materials.Steel), 'Z', OrePrefixes.spring.get(Materials.Steel) });
             }
         }
         {
             ItemStack tStack;
-            if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, null, tMat, tMat, null, tMat, tMat, null))) {
-                GT_ModHandler.addCraftingRecipe(
+            if (null != (tStack = GTModHandler.removeRecipe(tMat, tMat, null, tMat, tMat, null, tMat, tMat, null))) {
+                GTModHandler.addCraftingRecipe(
                     tStack,
-                    bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES,
+                    bits_no_remove_buffered | GTModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES,
                     new Object[] { "XX ", "XXh", "XX ", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'S',
                         OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) });
             }
         }
         {
             ItemStack tStack;
-            if (null != (tStack = GT_ModHandler.removeRecipe(tMat, null, tMat, tMat, null, tMat, tMat, tMat, tMat))) {
-                GT_ModHandler.addCraftingRecipe(
+            if (null != (tStack = GTModHandler.removeRecipe(tMat, null, tMat, tMat, null, tMat, tMat, tMat, tMat))) {
+                GTModHandler.addCraftingRecipe(
                     tStack,
-                    bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES,
+                    bits_no_remove_buffered | GTModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES,
                     new Object[] { aTextIron1, "XhX", aTextIron2, 'X', OrePrefixes.plate.get(Materials.AnyIron), 'S',
                         OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) });
             }
         }
         {
             ItemStack tStack;
-            if (null != (tStack = GT_ModHandler
+            if (null != (tStack = GTModHandler
                 .removeRecipe(tMat, null, tMat, tMat, new ItemStack(Blocks.chest, 1, 0), tMat, null, tMat, null))) {
-                GT_ModHandler.addCraftingRecipe(
+                GTModHandler.addCraftingRecipe(
                     tStack,
-                    bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES,
+                    bits_no_remove_buffered | GTModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES,
                     new Object[] { "XwX", "XCX", " X ", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'S',
                         OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron), 'C',
                         "craftingChest" });
@@ -92,1268 +91,1267 @@ public class GT_CraftingRecipeLoader implements Runnable {
         }
         {
             ItemStack tStack;
-            if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, tMat, tMat, tMat, tMat, null, null, null))) {
+            if (null != (tStack = GTModHandler.removeRecipe(tMat, tMat, tMat, tMat, tMat, tMat, null, null, null))) {
                 tStack.stackSize /= 2;
-                GT_ModHandler.addCraftingRecipe(
+                GTModHandler.addCraftingRecipe(
                     tStack,
-                    bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES,
+                    bits_no_remove_buffered | GTModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES,
                     new Object[] { " w ", aTextIron2, aTextIron2, 'X', OrePrefixes.stick.get(Materials.AnyIron), 'S',
                         OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) });
             }
         }
 
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("ironFence", 6L),
-            bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE,
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("ironFence", 6L),
+            bits_no_remove_buffered | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { aTextIron2, aTextIron2, " w ", 'X', OrePrefixes.stick.get(Materials.AnyIron), 'S',
                 OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) });
 
         tMat = new ItemStack(Items.gold_ingot);
         {
             ItemStack tStack;
-            if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, null, null, null, null, null, null, null))) {
-                GT_ModHandler.addCraftingRecipe(
+            if (null != (tStack = GTModHandler.removeRecipe(tMat, tMat, null, null, null, null, null, null, null))) {
+                GTModHandler.addCraftingRecipe(
                     tStack,
-                    bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES,
+                    bits_no_remove_buffered | GTModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES,
                     new Object[] { "ShS", "XZX", "SdS", 'X', OrePrefixes.plate.get(Materials.Gold), 'S',
                         OrePrefixes.screw.get(Materials.Steel), 'Z', OrePrefixes.spring.get(Materials.Steel) });
             }
         }
-        tMat = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L);
+        tMat = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L);
         {
             ItemStack tStack;
-            if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, tMat, tMat, tMat, tMat, null, null, null))) {
-                GT_ModHandler.addCraftingRecipe(
+            if (null != (tStack = GTModHandler.removeRecipe(tMat, tMat, tMat, tMat, tMat, tMat, null, null, null))) {
+                GTModHandler.addCraftingRecipe(
                     tStack,
-                    bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES,
+                    bits_no_remove_buffered | GTModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES,
                     new Object[] { aTextIron2, aTextIron2, 'X', OrePrefixes.plate.get(Materials.Rubber) });
             }
         }
-        GT_ModHandler.removeRecipeByOutputDelayed(ItemList.Bottle_Empty.get(1L));
-        GT_ModHandler.removeRecipeByOutputDelayed(ItemList.IC2_Spray_WeedEx.get(1L));
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("reBattery", 1L));
-        GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Blocks.tnt));
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("dynamite", 1L));
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("industrialTnt", 1L));
-
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 0));
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 1));
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 2));
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 3));
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 4));
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 5));
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 6));
-
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "engine", 1L, 0));
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "engine", 1L, 1));
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "engine", 1L, 2));
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "engine", 1L, 4));
-
-        ItemStack tStack = GT_ModHandler
+        GTModHandler.removeRecipeByOutputDelayed(ItemList.Bottle_Empty.get(1L));
+        GTModHandler.removeRecipeByOutputDelayed(ItemList.IC2_Spray_WeedEx.get(1L));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("reBattery", 1L));
+        GTModHandler.removeRecipeByOutputDelayed(new ItemStack(Blocks.tnt));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("dynamite", 1L));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("industrialTnt", 1L));
+
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getModItem(Forestry.ID, "stamps", 1L, 0));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getModItem(Forestry.ID, "stamps", 1L, 1));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getModItem(Forestry.ID, "stamps", 1L, 2));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getModItem(Forestry.ID, "stamps", 1L, 3));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getModItem(Forestry.ID, "stamps", 1L, 4));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getModItem(Forestry.ID, "stamps", 1L, 5));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getModItem(Forestry.ID, "stamps", 1L, 6));
+
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getModItem(Forestry.ID, "engine", 1L, 0));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getModItem(Forestry.ID, "engine", 1L, 1));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getModItem(Forestry.ID, "engine", 1L, 2));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getModItem(Forestry.ID, "engine", 1L, 4));
+
+        ItemStack tStack = GTModHandler
             .removeRecipe(new ItemStack(Blocks.planks, 1, 0), null, null, new ItemStack(Blocks.planks, 1, 0));
         if (tStack != null) {
-            GT_ModHandler.addCraftingRecipe(
-                GT_Utility.copyAmount(
-                    GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
+            GTModHandler.addCraftingRecipe(
+                GTUtility.copyAmount(
+                    GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
                     tStack),
                 bits_no_remove_buffered,
                 new Object[] { "s", "P", "P", 'P', OrePrefixes.plank.get(Materials.Wood) });
-            GT_ModHandler.addCraftingRecipe(
-                GT_Utility.copyAmount(
-                    GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize / 2 : tStack.stackSize,
-                    tStack),
+            GTModHandler.addCraftingRecipe(
+                GTUtility
+                    .copyAmount(GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize / 2 : tStack.stackSize, tStack),
                 bits_no_remove_buffered,
                 new Object[] { "P", "P", 'P', OrePrefixes.plank.get(Materials.Wood) });
         }
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.stone_button, 2, 0),
             bits_no_remove_buffered,
             new Object[] { "S", "S", 'S', OrePrefixes.stone });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.stone_button, 1, 0),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.stone });
 
-        GT_Log.out.println("GT_Mod: Adding Vanilla Convenience Recipes.");
+        GTLog.out.println("GTMod: Adding Vanilla Convenience Recipes.");
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.stonebrick, 1, 3),
             bits_no_remove_buffered,
             new Object[] { "f", "X", 'X', new ItemStack(Blocks.double_stone_slab, 1, 8) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.gravel, 1, 0),
             bits_no_remove_buffered,
             new Object[] { "h", "X", 'X', new ItemStack(Blocks.cobblestone, 1, 0) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.sand, 1, 0),
             bits_no_remove_buffered,
             new Object[] { "h", "X", 'X', new ItemStack(Blocks.gravel, 1, 0) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.cobblestone, 1, 0),
             bits_no_remove_buffered,
             new Object[] { "h", "X", 'X', new ItemStack(Blocks.stone, 1, 0) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.stonebrick, 1, 2),
             bits_no_remove_buffered,
             new Object[] { "h", "X", 'X', new ItemStack(Blocks.stonebrick, 1, 0) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.double_stone_slab, 1, 8),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.double_stone_slab, 1, 0) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.double_stone_slab, 1, 0),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.double_stone_slab, 1, 8) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.double_stone_slab, 1, 0),
             bits_no_remove_buffered,
             new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 0) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.cobblestone, 1, 0),
             bits_no_remove_buffered,
             new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 3) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.brick_block, 1, 0),
             bits_no_remove_buffered,
             new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 4) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.stonebrick, 1, 0),
             bits_no_remove_buffered,
             new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 5) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.nether_brick, 1, 0),
             bits_no_remove_buffered,
             new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 6) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.quartz_block, 1, 0),
             bits_no_remove_buffered,
             new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 7) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.double_stone_slab, 1, 8),
             bits_no_remove_buffered,
             new Object[] { "B", "B", 'B', new ItemStack(Blocks.stone_slab, 1, 8) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.planks, 1, 0),
             bits_no_remove_buffered,
             new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 0) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.planks, 1, 1),
             bits_no_remove_buffered,
             new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.planks, 1, 2),
             bits_no_remove_buffered,
             new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 2) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.planks, 1, 3),
             bits_no_remove_buffered,
             new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 3) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.planks, 1, 4),
             bits_no_remove_buffered,
             new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 4) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.planks, 1, 5),
             bits_no_remove_buffered,
             new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 5) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.planks, 1, 6),
             bits_no_remove_buffered,
             new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 6) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.planks, 1, 7),
             bits_no_remove_buffered,
             new Object[] { "B", "B", 'B', new ItemStack(Blocks.wooden_slab, 1, 7) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.stick, 2, 0),
             bits_no_remove_buffered,
             new Object[] { "s", "X", 'X', new ItemStack(Blocks.deadbush, 1, 32767) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.stick, 2, 0),
             bits_no_remove_buffered,
             new Object[] { "s", "X", 'X', new ItemStack(Blocks.tallgrass, 1, 0) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.stick, 1, 0),
             bits_no_remove_buffered,
             new Object[] { "s", "X", 'X', OrePrefixes.treeSapling });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.comparator, 1, 0),
             bits_no_remove_buffered,
             new Object[] { " T ", "TQT", "SSS", 'Q', OreDictNames.craftingQuartz, 'S', OrePrefixes.stoneSmooth, 'T',
                 OreDictNames.craftingRedstoneTorch });
 
-        GT_Log.out.println("GT_Mod: Adding Tool Recipes.");
-        GT_ModHandler.addCraftingRecipe(
+        GTLog.out.println("GTMod: Adding Tool Recipes.");
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.minecart, 1),
-            bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
+            bits_no_remove_buffered | GTModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
             new Object[] { " h ", "PwP", "WPW", 'P', OrePrefixes.plate.get(Materials.AnyIron), 'W',
                 ItemList.Component_Minecart_Wheels_Iron });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.minecart, 1),
             bits_no_remove_buffered,
             new Object[] { " h ", "PwP", "WPW", 'P', OrePrefixes.plate.get(Materials.Steel), 'W',
                 ItemList.Component_Minecart_Wheels_Steel });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.chest_minecart, 1),
-            bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE
-                | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
+            bits_no_remove_buffered | GTModHandler.RecipeBits.REVERSIBLE
+                | GTModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
             new Object[] { "X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', OreDictNames.craftingChest });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.furnace_minecart, 1),
-            bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE
-                | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
+            bits_no_remove_buffered | GTModHandler.RecipeBits.REVERSIBLE
+                | GTModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
             new Object[] { "X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', OreDictNames.craftingFurnace });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.hopper_minecart, 1),
-            bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE
-                | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
+            bits_no_remove_buffered | GTModHandler.RecipeBits.REVERSIBLE
+                | GTModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
             new Object[] { "X", "C", 'C', new ItemStack(Items.minecart, 1), 'X',
                 new ItemStack(Blocks.hopper, 1, 32767) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.tnt_minecart, 1),
-            bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE
-                | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
+            bits_no_remove_buffered | GTModHandler.RecipeBits.REVERSIBLE
+                | GTModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
             new Object[] { "X", "C", 'C', new ItemStack(Items.minecart, 1), 'X', new ItemStack(Blocks.tnt, 1, 32767) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.chainmail_helmet, 1),
-            bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE
-                | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
+            bits_no_remove_buffered | GTModHandler.RecipeBits.REVERSIBLE
+                | GTModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
             new Object[] { "RRR", "RhR", 'R', OrePrefixes.ring.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.chainmail_chestplate, 1),
-            bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE
-                | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
+            bits_no_remove_buffered | GTModHandler.RecipeBits.REVERSIBLE
+                | GTModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
             new Object[] { "RhR", "RRR", "RRR", 'R', OrePrefixes.ring.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.chainmail_leggings, 1),
-            bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE
-                | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
+            bits_no_remove_buffered | GTModHandler.RecipeBits.REVERSIBLE
+                | GTModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
             new Object[] { "RRR", "RhR", "R R", 'R', OrePrefixes.ring.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.chainmail_boots, 1),
-            bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE
-                | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
+            bits_no_remove_buffered | GTModHandler.RecipeBits.REVERSIBLE
+                | GTModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
             new Object[] { "R R", "RhR", 'R', OrePrefixes.ring.get(Materials.Steel) });
 
-        GT_Log.out.println("GT_Mod: Adding Wool and Color releated Recipes.");
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTLog.out.println("GTMod: Adding Wool and Color releated Recipes.");
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.wool, 1, 1),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeOrange });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.wool, 1, 2),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeMagenta });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.wool, 1, 3),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeLightBlue });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.wool, 1, 4),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeYellow });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.wool, 1, 5),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeLime });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.wool, 1, 6),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyePink });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.wool, 1, 7),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeGray });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.wool, 1, 8),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeLightGray });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.wool, 1, 9),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeCyan });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.wool, 1, 10),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyePurple });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.wool, 1, 11),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeBlue });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.wool, 1, 12),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeBrown });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.wool, 1, 13),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeGreen });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.wool, 1, 14),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeRed });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Blocks.wool, 1, 15),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.wool, 1, 0), Dyes.dyeBlack });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.stained_glass, 8, 0),
             bits_no_remove_buffered,
             new Object[] { "GGG", "GDG", "GGG", 'G', new ItemStack(Blocks.glass, 1), 'D', Dyes.dyeWhite });
 
-        GT_Log.out.println("GT_Mod: Putting a Potato on a Stick.");
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTLog.out.println("GTMod: Putting a Potato on a Stick.");
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Packaged_PotatoChips.get(1L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.foil.get(Materials.Aluminium), ItemList.Food_PotatoChips });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Packaged_ChiliChips.get(1L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.foil.get(Materials.Aluminium), ItemList.Food_ChiliChips });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Packaged_Fries.get(1L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.plateDouble.get(Materials.Paper), ItemList.Food_Fries });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Chum_On_Stick.get(1L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.stick.get(Materials.Wood), ItemList.Food_Chum });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Potato_On_Stick.get(1L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.stick.get(Materials.Wood), ItemList.Food_Raw_Potato });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Potato_On_Stick_Roasted.get(1L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.stick.get(Materials.Wood), ItemList.Food_Baked_Potato });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Dough.get(1L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.bucket.get(Materials.Water), OrePrefixes.dust.get(Materials.Wheat) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Dough_Sugar.get(2L),
             bits_no_remove_buffered,
             new Object[] { "foodDough", OrePrefixes.dust.get(Materials.Sugar) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Dough_Chocolate.get(2L),
             bits_no_remove_buffered,
             new Object[] { "foodDough", OrePrefixes.dust.get(Materials.Cocoa) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Dough_Chocolate.get(2L),
             bits_no_remove_buffered,
             new Object[] { "foodDough", OrePrefixes.dust.get(Materials.Chocolate) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Flat_Dough.get(1L),
             bits_no_remove_buffered,
             new Object[] { "foodDough", ToolDictNames.craftingToolRollingPin });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Raw_Bun.get(1L),
             bits_no_remove_buffered,
             new Object[] { "foodDough" });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Raw_Bread.get(1L),
             bits_no_remove_buffered,
             new Object[] { "foodDough", "foodDough" });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Raw_Baguette.get(1L),
             bits_no_remove_buffered,
             new Object[] { "foodDough", "foodDough", "foodDough" });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Raw_Cake.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Dough_Sugar, ItemList.Food_Dough_Sugar, ItemList.Food_Dough_Sugar,
                 ItemList.Food_Dough_Sugar });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_ChiliChips.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_PotatoChips, OrePrefixes.dust.get(Materials.Chili) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Sliced_Buns.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Bun });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Sliced_Breads.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Bread });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Sliced_Baguettes.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Baguette, ItemList.Food_Sliced_Baguette });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Sliced_Bun.get(2L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Buns });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Sliced_Bread.get(2L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Breads });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Sliced_Baguette.get(2L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Baguettes });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Burger_Veggie.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Buns, ItemList.Food_Sliced_Cucumber, ItemList.Food_Sliced_Tomato,
                 ItemList.Food_Sliced_Onion });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Burger_Cheese.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Buns, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese,
                 ItemList.Food_Sliced_Cheese });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Burger_Meat.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Buns, OrePrefixes.dust.get(Materials.MeatCooked) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Burger_Chum.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Buns, ItemList.Food_Chum });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Burger_Veggie.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Cucumber,
                 ItemList.Food_Sliced_Tomato, ItemList.Food_Sliced_Onion });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Burger_Cheese.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Cheese,
                 ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Burger_Meat.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Bun,
                 OrePrefixes.dust.get(Materials.MeatCooked) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Burger_Chum.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Bun, ItemList.Food_Sliced_Bun, ItemList.Food_Chum });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Sandwich_Veggie.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Breads, ItemList.Food_Sliced_Cucumber, ItemList.Food_Sliced_Cucumber,
                 ItemList.Food_Sliced_Tomato, ItemList.Food_Sliced_Tomato, ItemList.Food_Sliced_Onion });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Sandwich_Cheese.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Breads, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese,
                 ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Sandwich_Bacon.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Breads, new ItemStack(Items.cooked_porkchop, 1) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Sandwich_Steak.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Breads, new ItemStack(Items.cooked_beef, 1) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Sandwich_Veggie.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Cucumber,
                 ItemList.Food_Sliced_Cucumber, ItemList.Food_Sliced_Tomato, ItemList.Food_Sliced_Tomato,
                 ItemList.Food_Sliced_Onion });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Sandwich_Cheese.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Cheese,
                 ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese,
                 ItemList.Food_Sliced_Cheese });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Sandwich_Bacon.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Bread,
                 new ItemStack(Items.cooked_porkchop, 1) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Sandwich_Steak.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Bread, ItemList.Food_Sliced_Bread,
                 new ItemStack(Items.cooked_beef, 1) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Large_Sandwich_Veggie.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Baguettes, ItemList.Food_Sliced_Cucumber, ItemList.Food_Sliced_Cucumber,
                 ItemList.Food_Sliced_Cucumber, ItemList.Food_Sliced_Tomato, ItemList.Food_Sliced_Tomato,
                 ItemList.Food_Sliced_Tomato, ItemList.Food_Sliced_Onion });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Large_Sandwich_Cheese.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Baguettes, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese,
                 ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese,
                 ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Large_Sandwich_Bacon.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Baguettes, new ItemStack(Items.cooked_porkchop, 1),
                 new ItemStack(Items.cooked_porkchop, 1) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Large_Sandwich_Steak.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Baguettes, new ItemStack(Items.cooked_beef, 1),
                 new ItemStack(Items.cooked_beef, 1) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Large_Sandwich_Veggie.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Baguette, ItemList.Food_Sliced_Baguette, ItemList.Food_Sliced_Cucumber,
                 ItemList.Food_Sliced_Cucumber, ItemList.Food_Sliced_Cucumber, ItemList.Food_Sliced_Tomato,
                 ItemList.Food_Sliced_Tomato, ItemList.Food_Sliced_Tomato, ItemList.Food_Sliced_Onion });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Large_Sandwich_Cheese.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Baguette, ItemList.Food_Sliced_Baguette, ItemList.Food_Sliced_Cheese,
                 ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese,
                 ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Large_Sandwich_Bacon.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Baguette, ItemList.Food_Sliced_Baguette,
                 new ItemStack(Items.cooked_porkchop, 1), new ItemStack(Items.cooked_porkchop, 1) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Large_Sandwich_Steak.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Sliced_Baguette, ItemList.Food_Sliced_Baguette,
                 new ItemStack(Items.cooked_beef, 1), new ItemStack(Items.cooked_beef, 1) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Raw_Pizza_Veggie.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Flat_Dough, ItemList.Food_Sliced_Cucumber, ItemList.Food_Sliced_Tomato,
                 ItemList.Food_Sliced_Onion });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Raw_Pizza_Cheese.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Flat_Dough, ItemList.Food_Sliced_Cheese, ItemList.Food_Sliced_Cheese,
                 ItemList.Food_Sliced_Cheese });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Food_Raw_Pizza_Meat.get(1L),
             bits_no_remove_buffered,
             new Object[] { ItemList.Food_Flat_Dough, OrePrefixes.dust.get(Materials.MeatCooked) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Food_Sliced_Cheese.get(4L),
             bits_no_remove_buffered,
             new Object[] { "kX", 'X', "foodCheese" });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Food_Sliced_Lemon.get(4L),
             bits_no_remove_buffered,
             new Object[] { "kX", 'X', "cropLemon" });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Food_Sliced_Tomato.get(4L),
             bits_no_remove_buffered,
             new Object[] { "kX", 'X', "cropTomato" });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Food_Sliced_Onion.get(4L),
             bits_no_remove_buffered,
             new Object[] { "kX", 'X', "cropOnion" });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Food_Sliced_Cucumber.get(4L),
             bits_no_remove_buffered,
             new Object[] { "kX", 'X', "cropCucumber" });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Food_Sliced_Bun.get(2L),
             bits_no_remove_buffered,
             new Object[] { "kX", 'X', ItemList.Food_Baked_Bun });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Food_Sliced_Bread.get(2L),
             bits_no_remove_buffered,
             new Object[] { "kX", 'X', ItemList.Food_Baked_Bread });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Food_Sliced_Baguette.get(2L),
             bits_no_remove_buffered,
             new Object[] { "kX", 'X', ItemList.Food_Baked_Baguette });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Food_Raw_PotatoChips.get(1L),
             bits_no_remove_buffered,
             new Object[] { "kX", 'X', "cropPotato" });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Food_Raw_Cookie.get(4L),
             bits_no_remove_buffered,
             new Object[] { "kX", 'X', ItemList.Food_Dough_Chocolate });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Food_Raw_Fries.get(1L),
             bits_no_remove_buffered,
             new Object[] { "k", "X", 'X', "cropPotato" });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.bowl, 1),
             bits_no_remove_buffered,
             new Object[] { "k", "X", 'X', OrePrefixes.plank.get(Materials.Wood) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Rubber, 1L),
+        GTModHandler.addCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.ring, Materials.Rubber, 1L),
             bits_no_remove_buffered,
             new Object[] { "k", "X", 'X', OrePrefixes.plate.get(Materials.Rubber) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.arrow, 1),
-            bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
+            bits_no_remove_buffered | GTModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
             new Object[] { "  H", " S ", "F  ", 'H', new ItemStack(Items.flint, 1, 32767), 'S',
                 OrePrefixes.stick.get(Materials.Wood), 'F', OreDictNames.craftingFeather });
 
-        GT_ModHandler.removeRecipe(
+        GTModHandler.removeRecipe(
             new ItemStack(Blocks.planks),
             null,
             new ItemStack(Blocks.planks),
             null,
             new ItemStack(Blocks.planks));
-        GT_ModHandler.removeRecipeByOutputDelayed(ItemList.Food_Baked_Bread.get(1L));
-        GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.cookie, 1));
-        GT_ModHandler.removeRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L),
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L),
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L));
-        if (null != GT_Utility.setStack(
-            GT_ModHandler.getRecipeOutput(
+        GTModHandler.removeRecipeByOutputDelayed(ItemList.Food_Baked_Bread.get(1L));
+        GTModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.cookie, 1));
+        GTModHandler.removeRecipe(
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L));
+        if (null != GTUtility.setStack(
+            GTModHandler.getRecipeOutput(
                 true,
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L),
                 null,
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L)),
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L))) {
-            GT_Log.out.println("GT_Mod: Changed Forestrys Bronze Recipe");
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L)),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L))) {
+            GTLog.out.println("GTMod: Changed Forestrys Bronze Recipe");
         }
-        tStack = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1L);
+        tStack = GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1L);
 
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getRecipeOutput(
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getRecipeOutput(
                 null,
                 new ItemStack(Blocks.sand, 1, 0),
                 null,
                 null,
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Apatite, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.Apatite, 1L),
                 null,
                 null,
                 new ItemStack(Blocks.sand, 1, 0),
                 null),
-            GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "S", "A", "S", 'A', OrePrefixes.dust.get(Materials.Apatite), 'S',
                 new ItemStack(Blocks.sand, 1, 32767) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getRecipeOutput(
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getRecipeOutput(
                 tStack,
                 tStack,
                 tStack,
                 tStack,
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Apatite, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.Apatite, 1L),
                 tStack,
                 tStack,
                 tStack,
                 tStack),
-            GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "SSS", "SAS", "SSS", 'A', OrePrefixes.dust.get(Materials.Apatite), 'S',
                 OrePrefixes.dust.get(Materials.Ash) });
 
-        GT_Log.out.println("GT_Mod: Adding Mixed Metal Ingot Recipes.");
-        GT_ModHandler.removeRecipeByOutputDelayed(ItemList.IC2_Mixed_Metal_Ingot.get(1L));
+        GTLog.out.println("GTMod: Adding Mixed Metal Ingot Recipes.");
+        GTModHandler.removeRecipeByOutputDelayed(ItemList.IC2_Mixed_Metal_Ingot.get(1L));
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(1L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(1L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(1L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(1L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(1L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(1L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.AnyIron), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(1L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Nickel), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(1L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Nickel), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(1L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Nickel), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(1L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Nickel), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(1L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Nickel), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(1L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Nickel), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(2L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Invar), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(2L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Invar), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(3L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Invar), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(2L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Invar), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(2L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Invar), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(3L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Invar), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(2L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Steel), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(2L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Steel), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(3L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Steel), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(2L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Steel), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(2L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Steel), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(3L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Steel), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(3L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.StainlessSteel), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(3L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.StainlessSteel), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(4L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.StainlessSteel), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(3L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.StainlessSteel), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(3L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.StainlessSteel), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(4L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.StainlessSteel), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(3L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Titanium), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(3L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Titanium), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(4L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Titanium), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(3L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Titanium), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(3L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Titanium), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(4L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Titanium), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(3L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Tungsten), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(3L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Tungsten), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(4L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Tungsten), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(3L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Tungsten), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(3L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Tungsten), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(4L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Tungsten), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(5L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(5L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(6L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y',
                 OrePrefixes.plate.get(Materials.Bronze), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(5L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(5L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(6L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y',
                 OrePrefixes.plate.get(Materials.Brass), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(8L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y',
                 OrePrefixes.plate.get(Materials.Chrome), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(8L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y',
                 OrePrefixes.plate.get(Materials.Chrome), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(8L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y',
                 OrePrefixes.plate.get(Materials.Chrome), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(10L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y',
                 OrePrefixes.plate.get(Materials.StainlessSteel), 'Z', OrePrefixes.plate.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(10L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y',
                 OrePrefixes.plate.get(Materials.StainlessSteel), 'Z', OrePrefixes.plate.get(Materials.Zinc) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(10L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.TungstenSteel), 'Y',
                 OrePrefixes.plate.get(Materials.StainlessSteel), 'Z', OrePrefixes.plate.get(Materials.Aluminium) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(12L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Iridium), 'Y',
                 OrePrefixes.plate.get(Materials.Chrome), 'Z', OrePrefixes.plate.get(Materials.AnnealedCopper) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(12L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Iridium), 'Y',
                 OrePrefixes.plate.get(Materials.Chrome), 'Z', OrePrefixes.plate.get(Materials.RoseGold) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(12L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Iridium), 'Y',
                 OrePrefixes.plate.get(Materials.Chrome), 'Z', OrePrefixes.plate.get(Materials.AstralSilver) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(14L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Iridium), 'Y',
                 OrePrefixes.plate.get(Materials.StainlessSteel), 'Z',
                 OrePrefixes.plate.get(Materials.AnnealedCopper) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(14L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Iridium), 'Y',
                 OrePrefixes.plate.get(Materials.StainlessSteel), 'Z', OrePrefixes.plate.get(Materials.RoseGold) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(14L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Iridium), 'Y',
                 OrePrefixes.plate.get(Materials.StainlessSteel), 'Z', OrePrefixes.plate.get(Materials.AstralSilver) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(16L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSG), 'Y',
                 OrePrefixes.plate.get(Materials.StainlessSteel), 'Z',
                 OrePrefixes.plate.get(Materials.AnnealedCopper) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(16L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSG), 'Y',
                 OrePrefixes.plate.get(Materials.StainlessSteel), 'Z', OrePrefixes.plate.get(Materials.RoseGold) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(16L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSG), 'Y',
                 OrePrefixes.plate.get(Materials.StainlessSteel), 'Z', OrePrefixes.plate.get(Materials.AstralSilver) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(18L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSE), 'Y',
                 OrePrefixes.plate.get(Materials.Chrome), 'Z', OrePrefixes.plate.get(Materials.AnnealedCopper) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(18L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSE), 'Y',
                 OrePrefixes.plate.get(Materials.Chrome), 'Z', OrePrefixes.plate.get(Materials.RoseGold) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(18L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSE), 'Y',
                 OrePrefixes.plate.get(Materials.Chrome), 'Z', OrePrefixes.plate.get(Materials.AstralSilver) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(20L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSS), 'Y',
                 OrePrefixes.plate.get(Materials.TungstenSteel), 'Z', OrePrefixes.plate.get(Materials.AnnealedCopper) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(20L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSS), 'Y',
                 OrePrefixes.plate.get(Materials.TungstenSteel), 'Z', OrePrefixes.plate.get(Materials.RoseGold) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(20L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.HSSS), 'Y',
                 OrePrefixes.plate.get(Materials.TungstenSteel), 'Z', OrePrefixes.plate.get(Materials.AstralSilver) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Long_Distance_Pipeline_Fluid.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { "GPG", "IwI", "GPG", 'G', GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Steel, 1L),
-                'P', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L), 'I',
-                GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Steel, 1L) });
-        GT_ModHandler.addCraftingRecipe(
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { "GPG", "IwI", "GPG", 'G', GTOreDictUnificator.get(OrePrefixes.gear, Materials.Steel, 1L),
+                'P', GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L), 'I',
+                GTOreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Steel, 1L) });
+        GTModHandler.addCraftingRecipe(
             ItemList.Long_Distance_Pipeline_Item.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { "GPG", "IwI", "GPG", 'G', GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Steel, 1L),
-                'P', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L), 'I',
-                GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Tin, 1L) });
-        GT_ModHandler.addCraftingRecipe(
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { "GPG", "IwI", "GPG", 'G', GTOreDictUnificator.get(OrePrefixes.gear, Materials.Steel, 1L),
+                'P', GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L), 'I',
+                GTOreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Tin, 1L) });
+        GTModHandler.addCraftingRecipe(
             ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(32L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { "PPP", "IwI", "PPP", 'P', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L),
-                'I', GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 1L) });
-        GT_ModHandler.addCraftingRecipe(
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { "PPP", "IwI", "PPP", 'P', GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L),
+                'I', GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 1L) });
+        GTModHandler.addCraftingRecipe(
             ItemList.Long_Distance_Pipeline_Item_Pipe.get(32L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { "PPP", "IwI", "PPP", 'P', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L),
-                'I', GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Tin, 1L) });
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { "PPP", "IwI", "PPP", 'P', GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L),
+                'I', GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Tin, 1L) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(22L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Naquadah), 'Y',
                 OrePrefixes.plate.get(Materials.Iridium), 'Z', OrePrefixes.plate.get(Materials.HSSG) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(24L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Naquadah), 'Y',
                 OrePrefixes.plate.get(Materials.Iridium), 'Z', OrePrefixes.plate.get(Materials.HSSE) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(26L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Naquadah), 'Y',
                 OrePrefixes.plate.get(Materials.Iridium), 'Z', OrePrefixes.plate.get(Materials.HSSS) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(28L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.NaquadahAlloy), 'Y',
                 OrePrefixes.plate.get(Materials.Osmiridium), 'Z', OrePrefixes.plate.get(Materials.HSSE) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(30L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.NaquadahAlloy), 'Y',
                 OrePrefixes.plate.get(Materials.Osmiridium), 'Z', OrePrefixes.plate.get(Materials.HSSG) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(32L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.NaquadahAlloy), 'Y',
                 OrePrefixes.plate.get(Materials.Osmiridium), 'Z', OrePrefixes.plate.get(Materials.HSSS) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(34L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Neutronium), 'Y',
                 OrePrefixes.plate.get(Materials.EnergeticAlloy), 'Z', OrePrefixes.plate.get(Materials.Naquadah) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(36L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Neutronium), 'Y',
                 OrePrefixes.plate.get(Materials.EnergeticAlloy), 'Z', OrePrefixes.plate.get(Materials.NaquadahAlloy) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(38L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.Neutronium), 'Y',
                 OrePrefixes.plate.get(Materials.EnergeticAlloy), 'Z', OrePrefixes.plate.get(Materials.Draconium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(40L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.BlackPlutonium), 'Y',
                 OrePrefixes.plate.get(Materials.Sunnarium), 'Z', OrePrefixes.plate.get(Materials.Naquadah) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(42L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.BlackPlutonium), 'Y',
                 OrePrefixes.plate.get(Materials.Sunnarium), 'Z', OrePrefixes.plate.get(Materials.NaquadahAlloy) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(44L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.BlackPlutonium), 'Y',
                 OrePrefixes.plate.get(Materials.Sunnarium), 'Z', OrePrefixes.plate.get(Materials.Draconium) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(48L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.DraconiumAwakened), 'Y',
                 OrePrefixes.plate.get(Materials.Neutronium), 'Z', OrePrefixes.plate.get(Materials.HSSS) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(52L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.DraconiumAwakened), 'Y',
                 OrePrefixes.plate.get(Materials.Neutronium), 'Z', OrePrefixes.plate.get(Materials.Naquadah) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(56L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.DraconiumAwakened), 'Y',
                 OrePrefixes.plate.get(Materials.Neutronium), 'Z', OrePrefixes.plate.get(Materials.NaquadahAlloy) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.IC2_Mixed_Metal_Ingot.get(64L),
             bits_no_remove_buffered,
             new Object[] { "X", "Y", "Z", 'X', OrePrefixes.plate.get(Materials.DraconiumAwakened), 'Y',
                 OrePrefixes.plate.get(Materials.Neutronium), 'Z', OrePrefixes.plate.get(Materials.BlackPlutonium) });
 
-        GT_Log.out.println("GT_Mod: Beginning to add regular Crafting Recipes.");
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("scaffold", 4L),
+        GTLog.out.println("GTMod: Beginning to add regular Crafting Recipes.");
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("scaffold", 4L),
             bits_no_remove_buffered,
             new Object[] { "WWW", " S ", "S S", 'W', OrePrefixes.plank.get(Materials.Wood), 'S',
                 OrePrefixes.stick.get(Materials.Wood) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.stick.get(Materials.AnyIron), OrePrefixes.dust.get(Materials.Redstone),
                 OrePrefixes.dust.get(Materials.Redstone), OrePrefixes.dust.get(Materials.Redstone),
                 OrePrefixes.dust.get(Materials.Redstone) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Paper, 1L),
+        GTModHandler.addCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.ring, Materials.Paper, 1L),
             bits_no_remove_buffered,
             new Object[] { "PPk", 'P', OrePrefixes.plate.get(Materials.Paper) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.torch, 2),
             bits_no_remove_buffered,
             new Object[] { "C", "S", 'C', OrePrefixes.dust.get(Materials.Sulfur), 'S',
                 OrePrefixes.stick.get(Materials.Wood) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.torch, 6),
             bits_no_remove_buffered,
             new Object[] { "C", "S", 'C', OrePrefixes.dust.get(Materials.TricalciumPhosphate), 'S',
                 OrePrefixes.stick.get(Materials.Wood) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.piston, 1),
             bits_no_remove_buffered,
             new Object[] { "WWW", "CBC", "CRC", 'W', OrePrefixes.plank.get(Materials.Wood), 'C',
                 OrePrefixes.stoneCobble, 'R', OrePrefixes.dust.get(Materials.Redstone), 'B',
                 OrePrefixes.ingot.get(Materials.AnyIron) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.piston, 1),
             bits_no_remove_buffered,
             new Object[] { "WWW", "CBC", "CRC", 'W', OrePrefixes.plank.get(Materials.Wood), 'C',
                 OrePrefixes.stoneCobble, 'R', OrePrefixes.dust.get(Materials.Redstone), 'B',
                 OrePrefixes.ingot.get(Materials.AnyBronze) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.piston, 1),
             bits_no_remove_buffered,
             new Object[] { "WWW", "CBC", "CRC", 'W', OrePrefixes.plank.get(Materials.Wood), 'C',
                 OrePrefixes.stoneCobble, 'R', OrePrefixes.dust.get(Materials.Redstone), 'B',
                 OrePrefixes.ingot.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.piston, 1),
             bits_no_remove_buffered,
             new Object[] { "WWW", "CBC", "CRC", 'W', OrePrefixes.plank.get(Materials.Wood), 'C',
                 OrePrefixes.stoneCobble, 'R', OrePrefixes.dust.get(Materials.Redstone), 'B',
                 OrePrefixes.ingot.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Blocks.piston, 1),
             bits_no_remove_buffered,
             new Object[] { "WWW", "CBC", "CRC", 'W', OrePrefixes.plank.get(Materials.Wood), 'C',
                 OrePrefixes.stoneCobble, 'R', OrePrefixes.dust.get(Materials.Redstone), 'B',
                 OrePrefixes.ingot.get(Materials.Titanium) });
 
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("reactorVent", 1L, 1),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("reactorVent", 1L, 1),
             bits_no_remove_buffered,
             new Object[] { "AIA", "I I", "AIA", 'I', new ItemStack(Blocks.iron_bars, 1), 'A',
                 OrePrefixes.plate.get(Materials.Aluminium) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_ModHandler.getIC2Item("reactorPlatingExplosive", 1L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTModHandler.getIC2Item("reactorPlatingExplosive", 1L),
             bits_no_remove_buffered,
-            new Object[] { GT_ModHandler.getIC2Item("reactorPlating", 1L), OrePrefixes.plate.get(Materials.Lead) });
+            new Object[] { GTModHandler.getIC2Item("reactorPlating", 1L), OrePrefixes.plate.get(Materials.Lead) });
         if (!Materials.Steel.mBlastFurnaceRequired) {
-            GT_ModHandler.addShapelessCraftingRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1L),
+            GTModHandler.addShapelessCraftingRecipe(
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1L),
                 bits_no_remove_buffered,
                 new Object[] { OrePrefixes.dust.get(Materials.Iron), OrePrefixes.dust.get(Materials.Coal),
                     OrePrefixes.dust.get(Materials.Coal) });
         }
 
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 1L));
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 3L),
+        GTModHandler.removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 1L));
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 3L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.AnyCopper),
                 OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.Zinc) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Brass, 9L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Brass, 9L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Tetrahedrite), OrePrefixes.dust.get(Materials.Tetrahedrite),
                 OrePrefixes.dust.get(Materials.Tetrahedrite), OrePrefixes.dust.get(Materials.Zinc) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 3L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 3L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.AnyCopper),
                 OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.Tin) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Bronze, 9L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Bronze, 9L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Tetrahedrite), OrePrefixes.dust.get(Materials.Tetrahedrite),
                 OrePrefixes.dust.get(Materials.Tetrahedrite), OrePrefixes.dust.get(Materials.Tin) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Invar, 9L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Invar, 9L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Iron), OrePrefixes.dust.get(Materials.Iron),
                 OrePrefixes.dust.get(Materials.Nickel) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cupronickel, 6L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cupronickel, 6L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Nickel), OrePrefixes.dust.get(Materials.AnyCopper) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RoseGold, 4L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.RoseGold, 4L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Gold), OrePrefixes.dust.get(Materials.Gold),
                 OrePrefixes.dust.get(Materials.Gold), OrePrefixes.dust.get(Materials.Gold),
                 OrePrefixes.dust.get(Materials.AnyCopper) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SterlingSilver, 4L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.SterlingSilver, 4L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Silver), OrePrefixes.dust.get(Materials.Silver),
                 OrePrefixes.dust.get(Materials.Silver), OrePrefixes.dust.get(Materials.Silver),
                 OrePrefixes.dust.get(Materials.AnyCopper) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackBronze, 4L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.BlackBronze, 4L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Gold), OrePrefixes.dust.get(Materials.Silver),
                 OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.AnyCopper),
                 OrePrefixes.dust.get(Materials.AnyCopper) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BismuthBronze, 4L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.BismuthBronze, 4L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Bismuth), OrePrefixes.dust.get(Materials.Zinc),
                 OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.AnyCopper),
                 OrePrefixes.dust.get(Materials.AnyCopper) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CobaltBrass, 8L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.CobaltBrass, 8L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Brass), OrePrefixes.dust.get(Materials.Brass),
                 OrePrefixes.dust.get(Materials.Brass), OrePrefixes.dust.get(Materials.Brass),
@@ -1361,137 +1359,137 @@ public class GT_CraftingRecipeLoader implements Runnable {
                 OrePrefixes.dust.get(Materials.Brass), OrePrefixes.dust.get(Materials.Aluminium),
                 OrePrefixes.dust.get(Materials.Cobalt) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DamascusSteel, 2L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.DamascusSteel, 2L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Steel), OrePrefixes.dustSmall.get(Materials.Nickel),
                 OrePrefixes.dustSmall.get(Materials.Nickel), OrePrefixes.dustSmall.get(Materials.Nickel),
                 OrePrefixes.dustTiny.get(Materials.Coal), OrePrefixes.dustTiny.get(Materials.Silicon),
                 OrePrefixes.dustTiny.get(Materials.Manganese), OrePrefixes.dustTiny.get(Materials.Chrome),
                 OrePrefixes.dustTiny.get(Materials.Molybdenum) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DamascusSteel, 2L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.DamascusSteel, 2L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Steel), OrePrefixes.dustSmall.get(Materials.Manganese),
                 OrePrefixes.dustSmall.get(Materials.Manganese), OrePrefixes.dustSmall.get(Materials.Chrome),
                 OrePrefixes.dustSmall.get(Materials.Chrome), OrePrefixes.dustTiny.get(Materials.Coal),
                 OrePrefixes.dustTiny.get(Materials.Silicon), OrePrefixes.dustTiny.get(Materials.Vanadium) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RedstoneAlloy, 2L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.RedstoneAlloy, 2L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Redstone), OrePrefixes.dust.get(Materials.Silicon),
                 OrePrefixes.dust.get(Materials.Coal) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CrudeSteel, 2L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.CrudeSteel, 2L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Clay), OrePrefixes.dust.get(Materials.Flint),
                 OrePrefixes.dust.get(Materials.Stone) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ConductiveIron, 2L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.ConductiveIron, 2L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.RedstoneAlloy), OrePrefixes.dust.get(Materials.Iron),
                 OrePrefixes.dust.get(Materials.Silver) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.EnergeticAlloy, 2L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.EnergeticAlloy, 2L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.ConductiveIron), OrePrefixes.dust.get(Materials.Gold),
                 OrePrefixes.dust.get(Materials.BlackSteel) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.EnergeticSilver, 2L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.EnergeticSilver, 2L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.ConductiveIron), OrePrefixes.dust.get(Materials.Silver),
                 OrePrefixes.dust.get(Materials.BlackSteel) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectricalSteel, 2L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.ElectricalSteel, 2L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Steel), OrePrefixes.dust.get(Materials.Coal),
                 OrePrefixes.dust.get(Materials.Silicon) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Soularium, 2L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Soularium, 2L),
             bits_no_remove_buffered,
             new Object[] { new ItemStack(Blocks.soul_sand, 1, 32767), OrePrefixes.dust.get(Materials.Gold),
                 OrePrefixes.dust.get(Materials.Ash) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkSteel, 2L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.DarkSteel, 2L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.ElectricalSteel), OrePrefixes.dust.get(Materials.Coal),
                 OrePrefixes.dust.get(Materials.Obsidian) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Manyullyn, 3L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Manyullyn, 3L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Ardite), OrePrefixes.dust.get(Materials.Ardite),
                 OrePrefixes.dust.get(Materials.Ardite), OrePrefixes.dust.get(Materials.Ardite),
                 OrePrefixes.dust.get(Materials.Cobalt), OrePrefixes.dust.get(Materials.Cobalt),
                 OrePrefixes.dust.get(Materials.Cobalt), OrePrefixes.dust.get(Materials.Cobalt) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Haderoth, 1L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Haderoth, 1L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Rubracium), OrePrefixes.dust.get(Materials.Mithril) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Celenegil, 1L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Celenegil, 1L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Platinum), OrePrefixes.dust.get(Materials.Orichalcum) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IronWood, 2L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.IronWood, 2L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Iron), OrePrefixes.dust.get(Materials.LiveRoot),
                 OrePrefixes.dustTiny.get(Materials.Gold) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Hepatizon, 3L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Hepatizon, 3L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Copper), OrePrefixes.dust.get(Materials.Copper),
                 OrePrefixes.dust.get(Materials.Copper), OrePrefixes.dustTiny.get(Materials.Gold),
                 OrePrefixes.dustTiny.get(Materials.Gold), OrePrefixes.dustTiny.get(Materials.Gold),
                 OrePrefixes.dustTiny.get(Materials.Silver), OrePrefixes.dustTiny.get(Materials.Silver),
                 OrePrefixes.dustTiny.get(Materials.Silver) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Angmallen, 2L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Angmallen, 2L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Iron), OrePrefixes.dust.get(Materials.Gold) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Inolashite, 1L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Inolashite, 1L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Alduorite), OrePrefixes.dust.get(Materials.Ceruclase) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Items.gunpowder, 6),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Coal), OrePrefixes.dust.get(Materials.Coal),
                 OrePrefixes.dust.get(Materials.Coal), OrePrefixes.dust.get(Materials.Sulfur),
                 OrePrefixes.dust.get(Materials.Saltpeter), OrePrefixes.dust.get(Materials.Saltpeter) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Items.gunpowder, 6),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Charcoal), OrePrefixes.dust.get(Materials.Charcoal),
                 OrePrefixes.dust.get(Materials.Charcoal), OrePrefixes.dust.get(Materials.Sulfur),
                 OrePrefixes.dust.get(Materials.Saltpeter), OrePrefixes.dust.get(Materials.Saltpeter) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Items.gunpowder, 6),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Carbon), OrePrefixes.dust.get(Materials.Carbon),
                 OrePrefixes.dust.get(Materials.Carbon), OrePrefixes.dust.get(Materials.Sulfur),
                 OrePrefixes.dust.get(Materials.Saltpeter), OrePrefixes.dust.get(Materials.Saltpeter) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IndiumGalliumPhosphide, 3L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.IndiumGalliumPhosphide, 3L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Indium), OrePrefixes.dust.get(Materials.Gallium),
                 OrePrefixes.dust.get(Materials.Phosphorus) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 5L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 5L),
             bits_no_remove_buffered,
             new Object[] { OrePrefixes.dust.get(Materials.Potassium), OrePrefixes.cell.get(Materials.Nitrogen),
                 OrePrefixes.cell.get(Materials.Oxygen), OrePrefixes.cell.get(Materials.Oxygen),
                 OrePrefixes.cell.get(Materials.Oxygen) });
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("carbonFiber", 1L));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("carbonFiber", 1L));
 
         ItemStack[] tChestAndTank = new ItemStack[] { ItemList.Super_Chest_EV.get(1), ItemList.Super_Chest_IV.get(1),
             ItemList.Super_Chest_HV.get(1), ItemList.Super_Chest_MV.get(1), ItemList.Super_Chest_LV.get(1),
@@ -1501,7 +1499,7 @@ public class GT_CraftingRecipeLoader implements Runnable {
             ItemList.Super_Tank_LV.get(1), ItemList.Quantum_Tank_EV.get(1), ItemList.Quantum_Tank_IV.get(1),
             ItemList.Quantum_Tank_HV.get(1), ItemList.Quantum_Tank_MV.get(1), ItemList.Quantum_Tank_LV.get(1) };
         for (ItemStack tItem : tChestAndTank) {
-            GT_ModHandler.addShapelessCraftingRecipe(tItem, new Object[] { tItem });
+            GTModHandler.addShapelessCraftingRecipe(tItem, new Object[] { tItem });
         }
 
         List<ItemStack> iToRemoveAndHide = Arrays
@@ -1509,13 +1507,13 @@ public class GT_CraftingRecipeLoader implements Runnable {
                 new String[] { "copperCableItem", "insulatedCopperCableItem", "goldCableItem", "insulatedGoldCableItem",
                     "insulatedIronCableItem", "glassFiberCableItem", "tinCableItem", "ironCableItem",
                     "insulatedTinCableItem", "detectorCableItem", "splitterCableItem", "electrolyzer", "cutter" })
-            .map(x -> GT_ModHandler.getIC2Item(x, 1L))
+            .map(x -> GTModHandler.getIC2Item(x, 1L))
             .collect(Collectors.toList());
 
         if (NotEnoughItems.isModLoaded()) {
             iToRemoveAndHide.forEach(item -> {
                 codechicken.nei.api.API.hideItem(item);
-                GT_ModHandler.removeRecipeByOutputDelayed(item);
+                GTModHandler.removeRecipeByOutputDelayed(item);
             });
         }
 
@@ -1526,180 +1524,180 @@ public class GT_CraftingRecipeLoader implements Runnable {
                     "coil", "powerunit", "powerunitsmall", "remote", "odScanner", "ovScanner", "solarHelmet",
                     "staticBoots", "ecMeter", "obscurator", "overclockerUpgrade", "transformerUpgrade",
                     "energyStorageUpgrade", "ejectorUpgrade", "suBattery", "frequencyTransmitter", "pullingUpgrade" })
-            .map(x -> GT_ModHandler.getIC2Item(x, 1L))
-            .forEach(GT_ModHandler::removeRecipeByOutputDelayed);
+            .map(x -> GTModHandler.getIC2Item(x, 1L))
+            .forEach(GTModHandler::removeRecipeByOutputDelayed);
 
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("batBox", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("batBox", 1L),
             bits_no_remove_buffered,
             new Object[] { "PCP", "BBB", "PPP", 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'P',
                 OrePrefixes.plank.get(Materials.Wood), 'B', OrePrefixes.battery.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("mfeUnit", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("mfeUnit", 1L),
             bits_no_remove_buffered,
             new Object[] { "CEC", "EME", "CEC", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'E',
-                OrePrefixes.battery.get(Materials.IV), 'M', GT_ModHandler.getIC2Item("machine", 1L) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("lvTransformer", 1L),
+                OrePrefixes.battery.get(Materials.IV), 'M', GTModHandler.getIC2Item("machine", 1L) });
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("lvTransformer", 1L),
             bits_no_remove_buffered,
             new Object[] { "PCP", "POP", "PCP", 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'O',
-                GT_ModHandler.getIC2Item("coil", 1L), 'P', OrePrefixes.plank.get(Materials.Wood) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("mvTransformer", 1L),
+                GTModHandler.getIC2Item("coil", 1L), 'P', OrePrefixes.plank.get(Materials.Wood) });
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("mvTransformer", 1L),
             bits_no_remove_buffered,
             new Object[] { "CMC", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'M',
-                GT_ModHandler.getIC2Item("machine", 1L) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("hvTransformer", 1L),
+                GTModHandler.getIC2Item("machine", 1L) });
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("hvTransformer", 1L),
             bits_no_remove_buffered,
             new Object[] { " C ", "IMB", " C ", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'M',
-                GT_ModHandler.getIC2Item("mvTransformer", 1L), 'I', OrePrefixes.circuit.get(Materials.LV), 'B',
+                GTModHandler.getIC2Item("mvTransformer", 1L), 'I', OrePrefixes.circuit.get(Materials.LV), 'B',
                 OrePrefixes.battery.get(Materials.HV) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("evTransformer", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("evTransformer", 1L),
             bits_no_remove_buffered,
             new Object[] { " C ", "IMB", " C ", 'C', OrePrefixes.cableGt01.get(Materials.Aluminium), 'M',
-                GT_ModHandler.getIC2Item("hvTransformer", 1L), 'I', OrePrefixes.circuit.get(Materials.HV), 'B',
+                GTModHandler.getIC2Item("hvTransformer", 1L), 'I', OrePrefixes.circuit.get(Materials.HV), 'B',
                 OrePrefixes.battery.get(Materials.LuV) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("cesuUnit", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("cesuUnit", 1L),
             bits_no_remove_buffered,
             new Object[] { "PCP", "BBB", "PPP", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'P',
                 OrePrefixes.plate.get(Materials.Bronze), 'B', OrePrefixes.battery.get(Materials.HV) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("teleporter", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("teleporter", 1L),
             bits_no_remove_buffered,
             new Object[] { "GFG", "CMC", "GDG", 'C', OrePrefixes.cableGt01.get(Materials.Platinum), 'G',
                 OrePrefixes.circuit.get(Materials.HV), 'D', OrePrefixes.gem.get(Materials.Diamond), 'M',
-                GT_ModHandler.getIC2Item("machine", 1L), 'F', GT_ModHandler.getIC2Item("frequencyTransmitter", 1L) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("energyOMat", 1L),
+                GTModHandler.getIC2Item("machine", 1L), 'F', GTModHandler.getIC2Item("frequencyTransmitter", 1L) });
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("energyOMat", 1L),
             bits_no_remove_buffered,
             new Object[] { "RBR", "CMC", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'R',
                 OrePrefixes.dust.get(Materials.Redstone), 'B', OrePrefixes.battery.get(Materials.LV), 'M',
-                GT_ModHandler.getIC2Item("machine", 1L) });
+                GTModHandler.getIC2Item("machine", 1L) });
 
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("boatElectric", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("boatElectric", 1L),
             bits_no_remove_buffered,
             new Object[] { "CCC", "XWX", aTextIron2, 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'X',
-                OrePrefixes.plate.get(Materials.Iron), 'W', GT_ModHandler.getIC2Item("waterMill", 1L) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("cropnalyzer", 1L),
+                OrePrefixes.plate.get(Materials.Iron), 'W', GTModHandler.getIC2Item("waterMill", 1L) });
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("cropnalyzer", 1L),
             bits_no_remove_buffered,
             new Object[] { "CC ", "RGR", "RIR", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'R',
                 OrePrefixes.dust.get(Materials.Redstone), 'G', OrePrefixes.block.get(Materials.Glass), 'I',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("coil", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("coil", 1L),
             bits_no_remove_buffered,
             new Object[] { "CCC", "CXC", "CCC", 'C', OrePrefixes.wireGt01.get(Materials.Copper), 'X',
                 OrePrefixes.ingot.get(Materials.AnyIron) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("powerunit", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("powerunit", 1L),
             bits_no_remove_buffered,
             new Object[] { "BCA", "BIM", "BCA", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'B',
-                OrePrefixes.battery.get(Materials.LV), 'A', GT_ModHandler.getIC2Item("casingiron", 1L), 'I',
-                OrePrefixes.circuit.get(Materials.LV), 'M', GT_ModHandler.getIC2Item("elemotor", 1L) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("powerunitsmall", 1L),
+                OrePrefixes.battery.get(Materials.LV), 'A', GTModHandler.getIC2Item("casingiron", 1L), 'I',
+                OrePrefixes.circuit.get(Materials.LV), 'M', GTModHandler.getIC2Item("elemotor", 1L) });
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("powerunitsmall", 1L),
             bits_no_remove_buffered,
             new Object[] { " CA", "BIM", " CA", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'B',
-                OrePrefixes.battery.get(Materials.LV), 'A', GT_ModHandler.getIC2Item("casingiron", 1L), 'I',
-                OrePrefixes.circuit.get(Materials.LV), 'M', GT_ModHandler.getIC2Item("elemotor", 1L) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("remote", 1L),
+                OrePrefixes.battery.get(Materials.LV), 'A', GTModHandler.getIC2Item("casingiron", 1L), 'I',
+                OrePrefixes.circuit.get(Materials.LV), 'M', GTModHandler.getIC2Item("elemotor", 1L) });
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("remote", 1L),
             bits_no_remove_buffered,
             new Object[] { " C ", "TLT", " F ", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'L',
-                OrePrefixes.dust.get(Materials.Lapis), 'T', GT_ModHandler.getIC2Item("casingtin", 1L), 'F',
-                GT_ModHandler.getIC2Item("frequencyTransmitter", 1L) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("odScanner", 1L),
+                OrePrefixes.dust.get(Materials.Lapis), 'T', GTModHandler.getIC2Item("casingtin", 1L), 'F',
+                GTModHandler.getIC2Item("frequencyTransmitter", 1L) });
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("odScanner", 1L),
             bits_no_remove_buffered,
             new Object[] { "PGP", "CBC", "WWW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'G',
                 OrePrefixes.dust.get(Materials.Glowstone), 'B', OrePrefixes.battery.get(Materials.HV), 'C',
-                OrePrefixes.circuit.get(Materials.HV), 'P', GT_ModHandler.getIC2Item("casinggold", 1L) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("ovScanner", 1L),
+                OrePrefixes.circuit.get(Materials.HV), 'P', GTModHandler.getIC2Item("casinggold", 1L) });
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("ovScanner", 1L),
             bits_no_remove_buffered,
             new Object[] { "PDP", "GCG", "WSW", 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G',
                 OrePrefixes.dust.get(Materials.Glowstone), 'D', OrePrefixes.battery.get(Materials.IV), 'C',
-                OrePrefixes.circuit.get(Materials.HV), 'P', GT_ModHandler.getIC2Item("casinggold", 1L), 'S',
-                GT_ModHandler.getIC2Item("odScanner", 1L) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("staticBoots", 1L),
+                OrePrefixes.circuit.get(Materials.HV), 'P', GTModHandler.getIC2Item("casinggold", 1L), 'S',
+                GTModHandler.getIC2Item("odScanner", 1L) });
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("staticBoots", 1L),
             bits_no_remove_buffered,
             new Object[] { "I I", "IWI", "CCC", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'I',
                 OrePrefixes.ingot.get(Materials.Iron), 'W', new ItemStack(Blocks.wool) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("ecMeter", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("ecMeter", 1L),
             bits_no_remove_buffered,
             new Object[] { " G ", "CIC", "C C", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'G',
                 OrePrefixes.dust.get(Materials.Glowstone), 'I', OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("obscurator", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("obscurator", 1L),
             bits_no_remove_buffered,
             new Object[] { "RER", "CAC", "RRR", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'R',
                 OrePrefixes.dust.get(Materials.Redstone), 'E', OrePrefixes.battery.get(Materials.HV), 'A',
                 OrePrefixes.circuit.get(Materials.HV) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("overclockerUpgrade", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("overclockerUpgrade", 1L),
             bits_no_remove_buffered,
             new Object[] { "CCC", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'C',
-                GT_ModHandler.getIC2Item("reactorCoolantSimple", 1L, 1), 'E', OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("transformerUpgrade", 1L),
+                GTModHandler.getIC2Item("reactorCoolantSimple", 1L, 1), 'E', OrePrefixes.circuit.get(Materials.LV) });
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("transformerUpgrade", 1L),
             bits_no_remove_buffered,
             new Object[] { "GGG", "WTW", "GEG", 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'T',
-                GT_ModHandler.getIC2Item("mvTransformer", 1L), 'E', OrePrefixes.circuit.get(Materials.LV), 'G',
+                GTModHandler.getIC2Item("mvTransformer", 1L), 'E', OrePrefixes.circuit.get(Materials.LV), 'G',
                 OrePrefixes.block.get(Materials.Glass) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("energyStorageUpgrade", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("energyStorageUpgrade", 1L),
             bits_no_remove_buffered,
             new Object[] { "PPP", "WBW", "PEP", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'E',
                 OrePrefixes.circuit.get(Materials.LV), 'P', OrePrefixes.plank.get(Materials.Wood), 'B',
                 OrePrefixes.battery.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("ejectorUpgrade", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("ejectorUpgrade", 1L),
             bits_no_remove_buffered,
             new Object[] { "PHP", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'E',
                 OrePrefixes.circuit.get(Materials.LV), 'P', new ItemStack(Blocks.piston), 'H',
                 new ItemStack(Blocks.hopper) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("suBattery", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("suBattery", 1L),
             bits_no_remove_buffered,
             new Object[] { "W", "C", "R", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'C',
                 OrePrefixes.dust.get(Materials.HydratedCoal), 'R', OrePrefixes.dust.get(Materials.Redstone) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("pullingUpgrade", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("pullingUpgrade", 1L),
             bits_no_remove_buffered,
             new Object[] { "PHP", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'P',
                 new ItemStack(Blocks.sticky_piston), 'R', new ItemStack(Blocks.hopper), 'E',
                 OrePrefixes.circuit.get(Materials.LV) });
 
         if (NotEnoughItems.isModLoaded()) {
-            codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("reactorUraniumSimple", 1L, 1));
-            codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("reactorUraniumDual", 1L, 1));
-            codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("reactorUraniumQuad", 1L, 1));
-            codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("reactorMOXSimple", 1L, 1));
-            codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("reactorMOXDual", 1L, 1));
-            codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("reactorMOXQuad", 1L, 1));
+            codechicken.nei.api.API.hideItem(GTModHandler.getIC2Item("reactorUraniumSimple", 1L, 1));
+            codechicken.nei.api.API.hideItem(GTModHandler.getIC2Item("reactorUraniumDual", 1L, 1));
+            codechicken.nei.api.API.hideItem(GTModHandler.getIC2Item("reactorUraniumQuad", 1L, 1));
+            codechicken.nei.api.API.hideItem(GTModHandler.getIC2Item("reactorMOXSimple", 1L, 1));
+            codechicken.nei.api.API.hideItem(GTModHandler.getIC2Item("reactorMOXDual", 1L, 1));
+            codechicken.nei.api.API.hideItem(GTModHandler.getIC2Item("reactorMOXQuad", 1L, 1));
         }
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("UranFuel", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("UranFuel", 1L),
             bits_no_remove_buffered,
             new Object[] { "UUU", "NNN", "UUU", 'U', OrePrefixes.ingot.get(Materials.Uranium), 'N',
                 OrePrefixes.nugget.get(Materials.Uranium235) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("MOXFuel", 1L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("MOXFuel", 1L),
             bits_no_remove_buffered,
             new Object[] { "UUU", "NNN", "UUU", 'U', OrePrefixes.ingot.get(Materials.Uranium), 'N',
                 OrePrefixes.ingot.get(Materials.Plutonium) });
 
-        GT_ModHandler.removeRecipeByOutputDelayed(Ic2Items.miningLaser.copy());
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.removeRecipeByOutputDelayed(Ic2Items.miningLaser.copy());
+        GTModHandler.addCraftingRecipe(
             Ic2Items.miningLaser.copy(),
-            GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G',
                 OrePrefixes.gemExquisite.get(Materials.Diamond), 'E', ItemList.Emitter_HV, 'C',
                 OrePrefixes.circuit.get(Materials.IV), 'S', OrePrefixes.screw.get(Materials.Titanium), 'B',
@@ -1707,10 +1705,10 @@ public class GT_CraftingRecipeLoader implements Runnable {
                     Ic2Items.chargingEnergyCrystal.copy()
                         .getItem(),
                     1,
-                    GT_Values.W) });
-        GT_ModHandler.addCraftingRecipe(
+                    GTValues.W) });
+        GTModHandler.addCraftingRecipe(
             Ic2Items.miningLaser.copy(),
-            GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G',
                 OrePrefixes.gemExquisite.get(Materials.Ruby), 'E', ItemList.Emitter_HV, 'C',
                 OrePrefixes.circuit.get(Materials.IV), 'S', OrePrefixes.screw.get(Materials.Titanium), 'B',
@@ -1718,10 +1716,10 @@ public class GT_CraftingRecipeLoader implements Runnable {
                     Ic2Items.chargingEnergyCrystal.copy()
                         .getItem(),
                     1,
-                    GT_Values.W) });
-        GT_ModHandler.addCraftingRecipe(
+                    GTValues.W) });
+        GTModHandler.addCraftingRecipe(
             Ic2Items.miningLaser.copy(),
-            GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G',
                 OrePrefixes.gemExquisite.get(Materials.Jasper), 'E', ItemList.Emitter_HV, 'C',
                 OrePrefixes.circuit.get(Materials.IV), 'S', OrePrefixes.screw.get(Materials.Titanium), 'B',
@@ -1729,10 +1727,10 @@ public class GT_CraftingRecipeLoader implements Runnable {
                     Ic2Items.chargingEnergyCrystal.copy()
                         .getItem(),
                     1,
-                    GT_Values.W) });
-        GT_ModHandler.addCraftingRecipe(
+                    GTValues.W) });
+        GTModHandler.addCraftingRecipe(
             Ic2Items.miningLaser.copy(),
-            GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G',
                 OrePrefixes.gemExquisite.get(Materials.GarnetRed), 'E', ItemList.Emitter_HV, 'C',
                 OrePrefixes.circuit.get(Materials.IV), 'S', OrePrefixes.screw.get(Materials.Titanium), 'B',
@@ -1740,29 +1738,29 @@ public class GT_CraftingRecipeLoader implements Runnable {
                     Ic2Items.chargingEnergyCrystal.copy()
                         .getItem(),
                     1,
-                    GT_Values.W) });
+                    GTValues.W) });
 
-        GT_ModHandler.removeRecipeDelayed(GT_ModHandler.getIC2Item("miningPipe", 8));
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("miningPipe", 1),
-            GT_ModHandler.RecipeBits.BUFFERED,
+        GTModHandler.removeRecipeDelayed(GTModHandler.getIC2Item("miningPipe", 8));
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("miningPipe", 1),
+            GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "hPf", 'P', OrePrefixes.pipeSmall.get(Materials.Steel) });
 
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("luminator", 16L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("luminator", 16L),
             bits_no_remove_buffered,
             new Object[] { "RTR", "GHG", "GGG", 'H', OrePrefixes.cell.get(Materials.Helium), 'T',
                 OrePrefixes.ingot.get(Materials.Tin), 'R', OrePrefixes.ingot.get(Materials.AnyIron), 'G',
                 new ItemStack(Blocks.glass, 1) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("luminator", 16L),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("luminator", 16L),
             bits_no_remove_buffered,
             new Object[] { "RTR", "GHG", "GGG", 'H', OrePrefixes.cell.get(Materials.Mercury), 'T',
                 OrePrefixes.ingot.get(Materials.Tin), 'R', OrePrefixes.ingot.get(Materials.AnyIron), 'G',
                 new ItemStack(Blocks.glass, 1) });
 
-        GT_ModHandler.removeRecipeDelayed(
-            tStack = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L),
+        GTModHandler.removeRecipeDelayed(
+            tStack = GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L),
             tStack,
             tStack,
             tStack,
@@ -1771,8 +1769,8 @@ public class GT_CraftingRecipeLoader implements Runnable {
             tStack,
             tStack,
             tStack);
-        GT_ModHandler.removeRecipeDelayed(
-            tStack = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L),
+        GTModHandler.removeRecipeDelayed(
+            tStack = GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L),
             tStack,
             tStack,
             tStack,
@@ -1781,193 +1779,193 @@ public class GT_CraftingRecipeLoader implements Runnable {
             tStack,
             tStack,
             tStack);
-        GT_ModHandler.removeRecipeDelayed(
+        GTModHandler.removeRecipeDelayed(
             null,
             tStack = new ItemStack(Items.coal, 1),
             null,
             tStack,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L),
             tStack,
             null,
             tStack,
             null);
 
-        GT_ModHandler.removeFurnaceSmelting(new ItemStack(Blocks.hopper));
+        GTModHandler.removeFurnaceSmelting(new ItemStack(Blocks.hopper));
 
-        GT_Log.out.println("GT_Mod: Applying harder Recipes for several Blocks."); // TODO: Not Buffered
+        GTLog.out.println("GTMod: Applying harder Recipes for several Blocks."); // TODO: Not Buffered
 
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1));
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1),
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("reactorReflectorThick", 1L, 1));
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("reactorReflectorThick", 1L, 1),
             bits_no_remove_buffered,
             new Object[] { " N ", "NBN", " N ", 'B', OrePrefixes.plateDouble.get(Materials.Beryllium), 'N',
-                GT_ModHandler.getIC2Item("reactorReflector", 1L, 1) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1),
+                GTModHandler.getIC2Item("reactorReflector", 1L, 1) });
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("reactorReflectorThick", 1L, 1),
             bits_no_remove_buffered,
             new Object[] { " B ", "NCN", " B ", 'B', OrePrefixes.plate.get(Materials.Beryllium), 'N',
-                GT_ModHandler.getIC2Item("reactorReflector", 1L, 1), 'C',
+                GTModHandler.getIC2Item("reactorReflector", 1L, 1), 'C',
                 OrePrefixes.plate.get(Materials.TungstenCarbide) });
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("reactorReflector", 1L, 1));
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("reactorReflector", 1L, 1),
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("reactorReflector", 1L, 1));
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("reactorReflector", 1L, 1),
             bits_no_remove_buffered,
             new Object[] { "TGT", "GSG", "TGT", 'T', OrePrefixes.plate.get(Materials.Tin), 'G',
                 OrePrefixes.dust.get(Materials.Graphite), 'S', OrePrefixes.plateDouble.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("reactorReflector", 1L, 1),
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("reactorReflector", 1L, 1),
             bits_no_remove_buffered,
             new Object[] { "TTT", "GSG", "TTT", 'T', OrePrefixes.plate.get(Materials.TinAlloy), 'G',
                 OrePrefixes.dust.get(Materials.Graphite), 'S', OrePrefixes.plate.get(Materials.Beryllium) });
 
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("crophavester", 1L));
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("crophavester", 1L),
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("crophavester", 1L));
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("crophavester", 1L),
             bits_no_remove_buffered,
             new Object[] { "ACA", "PMS", "WOW", 'M', ItemList.Hull_MV, 'C', OrePrefixes.circuit.get(Materials.MV), 'A',
                 ItemList.Robot_Arm_LV, 'P', ItemList.Electric_Piston_LV, 'S', ItemList.Sensor_LV, 'W',
                 OrePrefixes.toolHeadSense.get(Materials.Aluminium), 'O', ItemList.Conveyor_Module_LV });
 
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("RTGenerator", 1L));
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("RTGenerator", 1L),
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("RTGenerator", 1L));
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("RTGenerator", 1L),
             bits_no_remove_buffered,
             new Object[] { "III", "IMI", "ICI", 'I', OrePrefixes.itemCasing.get(Materials.Steel), 'C',
                 OrePrefixes.circuit.get(Materials.LuV), 'M', ItemList.Hull_IV });
 
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("RTHeatGenerator", 1L));
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("RTHeatGenerator", 1L),
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("RTHeatGenerator", 1L));
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("RTHeatGenerator", 1L),
             bits_no_remove_buffered,
             new Object[] { "III", "IMB", "ICI", 'I', OrePrefixes.itemCasing.get(Materials.Steel), 'C',
                 OrePrefixes.circuit.get(Materials.LuV), 'M', ItemList.Hull_IV, 'B',
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Copper, 1) });
-
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("carbonrotor", 1L));
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("carbonrotor", 1L),
-            bits_no_remove_buffered,
-            new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("carbonrotorblade", 1), 'S',
-                OrePrefixes.screw.get(Materials.Iridium), 'T', GT_ModHandler.getIC2Item("steelshaft", 1) });
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("steelrotor", 1L));
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("steelrotor", 1L),
-            bits_no_remove_buffered,
-            new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("steelrotorblade", 1), 'S',
-                OrePrefixes.screw.get(Materials.StainlessSteel), 'T', GT_ModHandler.getIC2Item("ironshaft", 1) });
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("ironrotor", 1L));
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("ironrotor", 1L),
-            bits_no_remove_buffered,
-            new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("ironrotorblade", 1), 'S',
-                OrePrefixes.screw.get(Materials.WroughtIron), 'T', GT_ModHandler.getIC2Item("ironshaft", 1) });
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("woodrotor", 1L));
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("woodrotor", 1L),
-            bits_no_remove_buffered,
-            new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("woodrotorblade", 1), 'S',
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Copper, 1) });
+
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("carbonrotor", 1L));
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("carbonrotor", 1L),
+            bits_no_remove_buffered,
+            new Object[] { "dBS", "BTB", "SBw", 'B', GTModHandler.getIC2Item("carbonrotorblade", 1), 'S',
+                OrePrefixes.screw.get(Materials.Iridium), 'T', GTModHandler.getIC2Item("steelshaft", 1) });
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("steelrotor", 1L));
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("steelrotor", 1L),
+            bits_no_remove_buffered,
+            new Object[] { "dBS", "BTB", "SBw", 'B', GTModHandler.getIC2Item("steelrotorblade", 1), 'S',
+                OrePrefixes.screw.get(Materials.StainlessSteel), 'T', GTModHandler.getIC2Item("ironshaft", 1) });
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("ironrotor", 1L));
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("ironrotor", 1L),
+            bits_no_remove_buffered,
+            new Object[] { "dBS", "BTB", "SBw", 'B', GTModHandler.getIC2Item("ironrotorblade", 1), 'S',
+                OrePrefixes.screw.get(Materials.WroughtIron), 'T', GTModHandler.getIC2Item("ironshaft", 1) });
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("woodrotor", 1L));
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("woodrotor", 1L),
+            bits_no_remove_buffered,
+            new Object[] { "dBS", "BTB", "SBw", 'B', GTModHandler.getIC2Item("woodrotorblade", 1), 'S',
                 OrePrefixes.screw.get(Materials.WroughtIron), 'T', OrePrefixes.stickLong.get(Materials.WroughtIron) });
 
-        if (GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Diamond, 1L) != null) {
-            tStack = GT_ModHandler.getRecipeOutput(
-                GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Iron, 1L),
+        if (GTOreDictUnificator.get(OrePrefixes.gear, Materials.Diamond, 1L) != null) {
+            tStack = GTModHandler.getRecipeOutput(
+                GTOreDictUnificator.get(OrePrefixes.gear, Materials.Iron, 1L),
                 new ItemStack(Items.redstone, 1),
-                GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Iron, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Gold, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Iron, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Gold, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Diamond, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gear, Materials.Iron, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gear, Materials.Gold, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gear, Materials.Iron, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gear, Materials.Gold, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gear, Materials.Diamond, 1L),
                 new ItemStack(Items.diamond_pickaxe, 1),
-                GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Diamond, 1L));
-            GT_ModHandler.removeRecipeByOutputDelayed(tStack);
-            GT_ModHandler.addCraftingRecipe(
+                GTOreDictUnificator.get(OrePrefixes.gear, Materials.Diamond, 1L));
+            GTModHandler.removeRecipeByOutputDelayed(tStack);
+            GTModHandler.addCraftingRecipe(
                 tStack,
                 bits_no_remove_buffered,
                 new Object[] { "ICI", "GIG", "DPD", 'C', OrePrefixes.circuit.get(Materials.HV), 'D',
                     OrePrefixes.gear.get(Materials.Diamond), 'G', OrePrefixes.gear.get(Materials.Gold), 'I',
-                    OrePrefixes.gear.get(Materials.Steel), 'P', GT_ModHandler.getIC2Item("diamondDrill", 1L, 32767) });
+                    OrePrefixes.gear.get(Materials.Steel), 'P', GTModHandler.getIC2Item("diamondDrill", 1L, 32767) });
         }
 
-        GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.paper));
-        GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.sugar));
-        GT_ModHandler.addCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 2),
-            GT_ModHandler.RecipeBits.BUFFERED,
+        GTModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.paper));
+        GTModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.sugar));
+        GTModHandler.addCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 2),
+            GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "SSS", " m ", 'S', new ItemStack(Items.reeds) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1),
-            GT_ModHandler.RecipeBits.BUFFERED,
+        GTModHandler.addCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1),
+            GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "Sm ", 'S', new ItemStack(Items.reeds) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.paper, Materials.Empty, 2),
-            GT_ModHandler.RecipeBits.BUFFERED,
-            new Object[] { " C ", "SSS", " C ", 'S', GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 1),
-                'C', new ItemStack(Blocks.stone_slab) });
+        GTModHandler.addCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.paper, Materials.Empty, 2),
+            GTModHandler.RecipeBits.BUFFERED,
+            new Object[] { " C ", "SSS", " C ", 'S', GTOreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 1), 'C',
+                new ItemStack(Blocks.stone_slab) });
 
-        GT_Log.out.println("GT_Mod: Applying Recipes for Tools");
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("nanoSaber", 1L));
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("nanoSaber", 1L),
+        GTLog.out.println("GTMod: Applying Recipes for Tools");
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("nanoSaber", 1L));
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("nanoSaber", 1L),
             bits_no_remove_buffered,
             new Object[] { "PI ", "PI ", "CLC", 'L', OrePrefixes.battery.get(Materials.EV), 'I',
                 OrePrefixes.plateAlloy.get("Iridium"), 'P', OrePrefixes.plate.get(Materials.Platinum), 'C',
                 OrePrefixes.circuit.get(Materials.IV) });
 
-        GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.flint_and_steel, 1));
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.flint_and_steel, 1));
+        GTModHandler.addCraftingRecipe(
             new ItemStack(Items.flint_and_steel, 1),
             bits_no_remove_buffered,
             new Object[] { "S ", " F", 'F', new ItemStack(Items.flint, 1), 'S', "nuggetSteel" });
 
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("diamondDrill", 1L));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("diamondDrill", 1L));
 
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("miningDrill", 1L));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("miningDrill", 1L));
 
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("chainsaw", 1L));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("chainsaw", 1L));
 
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("electricHoe", 1L));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("electricHoe", 1L));
 
-        GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("electricTreetap", 1L));
+        GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("electricTreetap", 1L));
 
         if (GraviSuite.isModLoaded()) {
-            GT_ModHandler.removeRecipeByOutputDelayed(
-                GT_ModHandler.getModItem(GraviSuite.ID, "advNanoChestPlate", 1, GT_Values.W));
-            GT_ModHandler.addCraftingRecipe(
-                GT_ModHandler.getModItem(GraviSuite.ID, "advNanoChestPlate", 1, GT_Values.W),
+            GTModHandler.removeRecipeByOutputDelayed(
+                GTModHandler.getModItem(GraviSuite.ID, "advNanoChestPlate", 1, GTValues.W));
+            GTModHandler.addCraftingRecipe(
+                GTModHandler.getModItem(GraviSuite.ID, "advNanoChestPlate", 1, GTValues.W),
                 bits_no_remove_buffered,
                 new Object[] { "CJC", "TNT", "WPW", 'C', OrePrefixes.plateAlloy.get(Materials.Advanced), 'T',
                     OrePrefixes.plate.get(Materials.TungstenSteel), 'J',
-                    GT_ModHandler.getModItem(GraviSuite.ID, "advJetpack", 1, GT_Values.W), 'N',
-                    GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemArmorNanoChestplate", 1, GT_Values.W), 'W',
+                    GTModHandler.getModItem(GraviSuite.ID, "advJetpack", 1, GTValues.W), 'N',
+                    GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorNanoChestplate", 1, GTValues.W), 'W',
                     OrePrefixes.wireGt12.get(Materials.Platinum), 'P', OrePrefixes.circuit.get(Materials.IV) });
 
-            GT_ModHandler
-                .removeRecipeByOutputDelayed(GT_ModHandler.getModItem(GraviSuite.ID, "advLappack", 1, GT_Values.W));
-            GT_ModHandler.addCraftingRecipe(
-                GT_ModHandler.getModItem(GraviSuite.ID, "advLappack", 1, GT_Values.W),
+            GTModHandler
+                .removeRecipeByOutputDelayed(GTModHandler.getModItem(GraviSuite.ID, "advLappack", 1, GTValues.W));
+            GTModHandler.addCraftingRecipe(
+                GTModHandler.getModItem(GraviSuite.ID, "advLappack", 1, GTValues.W),
                 bits_no_remove_buffered,
                 new Object[] { "CEC", "EJE", "WPW", 'C', OrePrefixes.plateAlloy.get(Materials.Carbon), 'J',
-                    GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemArmorEnergypack", 1L, GT_Values.W), 'E',
-                    GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1L, GT_Values.W), 'W',
+                    GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorEnergypack", 1L, GTValues.W), 'E',
+                    GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1L, GTValues.W), 'W',
                     OrePrefixes.wireGt04.get(Materials.Platinum), 'P', OrePrefixes.circuit.get(Materials.EV) });
 
-            GT_ModHandler
-                .removeRecipeByOutputDelayed(GT_ModHandler.getModItem(GraviSuite.ID, "advJetpack", 1, GT_Values.W));
-            GT_ModHandler.addCraftingRecipe(
-                GT_ModHandler.getModItem(GraviSuite.ID, "advJetpack", 1, GT_Values.W),
+            GTModHandler
+                .removeRecipeByOutputDelayed(GTModHandler.getModItem(GraviSuite.ID, "advJetpack", 1, GTValues.W));
+            GTModHandler.addCraftingRecipe(
+                GTModHandler.getModItem(GraviSuite.ID, "advJetpack", 1, GTValues.W),
                 bits_no_remove_buffered,
                 new Object[] { "CJC", "EXE", "YZY", 'C', OrePrefixes.plateAlloy.get(Materials.Carbon), 'J',
-                    GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemArmorJetpackElectric", 1, GT_Values.W), 'E',
+                    GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorJetpackElectric", 1, GTValues.W), 'E',
                     OrePrefixes.plate.get(Materials.Titanium), 'X',
-                    GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemArmorAlloyChestplate", 1L), 'Z',
+                    GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorAlloyChestplate", 1L), 'Z',
                     OrePrefixes.circuit.get(Materials.EV), 'Y', OrePrefixes.wireGt02.get(Materials.Platinum) });
         }
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             Materials.Fireclay.getDust(2),
             new Object[] { Materials.Brick.getDust(1), Materials.Clay.getDust(1) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Casing_Advanced_Rhodium_Palladium.get(1L),
             bits,
             new Object[] { "PhP", "PFP", aTextPlateWrench, 'P',
@@ -1988,26 +1986,26 @@ public class GT_CraftingRecipeLoader implements Runnable {
                 ItemStack slabWood = getModItem(Forestry.ID, "slabs", 1, i);
                 ItemStack slabWoodFireproof = getModItem(Forestry.ID, "slabsFireproof", 1, i);
 
-                GT_ModHandler.addCraftingRecipe(
+                GTModHandler.addCraftingRecipe(
                     coverIDs[i],
-                    GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
+                    GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE,
                     new Object[] { "s ", " P", 'P', slabWood });
 
-                GT_ModHandler.addCraftingRecipe(
+                GTModHandler.addCraftingRecipe(
                     coverIDs[i],
-                    GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
+                    GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE,
                     new Object[] { "s ", " P", 'P', slabWoodFireproof });
             }
         }
-        GT_ModHandler.addCraftingRecipe(
-            GT_ModHandler.getIC2Item("electronicCircuit", 1L),
-            GT_ModHandler.RecipeBits.BUFFERED,
+        GTModHandler.addCraftingRecipe(
+            GTModHandler.getIC2Item("electronicCircuit", 1L),
+            GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "RIR", "VBV", "CCC", 'R', ItemList.Circuit_Parts_Resistor.get(1), 'C',
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.RedAlloy, 1), 'V',
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.RedAlloy, 1), 'V',
                 ItemList.Circuit_Parts_Vacuum_Tube.get(1), 'B', ItemList.Circuit_Board_Coated_Basic.get(1), 'I',
                 ItemList.IC2_Item_Casing_Steel.get(1) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_ModHandler.getIC2Item("electronicCircuit", 1L),
+        GTModHandler.addShapelessCraftingRecipe(
+            GTModHandler.getIC2Item("electronicCircuit", 1L),
             new Object[] { ItemList.Circuit_Integrated.getWildcard(1L) });
     }
 }
diff --git a/src/main/java/gregtech/loaders/postload/GT_CropLoader.java b/src/main/java/gregtech/loaders/postload/CropLoader.java
index e6608a52b6..752c6923b9 100644
--- a/src/main/java/gregtech/loaders/postload/GT_CropLoader.java
+++ b/src/main/java/gregtech/loaders/postload/CropLoader.java
@@ -7,22 +7,22 @@ import net.minecraft.item.ItemStack;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_BaseCrop;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTBaseCrop;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTOreDictUnificator;
 
-public class GT_CropLoader implements Runnable {
+public class CropLoader implements Runnable {
 
     @Override
     public void run() {
-        GT_Log.out.println("GT_Mod: Register Crops to IC2.");
+        GTLog.out.println("GTMod: Register Crops to IC2.");
         try {
             /*
              * Tags: Vines = Tendrilly Edible = Food
              */
             ItemStack[] tI = { ItemList.Crop_Drop_Indigo.get(4L), ItemList.Crop_Drop_MilkWart.get(4L),
                 new ItemStack(Blocks.brown_mushroom, 4), new ItemStack(Blocks.red_mushroom, 4) };
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 124,
                 "Indigo",
                 "Eloraam",
@@ -40,7 +40,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Flower", "Blue", "Ingredient" },
                 ItemList.Crop_Drop_Indigo.get(1L),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 125,
                 "Flax",
                 "Eloraam",
@@ -58,7 +58,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Silk", "Tendrilly", "Addictive" },
                 new ItemStack(Items.string, 1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 126,
                 "Oilberries",
                 "Spacetoad",
@@ -76,7 +76,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Fire", "Dark", "Reed", "Rotten", "Coal", "Oil" },
                 ItemList.Crop_Drop_OilBerry.get(1L),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 127,
                 "Bobsyeruncleranks",
                 "GenerikB",
@@ -95,7 +95,7 @@ public class GT_CropLoader implements Runnable {
                 Materials.Emerald,
                 ItemList.Crop_Drop_BobsYerUncleRanks.get(1L),
                 new ItemStack[] { new ItemStack(Items.emerald, 1) });
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 128,
                 "Diareed",
                 "Direwolf20",
@@ -112,9 +112,9 @@ public class GT_CropLoader implements Runnable {
                 10,
                 new String[] { "Fire", "Shiny", "Reed", "Coal", "Diamond", "Crystal" },
                 Materials.Diamond,
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1L),
                 new ItemStack[] { new ItemStack(Items.diamond, 1) });
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 129,
                 "Withereed",
                 "CovertJaguar",
@@ -131,9 +131,9 @@ public class GT_CropLoader implements Runnable {
                 3,
                 new String[] { "Fire", "Undead", "Reed", "Coal", "Rotten", "Wither" },
                 Materials.Coal,
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L),
                 new ItemStack[] { new ItemStack(Items.coal, 1), new ItemStack(Items.coal, 1) });
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 130,
                 "Blazereed",
                 "Mr. Brain",
@@ -151,7 +151,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Fire", "Blaze", "Reed", "Sulfur" },
                 new ItemStack(Items.blaze_powder, 1),
                 new ItemStack[] { new ItemStack(Items.blaze_rod, 1) });
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 131,
                 "Eggplant",
                 "Link",
@@ -170,7 +170,7 @@ public class GT_CropLoader implements Runnable {
                 new ItemStack(Items.egg, 1),
                 new ItemStack[] { new ItemStack(Items.chicken, 1), new ItemStack(Items.feather, 1),
                     new ItemStack(Items.feather, 1), new ItemStack(Items.feather, 1) });
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 132,
                 "Corium",
                 "Gregorius Techneticies",
@@ -188,7 +188,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Cow", "Silk", "Tendrilly" },
                 new ItemStack(Items.leather, 1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 133,
                 "Corpseplant",
                 "Mr. Kenny",
@@ -207,7 +207,7 @@ public class GT_CropLoader implements Runnable {
                 new ItemStack(Items.rotten_flesh, 1),
                 new ItemStack[] { ItemList.Dye_Bonemeal.get(1L), ItemList.Dye_Bonemeal.get(1L),
                     new ItemStack(Items.bone, 1) });
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 134,
                 "Creeperweed",
                 "General Spaz",
@@ -223,9 +223,9 @@ public class GT_CropLoader implements Runnable {
                 1,
                 3,
                 new String[] { "Creeper", "Tendrilly", "Explosive", "Fire", "Sulfur", "Saltpeter", "Coal" },
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1L),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 135,
                 "Enderbloom",
                 "RichardG",
@@ -241,10 +241,10 @@ public class GT_CropLoader implements Runnable {
                 1,
                 6,
                 new String[] { "Ender", "Flower", "Shiny" },
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.EnderPearl, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.EnderPearl, 1L),
                 new ItemStack[] { new ItemStack(Items.ender_pearl, 1), new ItemStack(Items.ender_pearl, 1),
                     new ItemStack(Items.ender_eye, 1) });
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 136,
                 "Meatrose",
                 "VintageBeef",
@@ -263,7 +263,7 @@ public class GT_CropLoader implements Runnable {
                 new ItemStack(Items.dye, 1, 9),
                 new ItemStack[] { new ItemStack(Items.beef, 1), new ItemStack(Items.porkchop, 1),
                     new ItemStack(Items.chicken, 1), new ItemStack(Items.fish, 1) });
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 137,
                 "Milkwart",
                 "Mr. Brain",
@@ -281,7 +281,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Food", "Milk", "Cow" },
                 ItemList.Crop_Drop_MilkWart.get(1L),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 138,
                 "Slimeplant",
                 "Neowulf",
@@ -299,7 +299,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Slime", "Bouncy", "Sticky", "Bush" },
                 new ItemStack(Items.slime_ball, 1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 139,
                 "Spidernip",
                 "Mr. Kenny",
@@ -317,7 +317,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Toxic", "Silk", "Spider", "Flower", "Ingredient", "Addictive" },
                 new ItemStack(Items.string, 1),
                 new ItemStack[] { new ItemStack(Items.spider_eye, 1), new ItemStack(Blocks.web, 1) });
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 140,
                 "Tearstalks",
                 "Neowulf",
@@ -335,7 +335,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Healing", "Nether", "Ingredient", "Reed", "Ghast" },
                 new ItemStack(Items.ghast_tear, 1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 141,
                 "Tine",
                 "Gregorius Techneticies",
@@ -354,7 +354,7 @@ public class GT_CropLoader implements Runnable {
                 Materials.Tin,
                 ItemList.Crop_Drop_Tine.get(1L),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 142,
                 "Coppon",
                 "Mr. Brain",
@@ -373,7 +373,7 @@ public class GT_CropLoader implements Runnable {
                 Materials.Copper,
                 ItemList.Crop_Drop_Coppon.get(1L),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 143,
                 "Brown Mushrooms",
                 "Mr. Brain",
@@ -391,7 +391,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Food", "Mushroom", "Ingredient" },
                 new ItemStack(Blocks.brown_mushroom, 1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 144,
                 "Red Mushrooms",
                 "Mr. Kenny",
@@ -409,7 +409,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Toxic", "Mushroom", "Ingredient" },
                 new ItemStack(Blocks.red_mushroom, 1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 145,
                 "Argentia",
                 "Eloraam",
@@ -428,7 +428,7 @@ public class GT_CropLoader implements Runnable {
                 Materials.Silver,
                 ItemList.Crop_Drop_Argentia.get(1L),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 146,
                 "Plumbilia",
                 "KingLemming",
@@ -447,7 +447,7 @@ public class GT_CropLoader implements Runnable {
                 Materials.Lead,
                 ItemList.Crop_Drop_Plumbilia.get(1L),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 147,
                 "Steeleafranks",
                 "Benimatic",
@@ -463,9 +463,9 @@ public class GT_CropLoader implements Runnable {
                 2,
                 8,
                 new String[] { "Metal", "Tendrilly", "Iron" },
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steeleaf, 1L),
-                new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steeleaf, 1L) });
-            new GT_BaseCrop(
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steeleaf, 1L),
+                new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steeleaf, 1L) });
+            new GTBaseCrop(
                 148,
                 "Liveroots",
                 "Benimatic",
@@ -481,9 +481,9 @@ public class GT_CropLoader implements Runnable {
                 2,
                 6,
                 new String[] { "Wood", "Tendrilly" },
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.LiveRoot, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.LiveRoot, 1L),
                 new ItemStack[] { ItemList.TF_LiveRoot.get(1L) });
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 149,
                 "Trollplant",
                 "unknown",
@@ -499,10 +499,10 @@ public class GT_CropLoader implements Runnable {
                 2,
                 8,
                 new String[] { "Troll", "Bad", "Scrap" },
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.FoolsRuby, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.FoolsRuby, 1L),
                 new ItemStack[] { ItemList.IC2_Plantball.get(1), ItemList.IC2_Scrap.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium241, 1L) });
-            new GT_BaseCrop(
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium241, 1L) });
+            new GTBaseCrop(
                 150,
                 "Lazulia",
                 "unknown",
@@ -519,9 +519,9 @@ public class GT_CropLoader implements Runnable {
                 4,
                 new String[] { "Shiny", "Bad", "Crystal", "Lapis" },
                 Materials.Lapis,
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 1L),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 151,
                 "Glowheat",
                 "unknown",
@@ -537,9 +537,9 @@ public class GT_CropLoader implements Runnable {
                 5,
                 4,
                 new String[] { "Light", "Shiny", "Crystal" },
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 153,
                 "Fertilia",
                 "unknown",
@@ -555,11 +555,11 @@ public class GT_CropLoader implements Runnable {
                 4,
                 8,
                 new String[] { "Growth", "Healing", "Flower" },
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1L),
                 new ItemStack[] { ItemList.IC2_Fertilizer.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1L) });
-            new GT_BaseCrop(
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1L) });
+            new GTBaseCrop(
                 154,
                 "Bauxia",
                 "unknown",
@@ -578,7 +578,7 @@ public class GT_CropLoader implements Runnable {
                 Materials.Aluminium,
                 ItemList.Crop_Drop_Bauxite.get(1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 155,
                 "Titania",
                 "unknown",
@@ -597,7 +597,7 @@ public class GT_CropLoader implements Runnable {
                 Materials.Titanium,
                 ItemList.Crop_Drop_Ilmenite.get(1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 156,
                 "Reactoria",
                 "unknown",
@@ -616,7 +616,7 @@ public class GT_CropLoader implements Runnable {
                 Materials.Uranium,
                 ItemList.Crop_Drop_Pitchblende.get(1),
                 new ItemStack[] { ItemList.Crop_Drop_Uraninite.get(1) });
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 157,
                 "God of Thunder",
                 "unknown",
@@ -635,7 +635,7 @@ public class GT_CropLoader implements Runnable {
                 Materials.Thorium,
                 ItemList.Crop_Drop_Thorium.get(1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 158,
                 "Transformium",
                 "unknown",
@@ -655,7 +655,7 @@ public class GT_CropLoader implements Runnable {
                 new ItemStack[] { ItemList.Crop_Drop_UUABerry.get(1L), ItemList.Crop_Drop_UUABerry.get(1L),
                     ItemList.Crop_Drop_UUABerry.get(1L), ItemList.Crop_Drop_UUABerry.get(1L),
                     ItemList.Crop_Drop_UUMBerry.get(1L) });
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 159,
                 "Starwart",
                 "unknown",
@@ -672,11 +672,11 @@ public class GT_CropLoader implements Runnable {
                 0,
                 new String[] { "Wither", "Nether", "Undead", "Netherstar" },
                 Materials.NetherStar,
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L),
-                new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L),
+                new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L),
                     new ItemStack(Items.skull, 1), new ItemStack(Items.skull, 1, 1), new ItemStack(Items.skull, 1, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 1L) });
-            new GT_BaseCrop(
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 1L) });
+            new GTBaseCrop(
                 160,
                 "Zomplant",
                 "unknown",
@@ -694,7 +694,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Zombie", "Rotten", "Undead" },
                 new ItemStack(Items.rotten_flesh),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 161,
                 "Nickelback",
                 "unknown",
@@ -713,7 +713,7 @@ public class GT_CropLoader implements Runnable {
                 Materials.Nickel,
                 ItemList.Crop_Drop_Nickel.get(1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 162,
                 "Galvania",
                 "unknown",
@@ -732,7 +732,7 @@ public class GT_CropLoader implements Runnable {
                 Materials.Zinc,
                 ItemList.Crop_Drop_Zinc.get(1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 163,
                 "Evil Ore",
                 "unknown",
@@ -748,10 +748,10 @@ public class GT_CropLoader implements Runnable {
                 1,
                 3,
                 new String[] { "Crystal", "Fire", "Nether" },
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 1L),
-                new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 1L), });
-            new GT_BaseCrop(
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 1L),
+                new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 1L), });
+            new GTBaseCrop(
                 164,
                 "Olivia",
                 "unknown",
@@ -768,9 +768,9 @@ public class GT_CropLoader implements Runnable {
                 0,
                 new String[] { "Crystal", "Shiny", "Processing", "Olivine" },
                 Materials.Olivine,
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Olivine, 1L),
-                new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), });
-            new GT_BaseCrop(
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Olivine, 1L),
+                new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L), });
+            new GTBaseCrop(
                 165,
                 "Sapphirum",
                 "unknown",
@@ -787,9 +787,9 @@ public class GT_CropLoader implements Runnable {
                 0,
                 new String[] { "Crystal", "Shiny", "Metal", "Sapphire" },
                 Materials.Sapphire,
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sapphire, 1L),
-                new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), });
-            new GT_BaseCrop(
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sapphire, 1L),
+                new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L), });
+            new GTBaseCrop(
                 166,
                 "Pyrolusium",
                 "unknown",
@@ -808,7 +808,7 @@ public class GT_CropLoader implements Runnable {
                 Materials.Manganese,
                 ItemList.Crop_Drop_Manganese.get(1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 167,
                 "Scheelinium",
                 "unknown",
@@ -827,7 +827,7 @@ public class GT_CropLoader implements Runnable {
                 Materials.Tungsten,
                 ItemList.Crop_Drop_Scheelite.get(1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 168,
                 "Platina",
                 "unknown",
@@ -846,7 +846,7 @@ public class GT_CropLoader implements Runnable {
                 Materials.Platinum,
                 ItemList.Crop_Drop_Platinum.get(1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 169,
                 "Quantaria",
                 "unknown",
@@ -865,7 +865,7 @@ public class GT_CropLoader implements Runnable {
                 Materials.Iridium,
                 ItemList.Crop_Drop_Iridium.get(1),
                 new ItemStack[] { ItemList.Crop_Drop_Osmium.get(1) });
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 170,
                 "Stargatium",
                 "unknown",
@@ -882,9 +882,9 @@ public class GT_CropLoader implements Runnable {
                 0,
                 new String[] { "Metal", "Heavy", "Alien", "Naquadah" },
                 Materials.Naquadah,
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1L),
                 new ItemStack[] { ItemList.Crop_Drop_Naquadah.get(1) });
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 171,
                 "Lemon",
                 "unknown",
@@ -902,7 +902,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Food", "Yellow", "Sour" },
                 ItemList.Crop_Drop_Lemon.get(1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 172,
                 "Chilly",
                 "unknown",
@@ -920,7 +920,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Food", "Red", "Spicy" },
                 ItemList.Crop_Drop_Chilly.get(1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 173,
                 "Tomato",
                 "unknown",
@@ -938,7 +938,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Food", "Red" },
                 ItemList.Crop_Drop_Tomato.get(1),
                 new ItemStack[] { ItemList.Crop_Drop_MTomato.get(1) });
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 174,
                 "Grape",
                 "unknown",
@@ -956,7 +956,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Food", "Purple" },
                 ItemList.Crop_Drop_Grapes.get(1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 175,
                 "Onion",
                 "unknown",
@@ -974,7 +974,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Food", "Brown" },
                 ItemList.Crop_Drop_Onion.get(1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 176,
                 "Cucumber",
                 "unknown",
@@ -992,7 +992,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Food", "Green" },
                 ItemList.Crop_Drop_Cucumber.get(1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 177,
                 "Tea",
                 "unknown",
@@ -1010,7 +1010,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Food", "Green", "Ingredient" },
                 ItemList.Crop_Drop_TeaLeaf.get(1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 178,
                 "Rape",
                 "unknown",
@@ -1028,7 +1028,7 @@ public class GT_CropLoader implements Runnable {
                 new String[] { "Food", "Yellow", "Oil" },
                 ItemList.Crop_Drop_Rape.get(1),
                 null);
-            new GT_BaseCrop(
+            new GTBaseCrop(
                 179,
                 "Micadia",
                 "bartimaeusnek",
@@ -1048,8 +1048,8 @@ public class GT_CropLoader implements Runnable {
                 ItemList.Crop_Drop_Mica.get(1L),
                 null);
         } catch (Throwable e) {
-            GT_Log.err.println("GT_Mod: Failed to register Crops to IC2.");
-            e.printStackTrace(GT_Log.err);
+            GTLog.err.println("GTMod: Failed to register Crops to IC2.");
+            e.printStackTrace(GTLog.err);
         }
     }
 }
diff --git a/src/main/java/gregtech/loaders/postload/GT_FakeRecipeLoader.java b/src/main/java/gregtech/loaders/postload/FakeRecipeLoader.java
index d4e653dba2..335423cdce 100644
--- a/src/main/java/gregtech/loaders/postload/GT_FakeRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/FakeRecipeLoader.java
@@ -1,16 +1,16 @@
 package gregtech.loaders.postload;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GTModHandler;
 
-public class GT_FakeRecipeLoader implements Runnable {
+public class FakeRecipeLoader implements Runnable {
 
     @Override
     public void run() {
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("reactorLithiumCell", 1))
-            .itemOutputs(GT_ModHandler.getIC2Item("TritiumCell", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("reactorLithiumCell", 1))
+            .itemOutputs(GTModHandler.getIC2Item("TritiumCell", 1))
             .setNEIDesc(
                 "Neutron reflecting Breeder",
                 String.format("Every %d reactor hull heat", 3_000),
diff --git a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java b/src/main/java/gregtech/loaders/postload/GTPostLoad.java
index 4dae7d5313..66c89dfe4b 100644
--- a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java
+++ b/src/main/java/gregtech/loaders/postload/GTPostLoad.java
@@ -9,9 +9,9 @@ import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes;
 import static gregtech.api.recipe.RecipeMaps.massFabFakeRecipes;
 import static gregtech.api.recipe.RecipeMaps.rockBreakerFakeRecipes;
 import static gregtech.api.recipe.RecipeMaps.scannerFakeRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
@@ -35,49 +35,48 @@ import com.google.common.base.Stopwatch;
 import cpw.mods.fml.common.ProgressManager;
 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.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
 import gregtech.api.enums.TierEU;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_CLS_Compat;
-import gregtech.api.util.GT_Forestry_Compat;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_RecipeConstants;
-import gregtech.api.util.GT_RecipeRegistrator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.behaviors.Behaviour_DataOrb;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Massfabricator;
+import gregtech.api.util.GTCLSCompat;
+import gregtech.api.util.GTForestryCompat;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTRecipeConstants;
+import gregtech.api.util.GTRecipeRegistrator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.items.MetaGeneratedTool01;
+import gregtech.common.items.behaviors.BehaviourDataOrb;
+import gregtech.common.tileentities.machines.basic.MTEMassfabricator;
 import ic2.api.recipe.IRecipeInput;
 import ic2.api.recipe.RecipeOutput;
 
 @SuppressWarnings("deprecation")
-public class GT_PostLoad {
+public class GTPostLoad {
 
     public static void activateOreDictHandler() {
         @SuppressWarnings("UnstableApiUsage") // Stable enough for this project
         Stopwatch stopwatch = Stopwatch.createStarted();
-        GT_Mod.gregtechproxy.activateOreDictHandler();
+        GTMod.gregtechproxy.activateOreDictHandler();
 
         // noinspection UnstableApiUsage// Stable enough for this project
-        GT_Mod.GT_FML_LOGGER
+        GTMod.GT_FML_LOGGER
             .info("Congratulations, you have been waiting long enough (" + stopwatch.stop() + "). Have a Cake.");
-        GT_Log.out.println(
-            "GT_Mod: List of Lists of Tool Recipes: "
-                + GT_ModHandler.sSingleNonBlockDamagableRecipeList_list.toString());
-        GT_Log.out.println(
-            "GT_Mod: Vanilla Recipe List -> Outputs null or stackSize <=0: "
-                + GT_ModHandler.sVanillaRecipeList_warntOutput.toString());
-        GT_Log.out.println(
-            "GT_Mod: Single Non Block Damageable Recipe List -> Outputs null or stackSize <=0: "
-                + GT_ModHandler.sSingleNonBlockDamagableRecipeList_warntOutput.toString());
+        GTLog.out.println(
+            "GTMod: List of Lists of Tool Recipes: " + GTModHandler.sSingleNonBlockDamagableRecipeList_list.toString());
+        GTLog.out.println(
+            "GTMod: Vanilla Recipe List -> Outputs null or stackSize <=0: "
+                + GTModHandler.sVanillaRecipeList_warntOutput.toString());
+        GTLog.out.println(
+            "GTMod: Single Non Block Damageable Recipe List -> Outputs null or stackSize <=0: "
+                + GTModHandler.sSingleNonBlockDamagableRecipeList_warntOutput.toString());
     }
 
     public static void removeIc2Recipes(Map<IRecipeInput, RecipeOutput> aMaceratorRecipeList,
@@ -87,7 +86,7 @@ public class GT_PostLoad {
         @SuppressWarnings("UnstableApiUsage") // Stable enough for this project
         Stopwatch stopwatch = Stopwatch.createStarted();
         // remove gemIridium exploit
-        ItemStack iridiumOre = GT_ModHandler.getIC2Item("iridiumOre", 1);
+        ItemStack iridiumOre = GTModHandler.getIC2Item("iridiumOre", 1);
         aCompressorRecipeList.entrySet()
             .parallelStream()
             .filter(
@@ -100,9 +99,9 @@ public class GT_PostLoad {
             .findAny()
             .ifPresent(e -> aCompressorRecipeList.remove(e.getKey()));
         // Remove all IC2
-        GT_ModHandler.removeAllIC2Recipes();
+        GTModHandler.removeAllIC2Recipes();
         // noinspection UnstableApiUsage// Stable enough for this project
-        GT_Mod.GT_FML_LOGGER.info("IC2 Removal (" + stopwatch.stop() + "). Have a Cake.");
+        GTMod.GT_FML_LOGGER.info("IC2 Removal (" + stopwatch.stop() + "). Have a Cake.");
     }
 
     public static void registerFluidCannerRecipes() {
@@ -111,14 +110,14 @@ public class GT_PostLoad {
             // lava clay bucket is registered with empty container with 0 stack size
             ItemStack emptyContainer = tData.emptyContainer.copy();
             emptyContainer.stackSize = 1;
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(emptyContainer)
                 .itemOutputs(tData.filledContainer)
                 .fluidInputs(tData.fluid)
                 .duration((tData.fluid.amount / 62) * TICKS)
                 .eut(1)
                 .addTo(fluidCannerRecipes);
-            GT_RecipeBuilder builder = GT_Values.RA.stdBuilder()
+            GTRecipeBuilder builder = GTValues.RA.stdBuilder()
                 .itemInputs(tData.filledContainer);
             if (tData.emptyContainer.stackSize > 0) {
                 builder.itemOutputs(tData.emptyContainer);
@@ -131,14 +130,14 @@ public class GT_PostLoad {
     }
 
     public static void addFakeRecipes() {
-        GT_Log.out.println("GT_Mod: Adding Fake Recipes for NEI");
+        GTLog.out.println("GTMod: Adding Fake Recipes for NEI");
 
         if (Forestry.isModLoaded()) {
-            GT_Forestry_Compat.populateFakeNeiRecipes();
+            GTForestryCompat.populateFakeNeiRecipes();
         }
 
         if (ItemList.IC2_Crop_Seeds.get(1L) != null) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.IC2_Crop_Seeds.getWildcard(1L))
                 .itemOutputs(ItemList.IC2_Crop_Seeds.getWithName(1L, "Scanned Seeds"))
                 .duration(8 * SECONDS)
@@ -148,7 +147,7 @@ public class GT_PostLoad {
                 .fake()
                 .addTo(scannerFakeRecipes);
         }
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.written_book, 1, 32767))
             .itemOutputs(ItemList.Tool_DataStick.getWithName(1L, "Scanned Book Data"))
             .special(ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"))
@@ -159,7 +158,7 @@ public class GT_PostLoad {
             .fake()
             .addTo(scannerFakeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.filled_map, 1, 32767))
             .itemOutputs(ItemList.Tool_DataStick.getWithName(1L, "Scanned Map Data"))
             .special(ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"))
@@ -170,7 +169,7 @@ public class GT_PostLoad {
             .fake()
             .addTo(scannerFakeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Tool_DataOrb.getWithName(1L, "Orb to overwrite"))
             .itemOutputs(ItemList.Tool_DataOrb.getWithName(1L, "Copy of the Orb"))
             .duration(25 * SECONDS + 12 * TICKS)
@@ -180,7 +179,7 @@ public class GT_PostLoad {
             .fake()
             .addTo(scannerFakeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Tool_DataStick.getWithName(1L, "Stick to overwrite"))
             .itemOutputs(ItemList.Tool_DataStick.getWithName(1L, "Copy of the Stick"))
             .special(ItemList.Tool_DataStick.getWithName(0L, "Stick to copy"))
@@ -191,7 +190,7 @@ public class GT_PostLoad {
             .fake()
             .addTo(scannerFakeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Tool_DataStick.getWithName(1L, "Raw Prospection Data"))
             .itemOutputs(ItemList.Tool_DataStick.getWithName(1L, "Analyzed Prospection Data"))
             .duration(50 * SECONDS)
@@ -202,11 +201,11 @@ public class GT_PostLoad {
             .addTo(scannerFakeRecipes);
 
         if (GalacticraftCore.isModLoaded()) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     Objects
                         .requireNonNull(
-                            GT_ModHandler.getModItem(GalacticraftCore.ID, "item.schematic", 1, Short.MAX_VALUE))
+                            GTModHandler.getModItem(GalacticraftCore.ID, "item.schematic", 1, Short.MAX_VALUE))
                         .setStackDisplayName("Any Schematic"))
                 .itemOutputs(ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic"))
                 .special(ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"))
@@ -218,11 +217,11 @@ public class GT_PostLoad {
                 .addTo(scannerFakeRecipes);
 
             if (GalacticraftMars.isModLoaded()) {
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
                         Objects
                             .requireNonNull(
-                                GT_ModHandler.getModItem(GalacticraftMars.ID, "item.schematic", 1, Short.MAX_VALUE))
+                                GTModHandler.getModItem(GalacticraftMars.ID, "item.schematic", 1, Short.MAX_VALUE))
                             .setStackDisplayName("Any Schematic"))
                     .itemOutputs(ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic"))
                     .special(ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"))
@@ -235,9 +234,9 @@ public class GT_PostLoad {
             }
             if (GalaxySpace.isModLoaded()) {
                 for (int i = 4; i < 9; i++) {
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_ModHandler.getModItem(GalaxySpace.ID, "item.SchematicTier" + i, 1)
+                            GTModHandler.getModItem(GalaxySpace.ID, "item.SchematicTier" + i, 1)
                                 .setStackDisplayName("Any Schematic"))
                         .itemOutputs(ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic"))
                         .special(ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"))
@@ -257,11 +256,11 @@ public class GT_PostLoad {
                     && (tMaterial != Materials.Magic)
                     && (tMaterial.getMass() > 0L)) {
                     ItemStack dataOrb = ItemList.Tool_DataOrb.get(1L);
-                    Behaviour_DataOrb.setDataTitle(dataOrb, "Elemental-Scan");
-                    Behaviour_DataOrb.setDataName(dataOrb, tMaterial.mElement.name());
-                    ItemStack dustItem = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, 1L);
+                    BehaviourDataOrb.setDataTitle(dataOrb, "Elemental-Scan");
+                    BehaviourDataOrb.setDataName(dataOrb, tMaterial.mElement.name());
+                    ItemStack dustItem = GTOreDictUnificator.get(OrePrefixes.dust, tMaterial, 1L);
                     if (dustItem != null) {
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(dustItem)
                             .itemOutputs(dataOrb)
                             .special(ItemList.Tool_DataOrb.get(1L))
@@ -270,16 +269,16 @@ public class GT_PostLoad {
                             .fake()
                             .ignoreCollision()
                             .addTo(scannerFakeRecipes);
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemOutputs(dustItem)
                             .special(dataOrb)
-                            .metadata(GT_RecipeConstants.MATERIAL, tMaterial)
+                            .metadata(GTRecipeConstants.MATERIAL, tMaterial)
                             .addTo(RecipeMaps.replicatorRecipes);
                         return;
                     }
-                    ItemStack cellItem = GT_OreDictUnificator.get(OrePrefixes.cell, tMaterial, 1L);
+                    ItemStack cellItem = GTOreDictUnificator.get(OrePrefixes.cell, tMaterial, 1L);
                     if (cellItem != null) {
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(cellItem)
                             .itemOutputs(dataOrb)
                             .special(ItemList.Tool_DataOrb.get(1L))
@@ -288,8 +287,8 @@ public class GT_PostLoad {
                             .fake()
                             .ignoreCollision()
                             .addTo(scannerFakeRecipes);
-                        FluidStack fluidStack = GT_Utility.getFluidForFilledItem(cellItem, false);
-                        GT_RecipeBuilder builder = GT_Values.RA.stdBuilder();
+                        FluidStack fluidStack = GTUtility.getFluidForFilledItem(cellItem, false);
+                        GTRecipeBuilder builder = GTValues.RA.stdBuilder();
                         if (fluidStack != null) {
                             builder.fluidOutputs(fluidStack);
                         } else {
@@ -297,44 +296,43 @@ public class GT_PostLoad {
                                 .itemOutputs(cellItem);
                         }
                         builder.special(dataOrb)
-                            .metadata(GT_RecipeConstants.MATERIAL, tMaterial)
+                            .metadata(GTRecipeConstants.MATERIAL, tMaterial)
                             .addTo(RecipeMaps.replicatorRecipes);
                     }
                 }
             });
 
-        if (!GT_MetaTileEntity_Massfabricator.sRequiresUUA) {
+        if (!MTEMassfabricator.sRequiresUUA) {
 
-            GT_MetaTileEntity_Massfabricator.nonUUARecipe = GT_Values.RA.stdBuilder()
+            MTEMassfabricator.nonUUARecipe = GTValues.RA.stdBuilder()
                 .fluidOutputs(Materials.UUMatter.getFluid(1L))
-                .duration(GT_MetaTileEntity_Massfabricator.sDurationMultiplier)
-                .eut(GT_MetaTileEntity_Massfabricator.BASE_EUT)
+                .duration(MTEMassfabricator.sDurationMultiplier)
+                .eut(MTEMassfabricator.BASE_EUT)
                 .ignoreCollision()
                 .noOptimize()
                 .fake()
                 .build()
                 .get();
 
-            massFabFakeRecipes.add(GT_MetaTileEntity_Massfabricator.nonUUARecipe);
+            massFabFakeRecipes.add(MTEMassfabricator.nonUUARecipe);
 
         }
 
-        GT_MetaTileEntity_Massfabricator.uuaRecipe = GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
-            .fluidInputs(Materials.UUAmplifier.getFluid(GT_MetaTileEntity_Massfabricator.sUUAperUUM))
+        MTEMassfabricator.uuaRecipe = GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
+            .fluidInputs(Materials.UUAmplifier.getFluid(MTEMassfabricator.sUUAperUUM))
             .fluidOutputs(Materials.UUMatter.getFluid(1L))
-            .duration(
-                GT_MetaTileEntity_Massfabricator.sDurationMultiplier / GT_MetaTileEntity_Massfabricator.sUUASpeedBonus)
-            .eut(GT_MetaTileEntity_Massfabricator.BASE_EUT)
+            .duration(MTEMassfabricator.sDurationMultiplier / MTEMassfabricator.sUUASpeedBonus)
+            .eut(MTEMassfabricator.BASE_EUT)
             .ignoreCollision()
             .noOptimize()
             .fake()
             .build()
             .get();
 
-        massFabFakeRecipes.add(GT_MetaTileEntity_Massfabricator.uuaRecipe);
+        massFabFakeRecipes.add(MTEMassfabricator.uuaRecipe);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Display_ITS_FREE.getWithName(1L, "IT'S FREE! Place Lava on Side"))
             .itemOutputs(new ItemStack(Blocks.cobblestone, 1))
             .duration(16 * TICKS)
@@ -344,7 +342,7 @@ public class GT_PostLoad {
             .fake()
             .addTo(rockBreakerFakeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Display_ITS_FREE.getWithName(1L, "IT'S FREE! Place Lava on Side"))
             .itemOutputs(new ItemStack(Blocks.stone, 1))
             .duration(16 * TICKS)
@@ -354,10 +352,10 @@ public class GT_PostLoad {
             .fake()
             .addTo(rockBreakerFakeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Blocks.obsidian, 1))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(TierEU.RECIPE_LV)
@@ -368,11 +366,11 @@ public class GT_PostLoad {
     }
 
     public static void nerfVanillaTools() {
-        if (!GT_Mod.gregtechproxy.mNerfedVanillaTools) {
+        if (!GTMod.gregtechproxy.mNerfedVanillaTools) {
             return;
         }
 
-        GT_Log.out.println("GT_Mod: Nerfing Vanilla Tool Durability");
+        GTLog.out.println("GTMod: Nerfing Vanilla Tool Durability");
         Items.wooden_sword.setMaxDamage(12);
         Items.wooden_pickaxe.setMaxDamage(12);
         Items.wooden_shovel.setMaxDamage(12);
@@ -408,19 +406,19 @@ public class GT_PostLoad {
     public static void replaceVanillaMaterials() {
         @SuppressWarnings("UnstableApiUsage") // Stable enough for this project
         Stopwatch stopwatch = Stopwatch.createStarted();
-        GT_Mod.GT_FML_LOGGER.info("Replacing Vanilla Materials in recipes, please wait.");
+        GTMod.GT_FML_LOGGER.info("Replacing Vanilla Materials in recipes, please wait.");
         Set<Materials> replaceVanillaItemsSet = Arrays.stream(Materials.values())
-            .filter(GT_RecipeRegistrator::hasVanillaRecipes)
+            .filter(GTRecipeRegistrator::hasVanillaRecipes)
             .collect(Collectors.toSet());
 
         ProgressManager.ProgressBar progressBar = ProgressManager
             .push("Register materials", replaceVanillaItemsSet.size());
-        if (GT_Values.cls_enabled) {
+        if (GTValues.cls_enabled) {
             try {
-                GT_CLS_Compat.doActualRegistrationCLS(progressBar, replaceVanillaItemsSet);
-                GT_CLS_Compat.pushToDisplayProgress();
+                GTCLSCompat.doActualRegistrationCLS(progressBar, replaceVanillaItemsSet);
+                GTCLSCompat.pushToDisplayProgress();
             } catch (InvocationTargetException | IllegalAccessException e) {
-                GT_Mod.GT_FML_LOGGER.catching(e);
+                GTMod.GT_FML_LOGGER.catching(e);
             }
         } else {
             replaceVanillaItemsSet.forEach(m -> {
@@ -430,16 +428,16 @@ public class GT_PostLoad {
         }
         ProgressManager.pop(progressBar);
         // noinspection UnstableApiUsage// stable enough for project
-        GT_Mod.GT_FML_LOGGER.info("Replaced Vanilla Materials (" + stopwatch.stop() + "). Have a Cake.");
+        GTMod.GT_FML_LOGGER.info("Replaced Vanilla Materials (" + stopwatch.stop() + "). Have a Cake.");
     }
 
     public static void doActualRegistration(Materials m) {
         String plateName = OrePrefixes.plate.get(m)
             .toString();
         boolean noSmash = !m.contains(SubTag.NO_SMASHING);
-        if ((m.mTypes & 2) != 0) GT_RecipeRegistrator.registerUsagesForMaterials(plateName, noSmash, m.getIngots(1));
-        if ((m.mTypes & 4) != 0) GT_RecipeRegistrator.registerUsagesForMaterials(plateName, noSmash, m.getGems(1));
-        if (m.getBlocks(1) != null) GT_RecipeRegistrator.registerUsagesForMaterials(null, noSmash, m.getBlocks(1));
+        if ((m.mTypes & 2) != 0) GTRecipeRegistrator.registerUsagesForMaterials(plateName, noSmash, m.getIngots(1));
+        if ((m.mTypes & 4) != 0) GTRecipeRegistrator.registerUsagesForMaterials(plateName, noSmash, m.getGems(1));
+        if (m.getBlocks(1) != null) GTRecipeRegistrator.registerUsagesForMaterials(null, noSmash, m.getBlocks(1));
     }
 
     public static void createGTtoolsCreativeTab() {
@@ -461,29 +459,26 @@ public class GT_PostLoad {
             public void displayAllReleventItems(List<ItemStack> aList) {
 
                 for (int i = 0; i < 32766; i += 2) {
-                    if (GT_MetaGenerated_Tool_01.INSTANCE
-                        .getToolStats(new ItemStack(GT_MetaGenerated_Tool_01.INSTANCE, 1, i)) == null) {
+                    if (MetaGeneratedTool01.INSTANCE.getToolStats(new ItemStack(MetaGeneratedTool01.INSTANCE, 1, i))
+                        == null) {
                         continue;
                     }
 
-                    ItemStack tStack = new ItemStack(GT_MetaGenerated_Tool_01.INSTANCE, 1, i);
-                    GT_MetaGenerated_Tool_01.INSTANCE.isItemStackUsable(tStack);
+                    ItemStack tStack = new ItemStack(MetaGeneratedTool01.INSTANCE, 1, i);
+                    MetaGeneratedTool01.INSTANCE.isItemStackUsable(tStack);
+                    aList
+                        .add(MetaGeneratedTool01.INSTANCE.getToolWithStats(i, 1, Materials.Lead, Materials.Lead, null));
                     aList.add(
-                        GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(i, 1, Materials.Lead, Materials.Lead, null));
+                        MetaGeneratedTool01.INSTANCE.getToolWithStats(i, 1, Materials.Nickel, Materials.Nickel, null));
                     aList.add(
-                        GT_MetaGenerated_Tool_01.INSTANCE
-                            .getToolWithStats(i, 1, Materials.Nickel, Materials.Nickel, null));
+                        MetaGeneratedTool01.INSTANCE.getToolWithStats(i, 1, Materials.Cobalt, Materials.Cobalt, null));
                     aList.add(
-                        GT_MetaGenerated_Tool_01.INSTANCE
-                            .getToolWithStats(i, 1, Materials.Cobalt, Materials.Cobalt, null));
+                        MetaGeneratedTool01.INSTANCE.getToolWithStats(i, 1, Materials.Osmium, Materials.Osmium, null));
                     aList.add(
-                        GT_MetaGenerated_Tool_01.INSTANCE
-                            .getToolWithStats(i, 1, Materials.Osmium, Materials.Osmium, null));
-                    aList.add(
-                        GT_MetaGenerated_Tool_01.INSTANCE
+                        MetaGeneratedTool01.INSTANCE
                             .getToolWithStats(i, 1, Materials.Adamantium, Materials.Adamantium, null));
                     aList.add(
-                        GT_MetaGenerated_Tool_01.INSTANCE
+                        MetaGeneratedTool01.INSTANCE
                             .getToolWithStats(i, 1, Materials.Neutronium, Materials.Neutronium, null));
 
                 }
@@ -495,32 +490,32 @@ public class GT_PostLoad {
     public static void addSolidFakeLargeBoilerFuels() {
         RecipeMaps.largeBoilerFakeFuels.getBackend()
             .addSolidRecipes(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Charcoal, 1),
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 1),
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1),
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1),
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1),
-                GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Coal, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lignite, 1),
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1),
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1),
-                GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Lignite, 1),
-                GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1),
-                GT_OreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
-                GT_OreDictUnificator.get(OrePrefixes.slab, Materials.Wood, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Caesium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
-                GT_OreDictUnificator.get(ItemList.Block_SSFUEL.get(1)),
-                GT_OreDictUnificator.get(ItemList.Block_MSSFUEL.get(1)),
-                GT_OreDictUnificator.get(OrePrefixes.rod, Materials.Blaze, 1));
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Charcoal, 1),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 1),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1),
+                GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Coal, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lignite, 1),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1),
+                GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Lignite, 1),
+                GTOreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1),
+                GTOreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
+                GTOreDictUnificator.get(OrePrefixes.slab, Materials.Wood, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Caesium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
+                GTOreDictUnificator.get(ItemList.Block_SSFUEL.get(1)),
+                GTOreDictUnificator.get(ItemList.Block_MSSFUEL.get(1)),
+                GTOreDictUnificator.get(OrePrefixes.rod, Materials.Blaze, 1));
         if (Thaumcraft.isModLoaded()) {
             RecipeMaps.largeBoilerFakeFuels.getBackend()
-                .addSolidRecipe(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1));
+                .addSolidRecipe(GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1));
         }
     }
 
@@ -528,12 +523,12 @@ public class GT_PostLoad {
         final String[] steamCandidates = { "steam", "ic2steam" };
         final String[] superHeatedSteamCandidates = { "ic2superheatedsteam" };
 
-        GT_ModHandler.sAnySteamFluidIDs = Arrays.stream(steamCandidates)
+        GTModHandler.sAnySteamFluidIDs = Arrays.stream(steamCandidates)
             .map(FluidRegistry::getFluid)
             .filter(Objects::nonNull)
             .map(FluidRegistry::getFluidID)
             .collect(Collectors.toList());
-        GT_ModHandler.sSuperHeatedSteamFluidIDs = Arrays.stream(superHeatedSteamCandidates)
+        GTModHandler.sSuperHeatedSteamFluidIDs = Arrays.stream(superHeatedSteamCandidates)
             .map(FluidRegistry::getFluid)
             .filter(Objects::nonNull)
             .map(FluidRegistry::getFluidID)
diff --git a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java b/src/main/java/gregtech/loaders/postload/GTWorldgenloader.java
index 921f227b08..85e81a1ec0 100644
--- a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java
+++ b/src/main/java/gregtech/loaders/postload/GTWorldgenloader.java
@@ -1,16 +1,16 @@
 package gregtech.loaders.postload;
 
-import bloodasp.galacticgreg.WorldGenGaGT;
+import galacticgreg.WorldgenGaGT;
 import gregtech.api.enums.GTStones;
 import gregtech.api.enums.OreMixes;
 import gregtech.api.enums.SmallOres;
-import gregtech.api.util.GT_Log;
-import gregtech.common.GT_Worldgenerator;
+import gregtech.api.util.GTLog;
+import gregtech.common.GTWorldgenerator;
 
-public class GT_Worldgenloader implements Runnable {
+public class GTWorldgenloader implements Runnable {
 
     public void run() {
-        new GT_Worldgenerator();
+        new GTWorldgenerator();
 
         // GT Stones
         for (GTStones stone : GTStones.values()) {
@@ -27,7 +27,7 @@ public class GT_Worldgenloader implements Runnable {
             oreMix.addGTOreLayer();
         }
 
-        new WorldGenGaGT().run();
-        GT_Log.out.println("Started Galactic Greg ore gen code");
+        new WorldgenGaGT().run();
+        GTLog.out.println("Started Galactic Greg ore gen code");
     }
 }
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineTooltipsLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineTooltipsLoader.java
deleted file mode 100644
index d18ccd6c83..0000000000
--- a/src/main/java/gregtech/loaders/postload/GT_MachineTooltipsLoader.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package gregtech.loaders.postload;
-
-import static gregtech.api.enums.GT_Values.GT;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Log;
-import gregtech.common.blocks.GT_Item_Machines;
-
-public class GT_MachineTooltipsLoader implements Runnable {
-
-    @Override
-    public void run() {
-        if (!GT.isClientSide()) return;
-        GT_Log.out.println("GT Mod: Register Block Machine's tooltips");
-        for (int i = 0; i < 32768; i++) {
-            ItemStack tStack = new ItemStack(GregTech_API.sBlockMachines, 1, i);
-            if (tStack.getItem() != null && tStack.getItem() instanceof GT_Item_Machines) {
-                ((GT_Item_Machines) tStack.getItem()).registerDescription(i);
-            }
-        }
-        GT_LanguageManager.addStringLocalization("TileEntity_EUp_IN", "Voltage IN: ");
-        GT_LanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Voltage OUT: ");
-        GT_LanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amperage: ");
-        GT_LanguageManager.addStringLocalization("TileEntity_EUp_STORE", "Capacity: ");
-        GT_LanguageManager.addStringLocalization("TileEntity_TANK_INFO", "Contains Fluid: ");
-        GT_LanguageManager.addStringLocalization("TileEntity_TANK_AMOUNT", "Fluid Amount: ");
-        GT_LanguageManager.addStringLocalization("TileEntity_CHEST_INFO", "Contains Item: ");
-        GT_LanguageManager.addStringLocalization("TileEntity_CHEST_AMOUNT", "Item Amount: ");
-        GT_LanguageManager.addStringLocalization("GT_TileEntity_MUFFLER", "has Muffler Upgrade");
-        GT_LanguageManager.addStringLocalization("GT_TileEntity_STEAMCONVERTER", "has Steam Upgrade");
-        GT_LanguageManager.addStringLocalization("GT_TileEntity_STEAMTANKS", "Steam Tank Upgrades");
-    }
-}
diff --git a/src/main/java/gregtech/loaders/postload/GT_MinableRegistrator.java b/src/main/java/gregtech/loaders/postload/GT_MinableRegistrator.java
deleted file mode 100644
index afa98e0b38..0000000000
--- a/src/main/java/gregtech/loaders/postload/GT_MinableRegistrator.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package gregtech.loaders.postload;
-
-import net.minecraft.init.Blocks;
-
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-
-public class GT_MinableRegistrator implements Runnable {
-
-    @Override
-    public void run() {
-        GT_Log.out.println("GT_Mod: Adding Blocks to the Miners Valuable List.");
-        GT_ModHandler.addValuableOre(Blocks.glowstone, 0, 1);
-        GT_ModHandler.addValuableOre(Blocks.soul_sand, 0, 1);
-    }
-}
diff --git a/src/main/java/gregtech/loaders/postload/GT_PCBFactoryMaterialLoader.java b/src/main/java/gregtech/loaders/postload/GT_PCBFactoryMaterialLoader.java
deleted file mode 100644
index 95732076d9..0000000000
--- a/src/main/java/gregtech/loaders/postload/GT_PCBFactoryMaterialLoader.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package gregtech.loaders.postload;
-
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.MaterialsKevlar;
-import gregtech.api.util.GT_PCBFactoryManager;
-
-public class GT_PCBFactoryMaterialLoader {
-
-    public static void load() {
-        // add Plastics
-        GT_PCBFactoryManager.addPlasticTier(Materials.Plastic, 1);
-        GT_PCBFactoryManager.addPlasticTier(Materials.PolyvinylChloride, 2);
-        GT_PCBFactoryManager.addPlasticTier(Materials.Polytetrafluoroethylene, 3);
-        GT_PCBFactoryManager.addPlasticTier(Materials.Epoxid, 4);
-        GT_PCBFactoryManager.addPlasticTier(Materials.EpoxidFiberReinforced, 5);
-        GT_PCBFactoryManager.addPlasticTier(Materials.Polybenzimidazole, 6);
-        GT_PCBFactoryManager.addPlasticTier(MaterialsKevlar.Kevlar, 7);
-    }
-}
diff --git a/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java
deleted file mode 100644
index 0ff53d0424..0000000000
--- a/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package gregtech.loaders.postload;
-
-import gregtech.api.enums.SoundResource;
-import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_ProcessingArray_Manager;
-
-public class GT_ProcessingArrayRecipeLoader {
-
-    public static void registerDefaultGregtechMaps() {
-
-        // Alloy Smelter
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.alloysmelter", RecipeMaps.alloySmelterRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.alloysmelter", SoundResource.IC2_MACHINES_INDUCTION_LOOP);
-        // Arc Furnace
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.arcfurnace", RecipeMaps.arcFurnaceRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.arcfurnace", SoundResource.IC2_MACHINES_INDUCTION_LOOP);
-        // Assembler
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.assembler", RecipeMaps.assemblerRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.assembler", SoundResource.NONE);
-        // Autoclave
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.autoclave", RecipeMaps.autoclaveRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.autoclave", SoundResource.NONE);
-        // Bender
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.bender", RecipeMaps.benderRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.bender", SoundResource.IC2_MACHINES_COMPRESSOR_OP);
-        // Boxinator
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.boxinator", RecipeMaps.packagerRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.boxinator", SoundResource.NONE);
-        // Brewery
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.brewery", RecipeMaps.brewingRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.brewery", SoundResource.NONE);
-        // Canner
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.canner", RecipeMaps.cannerRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.canner", SoundResource.IC2_MACHINES_EXTRACTOR_OP);
-        // Centrifuge
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.centrifuge", RecipeMaps.centrifugeNonCellRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.centrifuge", SoundResource.NONE);
-        // Chemical Bath
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.chemicalbath", RecipeMaps.chemicalBathRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.chemicalbath", SoundResource.NONE);
-        // Chemical Reactor
-        GT_ProcessingArray_Manager
-            .addRecipeMapToPA("basicmachine.chemicalreactor", RecipeMaps.multiblockChemicalReactorRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.chemicalreactor", SoundResource.IC2_MACHINES_EXTRACTOR_OP);
-        // Circuit Assembler
-        GT_ProcessingArray_Manager
-            .addRecipeMapToPA("basicmachine.circuitassembler", RecipeMaps.circuitAssemblerRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.circuitassembler", SoundResource.NONE);
-        // Compressor
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.compressor", RecipeMaps.compressorRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.compressor", SoundResource.IC2_MACHINES_COMPRESSOR_OP);
-        // Cutting Machine
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.cutter", RecipeMaps.cutterRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.cutter", SoundResource.NONE);
-        // Distillery
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.distillery", RecipeMaps.distilleryRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.distillery", SoundResource.GT_MACHINES_DISTILLERY_LOOP);
-        // Electrolyzer
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.electrolyzer", RecipeMaps.electrolyzerNonCellRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.electrolyzer", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP);
-        // Extractor
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.extractor", RecipeMaps.extractorRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.extractor", SoundResource.IC2_MACHINES_EXTRACTOR_OP);
-        // Extruder
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.extruder", RecipeMaps.extruderRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.extruder", SoundResource.IC2_MACHINES_INDUCTION_LOOP);
-        // Fermenter
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fermenter", RecipeMaps.fermentingRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.fermenter", SoundResource.NONE);
-        // Fluid Canner
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fluidcanner", RecipeMaps.fluidCannerRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.fluidcanner", SoundResource.IC2_MACHINES_EXTRACTOR_OP);
-        // Fluid Extractor
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fluidextractor", RecipeMaps.fluidExtractionRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.fluidextractor", SoundResource.IC2_MACHINES_EXTRACTOR_OP);
-        // Fluid Heater
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fluidheater", RecipeMaps.fluidHeaterRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.fluidheater", SoundResource.NONE);
-        // Fluid Solidifier
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fluidsolidifier", RecipeMaps.fluidSolidifierRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.fluidsolidifier", SoundResource.NONE);
-        // Forge Hammer
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.hammer", RecipeMaps.hammerRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.hammer", SoundResource.RANDOM_ANVIL_USE);
-        // Forming Press
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.press", RecipeMaps.formingPressRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.press", SoundResource.IC2_MACHINES_COMPRESSOR_OP);
-        // Laser Engraver
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.laserengraver", RecipeMaps.laserEngraverRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.laserengraver", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP);
-        // Lathe
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.lathe", RecipeMaps.latheRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.lathe", SoundResource.NONE);
-        // Macerator
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.macerator", RecipeMaps.maceratorRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.macerator", SoundResource.IC2_MACHINES_MACERATOR_OP);
-        // Magnetic Separator
-        GT_ProcessingArray_Manager
-            .addRecipeMapToPA("basicmachine.electromagneticseparator", RecipeMaps.electroMagneticSeparatorRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.electromagneticseparator", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP);
-        // Matter Amplifier
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.amplifab", RecipeMaps.amplifierRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.amplifab", SoundResource.IC2_MACHINES_EXTRACTOR_OP);
-        // Microwave
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.microwave", RecipeMaps.microwaveRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.microwave", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP);
-        // Mixer
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.mixer", RecipeMaps.mixerNonCellRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.mixer", SoundResource.NONE);
-        // Ore Washer
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.orewasher", RecipeMaps.oreWasherRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.orewasher", SoundResource.NONE);
-        // Plasma Arc Furnace
-        GT_ProcessingArray_Manager
-            .addRecipeMapToPA("basicmachine.plasmaarcfurnace", RecipeMaps.plasmaArcFurnaceRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.plasmaarcfurnace", SoundResource.IC2_MACHINES_INDUCTION_LOOP);
-        // Polarizer
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.polarizer", RecipeMaps.polarizerRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.polarizer", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP);
-        // Printer
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.printer", RecipeMaps.printerRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.printer", SoundResource.IC2_MACHINES_COMPRESSOR_OP);
-        // Recycler
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.recycler", RecipeMaps.recyclerRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.recycler", SoundResource.IC2_MACHINES_RECYCLER_OP);
-        // Scanner
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.scanner", RecipeMaps.scannerFakeRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.scanner", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP);
-        // Sifter
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.sifter", RecipeMaps.sifterRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.sifter", SoundResource.NONE);
-        // Slicer
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.slicer", RecipeMaps.slicerRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.slicer", SoundResource.NONE);
-        // Thermal Centrifuge
-        GT_ProcessingArray_Manager
-            .addRecipeMapToPA("basicmachine.thermalcentrifuge", RecipeMaps.thermalCentrifugeRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.thermalcentrifuge", SoundResource.NONE);
-        // Unboxinator
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.unboxinator", RecipeMaps.unpackagerRecipes);
-        GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.unboxinator", SoundResource.NONE);
-        // Wiremill
-        GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.wiremill", RecipeMaps.wiremillRecipes);
-        GT_ProcessingArray_Manager
-            .addSoundResourceToPA("basicmachine.wiremill", SoundResource.IC2_MACHINES_RECYCLER_OP);
-    }
-}
diff --git a/src/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java b/src/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java
deleted file mode 100644
index 6d466abaa9..0000000000
--- a/src/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package gregtech.loaders.postload;
-
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-
-public class GT_ScrapboxDropLoader implements Runnable {
-
-    @Override
-    public void run() {
-        GT_Log.out.println("GT_Mod: (re-)adding Scrapbox Drops.");
-
-        GT_ModHandler.addScrapboxDrop(9.5F, new ItemStack(Items.wooden_hoe));
-        GT_ModHandler.addScrapboxDrop(2.0F, new ItemStack(Items.wooden_axe));
-        GT_ModHandler.addScrapboxDrop(2.0F, new ItemStack(Items.wooden_sword));
-        GT_ModHandler.addScrapboxDrop(2.0F, new ItemStack(Items.wooden_shovel));
-        GT_ModHandler.addScrapboxDrop(2.0F, new ItemStack(Items.wooden_pickaxe));
-        GT_ModHandler.addScrapboxDrop(2.0F, new ItemStack(Items.sign));
-        GT_ModHandler.addScrapboxDrop(9.5F, new ItemStack(Items.stick));
-        GT_ModHandler.addScrapboxDrop(5.0F, new ItemStack(Blocks.dirt));
-        GT_ModHandler.addScrapboxDrop(3.0F, new ItemStack(Blocks.grass));
-        GT_ModHandler.addScrapboxDrop(3.0F, new ItemStack(Blocks.gravel));
-        GT_ModHandler.addScrapboxDrop(0.5F, new ItemStack(Blocks.pumpkin));
-        GT_ModHandler.addScrapboxDrop(1.0F, new ItemStack(Blocks.soul_sand));
-        GT_ModHandler.addScrapboxDrop(2.0F, new ItemStack(Blocks.netherrack));
-        GT_ModHandler.addScrapboxDrop(1.0F, new ItemStack(Items.bone));
-        GT_ModHandler.addScrapboxDrop(9.0F, new ItemStack(Items.rotten_flesh));
-        GT_ModHandler.addScrapboxDrop(0.4F, new ItemStack(Items.cooked_porkchop));
-        GT_ModHandler.addScrapboxDrop(0.4F, new ItemStack(Items.cooked_beef));
-        GT_ModHandler.addScrapboxDrop(0.4F, new ItemStack(Items.cooked_chicken));
-        GT_ModHandler.addScrapboxDrop(0.5F, new ItemStack(Items.apple));
-        GT_ModHandler.addScrapboxDrop(0.5F, new ItemStack(Items.bread));
-        GT_ModHandler.addScrapboxDrop(0.1F, new ItemStack(Items.cake));
-        GT_ModHandler.addScrapboxDrop(1.0F, ItemList.IC2_Food_Can_Filled.get(1L));
-        GT_ModHandler.addScrapboxDrop(2.0F, ItemList.IC2_Food_Can_Spoiled.get(1L));
-        GT_ModHandler.addScrapboxDrop(0.2F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1L));
-        GT_ModHandler.addScrapboxDrop(1.0F, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L));
-        GT_ModHandler.addScrapboxDrop(2.0F, ItemList.Cell_Empty.get(1L));
-        GT_ModHandler.addScrapboxDrop(5.0F, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 1L));
-        GT_ModHandler.addScrapboxDrop(1.0F, new ItemStack(Items.leather));
-        GT_ModHandler.addScrapboxDrop(1.0F, new ItemStack(Items.feather));
-        GT_ModHandler.addScrapboxDrop(0.7F, GT_ModHandler.getIC2Item("plantBall", 1L));
-        GT_ModHandler.addScrapboxDrop(3.8F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L));
-        GT_ModHandler.addScrapboxDrop(0.6F, new ItemStack(Items.slime_ball));
-        GT_ModHandler.addScrapboxDrop(0.8F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Rubber, 1L));
-        GT_ModHandler.addScrapboxDrop(2.7F, GT_ModHandler.getIC2Item("suBattery", 1L));
-        GT_ModHandler.addScrapboxDrop(3.6F, ItemList.Circuit_Primitive.get(1L));
-        GT_ModHandler.addScrapboxDrop(0.8F, ItemList.Circuit_Parts_Advanced.get(1L));
-        GT_ModHandler.addScrapboxDrop(1.8F, ItemList.Circuit_Board_Basic.get(1L));
-        GT_ModHandler.addScrapboxDrop(0.4F, ItemList.Circuit_Board_Advanced.get(1L));
-        GT_ModHandler.addScrapboxDrop(0.2F, ItemList.Circuit_Board_Elite.get(1L));
-        GT_ModHandler.addScrapboxDrop(0.9F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L));
-        GT_ModHandler.addScrapboxDrop(0.8F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L));
-        GT_ModHandler.addScrapboxDrop(0.8F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L));
-        GT_ModHandler.addScrapboxDrop(2.5F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Charcoal, 1L));
-        GT_ModHandler.addScrapboxDrop(1.0F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L));
-        GT_ModHandler.addScrapboxDrop(1.0F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L));
-        GT_ModHandler.addScrapboxDrop(0.5F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1L));
-        GT_ModHandler.addScrapboxDrop(0.5F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Electrum, 1L));
-        GT_ModHandler.addScrapboxDrop(1.2F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1L));
-        GT_ModHandler.addScrapboxDrop(1.2F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L));
-        GT_ModHandler.addScrapboxDrop(0.5F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bauxite, 1L));
-        GT_ModHandler.addScrapboxDrop(0.5F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L));
-        GT_ModHandler.addScrapboxDrop(0.5F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lead, 1L));
-        GT_ModHandler.addScrapboxDrop(0.5F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1L));
-        GT_ModHandler.addScrapboxDrop(0.5F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1L));
-        GT_ModHandler.addScrapboxDrop(0.5F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 1L));
-        GT_ModHandler.addScrapboxDrop(0.5F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1L));
-        GT_ModHandler.addScrapboxDrop(1.5F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L));
-        GT_ModHandler.addScrapboxDrop(1.5F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L));
-        GT_ModHandler.addScrapboxDrop(2.0F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1L));
-        GT_ModHandler.addScrapboxDrop(2.0F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lazurite, 1L));
-        GT_ModHandler.addScrapboxDrop(2.0F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Pyrite, 1L));
-        GT_ModHandler.addScrapboxDrop(2.0F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1L));
-        GT_ModHandler.addScrapboxDrop(2.0F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodalite, 1L));
-        GT_ModHandler.addScrapboxDrop(4.0F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Netherrack, 1L));
-        GT_ModHandler.addScrapboxDrop(4.0F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Flint, 1L));
-        GT_ModHandler.addScrapboxDrop(0.03F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1L));
-        GT_ModHandler.addScrapboxDrop(0.03F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 1L));
-        GT_ModHandler.addScrapboxDrop(0.03F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L));
-        GT_ModHandler.addScrapboxDrop(0.03F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1L));
-        GT_ModHandler.addScrapboxDrop(0.03F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 1L));
-        GT_ModHandler.addScrapboxDrop(0.03F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1L));
-        GT_ModHandler.addScrapboxDrop(0.5F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GarnetRed, 1L));
-        GT_ModHandler.addScrapboxDrop(0.5F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GarnetYellow, 1L));
-        GT_ModHandler.addScrapboxDrop(0.05F, GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L));
-        GT_ModHandler.addScrapboxDrop(0.05F, GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L));
-        GT_ModHandler.addScrapboxDrop(0.05F, GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L));
-        GT_ModHandler.addScrapboxDrop(0.05F, GT_OreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L));
-        GT_ModHandler.addScrapboxDrop(0.05F, GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L));
-        GT_ModHandler.addScrapboxDrop(0.05F, GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Diamond, 1L));
-    }
-}
diff --git a/src/main/java/gregtech/loaders/postload/GT_ItemMaxStacksizeLoader.java b/src/main/java/gregtech/loaders/postload/ItemMaxStacksizeLoader.java
index 67f7f00d87..7e2a1164e1 100644
--- a/src/main/java/gregtech/loaders/postload/GT_ItemMaxStacksizeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/ItemMaxStacksizeLoader.java
@@ -4,19 +4,19 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_Log;
+import gregtech.api.util.GTLog;
 
-public class GT_ItemMaxStacksizeLoader implements Runnable {
+public class ItemMaxStacksizeLoader implements Runnable {
 
     @Override
     public void run() {
-        GT_Log.out.println("GT_Mod: Changing maximum Stacksizes if configured.");
+        GTLog.out.println("GTMod: Changing maximum Stacksizes if configured.");
 
         ItemList.Upgrade_Overclocker.getItem()
-            .setMaxStackSize(GT_Mod.gregtechproxy.mUpgradeCount);
+            .setMaxStackSize(GTMod.gregtechproxy.mUpgradeCount);
         Items.cake.setMaxStackSize(64);
         Items.wooden_door.setMaxStackSize(8);
         Items.iron_door.setMaxStackSize(8);
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/MachineRecipeLoader.java
index 92de5291e1..c64ea6cf7b 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/MachineRecipeLoader.java
@@ -1,10 +1,10 @@
 package gregtech.loaders.postload;
 
 import gregtech.api.enums.Materials;
-import gregtech.loaders.postload.chains.GT_BauxiteRefineChain;
-import gregtech.loaders.postload.chains.GT_NaniteChain;
-import gregtech.loaders.postload.chains.GT_PCBFactoryRecipes;
-import gregtech.loaders.postload.chains.GT_PurifiedWaterRecipes;
+import gregtech.loaders.postload.chains.BauxiteRefineChain;
+import gregtech.loaders.postload.chains.NaniteChain;
+import gregtech.loaders.postload.chains.PCBFactoryRecipes;
+import gregtech.loaders.postload.chains.PurifiedWaterRecipes;
 import gregtech.loaders.postload.recipes.AlloySmelterRecipes;
 import gregtech.loaders.postload.recipes.ArcFurnaceRecipes;
 import gregtech.loaders.postload.recipes.AssemblerRecipes;
@@ -57,7 +57,7 @@ import gregtech.loaders.postload.recipes.TranscendentPlasmaMixerRecipes;
 import gregtech.loaders.postload.recipes.VacuumFreezerRecipes;
 import gregtech.loaders.postload.recipes.WiremillRecipes;
 
-public class GT_MachineRecipeLoader implements Runnable {
+public class MachineRecipeLoader implements Runnable {
 
     public static final String aTextTCGTPage = "gt.research.page.1.";
 
@@ -118,9 +118,9 @@ public class GT_MachineRecipeLoader implements Runnable {
         new WiremillRecipes().run();
         new TranscendentPlasmaMixerRecipes().run();
 
-        GT_BauxiteRefineChain.run();
-        GT_NaniteChain.run();
-        GT_PCBFactoryRecipes.load();
-        GT_PurifiedWaterRecipes.run();
+        BauxiteRefineChain.run();
+        NaniteChain.run();
+        PCBFactoryRecipes.load();
+        PurifiedWaterRecipes.run();
     }
 }
diff --git a/src/main/java/gregtech/loaders/postload/MachineTooltipsLoader.java b/src/main/java/gregtech/loaders/postload/MachineTooltipsLoader.java
new file mode 100644
index 0000000000..2043576494
--- /dev/null
+++ b/src/main/java/gregtech/loaders/postload/MachineTooltipsLoader.java
@@ -0,0 +1,36 @@
+package gregtech.loaders.postload;
+
+import static gregtech.api.enums.GTValues.GT;
+
+import net.minecraft.item.ItemStack;
+
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTLog;
+import gregtech.common.blocks.ItemMachines;
+
+public class MachineTooltipsLoader implements Runnable {
+
+    @Override
+    public void run() {
+        if (!GT.isClientSide()) return;
+        GTLog.out.println("GT Mod: Register Block Machine's tooltips");
+        for (int i = 0; i < 32768; i++) {
+            ItemStack tStack = new ItemStack(GregTechAPI.sBlockMachines, 1, i);
+            if (tStack.getItem() != null && tStack.getItem() instanceof ItemMachines) {
+                ((ItemMachines) tStack.getItem()).registerDescription(i);
+            }
+        }
+        GTLanguageManager.addStringLocalization("TileEntity_EUp_IN", "Voltage IN: ");
+        GTLanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Voltage OUT: ");
+        GTLanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amperage: ");
+        GTLanguageManager.addStringLocalization("TileEntity_EUp_STORE", "Capacity: ");
+        GTLanguageManager.addStringLocalization("TileEntity_TANK_INFO", "Contains Fluid: ");
+        GTLanguageManager.addStringLocalization("TileEntity_TANK_AMOUNT", "Fluid Amount: ");
+        GTLanguageManager.addStringLocalization("TileEntity_CHEST_INFO", "Contains Item: ");
+        GTLanguageManager.addStringLocalization("TileEntity_CHEST_AMOUNT", "Item Amount: ");
+        GTLanguageManager.addStringLocalization("GT_TileEntity_MUFFLER", "has Muffler Upgrade");
+        GTLanguageManager.addStringLocalization("GT_TileEntity_STEAMCONVERTER", "has Steam Upgrade");
+        GTLanguageManager.addStringLocalization("GT_TileEntity_STEAMTANKS", "Steam Tank Upgrades");
+    }
+}
diff --git a/src/main/java/gregtech/loaders/postload/MinableRegistrator.java b/src/main/java/gregtech/loaders/postload/MinableRegistrator.java
new file mode 100644
index 0000000000..ea59486146
--- /dev/null
+++ b/src/main/java/gregtech/loaders/postload/MinableRegistrator.java
@@ -0,0 +1,16 @@
+package gregtech.loaders.postload;
+
+import net.minecraft.init.Blocks;
+
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+
+public class MinableRegistrator implements Runnable {
+
+    @Override
+    public void run() {
+        GTLog.out.println("GTMod: Adding Blocks to the Miners Valuable List.");
+        GTModHandler.addValuableOre(Blocks.glowstone, 0, 1);
+        GTModHandler.addValuableOre(Blocks.soul_sand, 0, 1);
+    }
+}
diff --git a/src/main/java/gregtech/loaders/postload/PCBFactoryMaterialLoader.java b/src/main/java/gregtech/loaders/postload/PCBFactoryMaterialLoader.java
new file mode 100644
index 0000000000..0f6ab52a32
--- /dev/null
+++ b/src/main/java/gregtech/loaders/postload/PCBFactoryMaterialLoader.java
@@ -0,0 +1,19 @@
+package gregtech.loaders.postload;
+
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.MaterialsKevlar;
+import gregtech.api.util.PCBFactoryManager;
+
+public class PCBFactoryMaterialLoader {
+
+    public static void load() {
+        // add Plastics
+        PCBFactoryManager.addPlasticTier(Materials.Plastic, 1);
+        PCBFactoryManager.addPlasticTier(Materials.PolyvinylChloride, 2);
+        PCBFactoryManager.addPlasticTier(Materials.Polytetrafluoroethylene, 3);
+        PCBFactoryManager.addPlasticTier(Materials.Epoxid, 4);
+        PCBFactoryManager.addPlasticTier(Materials.EpoxidFiberReinforced, 5);
+        PCBFactoryManager.addPlasticTier(Materials.Polybenzimidazole, 6);
+        PCBFactoryManager.addPlasticTier(MaterialsKevlar.Kevlar, 7);
+    }
+}
diff --git a/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java b/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java
index 389ac1cc57..cb8d73cae1 100644
--- a/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java
+++ b/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java
@@ -14,7 +14,7 @@ import appeng.api.networking.ticking.TickingRequest;
 import appeng.parts.AEBasePart;
 import appeng.parts.p2p.PartP2PIC2Power;
 import gregtech.api.interfaces.tileentity.IEnergyConnected;
-import gregtech.api.util.GT_Log;
+import gregtech.api.util.GTLog;
 
 public class PartP2PGTPower extends PartP2PIC2Power implements IGridTickable {
 
@@ -96,8 +96,8 @@ public class PartP2PGTPower extends PartP2PIC2Power implements IGridTickable {
             fSide.setAccessible(true);
             return (ForgeDirection) fSide.get(this);
         } catch (Exception e) {
-            GT_Log.out.println("A fatal error occured at the P2P tunnel for GT electricity");
-            e.printStackTrace(GT_Log.out);
+            GTLog.out.println("A fatal error occured at the P2P tunnel for GT electricity");
+            e.printStackTrace(GTLog.out);
             throw new RuntimeException(e);
         }
     }
diff --git a/src/main/java/gregtech/loaders/postload/PosteaTransformers.java b/src/main/java/gregtech/loaders/postload/PosteaTransformers.java
index ae24de26e8..d920872f0e 100644
--- a/src/main/java/gregtech/loaders/postload/PosteaTransformers.java
+++ b/src/main/java/gregtech/loaders/postload/PosteaTransformers.java
@@ -8,8 +8,8 @@ import com.gtnewhorizons.postea.api.TileEntityReplacementManager;
 import com.gtnewhorizons.postea.utility.BlockInfo;
 
 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 vexatos.tgregworks.reference.Mods;
 
 public class PosteaTransformers implements Runnable {
@@ -34,7 +34,7 @@ public class PosteaTransformers implements Runnable {
             int indexInMaterialList = id - 4096;
             // The offset from 4096 is the index in the material list, so if this is outside the valid range then this
             // is not a valid frame box, and we don't want to modify it
-            if (indexInMaterialList < 0 || indexInMaterialList >= GregTech_API.sGeneratedMaterials.length) {
+            if (indexInMaterialList < 0 || indexInMaterialList >= GregTechAPI.sGeneratedMaterials.length) {
                 // Do not modify this TE, so return null
                 return null;
             }
@@ -44,12 +44,12 @@ public class PosteaTransformers implements Runnable {
             // is the new frame block. We can make sure to keep the TE using a pass-through transformer.
             // This works because between the old and new frame systems, the TileEntity used for covered frames
             // is still the same
-            if (tag.hasKey(GT_Values.NBT.COVERS)) {
-                return new BlockInfo(GregTech_API.sBlockFrames, indexInMaterialList, PosteaTransformers::passthrough);
+            if (tag.hasKey(GTValues.NBT.COVERS)) {
+                return new BlockInfo(GregTechAPI.sBlockFrames, indexInMaterialList, PosteaTransformers::passthrough);
             }
 
             // If this frame has no covers, simply return a block and delete the TileEntity
-            return new BlockInfo(GregTech_API.sBlockFrames, indexInMaterialList);
+            return new BlockInfo(GregTechAPI.sBlockFrames, indexInMaterialList);
         });
 
         ItemStackReplacementManager.addItemReplacement("gregtech:gt.blockmachines", (tag) -> {
@@ -57,12 +57,12 @@ public class PosteaTransformers implements Runnable {
             int id = tag.getInteger("Damage");
             int indexInMaterialList = id - 4096;
             // Not a frame box
-            if (indexInMaterialList < 0 || indexInMaterialList >= GregTech_API.sGeneratedMaterials.length) {
+            if (indexInMaterialList < 0 || indexInMaterialList >= GregTechAPI.sGeneratedMaterials.length) {
                 return tag;
             }
             // Not a frame box if the material for this id does not have a frame box associated with it.
             // Apparently the DEFC ID overlaps with the material ID for a Bastnasite frame box for example
-            if ((GregTech_API.sGeneratedMaterials[indexInMaterialList].mTypes & 0x2) == 0) {
+            if ((GregTechAPI.sGeneratedMaterials[indexInMaterialList].mTypes & 0x2) == 0) {
                 return tag;
             }
             Item frameItem = GameRegistry.findItem(Mods.GregTech, "gt.blockframes");
diff --git a/src/main/java/gregtech/loaders/postload/ProcessingArrayRecipeLoader.java b/src/main/java/gregtech/loaders/postload/ProcessingArrayRecipeLoader.java
new file mode 100644
index 0000000000..9525041fcc
--- /dev/null
+++ b/src/main/java/gregtech/loaders/postload/ProcessingArrayRecipeLoader.java
@@ -0,0 +1,156 @@
+package gregtech.loaders.postload;
+
+import gregtech.api.enums.SoundResource;
+import gregtech.api.recipe.RecipeMaps;
+import gregtech.api.util.ProcessingArrayManager;
+
+public class ProcessingArrayRecipeLoader {
+
+    public static void registerDefaultGregtechMaps() {
+
+        // Alloy Smelter
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.alloysmelter", RecipeMaps.alloySmelterRecipes);
+        ProcessingArrayManager
+            .addSoundResourceToPA("basicmachine.alloysmelter", SoundResource.IC2_MACHINES_INDUCTION_LOOP);
+        // Arc Furnace
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.arcfurnace", RecipeMaps.arcFurnaceRecipes);
+        ProcessingArrayManager
+            .addSoundResourceToPA("basicmachine.arcfurnace", SoundResource.IC2_MACHINES_INDUCTION_LOOP);
+        // Assembler
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.assembler", RecipeMaps.assemblerRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.assembler", SoundResource.NONE);
+        // Autoclave
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.autoclave", RecipeMaps.autoclaveRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.autoclave", SoundResource.NONE);
+        // Bender
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.bender", RecipeMaps.benderRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.bender", SoundResource.IC2_MACHINES_COMPRESSOR_OP);
+        // Boxinator
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.boxinator", RecipeMaps.packagerRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.boxinator", SoundResource.NONE);
+        // Brewery
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.brewery", RecipeMaps.brewingRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.brewery", SoundResource.NONE);
+        // Canner
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.canner", RecipeMaps.cannerRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.canner", SoundResource.IC2_MACHINES_EXTRACTOR_OP);
+        // Centrifuge
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.centrifuge", RecipeMaps.centrifugeNonCellRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.centrifuge", SoundResource.NONE);
+        // Chemical Bath
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.chemicalbath", RecipeMaps.chemicalBathRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.chemicalbath", SoundResource.NONE);
+        // Chemical Reactor
+        ProcessingArrayManager
+            .addRecipeMapToPA("basicmachine.chemicalreactor", RecipeMaps.multiblockChemicalReactorRecipes);
+        ProcessingArrayManager
+            .addSoundResourceToPA("basicmachine.chemicalreactor", SoundResource.IC2_MACHINES_EXTRACTOR_OP);
+        // Circuit Assembler
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.circuitassembler", RecipeMaps.circuitAssemblerRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.circuitassembler", SoundResource.NONE);
+        // Compressor
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.compressor", RecipeMaps.compressorRecipes);
+        ProcessingArrayManager
+            .addSoundResourceToPA("basicmachine.compressor", SoundResource.IC2_MACHINES_COMPRESSOR_OP);
+        // Cutting Machine
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.cutter", RecipeMaps.cutterRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.cutter", SoundResource.NONE);
+        // Distillery
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.distillery", RecipeMaps.distilleryRecipes);
+        ProcessingArrayManager
+            .addSoundResourceToPA("basicmachine.distillery", SoundResource.GT_MACHINES_DISTILLERY_LOOP);
+        // Electrolyzer
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.electrolyzer", RecipeMaps.electrolyzerNonCellRecipes);
+        ProcessingArrayManager
+            .addSoundResourceToPA("basicmachine.electrolyzer", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP);
+        // Extractor
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.extractor", RecipeMaps.extractorRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.extractor", SoundResource.IC2_MACHINES_EXTRACTOR_OP);
+        // Extruder
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.extruder", RecipeMaps.extruderRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.extruder", SoundResource.IC2_MACHINES_INDUCTION_LOOP);
+        // Fermenter
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.fermenter", RecipeMaps.fermentingRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.fermenter", SoundResource.NONE);
+        // Fluid Canner
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.fluidcanner", RecipeMaps.fluidCannerRecipes);
+        ProcessingArrayManager
+            .addSoundResourceToPA("basicmachine.fluidcanner", SoundResource.IC2_MACHINES_EXTRACTOR_OP);
+        // Fluid Extractor
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.fluidextractor", RecipeMaps.fluidExtractionRecipes);
+        ProcessingArrayManager
+            .addSoundResourceToPA("basicmachine.fluidextractor", SoundResource.IC2_MACHINES_EXTRACTOR_OP);
+        // Fluid Heater
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.fluidheater", RecipeMaps.fluidHeaterRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.fluidheater", SoundResource.NONE);
+        // Fluid Solidifier
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.fluidsolidifier", RecipeMaps.fluidSolidifierRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.fluidsolidifier", SoundResource.NONE);
+        // Forge Hammer
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.hammer", RecipeMaps.hammerRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.hammer", SoundResource.RANDOM_ANVIL_USE);
+        // Forming Press
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.press", RecipeMaps.formingPressRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.press", SoundResource.IC2_MACHINES_COMPRESSOR_OP);
+        // Laser Engraver
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.laserengraver", RecipeMaps.laserEngraverRecipes);
+        ProcessingArrayManager
+            .addSoundResourceToPA("basicmachine.laserengraver", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP);
+        // Lathe
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.lathe", RecipeMaps.latheRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.lathe", SoundResource.NONE);
+        // Macerator
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.macerator", RecipeMaps.maceratorRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.macerator", SoundResource.IC2_MACHINES_MACERATOR_OP);
+        // Magnetic Separator
+        ProcessingArrayManager
+            .addRecipeMapToPA("basicmachine.electromagneticseparator", RecipeMaps.electroMagneticSeparatorRecipes);
+        ProcessingArrayManager
+            .addSoundResourceToPA("basicmachine.electromagneticseparator", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP);
+        // Matter Amplifier
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.amplifab", RecipeMaps.amplifierRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.amplifab", SoundResource.IC2_MACHINES_EXTRACTOR_OP);
+        // Microwave
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.microwave", RecipeMaps.microwaveRecipes);
+        ProcessingArrayManager
+            .addSoundResourceToPA("basicmachine.microwave", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP);
+        // Mixer
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.mixer", RecipeMaps.mixerNonCellRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.mixer", SoundResource.NONE);
+        // Ore Washer
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.orewasher", RecipeMaps.oreWasherRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.orewasher", SoundResource.NONE);
+        // Plasma Arc Furnace
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.plasmaarcfurnace", RecipeMaps.plasmaArcFurnaceRecipes);
+        ProcessingArrayManager
+            .addSoundResourceToPA("basicmachine.plasmaarcfurnace", SoundResource.IC2_MACHINES_INDUCTION_LOOP);
+        // Polarizer
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.polarizer", RecipeMaps.polarizerRecipes);
+        ProcessingArrayManager
+            .addSoundResourceToPA("basicmachine.polarizer", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP);
+        // Printer
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.printer", RecipeMaps.printerRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.printer", SoundResource.IC2_MACHINES_COMPRESSOR_OP);
+        // Recycler
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.recycler", RecipeMaps.recyclerRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.recycler", SoundResource.IC2_MACHINES_RECYCLER_OP);
+        // Scanner
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.scanner", RecipeMaps.scannerFakeRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.scanner", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP);
+        // Sifter
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.sifter", RecipeMaps.sifterRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.sifter", SoundResource.NONE);
+        // Slicer
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.slicer", RecipeMaps.slicerRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.slicer", SoundResource.NONE);
+        // Thermal Centrifuge
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.thermalcentrifuge", RecipeMaps.thermalCentrifugeRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.thermalcentrifuge", SoundResource.NONE);
+        // Unboxinator
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.unboxinator", RecipeMaps.unpackagerRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.unboxinator", SoundResource.NONE);
+        // Wiremill
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.wiremill", RecipeMaps.wiremillRecipes);
+        ProcessingArrayManager.addSoundResourceToPA("basicmachine.wiremill", SoundResource.IC2_MACHINES_RECYCLER_OP);
+    }
+}
diff --git a/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java b/src/main/java/gregtech/loaders/postload/RecyclerBlacklistLoader.java
index 70bb18527c..e2c821512f 100644
--- a/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java
+++ b/src/main/java/gregtech/loaders/postload/RecyclerBlacklistLoader.java
@@ -1,7 +1,7 @@
 package gregtech.loaders.postload;
 
 import static gregtech.api.enums.Mods.Chisel;
-import static gregtech.api.util.GT_ModHandler.addToRecyclerBlackList;
+import static gregtech.api.util.GTModHandler.addToRecyclerBlackList;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -11,14 +11,14 @@ import com.glodblock.github.loader.ItemAndBlockHolder;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Mods;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
 
-public class GT_RecyclerBlacklistLoader implements Runnable {
+public class RecyclerBlacklistLoader implements Runnable {
 
     @Override
     public void run() {
-        GT_Log.out.println("GT_Mod: Adding Stuff to the Recycler Blacklist.");
+        GTLog.out.println("GTMod: Adding Stuff to the Recycler Blacklist.");
         addToRecyclerBlackList(new ItemStack(Items.arrow, 1, 0));
         addToRecyclerBlackList(new ItemStack(Items.bone, 1, 0));
         addToRecyclerBlackList(ItemList.Dye_Bonemeal.get(1L));
@@ -31,7 +31,7 @@ public class GT_RecyclerBlacklistLoader implements Runnable {
         ItemStack tStack = new ItemStack(Blocks.cobblestone, 1, 0);
         while (tStack != null) {
             addToRecyclerBlackList(tStack);
-            tStack = GT_ModHandler
+            tStack = GTModHandler
                 .getRecipeOutput(tStack, tStack, tStack, tStack, tStack, tStack, tStack, tStack, tStack);
         }
         addToRecyclerBlackList(new ItemStack(Blocks.gravel, 1, 32767));
@@ -40,63 +40,63 @@ public class GT_RecyclerBlacklistLoader implements Runnable {
         addToRecyclerBlackList(new ItemStack(Blocks.sandstone_stairs, 1, 32767));
         addToRecyclerBlackList(new ItemStack(Blocks.stone_stairs, 1, 32767));
         addToRecyclerBlackList(new ItemStack(Blocks.stone_brick_stairs, 1, 32767));
-        addToRecyclerBlackList(GT_ModHandler.getSmeltingOutput(new ItemStack(Blocks.stone, 1, 0), false, null));
+        addToRecyclerBlackList(GTModHandler.getSmeltingOutput(new ItemStack(Blocks.stone, 1, 0), false, null));
         addToRecyclerBlackList(
-            GT_ModHandler
+            GTModHandler
                 .getRecipeOutput(new ItemStack(Blocks.glass, 1, 0), null, null, new ItemStack(Blocks.glass, 1, 0)));
         addToRecyclerBlackList(
-            GT_ModHandler
+            GTModHandler
                 .getRecipeOutput(new ItemStack(Blocks.stone, 1, 0), null, null, new ItemStack(Blocks.stone, 1, 0)));
         addToRecyclerBlackList(
-            GT_ModHandler.getRecipeOutput(
+            GTModHandler.getRecipeOutput(
                 new ItemStack(Blocks.cobblestone, 1, 0),
                 null,
                 null,
                 new ItemStack(Blocks.cobblestone, 1, 0)));
         addToRecyclerBlackList(
-            GT_ModHandler.getRecipeOutput(
+            GTModHandler.getRecipeOutput(
                 new ItemStack(Blocks.stone, 1, 0),
                 null,
                 new ItemStack(Blocks.stone, 1, 0),
                 null,
                 new ItemStack(Blocks.stone, 1, 0)));
         addToRecyclerBlackList(
-            GT_ModHandler.getRecipeOutput(
+            GTModHandler.getRecipeOutput(
                 new ItemStack(Blocks.stone, 1, 0),
                 new ItemStack(Blocks.glass, 1, 0),
                 new ItemStack(Blocks.stone, 1, 0)));
         addToRecyclerBlackList(
-            GT_ModHandler.getRecipeOutput(
+            GTModHandler.getRecipeOutput(
                 new ItemStack(Blocks.cobblestone, 1, 0),
                 new ItemStack(Blocks.glass, 1, 0),
                 new ItemStack(Blocks.cobblestone, 1, 0)));
         addToRecyclerBlackList(
-            GT_ModHandler.getRecipeOutput(
+            GTModHandler.getRecipeOutput(
                 new ItemStack(Blocks.sandstone, 1, 0),
                 new ItemStack(Blocks.glass, 1, 0),
                 new ItemStack(Blocks.sandstone, 1, 0)));
         addToRecyclerBlackList(
-            GT_ModHandler.getRecipeOutput(
+            GTModHandler.getRecipeOutput(
                 new ItemStack(Blocks.sand, 1, 0),
                 new ItemStack(Blocks.glass, 1, 0),
                 new ItemStack(Blocks.sand, 1, 0)));
         addToRecyclerBlackList(
-            GT_ModHandler.getRecipeOutput(
+            GTModHandler.getRecipeOutput(
                 new ItemStack(Blocks.sandstone, 1, 0),
                 new ItemStack(Blocks.sandstone, 1, 0),
                 new ItemStack(Blocks.sandstone, 1, 0),
                 new ItemStack(Blocks.sandstone, 1, 0),
                 new ItemStack(Blocks.sandstone, 1, 0),
                 new ItemStack(Blocks.sandstone, 1, 0)));
-        addToRecyclerBlackList(GT_ModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0)));
+        addToRecyclerBlackList(GTModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0)));
         addToRecyclerBlackList(
-            GT_ModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0), new ItemStack(Blocks.glass, 1, 0)));
+            GTModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0), new ItemStack(Blocks.glass, 1, 0)));
         if (Chisel.isModLoaded()) {
             for (int i = 1; i <= 15; i++) {
-                addToRecyclerBlackList(GT_ModHandler.getModItem(Chisel.ID, "cobblestone", 1, i));
+                addToRecyclerBlackList(GTModHandler.getModItem(Chisel.ID, "cobblestone", 1, i));
             }
             for (int i = 0; i <= 15; i++) {
-                addToRecyclerBlackList(GT_ModHandler.getModItem(Chisel.ID, "stonebricksmooth", 1, i));
+                addToRecyclerBlackList(GTModHandler.getModItem(Chisel.ID, "stonebricksmooth", 1, i));
             }
         }
         if (Mods.AE2FluidCraft.isModLoaded()) {
diff --git a/src/main/java/gregtech/loaders/postload/ScrapboxDropLoader.java b/src/main/java/gregtech/loaders/postload/ScrapboxDropLoader.java
new file mode 100644
index 0000000000..8574087d31
--- /dev/null
+++ b/src/main/java/gregtech/loaders/postload/ScrapboxDropLoader.java
@@ -0,0 +1,100 @@
+package gregtech.loaders.postload;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+
+public class ScrapboxDropLoader implements Runnable {
+
+    @Override
+    public void run() {
+        GTLog.out.println("GTMod: (re-)adding Scrapbox Drops.");
+
+        GTModHandler.addScrapboxDrop(9.5F, new ItemStack(Items.wooden_hoe));
+        GTModHandler.addScrapboxDrop(2.0F, new ItemStack(Items.wooden_axe));
+        GTModHandler.addScrapboxDrop(2.0F, new ItemStack(Items.wooden_sword));
+        GTModHandler.addScrapboxDrop(2.0F, new ItemStack(Items.wooden_shovel));
+        GTModHandler.addScrapboxDrop(2.0F, new ItemStack(Items.wooden_pickaxe));
+        GTModHandler.addScrapboxDrop(2.0F, new ItemStack(Items.sign));
+        GTModHandler.addScrapboxDrop(9.5F, new ItemStack(Items.stick));
+        GTModHandler.addScrapboxDrop(5.0F, new ItemStack(Blocks.dirt));
+        GTModHandler.addScrapboxDrop(3.0F, new ItemStack(Blocks.grass));
+        GTModHandler.addScrapboxDrop(3.0F, new ItemStack(Blocks.gravel));
+        GTModHandler.addScrapboxDrop(0.5F, new ItemStack(Blocks.pumpkin));
+        GTModHandler.addScrapboxDrop(1.0F, new ItemStack(Blocks.soul_sand));
+        GTModHandler.addScrapboxDrop(2.0F, new ItemStack(Blocks.netherrack));
+        GTModHandler.addScrapboxDrop(1.0F, new ItemStack(Items.bone));
+        GTModHandler.addScrapboxDrop(9.0F, new ItemStack(Items.rotten_flesh));
+        GTModHandler.addScrapboxDrop(0.4F, new ItemStack(Items.cooked_porkchop));
+        GTModHandler.addScrapboxDrop(0.4F, new ItemStack(Items.cooked_beef));
+        GTModHandler.addScrapboxDrop(0.4F, new ItemStack(Items.cooked_chicken));
+        GTModHandler.addScrapboxDrop(0.5F, new ItemStack(Items.apple));
+        GTModHandler.addScrapboxDrop(0.5F, new ItemStack(Items.bread));
+        GTModHandler.addScrapboxDrop(0.1F, new ItemStack(Items.cake));
+        GTModHandler.addScrapboxDrop(1.0F, ItemList.IC2_Food_Can_Filled.get(1L));
+        GTModHandler.addScrapboxDrop(2.0F, ItemList.IC2_Food_Can_Spoiled.get(1L));
+        GTModHandler.addScrapboxDrop(0.2F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1L));
+        GTModHandler.addScrapboxDrop(1.0F, GTOreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L));
+        GTModHandler.addScrapboxDrop(2.0F, ItemList.Cell_Empty.get(1L));
+        GTModHandler.addScrapboxDrop(5.0F, GTOreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 1L));
+        GTModHandler.addScrapboxDrop(1.0F, new ItemStack(Items.leather));
+        GTModHandler.addScrapboxDrop(1.0F, new ItemStack(Items.feather));
+        GTModHandler.addScrapboxDrop(0.7F, GTModHandler.getIC2Item("plantBall", 1L));
+        GTModHandler.addScrapboxDrop(3.8F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L));
+        GTModHandler.addScrapboxDrop(0.6F, new ItemStack(Items.slime_ball));
+        GTModHandler.addScrapboxDrop(0.8F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Rubber, 1L));
+        GTModHandler.addScrapboxDrop(2.7F, GTModHandler.getIC2Item("suBattery", 1L));
+        GTModHandler.addScrapboxDrop(3.6F, ItemList.Circuit_Primitive.get(1L));
+        GTModHandler.addScrapboxDrop(0.8F, ItemList.Circuit_Parts_Advanced.get(1L));
+        GTModHandler.addScrapboxDrop(1.8F, ItemList.Circuit_Board_Basic.get(1L));
+        GTModHandler.addScrapboxDrop(0.4F, ItemList.Circuit_Board_Advanced.get(1L));
+        GTModHandler.addScrapboxDrop(0.2F, ItemList.Circuit_Board_Elite.get(1L));
+        GTModHandler.addScrapboxDrop(0.9F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L));
+        GTModHandler.addScrapboxDrop(0.8F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L));
+        GTModHandler.addScrapboxDrop(0.8F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L));
+        GTModHandler.addScrapboxDrop(2.5F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Charcoal, 1L));
+        GTModHandler.addScrapboxDrop(1.0F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L));
+        GTModHandler.addScrapboxDrop(1.0F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L));
+        GTModHandler.addScrapboxDrop(0.5F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1L));
+        GTModHandler.addScrapboxDrop(0.5F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Electrum, 1L));
+        GTModHandler.addScrapboxDrop(1.2F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1L));
+        GTModHandler.addScrapboxDrop(1.2F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L));
+        GTModHandler.addScrapboxDrop(0.5F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bauxite, 1L));
+        GTModHandler.addScrapboxDrop(0.5F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L));
+        GTModHandler.addScrapboxDrop(0.5F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lead, 1L));
+        GTModHandler.addScrapboxDrop(0.5F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1L));
+        GTModHandler.addScrapboxDrop(0.5F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1L));
+        GTModHandler.addScrapboxDrop(0.5F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 1L));
+        GTModHandler.addScrapboxDrop(0.5F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1L));
+        GTModHandler.addScrapboxDrop(1.5F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L));
+        GTModHandler.addScrapboxDrop(1.5F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L));
+        GTModHandler.addScrapboxDrop(2.0F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1L));
+        GTModHandler.addScrapboxDrop(2.0F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lazurite, 1L));
+        GTModHandler.addScrapboxDrop(2.0F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Pyrite, 1L));
+        GTModHandler.addScrapboxDrop(2.0F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1L));
+        GTModHandler.addScrapboxDrop(2.0F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodalite, 1L));
+        GTModHandler.addScrapboxDrop(4.0F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Netherrack, 1L));
+        GTModHandler.addScrapboxDrop(4.0F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Flint, 1L));
+        GTModHandler.addScrapboxDrop(0.03F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1L));
+        GTModHandler.addScrapboxDrop(0.03F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 1L));
+        GTModHandler.addScrapboxDrop(0.03F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L));
+        GTModHandler.addScrapboxDrop(0.03F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1L));
+        GTModHandler.addScrapboxDrop(0.03F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 1L));
+        GTModHandler.addScrapboxDrop(0.03F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1L));
+        GTModHandler.addScrapboxDrop(0.5F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.GarnetRed, 1L));
+        GTModHandler.addScrapboxDrop(0.5F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.GarnetYellow, 1L));
+        GTModHandler.addScrapboxDrop(0.05F, GTOreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L));
+        GTModHandler.addScrapboxDrop(0.05F, GTOreDictUnificator.get(OrePrefixes.gem, Materials.Ruby, 1L));
+        GTModHandler.addScrapboxDrop(0.05F, GTOreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L));
+        GTModHandler.addScrapboxDrop(0.05F, GTOreDictUnificator.get(OrePrefixes.gem, Materials.GreenSapphire, 1L));
+        GTModHandler.addScrapboxDrop(0.05F, GTOreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L));
+        GTModHandler.addScrapboxDrop(0.05F, GTOreDictUnificator.get(OrePrefixes.gem, Materials.Diamond, 1L));
+    }
+}
diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java b/src/main/java/gregtech/loaders/postload/chains/BauxiteRefineChain.java
index dfe14762c5..ec108b7cc9 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java
+++ b/src/main/java/gregtech/loaders/postload/chains/BauxiteRefineChain.java
@@ -5,50 +5,50 @@ import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidHeaterRecipes;
 import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
 import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
-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 net.minecraftforge.fluids.FluidStack;
 
-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.MaterialsOreAlum;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
-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_BauxiteRefineChain {
+public class BauxiteRefineChain {
 
     public static void run() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bauxite, 32),
+                GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Bauxite, 32),
                 Materials.SodiumHydroxide.getDust(9),
                 Materials.Quicklime.getDust(4),
-                GT_Utility.getIntegratedCircuit(8))
+                GTUtility.getIntegratedCircuit(8))
             .fluidInputs(Materials.Water.getFluid(5000))
             .fluidOutputs(MaterialsOreAlum.BauxiteSlurry.getFluid(8000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Bauxite, 32),
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Bauxite, 32),
                 Materials.SodiumHydroxide.getDust(9),
                 Materials.Quicklime.getDust(4),
-                GT_Utility.getIntegratedCircuit(8))
+                GTUtility.getIntegratedCircuit(8))
             .fluidInputs(Materials.Water.getFluid(5000))
             .fluidOutputs(MaterialsOreAlum.BauxiteSlurry.getFluid(8000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(MaterialsOreAlum.BauxiteSlurry.getFluid(2000))
             .fluidOutputs(MaterialsOreAlum.HeatedBauxiteSlurry.getFluid(2000))
             .duration(2 * SECONDS)
@@ -56,7 +56,7 @@ public class GT_BauxiteRefineChain {
             .noOptimize()
             .addTo(fluidHeaterRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Aluminiumhydroxide.getDust(1))
             .itemOutputs(
                 Materials.Aluminiumoxide.getDust(64),
@@ -70,7 +70,7 @@ public class GT_BauxiteRefineChain {
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(MaterialsOreAlum.BauxiteSlag.getDust(1))
             .itemOutputs(
                 Materials.Rutile.getDust(1),
@@ -83,8 +83,8 @@ public class GT_BauxiteRefineChain {
             .eut(TierEU.RECIPE_MV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Ilmenite, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Ilmenite, 1))
             .itemOutputs(Materials.Rutile.getDust(2), MaterialsOreAlum.IlmeniteSlag.getDust(1))
             .outputChances(10000, 3000)
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000))
@@ -93,8 +93,8 @@ public class GT_BauxiteRefineChain {
             .eut(1000)
             .addTo(chemicalBathRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Ilmenite, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Ilmenite, 1))
             .itemOutputs(Materials.Rutile.getDust(2), MaterialsOreAlum.IlmeniteSlag.getDust(1))
             .outputChances(10000, 6000)
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000))
@@ -103,7 +103,7 @@ public class GT_BauxiteRefineChain {
             .eut(1000)
             .addTo(chemicalBathRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(MaterialsOreAlum.IlmeniteSlag.getDust(1))
             .itemOutputs(
                 Materials.Iron.getDust(1),
@@ -120,33 +120,33 @@ public class GT_BauxiteRefineChain {
             OrePrefixes.dustImpure, OrePrefixes.dustPure };
 
         for (OrePrefixes ore : washable) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(ore, Materials.Sapphire, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(ore, Materials.Sapphire, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
                 .fluidOutputs(MaterialsOreAlum.SapphireJuice.getFluid(1000))
                 .duration(2 * SECONDS)
                 .eut(100)
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(ore, Materials.GreenSapphire, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(ore, Materials.GreenSapphire, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
                 .fluidOutputs(MaterialsOreAlum.GreenSapphireJuice.getFluid(1000))
                 .duration(2 * SECONDS)
                 .eut(100)
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(ore, Materials.Ruby, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(ore, Materials.Ruby, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
                 .fluidOutputs(MaterialsOreAlum.RubyJuice.getFluid(1000))
                 .duration(2 * SECONDS)
@@ -154,8 +154,8 @@ public class GT_BauxiteRefineChain {
                 .addTo(mixerRecipes);
         }
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(
                 Materials.Aluminiumhydroxide.getDust(3),
                 Materials.Iron.getDust(1),
@@ -168,8 +168,8 @@ public class GT_BauxiteRefineChain {
             .eut(100)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(
                 Materials.Aluminiumhydroxide.getDust(3),
                 Materials.Iron.getDust(1),
@@ -183,8 +183,8 @@ public class GT_BauxiteRefineChain {
             .eut(100)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(
                 Materials.Aluminiumhydroxide.getDust(3),
                 Materials.Chrome.getDust(1),
@@ -198,7 +198,7 @@ public class GT_BauxiteRefineChain {
             .eut(100)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Pyrope.getDust(1))
             .itemOutputs(
                 Materials.Aluminiumoxide.getDust(1),
@@ -214,7 +214,7 @@ public class GT_BauxiteRefineChain {
             .eut(TierEU.RECIPE_MV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Almandine.getDust(1))
             .itemOutputs(
                 Materials.Aluminiumoxide.getDust(1),
@@ -230,7 +230,7 @@ public class GT_BauxiteRefineChain {
             .eut(TierEU.RECIPE_MV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Spessartine.getDust(1))
             .itemOutputs(
                 Materials.Aluminiumoxide.getDust(1),
@@ -246,7 +246,7 @@ public class GT_BauxiteRefineChain {
             .eut(TierEU.RECIPE_MV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Andradite.getDust(1))
             .itemOutputs(
                 Materials.Quicklime.getDust(1),
@@ -262,7 +262,7 @@ public class GT_BauxiteRefineChain {
             .eut(TierEU.RECIPE_MV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Uvarovite.getDust(1))
             .itemOutputs(
                 Materials.Quicklime.getDust(1),
@@ -278,7 +278,7 @@ public class GT_BauxiteRefineChain {
             .eut(TierEU.RECIPE_MV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Grossular.getDust(1))
             .itemOutputs(
                 Materials.Quicklime.getDust(1),
diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java
index 836756a18a..9be7e1b6b6 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
+++ b/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java
@@ -3,14 +3,14 @@ package gregtech.loaders.postload.chains;
 import static goodgenerator.loader.Loaders.huiCircuit;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.recipe.RecipeMaps.nanoForgeRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.HOURS;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeConstants.AssemblyLine;
-import static gregtech.api.util.GT_RecipeConstants.NANO_FORGE_TIER;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.HOURS;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeConstants.AssemblyLine;
+import static gregtech.api.util.GTRecipeConstants.NANO_FORGE_TIER;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME;
 import static gtPlusPlus.core.block.ModBlocks.blockCompressedObsidian;
 
 import net.minecraft.item.ItemStack;
@@ -18,18 +18,17 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-
-import gregtech.api.enums.GT_Values;
+import bartworks.system.material.WerkstoffLoader;
+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.TierEU;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
-public class GT_NaniteChain {
+public class NaniteChain {
 
     public static void run() {
 
@@ -37,14 +36,14 @@ public class GT_NaniteChain {
         ItemStack aUHVTierLens = getModItem(NewHorizonsCoreMod.ID, "item.ChromaticLens", 0);
         ItemStack aUEVTierLens = getModItem(NewHorizonsCoreMod.ID, "item.RadoxPolymerLens", 0);
         ItemStack aUIVTierLens = ItemList.EnergisedTesseract.get(0);
-        ItemStack aUMVTierLens = GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 0, false);
+        ItemStack aUMVTierLens = GTOreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 0, false);
 
         // Carbon Nanite Recipe Before Nano Forge
         Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null
             ? FluidRegistry.getFluid("molten.indalloy140")
             : FluidRegistry.getFluid("molten.solderingalloy");
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, Materials.Carbon.getNanite(1))
             .metadata(RESEARCH_TIME, 1 * HOURS)
             .itemInputs(
@@ -54,7 +53,7 @@ public class GT_NaniteChain {
                 ItemList.Conveyor_Module_UV.get(16),
                 ItemList.Electric_Motor_UV.get(32),
                 new Object[] { OrePrefixes.circuit.get(Materials.LuV), 16 },
-                GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 32))
+                GTOreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 32))
             .fluidInputs(
                 new FluidStack(solderIndalloy, 144 * 32),
                 Materials.HSSS.getMolten(144L * 32),
@@ -64,15 +63,15 @@ public class GT_NaniteChain {
             .duration(5 * MINUTES)
             .addTo(AssemblyLine);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, ItemList.Circuit_Crystalmainframe.get(1))
             .metadata(RESEARCH_TIME, 2 * HOURS)
             .itemInputs(
                 new Object[] { OrePrefixes.circuit.get(Materials.UV), 16 },
                 ItemList.Robot_Arm_UV.get(16),
                 ItemList.Circuit_Chip_Stemcell.get(32),
-                GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 32),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahAlloy, 16),
+                GTOreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 32),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahAlloy, 16),
                 Materials.Carbon.getDust(64))
             .fluidInputs(Materials.UUMatter.getFluid(10000), new FluidStack(solderIndalloy, 144 * 32))
             .itemOutputs(Materials.Carbon.getNanite(2))
@@ -88,7 +87,7 @@ public class GT_NaniteChain {
          */
 
         // Carbon Nanites - Used to make more Nano Forge Controllers
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 aUVTierLens,
                 new ItemStack(WerkstoffLoader.BWBlockCasingsAdvanced, 8, 31776),
@@ -101,7 +100,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Silver Nanites - Used in Tier 2 PCB Factory to improve board production
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(aUEVTierLens, Materials.Silver.getBlocks(8), ItemList.Circuit_Chip_SoC.get(16))
             .itemOutputs(Materials.Silver.getNanite(1))
             .fluidInputs(Materials.UUMatter.getFluid(200_000))
@@ -111,7 +110,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Neutronium Nanites - Used to upgrade the Nano Forge to Tier 2
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 aUHVTierLens,
                 Materials.Neutronium.getBlocks(8),
@@ -125,7 +124,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Glowstone Nanites - Used in the optical circuit line
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 aUEVTierLens,
                 new ItemStack(blockCompressedObsidian, 8, 7), // Double compressed glowstone blocks (yes,
@@ -139,7 +138,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Gold Nanites - Used in Tier 3 PCB Factory to improve board production
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(aUMVTierLens, Materials.Gold.getBlocks(8), ItemList.Circuit_Chip_SoC.get(16))
             .itemOutputs(Materials.Gold.getNanite(1))
             .fluidInputs(Materials.UUMatter.getFluid(300_000))
@@ -149,7 +148,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Transcendent Metal Nanites - Used to upgrade the Nano Forge to Tier 3
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 aUIVTierLens,
                 MaterialsUEVplus.TranscendentMetal.getBlocks(8),
@@ -164,7 +163,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Six-Phased Copper Nanites - Used in Phononic Crystal production for the godforge
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 aUIVTierLens,
                 MaterialsUEVplus.SixPhasedCopper.getBlocks(16),
@@ -181,7 +180,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // White Dwarf Matter Nanites. Used to make Magnetohydrodynamically constrained star matter.
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 aUMVTierLens,
                 new ItemStack(WerkstoffLoader.items.get(OrePrefixes.lens), 0, 36), // Magneto lens
@@ -202,7 +201,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Black Dwarf Matter Nanites. Used to make Magnetohydrodynamically constrained star matter.
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 aUMVTierLens,
                 new ItemStack(WerkstoffLoader.items.get(OrePrefixes.lens), 0, 36), // Magneto lens
@@ -223,7 +222,7 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Universium nanites.
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 aUMVTierLens,
                 // Quantum Anomaly, couldn't find any better naming.
@@ -244,9 +243,9 @@ public class GT_NaniteChain {
             .addTo(nanoForgeRecipes);
 
         // Eternity nanites
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Forcicium, 0, false),
+                GTOreDictUnificator.get(OrePrefixes.lens, Materials.Forcicium, 0, false),
                 // Quantum Anomaly
                 GregtechItemList.Laser_Lens_Special.get(0),
                 MaterialsUEVplus.TranscendentMetal.getNanite(1),
diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/PCBFactoryRecipes.java
index 6be4ab534e..f047bdcab2 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/chains/PCBFactoryRecipes.java
@@ -2,14 +2,14 @@ package gregtech.loaders.postload.chains;
 
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.metadata.PCBFactoryUpgrade.BIO;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeConstants.AssemblyLine;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME;
-import static gtPlusPlus.core.material.ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN;
-import static gtPlusPlus.core.material.ELEMENT.STANDALONE.CHRONOMATIC_GLASS;
-import static gtPlusPlus.core.material.ELEMENT.STANDALONE.HYPOGEN;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeConstants.AssemblyLine;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME;
+import static gtPlusPlus.core.material.MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN;
+import static gtPlusPlus.core.material.MaterialsElements.STANDALONE.CHRONOMATIC_GLASS;
+import static gtPlusPlus.core.material.MaterialsElements.STANDALONE.HYPOGEN;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,9 +19,8 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-
-import gregtech.api.enums.GT_Values;
+import bartworks.system.material.WerkstoffLoader;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsUEVplus;
@@ -30,12 +29,12 @@ import gregtech.api.enums.TierEU;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.metadata.PCBFactoryTierKey;
 import gregtech.api.recipe.metadata.PCBFactoryUpgradeKey;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_PCBFactoryManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.PCBFactoryManager;
 
 @SuppressWarnings("SpellCheckingInspection")
-public class GT_PCBFactoryRecipes {
+public class PCBFactoryRecipes {
 
     private static final PCBFactoryTierKey TIER = PCBFactoryTierKey.INSTANCE;
     private static final PCBFactoryUpgradeKey UPGRADE = PCBFactoryUpgradeKey.INSTANCE;
@@ -46,11 +45,11 @@ public class GT_PCBFactoryRecipes {
             : FluidRegistry.getFluid("molten.solderingalloy");
 
         // Load Multi Recipes
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, ItemList.Circuit_Board_Wetware.get(1))
             .metadata(RESEARCH_TIME, 3 * MINUTES)
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 32),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 32),
                 ItemList.Machine_ZPM_CircuitAssembler.get(4),
                 new Object[] { OrePrefixes.circuit.get(Materials.LuV), 16 },
                 ItemList.Robot_Arm_ZPM.get(8))
@@ -60,24 +59,24 @@ public class GT_PCBFactoryRecipes {
             .duration(5 * MINUTES)
             .addTo(AssemblyLine);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1),
                 Materials.get("Artherium-Sn")
                     .getPlates(6))
             .itemOutputs(ItemList.BasicPhotolithographicFrameworkCasing.get(1))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_ZPM)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
                 Materials.EnrichedHolmium.getPlates(6))
             .itemOutputs(ItemList.ReinforcedPhotolithographicFrameworkCasing.get(1))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_UHV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CELESTIAL_TUNGSTEN.getFrameBox(1),
                 Materials.get("Quantum")
@@ -86,10 +85,10 @@ public class GT_PCBFactoryRecipes {
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_UIV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 HYPOGEN.getFrameBox(1),
-                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2),
+                GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2),
                 Materials.Thulium.getPlates(6))
             .itemOutputs(ItemList.InfinityCooledCasing.get(1))
             .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(8 * 144))
@@ -100,7 +99,7 @@ public class GT_PCBFactoryRecipes {
         // Load CircuitBoard Recipes
 
         // Plastic Circuit Board
-        for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 1; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -108,24 +107,24 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(1),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(1),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.AnnealedCopper, (long) (16 * (Math.sqrt(tier)))),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))),
                     Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 1.5))))
-                .eut((int) GT_Values.VP[tier] * 3 / 4)
+                .eut((int) GTValues.VP[tier] * 3 / 4)
                 .metadata(TIER, 1)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 1; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 0.5))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -133,25 +132,25 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(2),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Silver),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(2),
+                    GTUtility.getNaniteAsCatalyst(Materials.Silver),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.AnnealedCopper, (long) (16 * (Math.sqrt(tier)))),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))),
                     Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 1.5))))
-                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .eut((int) GTValues.VP[tier + 1] * 3 / 4)
                 .metadata(TIER, 2)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 1; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -159,27 +158,27 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(3),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Gold),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(3),
+                    GTUtility.getNaniteAsCatalyst(Materials.Gold),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.AnnealedCopper, (long) (16 * (Math.sqrt(tier)))),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))),
                     Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 1.5))))
-                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .eut((int) GTValues.VP[tier + 1] * 3 / 4)
                 .metadata(TIER, 3)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
 
         // Advanced Circuit Board
-        for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 2; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -187,23 +186,23 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(1),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(1),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))),
                     Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 2.5))))
-                .eut((int) GT_Values.VP[tier] * 3 / 4)
+                .eut((int) GTValues.VP[tier] * 3 / 4)
                 .metadata(TIER, 1)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 2; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1.5))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -211,24 +210,24 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(2),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Silver),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(2),
+                    GTUtility.getNaniteAsCatalyst(Materials.Silver),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))),
                     Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 2.5))))
-                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .eut((int) GTValues.VP[tier + 1] * 3 / 4)
                 .metadata(TIER, 2)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 2; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -236,26 +235,26 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(3),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Gold),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(3),
+                    GTUtility.getNaniteAsCatalyst(Materials.Gold),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))),
                     Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 2.5))))
-                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .eut((int) GTValues.VP[tier + 1] * 3 / 4)
                 .metadata(TIER, 3)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
 
         // More Advanced Circuit Board
-        for (int tier = 3; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 3; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 3))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -263,25 +262,24 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(1),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(1),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator
-                        .get(OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))),
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))),
                     Materials.IronIIIChloride.getFluid((long) (1000 * (Math.sqrt(tier - 2)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 3.5))))
-                .eut((int) GT_Values.VP[tier] * 3 / 4)
+                .eut((int) GTValues.VP[tier] * 3 / 4)
                 .metadata(TIER, 1)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 3; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 3; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2.5))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -289,26 +287,25 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(2),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Silver),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(2),
+                    GTUtility.getNaniteAsCatalyst(Materials.Silver),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator
-                        .get(OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))),
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))),
                     Materials.IronIIIChloride.getFluid((long) (1000 * (Math.sqrt(tier - 2)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 3.5))))
-                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .eut((int) GTValues.VP[tier + 1] * 3 / 4)
                 .metadata(TIER, 2)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 3; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 3; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -316,28 +313,27 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(3),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Gold),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(3),
+                    GTUtility.getNaniteAsCatalyst(Materials.Gold),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator
-                        .get(OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))),
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))),
                     Materials.IronIIIChloride.getFluid((long) (1000 * (Math.sqrt(tier - 2)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 3.5))))
-                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .eut((int) GTValues.VP[tier + 1] * 3 / 4)
                 .metadata(TIER, 3)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
 
         // Elite Circuit Board
-        for (int tier = 4; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 4; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 4))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -345,24 +341,23 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(1),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(1),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator
-                        .get(OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))),
                     Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 4.5))))
-                .eut((int) GT_Values.VP[tier] * 3 / 4)
+                .eut((int) GTValues.VP[tier] * 3 / 4)
                 .metadata(TIER, 1)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 4; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 4; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 3.5))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -370,25 +365,24 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(2),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Silver),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(2),
+                    GTUtility.getNaniteAsCatalyst(Materials.Silver),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator
-                        .get(OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))),
                     Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 4.5))))
-                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .eut((int) GTValues.VP[tier + 1] * 3 / 4)
                 .metadata(TIER, 2)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 4; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 4; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 3))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -396,27 +390,26 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(3),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Gold),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(3),
+                    GTUtility.getNaniteAsCatalyst(Materials.Gold),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator
-                        .get(OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))),
                     Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 4.5))))
-                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .eut((int) GTValues.VP[tier + 1] * 3 / 4)
                 .metadata(TIER, 3)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
 
         // Wetware Circuit Board
-        for (int tier = 5; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 5; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 5))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -424,14 +417,14 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(1),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(1),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.EnrichedHolmium, (long) (16 * (Math.sqrt(tier - 4)))),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))),
@@ -439,12 +432,12 @@ public class GT_PCBFactoryRecipes {
                     Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5))))
-                .eut((int) GT_Values.VP[tier] * 3 / 4)
+                .eut((int) GTValues.VP[tier] * 3 / 4)
                 .metadata(TIER, 1)
                 .metadata(UPGRADE, BIO)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 5; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 5; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 4.5))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -452,15 +445,15 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(2),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Silver),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(2),
+                    GTUtility.getNaniteAsCatalyst(Materials.Silver),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.EnrichedHolmium, (long) (16 * (Math.sqrt(tier - 4)))),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))),
@@ -468,12 +461,12 @@ public class GT_PCBFactoryRecipes {
                     Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 5.5))))
-                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .eut((int) GTValues.VP[tier + 1] * 3 / 4)
                 .metadata(TIER, 2)
                 .metadata(UPGRADE, BIO)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 5; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 5; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 4))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -481,15 +474,15 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(3),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Gold),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(3),
+                    GTUtility.getNaniteAsCatalyst(Materials.Gold),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.EnrichedHolmium, (long) (16 * (Math.sqrt(tier - 4)))),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))),
@@ -497,14 +490,14 @@ public class GT_PCBFactoryRecipes {
                     Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 5.5))))
-                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .eut((int) GTValues.VP[tier + 1] * 3 / 4)
                 .metadata(TIER, 3)
                 .metadata(UPGRADE, BIO)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
 
         // Bioware Circuit Board
-        for (int tier = 6; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 6; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -512,16 +505,16 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(1),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(1),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator.get(
+                    GTOreDictUnificator.get(
                         OrePrefixes.foil,
                         Materials.Longasssuperconductornameforuvwire,
                         (long) (16 * (Math.sqrt(tier - 5)))),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))),
@@ -529,12 +522,12 @@ public class GT_PCBFactoryRecipes {
                     Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5))))
-                .eut((int) GT_Values.VP[tier] * 3 / 4)
+                .eut((int) GTValues.VP[tier] * 3 / 4)
                 .metadata(TIER, 1)
                 .metadata(UPGRADE, BIO)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 6; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 6; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 5.5))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -542,17 +535,17 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(2),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Silver),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(2),
+                    GTUtility.getNaniteAsCatalyst(Materials.Silver),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator.get(
+                    GTOreDictUnificator.get(
                         OrePrefixes.foil,
                         Materials.Longasssuperconductornameforuvwire,
                         (long) (16 * (Math.sqrt(tier - 5)))),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))),
@@ -560,12 +553,12 @@ public class GT_PCBFactoryRecipes {
                     Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5))))
-                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .eut((int) GTValues.VP[tier + 1] * 3 / 4)
                 .metadata(TIER, 2)
                 .metadata(UPGRADE, BIO)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 6; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 6; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 5))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -573,17 +566,17 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(3),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Gold),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(3),
+                    GTUtility.getNaniteAsCatalyst(Materials.Gold),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
-                    GT_OreDictUnificator.get(
+                    GTOreDictUnificator.get(
                         OrePrefixes.foil,
                         Materials.Longasssuperconductornameforuvwire,
                         (long) (16 * (Math.sqrt(tier - 5)))),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))))
                 .fluidInputs(
                     Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))),
@@ -591,14 +584,14 @@ public class GT_PCBFactoryRecipes {
                     Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5))))
-                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .eut((int) GTValues.VP[tier + 1] * 3 / 4)
                 .metadata(TIER, 3)
                 .metadata(UPGRADE, BIO)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
 
         // Optical Circuit Board
-        for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 7; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 7))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -606,16 +599,16 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(1),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(1),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
                     new ItemStack(
                         WerkstoffLoader.items.get(OrePrefixes.foil),
                         (int) (16 * (Math.sqrt(tier - 6))),
                         10106),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))),
                     CHRONOMATIC_GLASS.getFoil((int) (16 * (Math.sqrt(tier - 6)))))
                 .fluidInputs(
@@ -624,11 +617,11 @@ public class GT_PCBFactoryRecipes {
                     Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5))))
-                .eut((int) GT_Values.VP[tier] * 3 / 4)
+                .eut((int) GTValues.VP[tier] * 3 / 4)
                 .metadata(TIER, 1)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 7; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6.5))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -636,17 +629,17 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(2),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Silver),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(2),
+                    GTUtility.getNaniteAsCatalyst(Materials.Silver),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
                     new ItemStack(
                         WerkstoffLoader.items.get(OrePrefixes.foil),
                         (int) (16 * (Math.sqrt(tier - 6))),
                         10106),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))),
                     CHRONOMATIC_GLASS.getFoil((int) (16 * (Math.sqrt(tier - 6)))))
                 .fluidInputs(
@@ -655,11 +648,11 @@ public class GT_PCBFactoryRecipes {
                     Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5))))
-                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .eut((int) GTValues.VP[tier + 1] * 3 / 4)
                 .metadata(TIER, 2)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
-        for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+        for (int tier = 7; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6))));
             List<ItemStack> aBoards = new ArrayList<>();
             for (int i = amountOfBoards; i > 64; i -= 64) {
@@ -667,17 +660,17 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(3),
-                    GT_Utility.getNaniteAsCatalyst(Materials.Gold),
-                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                    GTUtility.getIntegratedCircuit(3),
+                    GTUtility.getNaniteAsCatalyst(Materials.Gold),
+                    PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
                     new ItemStack(
                         WerkstoffLoader.items.get(OrePrefixes.foil),
                         (int) (16 * (Math.sqrt(tier - 6))),
                         10106),
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))),
                     CHRONOMATIC_GLASS.getFoil((int) (16 * (Math.sqrt(tier - 6)))))
                 .fluidInputs(
@@ -686,7 +679,7 @@ public class GT_PCBFactoryRecipes {
                     Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))))
                 .itemOutputs(aBoards.toArray(new ItemStack[0]))
                 .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5))))
-                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .eut((int) GTValues.VP[tier + 1] * 3 / 4)
                 .metadata(TIER, 3)
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PurifiedWaterRecipes.java b/src/main/java/gregtech/loaders/postload/chains/PurifiedWaterRecipes.java
index 9aa13b3f33..c0d73d02b6 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_PurifiedWaterRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/chains/PurifiedWaterRecipes.java
@@ -1,6 +1,6 @@
 package gregtech.loaders.postload.chains;
 
-import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.FluorBuergerit;
+import static bartworks.system.material.WerkstoffLoader.FluorBuergerit;
 import static gregtech.api.enums.MaterialsBotania.ManaDiamond;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
@@ -17,20 +17,20 @@ import static gregtech.api.recipe.RecipeMaps.purificationParticleExtractionRecip
 import static gregtech.api.recipe.RecipeMaps.purificationPhAdjustmentRecipes;
 import static gregtech.api.recipe.RecipeMaps.purificationPlasmaHeatingRecipes;
 import static gregtech.api.recipe.RecipeMaps.purificationUVTreatmentRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.HOURS;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeConstants.AssemblyLine;
-import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME;
-import static gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitParticleExtractor.BARYONIC_MATTER_OUTPUT;
+import static gregtech.api.util.GTRecipeBuilder.HOURS;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeConstants.AssemblyLine;
+import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME;
+import static gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitBaryonicPerfection.BARYONIC_MATTER_OUTPUT;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-import goodgenerator.items.MyMaterial;
-import gregtech.api.enums.GT_Values;
+import goodgenerator.items.GGMaterial;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.HeatingCoilLevel;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
@@ -39,24 +39,24 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
 import gregtech.api.recipe.maps.PurificationUnitParticleExtractorFrontend;
 import gregtech.api.recipe.metadata.PurificationPlantBaseChanceKey;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationPlant;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitUVTreatment;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.tileentities.machines.multi.purification.MTEPurificationPlant;
+import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitUVTreatment;
 import gtPlusPlus.core.material.Particle;
 
-public class GT_PurifiedWaterRecipes {
+public class PurifiedWaterRecipes {
 
     static final PurificationPlantBaseChanceKey BASE_CHANCE = PurificationPlantBaseChanceKey.INSTANCE;
 
     public static void run() {
-        final int duration = GT_MetaTileEntity_PurificationPlant.CYCLE_TIME_TICKS;
+        final int duration = MTEPurificationPlant.CYCLE_TIME_TICKS;
 
         // Grade 1 - Clarifier
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.ActivatedCarbonFilterMesh.get(1))
-            .fluidInputs(GT_ModHandler.getWater(1000L))
+            .fluidInputs(GTModHandler.getWater(1000L))
             .fluidOutputs(Materials.Grade1PurifiedWater.getFluid(900L))
             .itemOutputs(new ItemStack(Items.stick, 1), Materials.Stone.getDust(1), Materials.Gold.getNuggets(1))
             .outputChances(1000, 500, 100)
@@ -66,21 +66,21 @@ public class GT_PurifiedWaterRecipes {
             .addTo(purificationClarifierRecipes);
 
         // Activated Carbon Line
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Carbon.getDust(1))
             .fluidInputs(Materials.PhosphoricAcid.getFluid(1000L))
             .itemOutputs(Materials.PreActivatedCarbon.getDust(1))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(multiblockChemicalReactorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.PreActivatedCarbon.getDust(1))
             .itemOutputs(Materials.DirtyActivatedCarbon.getDust(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .specialValue((int) HeatingCoilLevel.EV.getHeat())
             .addTo(blastFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.DirtyActivatedCarbon.getDust(1))
             .fluidInputs(Materials.Water.getFluid(1000L))
             .itemOutputs(Materials.ActivatedCarbon.getDust(1))
@@ -89,19 +89,19 @@ public class GT_PurifiedWaterRecipes {
             .duration(2 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(chemicalBathRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 Materials.ActivatedCarbon.getDust(64),
-                GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16))
+                GTOreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16))
             .itemOutputs(ItemList.ActivatedCarbonFilterMesh.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
         // Grade 2 - Ozonation
-        for (ItemStack lens : GT_OreDictUnificator.getOres("craftingLensBlue")) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(0, lens))
+        for (ItemStack lens : GTOreDictUnificator.getOres("craftingLensBlue")) {
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(0, lens))
                 .noOptimize()
                 .fluidInputs(Materials.Air.getGas(10000L))
                 .fluidOutputs(Materials.Ozone.getGas(2000L))
@@ -114,7 +114,7 @@ public class GT_PurifiedWaterRecipes {
         // 20% boost per tier
         // Gets you up to 80%, need to water boost for 95%
         for (int tier = 1; tier <= 4; ++tier) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .noOptimize()
                 .fluidInputs(
                     Materials.Grade1PurifiedWater.getFluid(1000L),
@@ -130,7 +130,7 @@ public class GT_PurifiedWaterRecipes {
         }
 
         // Grade 3 - Flocculation.
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Grade2PurifiedWater.getFluid(1000L))
             .fluidOutputs(Materials.Grade3PurifiedWater.getFluid(900L))
             .itemOutputs(
@@ -144,7 +144,7 @@ public class GT_PurifiedWaterRecipes {
             .addTo(purificationFlocculationRecipes);
 
         // 2 Al(OH)3 + 3 HCl -> Al2(OH)3 Cl3 + 3 H2O
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Aluminiumhydroxide.getDust(8))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(3000L))
             .fluidOutputs(Materials.PolyAluminiumChloride.getFluid(1000L), Materials.Water.getFluid(3000L))
@@ -154,7 +154,7 @@ public class GT_PurifiedWaterRecipes {
 
         // Diluted is twice what chem balance would suggest, but it is 2:1 with hydrochloric acid which makes it
         // correct I believe.
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.FlocculationWasteLiquid.getFluid(10000L))
             .itemOutputs(Materials.Aluminium.getDust(11))
             .fluidOutputs(Materials.Oxygen.getGas(29000L), Materials.DilutedHydrochloricAcid.getFluid(58000L))
@@ -163,7 +163,7 @@ public class GT_PurifiedWaterRecipes {
             .addTo(distillationTowerRecipes);
 
         // Grade 4 - pH adjustment
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Grade3PurifiedWater.getFluid(1000L))
             .fluidOutputs(Materials.Grade4PurifiedWater.getFluid(900L))
             .ignoreCollision()
@@ -173,7 +173,7 @@ public class GT_PurifiedWaterRecipes {
             .addTo(purificationPhAdjustmentRecipes);
 
         // Grade 5 - Plasma Heating
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Grade4PurifiedWater.getFluid(1000L))
             .fluidOutputs(Materials.Grade5PurifiedWater.getFluid(900L))
             .ignoreCollision()
@@ -182,25 +182,21 @@ public class GT_PurifiedWaterRecipes {
             .metadata(BASE_CHANCE, 0.0f)
             .addTo(purificationPlasmaHeatingRecipes);
 
-        GT_MetaTileEntity_PurificationUnitUVTreatment.LENS_ITEMS.add(MyMaterial.orundum.get(OrePrefixes.lens, 1));
-        GT_MetaTileEntity_PurificationUnitUVTreatment.LENS_ITEMS
-            .add(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Amber, 1));
-        GT_MetaTileEntity_PurificationUnitUVTreatment.LENS_ITEMS
-            .add(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.InfusedAir, 1));
-        GT_MetaTileEntity_PurificationUnitUVTreatment.LENS_ITEMS
-            .add(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Emerald, 1));
-        GT_MetaTileEntity_PurificationUnitUVTreatment.LENS_ITEMS
-            .add(GT_OreDictUnificator.get(OrePrefixes.lens, ManaDiamond, 1));
-        GT_MetaTileEntity_PurificationUnitUVTreatment.LENS_ITEMS
-            .add(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.BlueTopaz, 1));
-        GT_MetaTileEntity_PurificationUnitUVTreatment.LENS_ITEMS
-            .add(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Amethyst, 1));
-        GT_MetaTileEntity_PurificationUnitUVTreatment.LENS_ITEMS.add(FluorBuergerit.get(OrePrefixes.lens, 1));
-        GT_MetaTileEntity_PurificationUnitUVTreatment.LENS_ITEMS
-            .add(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 1));
+        MTEPurificationUnitUVTreatment.LENS_ITEMS.add(GGMaterial.orundum.get(OrePrefixes.lens, 1));
+        MTEPurificationUnitUVTreatment.LENS_ITEMS.add(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Amber, 1));
+        MTEPurificationUnitUVTreatment.LENS_ITEMS
+            .add(GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedAir, 1));
+        MTEPurificationUnitUVTreatment.LENS_ITEMS.add(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Emerald, 1));
+        MTEPurificationUnitUVTreatment.LENS_ITEMS.add(GTOreDictUnificator.get(OrePrefixes.lens, ManaDiamond, 1));
+        MTEPurificationUnitUVTreatment.LENS_ITEMS
+            .add(GTOreDictUnificator.get(OrePrefixes.lens, Materials.BlueTopaz, 1));
+        MTEPurificationUnitUVTreatment.LENS_ITEMS.add(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Amethyst, 1));
+        MTEPurificationUnitUVTreatment.LENS_ITEMS.add(FluorBuergerit.get(OrePrefixes.lens, 1));
+        MTEPurificationUnitUVTreatment.LENS_ITEMS
+            .add(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 1));
 
         // Grade 6 - UV treatment
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Grade5PurifiedWater.getFluid(1000L))
             .fluidOutputs(Materials.Grade6PurifiedWater.getFluid(900L))
             .ignoreCollision()
@@ -210,7 +206,7 @@ public class GT_PurifiedWaterRecipes {
             .addTo(purificationUVTreatmentRecipes);
 
         // Grade 7 - Degasification
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Grade6PurifiedWater.getFluid(1000L))
             .fluidOutputs(Materials.Grade7PurifiedWater.getFluid(900L))
             .ignoreCollision()
@@ -237,8 +233,8 @@ public class GT_PurifiedWaterRecipes {
 
         // Add re-alignment recipes
         for (int i = 0; i < catalystInputs.length; ++i) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(ItemList.Quark_Creation_Catalyst_Unaligned.get(1), GT_Utility.getIntegratedCircuit(i + 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(ItemList.Quark_Creation_Catalyst_Unaligned.get(1), GTUtility.getIntegratedCircuit(i + 1))
                 .fluidInputs(Materials.StableBaryonicMatter.getFluid(1000L))
                 .itemOutputs(catalystInputs[i])
                 .duration(30 * SECONDS)
@@ -256,7 +252,7 @@ public class GT_PurifiedWaterRecipes {
             Particle.getBaseParticle(Particle.STRANGE), Particle.getBaseParticle(Particle.CHARM) };
 
         for (int i = 0; i < catalystInputs.length; ++i) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Quark_Catalyst_Housing.get(1), quarks[i])
                 .fluidInputs(MaterialsUEVplus.ExcitedDTRC.getFluid(10000L))
                 .itemOutputs(catalystInputs[i])
@@ -267,20 +263,20 @@ public class GT_PurifiedWaterRecipes {
         }
 
         // Recipe for quark catalyst housing
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, ItemList.Electromagnet_Tengam.get(1))
             .metadata(RESEARCH_TIME, 1 * HOURS)
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tritanium, 16),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 16),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 16),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 8),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Tritanium, 16),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 16),
+                GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64),
+                GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64),
+                GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64),
+                GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64),
+                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 16),
+                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 8),
                 ItemList.Field_Generator_UEV.get(4))
             .fluidInputs(
                 Materials.Neutronium.getMolten(16 * 144),
@@ -292,7 +288,7 @@ public class GT_PurifiedWaterRecipes {
             .duration(60 * SECONDS)
             .addTo(AssemblyLine);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             // Fake item inputs
             .itemInputs(ItemList.Quark_Creation_Catalyst_Charm.get(1), ItemList.Quark_Creation_Catalyst_Strange.get(1))
             .fluidInputs(Materials.Grade7PurifiedWater.getFluid(1000L))
@@ -309,7 +305,7 @@ public class GT_PurifiedWaterRecipes {
             .addTo(purificationParticleExtractionRecipes);
 
         // real recipe
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Grade7PurifiedWater.getFluid(1000L))
             .fluidOutputs(Materials.Grade8PurifiedWater.getFluid(900L))
             .itemOutputs(ItemList.Quark_Creation_Catalyst_Unaligned.get(2L), Particle.getBaseParticle(Particle.UNKNOWN))
diff --git a/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java
index a9e587a145..01d77704f7 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java
@@ -1,15 +1,15 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.objects.MaterialStack;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class AlloySmelterRecipes implements Runnable {
 
@@ -58,24 +58,22 @@ public class AlloySmelterRecipes implements Runnable {
     @Override
     public void run() {
         for (MaterialStack[] materials : mAlloySmelterList) {
-            ItemStack dust1 = GT_OreDictUnificator.get(OrePrefixes.dust, materials[0].mMaterial, materials[0].mAmount);
-            ItemStack dust2 = GT_OreDictUnificator.get(OrePrefixes.dust, materials[1].mMaterial, materials[1].mAmount);
-            ItemStack ingot1 = GT_OreDictUnificator
-                .get(OrePrefixes.ingot, materials[0].mMaterial, materials[0].mAmount);
-            ItemStack ingot2 = GT_OreDictUnificator
-                .get(OrePrefixes.ingot, materials[1].mMaterial, materials[1].mAmount);
-            ItemStack outputIngot = GT_OreDictUnificator
+            ItemStack dust1 = GTOreDictUnificator.get(OrePrefixes.dust, materials[0].mMaterial, materials[0].mAmount);
+            ItemStack dust2 = GTOreDictUnificator.get(OrePrefixes.dust, materials[1].mMaterial, materials[1].mAmount);
+            ItemStack ingot1 = GTOreDictUnificator.get(OrePrefixes.ingot, materials[0].mMaterial, materials[0].mAmount);
+            ItemStack ingot2 = GTOreDictUnificator.get(OrePrefixes.ingot, materials[1].mMaterial, materials[1].mAmount);
+            ItemStack outputIngot = GTOreDictUnificator
                 .get(OrePrefixes.ingot, materials[2].mMaterial, materials[2].mAmount);
-            if (outputIngot != GT_Values.NI) {
+            if (outputIngot != GTValues.NI) {
                 if (ingot1 != null) {
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(ingot1, dust2)
                         .itemOutputs(outputIngot)
                         .duration((int) materials[2].mAmount * 50)
                         .eut(16)
                         .addTo(alloySmelterRecipes);
                     if (ingot2 != null) {
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(ingot1, ingot2)
                             .itemOutputs(outputIngot)
                             .duration((int) materials[2].mAmount * 50)
@@ -85,7 +83,7 @@ public class AlloySmelterRecipes implements Runnable {
                 }
 
                 if (ingot2 != null) {
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(dust1, ingot2)
                         .itemOutputs(outputIngot)
                         .duration((int) materials[2].mAmount * 50)
@@ -93,7 +91,7 @@ public class AlloySmelterRecipes implements Runnable {
                         .addTo(alloySmelterRecipes);
                 }
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(dust1, dust2)
                     .itemOutputs(outputIngot)
                     .duration((int) materials[2].mAmount * 50)
@@ -104,11 +102,11 @@ public class AlloySmelterRecipes implements Runnable {
         }
 
         // We use rubber
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L))
             .duration(10 * SECONDS)
             .eut(8)
             .addTo(alloySmelterRecipes);
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java
index 755e5ab885..38eb8bc7c7 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java
@@ -2,472 +2,472 @@ package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.Mods.Railcraft;
 import static gregtech.api.recipe.RecipeMaps.arcFurnaceRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.RECYCLE;
-import static gregtech.api.util.GT_RecipeConstants.UniversalArcFurnace;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.RECYCLE;
+import static gregtech.api.util.GTRecipeConstants.UniversalArcFurnace;
 
-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.enums.TierEU;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class ArcFurnaceRecipes implements Runnable {
 
     @Override
     public void run() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Block_TungstenSteelReinforced.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Concrete, 1))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Concrete, 1))
             .duration(8 * SECONDS)
             .eut(96)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Long_Distance_Pipeline_Fluid.get(1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 19L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 19L))
             .duration(9 * SECONDS)
             .eut((int) TierEU.RECIPE_MV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Long_Distance_Pipeline_Item.get(1L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 12L),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 7L))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 12L),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 7L))
             .duration(9 * SECONDS)
             .eut((int) TierEU.RECIPE_MV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 2L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 2L))
             .duration(10 * TICKS)
             .eut((int) TierEU.RECIPE_MV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Long_Distance_Pipeline_Item_Pipe.get(1L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L))
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1L),
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L))
             .duration(10 * TICKS)
             .eut((int) TierEU.RECIPE_MV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_Cupronickel.get(1L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 8),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 8),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_Kanthal.get(1L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 8),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 8),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_Nichrome.get(1L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 8),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 8),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_TungstenSteel.get(1L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 8),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 5))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 8),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 5))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_HSSG.get(1L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 8),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 6))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 8),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 6))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_HSSS.get(1L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 8),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 7))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 8),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 7))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_Naquadah.get(1L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 8),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 8),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_NaquadahAlloy.get(1L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 8),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 9))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 8),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 9))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_Trinium.get(1L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 8),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 10))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 8),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 10))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_ElectrumFlux.get(1L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 8),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 11))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 8),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 11))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_AwakenedDraconium.get(1L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DraconiumAwakened, 8),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.DraconiumAwakened, 8),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 0))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 2L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 2L))
             .duration(7 * SECONDS + 10 * TICKS)
             .eut(90)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
             .duration(7 * SECONDS + 10 * TICKS)
             .eut(90)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 2))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 12L),
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 12L),
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6))
             .duration(7 * SECONDS + 10 * TICKS)
             .eut(90)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 13))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 2L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 2L))
             .duration(9 * SECONDS)
             .eut((int) TierEU.RECIPE_MV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 14))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
             .duration(9 * SECONDS)
             .eut((int) TierEU.RECIPE_MV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 15))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 12L),
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 6L))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 12L),
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 6L))
             .duration(9 * SECONDS)
             .eut((int) TierEU.RECIPE_MV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 0))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 2L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 2L))
             .duration(10 * SECONDS + 10 * TICKS)
             .eut(150)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 3))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 3))
             .duration(10 * SECONDS + 10 * TICKS)
             .eut(150)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 2))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12L),
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 6L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12L),
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 6L))
             .duration(10 * SECONDS + 10 * TICKS)
             .eut(150)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 3))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 2L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 2L))
             .duration(12 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 4))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
             .duration(12 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 5))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 12L),
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.StainlessSteel, 6L))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 12L),
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.StainlessSteel, 6L))
             .duration(12 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 6))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 2L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 2L))
             .duration(13 * SECONDS + 10 * TICKS)
             .eut(210)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 7))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
             .duration(13 * SECONDS + 10 * TICKS)
             .eut(210)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 8))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 12L),
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Titanium, 6L))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 12L),
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Titanium, 6L))
             .duration(13 * SECONDS + 10 * TICKS)
             .eut(210)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 10))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 11))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 12L),
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.TungstenSteel, 6L))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 12L),
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.TungstenSteel, 6L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 12))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 2L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 2L))
             .duration(16 * SECONDS + 10 * TICKS)
             .eut(270)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 13))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
             .duration(16 * SECONDS + 10 * TICKS)
             .eut(270)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 14))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NiobiumTitanium, 12L),
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.NiobiumTitanium, 12L),
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L))
             .duration(16 * SECONDS + 10 * TICKS)
             .eut(270)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 0))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 2L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 2L))
             .duration(18 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
             .duration(18 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 2))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Enderium, 12L),
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Enderium, 12L),
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L))
             .duration(18 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 3))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 2L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 2L))
             .duration(18 * SECONDS)
             .eut(330)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 4))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
             .duration(18 * SECONDS)
             .eut(330)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 5))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 12L),
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 12L),
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L))
             .duration(18 * SECONDS)
             .eut(330)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 6))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 2L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 2L))
             .duration(18 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 7))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
             .duration(18 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 8))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 12L),
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Neutronium, 6L))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 12L),
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Neutronium, 6L))
             .duration(18 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .metadata(RECYCLE, true)
             .addTo(UniversalArcFurnace);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3))
             .fluidInputs(Materials.Oxygen.getGas(2000L))
             .duration(60 * SECONDS)
             .eut((int) TierEU.RECIPE_LV)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
index 217be9082a..b0eb83a49a 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
@@ -17,16 +17,16 @@ import static gregtech.api.enums.Mods.Railcraft;
 import static gregtech.api.enums.Mods.TinkerConstruct;
 import static gregtech.api.enums.Mods.TwilightForest;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.EIGHTH_INGOT;
-import static gregtech.api.util.GT_RecipeBuilder.HALF_INGOT;
-import static gregtech.api.util.GT_RecipeBuilder.INGOTS;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.QUARTER_INGOT;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.loaders.postload.GT_MachineRecipeLoader.solderingMats;
-import static gtPlusPlus.core.material.ALLOY.INCONEL_690;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.EIGHTH_INGOT;
+import static gregtech.api.util.GTRecipeBuilder.HALF_INGOT;
+import static gregtech.api.util.GTRecipeBuilder.INGOTS;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.QUARTER_INGOT;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.loaders.postload.MachineRecipeLoader.solderingMats;
+import static gtPlusPlus.core.material.MaterialsAlloy.INCONEL_690;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -35,9 +35,9 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Dyes;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsUEVplus;
@@ -45,10 +45,10 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
 import gregtech.api.enums.TierEU;
 import gregtech.api.util.ExternalMaterials;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.material.ALLOY;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.material.MaterialsAlloy;
 
 public class AssemblerRecipes implements Runnable {
 
@@ -67,517 +67,517 @@ public class AssemblerRecipes implements Runnable {
         this.withIC2NuclearControl();
 
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Spray_Empty.get(1L))
                 .duration(40 * SECONDS)
                 .eut(1)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Aluminium, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Aluminium, 2L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Aluminium, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.Aluminium, 2L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.ThermosCan_Empty.get(1L))
                 .duration(40 * SECONDS)
                 .eut(1)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, 4L),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.AnyBronze, 4L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, 4L),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.AnyBronze, 4L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Large_Fluid_Cell_Steel.get(1L))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.TungstenSteel, 4L),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Platinum, 4L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.TungstenSteel, 4L),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.Platinum, 4L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Large_Fluid_Cell_TungstenSteel.get(1L))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Aluminium, 4L),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Silver, 4L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Aluminium, 4L),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.Silver, 4L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Large_Fluid_Cell_Aluminium.get(1L))
                 .duration(10 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.StainlessSteel, 4L),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Electrum, 4L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.StainlessSteel, 4L),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.Electrum, 4L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Large_Fluid_Cell_StainlessSteel.get(1L))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Titanium, 4L),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.RoseGold, 4L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Titanium, 4L),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.RoseGold, 4L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Large_Fluid_Cell_Titanium.get(1L))
                 .duration(10 * SECONDS)
                 .eut(256)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Chrome, 4L),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Palladium, 4L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Chrome, 4L),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.Palladium, 4L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Large_Fluid_Cell_Chrome.get(1L))
                 .duration(10 * SECONDS)
                 .eut(1024)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 4L),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Naquadah, 4L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 4L),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.Naquadah, 4L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Large_Fluid_Cell_Iridium.get(1L))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_EV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmium, 4L),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.ElectrumFlux, 4L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmium, 4L),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.ElectrumFlux, 4L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Large_Fluid_Cell_Osmium.get(1L))
                 .duration(10 * SECONDS)
                 .eut(4096)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 4L),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Draconium, 4L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 4L),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.Draconium, 4L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Large_Fluid_Cell_Neutronium.get(1L))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_IV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
                     ItemList.Large_Fluid_Cell_Aluminium.get(1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Spray_Color_Remover_Empty.get(1L))
                 .duration(40 * SECONDS)
                 .eut(1)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 1L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Tool_Matches.get(1L))
                 .duration(16 * TICKS)
                 .eut(16)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.TricalciumPhosphate, 1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.TricalciumPhosphate, 1L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Tool_Matches.get(1L))
                 .duration(16 * TICKS)
                 .eut(16)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 4L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 4L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Tool_Matches.get(4L))
                 .duration(3 * SECONDS + 4 * TICKS)
                 .eut(16)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 4L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 4L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Tool_Matches.get(4L))
                 .duration(3 * SECONDS + 4 * TICKS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Invar, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Invar, 2L),
                     new ItemStack(Items.flint, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Tool_Lighter_Invar_Empty.get(1L))
                 .duration(12 * SECONDS + 16 * TICKS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Platinum, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Platinum, 2L),
                     new ItemStack(Items.flint, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Tool_Lighter_Platinum_Empty.get(1L))
                 .duration(12 * SECONDS + 16 * TICKS)
                 .eut(256)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 2L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 2L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Upgrade_Muffler.get(1L))
                 .duration(1 * MINUTES + 20 * SECONDS)
                 .eut(2)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Upgrade_Muffler.get(1L))
                 .duration(1 * MINUTES + 20 * SECONDS)
                 .eut(2)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 2L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 2L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Upgrade_Muffler.get(1L))
                 .duration(1 * MINUTES + 20 * SECONDS)
                 .eut(2)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Upgrade_Muffler.get(1L))
                 .duration(1 * MINUTES + 20 * SECONDS)
                 .eut(2)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 2L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 2L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Upgrade_Muffler.get(1L))
                 .duration(1 * MINUTES + 20 * SECONDS)
                 .eut(2)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Upgrade_Muffler.get(1L))
                 .duration(1 * MINUTES + 20 * SECONDS)
                 .eut(2)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Upgrade_Lock.get(1L))
                 .duration(5 * MINUTES + 20 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Upgrade_Lock.get(1L))
                 .duration(5 * MINUTES + 20 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Upgrade_Lock.get(1L))
                 .duration(5 * MINUTES + 20 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Sensor_EV.get(1L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Cover_PlayerDetector.get(1L))
                 .duration(2 * MINUTES + 40 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
                     ItemList.Cover_Drain.get(1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Cover_Shutter.get(1L))
                 .duration(40 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
                     ItemList.Cover_Drain.get(1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Cover_Shutter.get(1L))
                 .duration(40 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L),
                     ItemList.Cover_Drain.get(1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Cover_Shutter.get(1L))
                 .duration(40 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L),
                     new ItemStack(Blocks.iron_bars, 2),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Cover_Drain.get(1L))
                 .duration(40 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 2L),
                     new ItemStack(Blocks.iron_bars, 2),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Cover_Drain.get(1L))
                 .duration(40 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 2L),
                     new ItemStack(Blocks.iron_bars, 2),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Cover_Drain.get(1L))
                 .duration(40 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
                     new ItemStack(Blocks.crafting_table, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Cover_Crafting.get(1L))
                 .duration(40 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
                     new ItemStack(Blocks.crafting_table, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Cover_Crafting.get(1L))
                 .duration(40 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L),
                     new ItemStack(Blocks.crafting_table, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Cover_Crafting.get(1L))
                 .duration(40 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Cover_Screen.get(1L),
                     ItemList.Cover_FluidDetector.get(1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Cover_FluidStorageMonitor.get(1L))
                 .duration(40 * SECONDS)
                 .eut(4)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(ItemList.Sensor_LV.get(1L), ItemList.Emitter_LV.get(1L), GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(ItemList.Sensor_LV.get(1L), ItemList.Emitter_LV.get(1L), GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.NC_SensorKit.get(1L))
                 .duration(1 * MINUTES + 20 * SECONDS)
                 .eut(2)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Emitter_EV.get(1L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 1L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Cover_RedstoneTransmitterExternal.get(1L))
                 .duration(2 * MINUTES + 40 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Sensor_EV.get(1L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 1L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Cover_RedstoneReceiverExternal.get(1L))
                 .duration(2 * MINUTES + 40 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Emitter_MV.get(1L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Cover_NeedsMaintainance.get(1L))
                 .duration(30 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 2L),
                     ItemList.Component_Filter.get(1L),
                     ItemList.Conveyor_Module_LV.get(1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.ItemFilter_Export.get(1L))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 2L),
                     ItemList.Component_Filter.get(1L),
                     ItemList.Conveyor_Module_LV.get(1L),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.ItemFilter_Import.get(1L))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 2L))
+                    GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 2L))
                 .itemOutputs(ItemList.BatteryHull_EV.get(1L))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(144L))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Platinum, 2L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RoseGold, 6L))
+                    GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Platinum, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.RoseGold, 6L))
                 .itemOutputs(ItemList.BatteryHull_IV.get(1L))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288L))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_EV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 18L))
+                    GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 18L))
                 .itemOutputs(ItemList.BatteryHull_LuV.get(1L))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(144L))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_IV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 2L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 6L))
+                    GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 6L))
                 .itemOutputs(ItemList.BatteryHull_ZPM.get(1L))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(288L))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LuV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.ElectrumFlux, 2L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 18L))
+                    GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.ElectrumFlux, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 18L))
                 .itemOutputs(ItemList.BatteryHull_UV.get(1L))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(576L))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_ZPM)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.ElectrumFlux, 2L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 24L))
+                    GTOreDictUnificator.get(OrePrefixes.cableGt02, Materials.ElectrumFlux, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 24L))
                 .itemOutputs(ItemList.BatteryHull_UHV.get(1L))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1152L))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_UV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 2L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahEnriched, 36L))
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahEnriched, 36L))
                 .itemOutputs(ItemList.BatteryHull_UEV.get(1L))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(2304L))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_UHV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.ElectrumFlux, 2L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 48L))
+                    GTOreDictUnificator.get(OrePrefixes.cableGt08, Materials.ElectrumFlux, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 48L))
                 .itemOutputs(ItemList.BatteryHull_UIV.get(1L))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(4608L))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_UHV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 56L))
+                    GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 56L))
                 .itemOutputs(ItemList.BatteryHull_UMV.get(1L))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(9216L))
                 .duration(30 * SECONDS)
                 .eut(TierEU.RECIPE_UHV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2L),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 64L))
+                    GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 64L))
                 .itemOutputs(ItemList.BatteryHull_UxV.get(1L))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(18432L))
                 .duration(60 * SECONDS)
@@ -586,15 +586,15 @@ public class AssemblerRecipes implements Runnable {
         }
 
         // If Cleanroom is enabled, add an assembler recipe
-        if (GT_Mod.gregtechproxy.mEnableCleanroom) {
-            GT_Values.RA.stdBuilder()
+        if (GTMod.gregtechproxy.mEnableCleanroom) {
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_HV.get(1L),
                     ItemList.Component_Filter.get(3L),
-                    GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1L),
                     ItemList.Electric_Motor_HV.get(2L),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Machine_Multi_Cleanroom.get(1L))
                 .fluidInputs(Materials.StainlessSteel.getMolten(144L))
                 .duration(60 * SECONDS)
@@ -602,55 +602,55 @@ public class AssemblerRecipes implements Runnable {
                 .addTo(assemblerRecipes);
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Cover_Shutter.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.FluidFilter.get(1L))
             .duration(40 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.FR_Stick.get(1L))
             .fluidInputs(Materials.SeedOil.getFluid(50L))
             .duration(16 * TICKS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 1))
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 1))
             .itemOutputs(ItemList.Block_Plascrete.get(1))
             .fluidInputs(Materials.Concrete.getMolten(144))
             .duration(10 * SECONDS)
             .eut(48)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 1))
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 1))
             .itemOutputs(ItemList.Block_Plascrete.get(1))
             .fluidInputs(Materials.Concrete.getMolten(144))
             .duration(10 * SECONDS)
             .eut(48)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 16),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.EV), 4),
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 16),
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.EV), 4),
                 ItemList.Electric_Motor_IV.get(16),
                 ItemList.Emitter_EV.get(4),
                 ItemList.Duct_Tape.get(64),
                 ItemList.Energy_LapotronicOrb.get(1),
-                GT_Utility.getIntegratedCircuit(4))
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(ItemList.TierdDrone0.get(4))
             .fluidInputs(Materials.AdvancedGlue.getFluid(144))
             .duration(10 * SECONDS)
@@ -660,8 +660,8 @@ public class AssemblerRecipes implements Runnable {
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {
             for (int j = 0; j < Dyes.VALUES[i].getSizeOfFluidList(); j++) {
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(new ItemStack(Items.string, 3), GT_Utility.getIntegratedCircuit(3))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(new ItemStack(Items.string, 3), GTUtility.getIntegratedCircuit(3))
                     .itemOutputs(new ItemStack(Blocks.carpet, 2, 15 - i))
                     .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 24))
                     .duration(6 * SECONDS + 8 * TICKS)
@@ -670,9 +670,9 @@ public class AssemblerRecipes implements Runnable {
             }
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.foil, Materials.PolyvinylChloride, 1),
+                GTOreDictUnificator.get(OrePrefixes.foil, Materials.PolyvinylChloride, 1),
                 ItemList.Paper_Printed_Pages.get(1))
             .itemOutputs(new ItemStack(Items.written_book, 1, 0))
             .fluidInputs(Materials.Glue.getFluid(20))
@@ -680,278 +680,278 @@ public class AssemblerRecipes implements Runnable {
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.foil, Materials.PolyvinylChloride, 1),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3))
+                GTOreDictUnificator.get(OrePrefixes.foil, Materials.PolyvinylChloride, 1),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3))
             .itemOutputs(new ItemStack(Items.book, 1, 0))
             .fluidInputs(Materials.Glue.getFluid(20))
             .duration(20 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_ModHandler.getIC2Item("carbonMesh", 4),
-                GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16),
-                GT_Utility.getIntegratedCircuit(1))
+                GTModHandler.getIC2Item("carbonMesh", 4),
+                GTOreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Component_Filter.get(1))
             .duration(1 * MINUTES + 20 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 64),
-                GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 64),
+                GTOreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Component_Filter.get(1))
             .fluidInputs(Materials.Plastic.getMolten(144))
             .duration(1 * MINUTES + 20 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64),
                 ItemList.Circuit_Silicon_Wafer2.get(32),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 64))
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 64))
             .fluidInputs(Materials.AdvancedGlue.getFluid(500))
             .duration(2 * MINUTES + 40 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64),
                 ItemList.Circuit_Silicon_Wafer3.get(8),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 64))
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 64))
             .fluidInputs(Materials.AdvancedGlue.getFluid(250))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_LV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.LV), 2),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.LV), 2),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.FluidRegulator_LV.get(1))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_MV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.FluidRegulator_MV.get(1))
             .duration(17 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_HV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.HV), 2),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.HV), 2),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.FluidRegulator_HV.get(1))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_EV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.EV), 2),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.EV), 2),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.FluidRegulator_EV.get(1))
             .duration(12 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_IV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.IV), 2),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.IV), 2),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.FluidRegulator_IV.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_LuV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.LuV), 2),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.LuV), 2),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.FluidRegulator_LuV.get(1))
             .duration(7 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_ZPM.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.ZPM), 2),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.ZPM), 2),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.FluidRegulator_ZPM.get(1))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_ZPM)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_UV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.UV), 2),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.UV), 2),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.FluidRegulator_UV.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_UV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Steam_Valve_LV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.LV), 2),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.LV), 2),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Steam_Regulator_LV.get(1))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Steam_Valve_MV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Steam_Regulator_MV.get(1))
             .duration(17 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Steam_Valve_HV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.HV), 2),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.HV), 2),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Steam_Regulator_HV.get(1))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Steam_Valve_EV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.EV), 2),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.EV), 2),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Steam_Regulator_EV.get(1))
             .duration(12 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Steam_Valve_IV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.IV), 2),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.IV), 2),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Steam_Regulator_IV.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_LV.get(1),
                 ItemList.Electric_Motor_LV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.Steel), 2),
-                GT_Utility.getIntegratedCircuit(5))
+                GTOreDictUnificator.get(OrePrefixes.gear.get(Materials.Steel), 2),
+                GTUtility.getIntegratedCircuit(5))
             .itemOutputs(ItemList.Steam_Valve_LV.get(1))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_MV.get(1),
                 ItemList.Electric_Motor_MV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.Aluminium), 2),
-                GT_Utility.getIntegratedCircuit(5))
+                GTOreDictUnificator.get(OrePrefixes.gear.get(Materials.Aluminium), 2),
+                GTUtility.getIntegratedCircuit(5))
             .itemOutputs(ItemList.Steam_Valve_MV.get(1))
             .duration(17 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_HV.get(1),
                 ItemList.Electric_Motor_HV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.StainlessSteel), 2),
-                GT_Utility.getIntegratedCircuit(5))
+                GTOreDictUnificator.get(OrePrefixes.gear.get(Materials.StainlessSteel), 2),
+                GTUtility.getIntegratedCircuit(5))
             .itemOutputs(ItemList.Steam_Valve_HV.get(1))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_EV.get(1),
                 ItemList.Electric_Motor_EV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.Titanium), 2),
-                GT_Utility.getIntegratedCircuit(5))
+                GTOreDictUnificator.get(OrePrefixes.gear.get(Materials.Titanium), 2),
+                GTUtility.getIntegratedCircuit(5))
             .itemOutputs(ItemList.Steam_Valve_EV.get(1))
             .duration(12 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_IV.get(1),
                 ItemList.Electric_Motor_IV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.TungstenSteel), 2),
-                GT_Utility.getIntegratedCircuit(5))
+                GTOreDictUnificator.get(OrePrefixes.gear.get(Materials.TungstenSteel), 2),
+                GTUtility.getIntegratedCircuit(5))
             .itemOutputs(ItemList.Steam_Valve_IV.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate.get(Materials.Steel), 4),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.LV), 4),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.plate.get(Materials.Steel), 4),
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.LV), 4),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Schematic.get(1L))
             .duration(30 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate.get(Materials.Aluminium), 3),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.plate.get(Materials.Aluminium), 3),
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Schematic.get(1L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate.get(Materials.StainlessSteel), 2),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.HV), 1),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.plate.get(Materials.StainlessSteel), 2),
+                GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.HV), 1),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Schematic.get(1L))
             .duration(7 * SECONDS + 10 * TICKS)
             .eut(48)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_HV.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 1L),
                 ItemList.Circuit_Chip_LPIC.get(2L),
                 ItemList.HV_Coil.get(2L),
                 ItemList.Reactor_Coolant_He_1.get(1L),
@@ -961,10 +961,10 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_EV.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 1L),
                 ItemList.Circuit_Chip_PIC.get(2L),
                 ItemList.EV_Coil.get(2L),
                 ItemList.Reactor_Coolant_He_1.get(1L),
@@ -974,10 +974,10 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_IV.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 1L),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 1L),
                 ItemList.Circuit_Chip_HPIC.get(2L),
                 ItemList.IV_Coil.get(2L),
                 ItemList.Reactor_Coolant_He_3.get(1L),
@@ -987,10 +987,10 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_HV.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 1L),
                 ItemList.Circuit_Chip_LPIC.get(2L),
                 ItemList.HV_Coil.get(2L),
                 ItemList.Reactor_Coolant_NaK_1.get(1L),
@@ -1000,10 +1000,10 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_EV.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 1L),
                 ItemList.Circuit_Chip_PIC.get(2L),
                 ItemList.EV_Coil.get(2L),
                 ItemList.Reactor_Coolant_NaK_1.get(1L),
@@ -1013,10 +1013,10 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_IV.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 1L),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 1L),
                 ItemList.Circuit_Chip_HPIC.get(2L),
                 ItemList.IV_Coil.get(2L),
                 ItemList.Reactor_Coolant_NaK_3.get(1L),
@@ -1026,10 +1026,10 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_HV.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Gold, 1L),
+                GTOreDictUnificator.get(OrePrefixes.spring, Materials.Gold, 1L),
                 ItemList.Circuit_Chip_LPIC.get(2L),
                 ItemList.HV_Coil.get(2L),
                 ItemList.Reactor_Coolant_He_1.get(1L),
@@ -1039,10 +1039,10 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_EV.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Aluminium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.spring, Materials.Aluminium, 1L),
                 ItemList.Circuit_Chip_PIC.get(2L),
                 ItemList.EV_Coil.get(2L),
                 ItemList.Reactor_Coolant_He_1.get(1L),
@@ -1052,10 +1052,10 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_IV.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Vanadiumtriindinid, 1L),
+                GTOreDictUnificator.get(OrePrefixes.spring, Materials.Vanadiumtriindinid, 1L),
                 ItemList.Circuit_Chip_HPIC.get(2L),
                 ItemList.IV_Coil.get(2L),
                 ItemList.Reactor_Coolant_He_3.get(1L),
@@ -1065,10 +1065,10 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_HV.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Gold, 1L),
+                GTOreDictUnificator.get(OrePrefixes.spring, Materials.Gold, 1L),
                 ItemList.Circuit_Chip_LPIC.get(2L),
                 ItemList.HV_Coil.get(2L),
                 ItemList.Reactor_Coolant_NaK_1.get(1L),
@@ -1078,10 +1078,10 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_EV.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Aluminium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.spring, Materials.Aluminium, 1L),
                 ItemList.Circuit_Chip_PIC.get(2L),
                 ItemList.EV_Coil.get(2L),
                 ItemList.Reactor_Coolant_NaK_1.get(1L),
@@ -1091,10 +1091,10 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_IV.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Vanadiumtriindinid, 1L),
+                GTOreDictUnificator.get(OrePrefixes.spring, Materials.Vanadiumtriindinid, 1L),
                 ItemList.Circuit_Chip_HPIC.get(2L),
                 ItemList.IV_Coil.get(2L),
                 ItemList.Reactor_Coolant_NaK_3.get(1L),
@@ -1104,124 +1104,124 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Steel, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 6L),
-                GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Steel, 2L),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Steel, 2L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 6L),
+                GTOreDictUnificator.get(OrePrefixes.gear, Materials.Steel, 2L),
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.Long_Distance_Pipeline_Fluid.get(2L))
             .fluidInputs(Materials.Tin.getMolten(144L))
             .duration(15 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Tin, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 6L),
-                GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Steel, 2L),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Tin, 2L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 6L),
+                GTOreDictUnificator.get(OrePrefixes.gear, Materials.Steel, 2L),
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.Long_Distance_Pipeline_Item.get(2L))
             .fluidInputs(Materials.Tin.getMolten(144L))
             .duration(15 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 9L),
-                GT_Utility.getIntegratedCircuit(24))
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 2L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 9L),
+                GTUtility.getIntegratedCircuit(24))
             .itemOutputs(ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(64L))
             .fluidInputs(Materials.Tin.getMolten(144L))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Tin, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 9L),
-                GT_Utility.getIntegratedCircuit(24))
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Tin, 2L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 9L),
+                GTUtility.getIntegratedCircuit(24))
             .itemOutputs(ItemList.Long_Distance_Pipeline_Item_Pipe.get(64L))
             .fluidInputs(Materials.Tin.getMolten(144L))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.StainlessSteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.StainlessSteel, 1L),
                 ItemList.Hull_EV.get(1L),
-                GT_Utility.getIntegratedCircuit(4))
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(ItemList.Hatch_Input_Multi_2x2_EV.get(1L))
             .fluidInputs(Materials.Glass.getMolten(2304L))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.Titanium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.Titanium, 1L),
                 ItemList.Hull_IV.get(1L),
-                GT_Utility.getIntegratedCircuit(4))
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(ItemList.Hatch_Input_Multi_2x2_IV.get(1L))
             .fluidInputs(Materials.Glass.getMolten(2304L))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.TungstenSteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.TungstenSteel, 1L),
                 ItemList.Hull_LuV.get(1L),
-                GT_Utility.getIntegratedCircuit(4))
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(ItemList.Hatch_Input_Multi_2x2_LuV.get(1L))
             .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(2304L))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.NiobiumTitanium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.NiobiumTitanium, 1L),
                 ItemList.Hull_ZPM.get(1L),
-                GT_Utility.getIntegratedCircuit(4))
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(ItemList.Hatch_Input_Multi_2x2_ZPM.get(1L))
             .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(2304L))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_ZPM)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.MysteriousCrystal, 1L),
+                GTOreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.MysteriousCrystal, 1L),
                 ItemList.Hull_UV.get(1L),
-                GT_Utility.getIntegratedCircuit(4))
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(ItemList.Hatch_Input_Multi_2x2_UV.get(1L))
             .fluidInputs(Materials.Polybenzimidazole.getMolten(2304L))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_UV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.Neutronium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.Neutronium, 1L),
                 ItemList.Hull_MAX.get(1L),
-                GT_Utility.getIntegratedCircuit(4))
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(ItemList.Hatch_Input_Multi_2x2_UHV.get(1L))
             .fluidInputs(Materials.Polybenzimidazole.getMolten(2304L))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_UHV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 4L),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 4L),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1L),
                 ItemList.Robot_Arm_IV.get(2L),
-                GT_Utility.getIntegratedCircuit(3))
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Casing_Gearbox_TungstenSteel.get(1L))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
@@ -1236,10 +1236,10 @@ public class AssemblerRecipes implements Runnable {
                 nbtFlask.setInteger("Capacity", capacities[i]);
                 flask.setTagCompound(nbtFlask);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
                         ItemList.VOLUMETRIC_FLASK.get(1),
-                        GT_Utility.getIntegratedCircuit(circuitConfigurations[i]))
+                        GTUtility.getIntegratedCircuit(circuitConfigurations[i]))
                     .itemOutputs(flask)
                     .duration(10 * TICKS)
                     .eut(TierEU.RECIPE_LV)
@@ -1247,125 +1247,125 @@ public class AssemblerRecipes implements Runnable {
             }
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_LV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Bronze, 1),
-                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Bronze, 1),
+                GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Bronze, 1),
+                GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Bronze, 1),
                 ItemList.Electric_Motor_LV.get(1),
-                GT_Utility.getIntegratedCircuit(3))
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Hatch_Muffler_LV.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_MV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Steel, 1),
+                GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1),
+                GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Steel, 1),
                 ItemList.Electric_Motor_MV.get(1),
-                GT_Utility.getIntegratedCircuit(3))
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Hatch_Muffler_MV.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_HV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 1),
+                GTOreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1),
                 ItemList.Electric_Motor_HV.get(1),
-                GT_Utility.getIntegratedCircuit(3))
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Hatch_Muffler_HV.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_EV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 1),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 1),
                 ItemList.Electric_Motor_EV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Titanium, 1),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Titanium, 1),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Hatch_Muffler_EV.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_IV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 1),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 1),
                 ItemList.Electric_Motor_IV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Hatch_Muffler_IV.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_LuV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Enderium, 1),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Enderium, 1),
                 ItemList.Electric_Motor_LuV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Enderium, 1),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Enderium, 1),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Hatch_Muffler_LuV.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_ZPM.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 1),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 1),
                 ItemList.Electric_Motor_ZPM.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 1),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 1),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Hatch_Muffler_ZPM.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_ZPM)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_UV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 1),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 1),
                 ItemList.Electric_Motor_UV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 1),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 1),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Hatch_Muffler_UV.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_UV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hull_MAX.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.MysteriousCrystal, 1),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.MysteriousCrystal, 1),
                 ItemList.Electric_Motor_UHV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.CosmicNeutronium, 1),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.rotor, Materials.CosmicNeutronium, 1),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Hatch_Muffler_MAX.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_UHV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.redstone_torch, 2, 32767),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1))
             .itemOutputs(new ItemStack(Items.repeater, 1, 0))
             .fluidInputs(Materials.Concrete.getMolten(144))
             .duration(4 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.leather, 1, 32767), new ItemStack(Items.lead, 1, 32767))
             .itemOutputs(new ItemStack(Items.name_tag, 1, 0))
             .fluidInputs(Materials.Glue.getFluid(72))
@@ -1373,7 +1373,7 @@ public class AssemblerRecipes implements Runnable {
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 1L, 0),
                 new ItemStack(Items.lead, 1, 32767))
@@ -1383,76 +1383,68 @@ public class AssemblerRecipes implements Runnable {
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 8),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 8),
                 new ItemStack(Items.compass, 1, 32767))
             .itemOutputs(new ItemStack(Items.map, 1, 0))
             .duration(5 * SECONDS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tantalum, 1),
-                GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Manganese, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tantalum, 1),
+                GTOreDictUnificator.get(OrePrefixes.foil, Materials.Manganese, 1))
             .itemOutputs(ItemList.Battery_RE_ULV_Tantalum.get(8))
             .fluidInputs(Materials.Plastic.getMolten(144))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(getModItem(TwilightForest.ID, "item.charmOfLife1", 4L, 0), GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(getModItem(TwilightForest.ID, "item.charmOfLife1", 4L, 0), GTUtility.getIntegratedCircuit(4))
             .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfLife2", 1L, 0))
             .duration(5 * SECONDS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                getModItem(TwilightForest.ID, "item.charmOfKeeping1", 4L, 0),
-                GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(getModItem(TwilightForest.ID, "item.charmOfKeeping1", 4L, 0), GTUtility.getIntegratedCircuit(4))
             .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfKeeping2", 1L, 0))
             .duration(5 * SECONDS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                getModItem(TwilightForest.ID, "item.charmOfKeeping2", 4L, 0),
-                GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(getModItem(TwilightForest.ID, "item.charmOfKeeping2", 4L, 0), GTUtility.getIntegratedCircuit(4))
             .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfKeeping3", 1L, 0))
             .duration(5 * SECONDS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(getModItem(TwilightForest.ID, "item.charmOfLife2", 1L, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(getModItem(TwilightForest.ID, "item.charmOfLife2", 1L, 0), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfLife1", 4L, 0))
             .duration(5 * SECONDS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                getModItem(TwilightForest.ID, "item.charmOfKeeping2", 1L, 0),
-                GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(getModItem(TwilightForest.ID, "item.charmOfKeeping2", 1L, 0), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfKeeping1", 4L, 0))
             .duration(5 * SECONDS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                getModItem(TwilightForest.ID, "item.charmOfKeeping3", 1L, 0),
-                GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(getModItem(TwilightForest.ID, "item.charmOfKeeping3", 1L, 0), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfKeeping2", 4L, 0))
             .duration(5 * SECONDS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 16),
                 getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 20))
@@ -1462,7 +1454,7 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 17),
                 getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 20))
@@ -1472,7 +1464,7 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 18),
                 getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 20))
@@ -1482,34 +1474,34 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 1),
                 new ItemStack(Blocks.sand, 1, 32767))
             .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 2L, 0))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 1),
                 new ItemStack(Blocks.sand, 1, 32767))
             .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 2L, 600))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Fluix, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Fluix, 1),
                 new ItemStack(Blocks.sand, 1, 32767))
             .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 2L, 1200))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.FR_Wax.get(6), new ItemStack(Items.string, 1, 32767))
             .itemOutputs(getModItem(Forestry.ID, "candle", 24L, 0))
             .fluidInputs(Materials.Water.getFluid(600))
@@ -1517,7 +1509,7 @@ public class AssemblerRecipes implements Runnable {
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.FR_Wax.get(2), ItemList.FR_Silk.get(1))
             .itemOutputs(getModItem(Forestry.ID, "candle", 8L, 0))
             .fluidInputs(Materials.Water.getFluid(200))
@@ -1525,24 +1517,24 @@ public class AssemblerRecipes implements Runnable {
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.FR_Silk.get(9), GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.FR_Silk.get(9), GTUtility.getIntegratedCircuit(9))
             .itemOutputs(getModItem(Forestry.ID, "craftingMaterial", 1L, 3))
             .fluidInputs(Materials.Water.getFluid(500))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(getModItem(Forestry.ID, "propolis", 5L, 2), GT_Utility.getIntegratedCircuit(5))
+        GTValues.RA.stdBuilder()
+            .itemInputs(getModItem(Forestry.ID, "propolis", 5L, 2), GTUtility.getIntegratedCircuit(5))
             .itemOutputs(getModItem(Forestry.ID, "craftingMaterial", 1L, 1))
             .duration(16 * TICKS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
                 new ItemStack(Blocks.wool, 1, 32767))
             .itemOutputs(new ItemStack(Blocks.torch, 6, 0))
             .fluidInputs(Materials.Creosote.getFluid(1000))
@@ -1550,62 +1542,62 @@ public class AssemblerRecipes implements Runnable {
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(getModItem(Forestry.ID, "craftingMaterial", 5L, 1), GT_Utility.getIntegratedCircuit(5))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(getModItem(Forestry.ID, "craftingMaterial", 5L, 1), GTUtility.getIntegratedCircuit(5))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.piston, 1, 32767), new ItemStack(Items.slime_ball, 1, 32767))
             .itemOutputs(new ItemStack(Blocks.sticky_piston, 1, 0))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.piston, 1, 32767), ItemList.IC2_Resin.get(1))
             .itemOutputs(new ItemStack(Blocks.sticky_piston, 1, 0))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Blocks.piston, 1, 32767), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.piston, 1, 32767), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Blocks.sticky_piston, 1, 0))
             .fluidInputs(Materials.Glue.getFluid(100))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 3),
-                GT_ModHandler.getIC2Item("carbonMesh", 3),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 3),
+                GTModHandler.getIC2Item("carbonMesh", 3),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Duct_Tape.get(1))
             .fluidInputs(Materials.Glue.getFluid(300))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StyreneButadieneRubber, 2),
-                GT_ModHandler.getIC2Item("carbonMesh", 2),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.StyreneButadieneRubber, 2),
+                GTModHandler.getIC2Item("carbonMesh", 2),
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.Duct_Tape.get(1))
             .fluidInputs(Materials.Glue.getFluid(200))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicone, 1),
-                GT_ModHandler.getIC2Item("carbonMesh", 1),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Silicone, 1),
+                GTModHandler.getIC2Item("carbonMesh", 1),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Duct_Tape.get(1))
             .fluidInputs(Materials.Glue.getFluid(100))
             .duration(5 * SECONDS)
@@ -1615,17 +1607,17 @@ public class AssemblerRecipes implements Runnable {
         // Maintenance Hatch Recipes Using BrainTech + Refined Glue. Info: One BrainTech Recipe Is In GT+ü Originally.
         // The Maintenance Hatch Recipe using SuperGlue is there.
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.Hull_LV.get(1), ItemList.Duct_Tape.get(2), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.Hull_LV.get(1), ItemList.Duct_Tape.get(2), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.Hatch_Maintenance.get(1))
             .fluidInputs(Materials.Glue.getFluid(1000))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3),
                 new ItemStack(Items.leather, 1, 32767))
             .itemOutputs(new ItemStack(Items.book, 1, 0))
             .fluidInputs(Materials.Glue.getFluid(20))
@@ -1633,9 +1625,9 @@ public class AssemblerRecipes implements Runnable {
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3),
                 getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 1L, 0))
             .itemOutputs(new ItemStack(Items.book, 1, 0))
             .fluidInputs(Materials.Glue.getFluid(20))
@@ -1643,17 +1635,17 @@ public class AssemblerRecipes implements Runnable {
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3),
-                GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Paper, 1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3),
+                GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Paper, 1))
             .itemOutputs(new ItemStack(Items.book, 1, 0))
             .fluidInputs(Materials.Glue.getFluid(20))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Paper_Printed_Pages.get(1), new ItemStack(Items.leather, 1, 32767))
             .itemOutputs(new ItemStack(Items.written_book, 1, 0))
             .fluidInputs(Materials.Glue.getFluid(20))
@@ -1661,7 +1653,7 @@ public class AssemblerRecipes implements Runnable {
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Paper_Printed_Pages.get(1),
                 getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 1L, 0))
@@ -1671,14 +1663,14 @@ public class AssemblerRecipes implements Runnable {
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 4))
             .itemOutputs(ItemList.Cell_Universal_Fluid.get(1))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Food_Baked_Cake.get(1), new ItemStack(Items.egg, 1, 0))
             .itemOutputs(new ItemStack(Items.cake, 1, 0))
             .fluidInputs(Materials.Milk.getFluid(3000))
@@ -1686,104 +1678,104 @@ public class AssemblerRecipes implements Runnable {
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.Food_Sliced_Bun.get(2), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.Food_Sliced_Bun.get(2), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.Food_Sliced_Buns.get(1))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.Food_Sliced_Bread.get(2), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.Food_Sliced_Bread.get(2), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.Food_Sliced_Breads.get(1))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.Food_Sliced_Baguette.get(2), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.Food_Sliced_Baguette.get(2), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.Food_Sliced_Baguettes.get(1))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.Food_Sliced_Buns.get(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.Food_Sliced_Buns.get(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Food_Sliced_Bun.get(2))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.Food_Sliced_Breads.get(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.Food_Sliced_Breads.get(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Food_Sliced_Bread.get(2))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.Food_Sliced_Baguettes.get(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.Food_Sliced_Baguettes.get(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Food_Sliced_Baguette.get(2))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Food_Sliced_Bun.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1))
             .itemOutputs(ItemList.Food_Burger_Meat.get(1))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Food_Sliced_Buns.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1))
             .itemOutputs(ItemList.Food_Burger_Meat.get(1))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Food_Sliced_Bun.get(2), ItemList.Food_Chum.get(1))
             .itemOutputs(ItemList.Food_Burger_Chum.get(1))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Food_Sliced_Buns.get(1), ItemList.Food_Chum.get(1))
             .itemOutputs(ItemList.Food_Burger_Chum.get(1))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Food_Sliced_Bun.get(2), ItemList.Food_Sliced_Cheese.get(3))
             .itemOutputs(ItemList.Food_Burger_Cheese.get(1))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Food_Sliced_Buns.get(1), ItemList.Food_Sliced_Cheese.get(3))
             .itemOutputs(ItemList.Food_Burger_Cheese.get(1))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Food_Flat_Dough.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1))
             .itemOutputs(ItemList.Food_Raw_Pizza_Meat.get(1))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Food_Flat_Dough.get(1), ItemList.Food_Sliced_Cheese.get(3))
             .itemOutputs(ItemList.Food_Raw_Pizza_Cheese.get(1))
             .duration(5 * SECONDS)
@@ -1792,838 +1784,838 @@ public class AssemblerRecipes implements Runnable {
 
         // SC craft
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Pentacadmiummagnesiumhexaoxid, 3),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 2),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Pentacadmiummagnesiumhexaoxid, 3),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 2),
                 ItemList.Electric_Pump_MV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 3))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 3))
             .fluidInputs(Materials.Helium.getGas(2000))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titaniumonabariumdecacoppereikosaoxid, 6),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 4),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titaniumonabariumdecacoppereikosaoxid, 6),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 4),
                 ItemList.Electric_Pump_HV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 6))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 6))
             .fluidInputs(Materials.Helium.getGas(4000))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Uraniumtriplatinid, 9),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.TungstenSteel, 6),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Uraniumtriplatinid, 9),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.TungstenSteel, 6),
                 ItemList.Electric_Pump_EV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 9))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 9))
             .fluidInputs(Materials.Helium.getGas(6000))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Vanadiumtriindinid, 12),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 8),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Vanadiumtriindinid, 12),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 8),
                 ItemList.Electric_Pump_IV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 12))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 12))
             .fluidInputs(Materials.Helium.getGas(8000))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(
+                GTOreDictUnificator.get(
                     OrePrefixes.wireGt01,
                     Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid,
                     15),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 10),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 10),
                 ItemList.Electric_Pump_LuV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 15))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 15))
             .fluidInputs(Materials.Helium.getGas(12000))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 18),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 12),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 18),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 12),
                 ItemList.Electric_Pump_ZPM.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 18))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 18))
             .fluidInputs(Materials.Helium.getGas(16000))
             .duration(1 * MINUTES + 20 * SECONDS)
             .eut(TierEU.RECIPE_ZPM)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuvwire, 21),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 14),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuvwire, 21),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 14),
                 ItemList.Electric_Pump_UV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 21))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 21))
             .fluidInputs(Materials.Helium.getGas(20000))
             .duration(1 * MINUTES + 20 * SECONDS)
             .eut(TierEU.RECIPE_UV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuhvwire, 24),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Bedrockium, 16),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuhvwire, 24),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Bedrockium, 16),
                 ItemList.Electric_Pump_UHV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24))
             .fluidInputs(Materials.Helium.getGas(24000))
             .duration(2 * MINUTES + 40 * SECONDS)
             .eut(TierEU.RECIPE_UHV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Pentacadmiummagnesiumhexaoxid, 3),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 2),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Pentacadmiummagnesiumhexaoxid, 3),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 2),
                 ItemList.Electric_Pump_MV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 3))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 3))
             .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(4))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titaniumonabariumdecacoppereikosaoxid, 6),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 4),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titaniumonabariumdecacoppereikosaoxid, 6),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 4),
                 ItemList.Electric_Pump_HV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 6))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 6))
             .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(8))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Uraniumtriplatinid, 9),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.TungstenSteel, 6),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Uraniumtriplatinid, 9),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.TungstenSteel, 6),
                 ItemList.Electric_Pump_EV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 9))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 9))
             .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(12))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Vanadiumtriindinid, 12),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 8),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Vanadiumtriindinid, 12),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 8),
                 ItemList.Electric_Pump_IV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 12))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 12))
             .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(16))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(
+                GTOreDictUnificator.get(
                     OrePrefixes.wireGt01,
                     Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid,
                     15),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 10),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 10),
                 ItemList.Electric_Pump_LuV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 15))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 15))
             .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(24))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 18),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 12),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 18),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 12),
                 ItemList.Electric_Pump_ZPM.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 18))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 18))
             .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(32))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_ZPM)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuvwire, 21),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 14),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuvwire, 21),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 14),
                 ItemList.Electric_Pump_UV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 21))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 21))
             .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(40))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_UV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuhvwire, 24),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Bedrockium, 16),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuhvwire, 24),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Bedrockium, 16),
                 ItemList.Electric_Pump_UHV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24))
             .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(48))
             .duration(1 * MINUTES + 20 * SECONDS)
             .eut(TierEU.RECIPE_UHV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEVBase, 27),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Infinity, 18),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEVBase, 27),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Infinity, 18),
                 ItemList.Electric_Pump_UEV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 27))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 27))
             .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(56))
             .duration(1 * MINUTES + 20 * SECONDS)
             .eut(TierEU.RECIPE_UEV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUIVBase, 30L),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, MaterialsUEVplus.TranscendentMetal, 20L),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUIVBase, 30L),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, MaterialsUEVplus.TranscendentMetal, 20L),
                 ItemList.Electric_Pump_UIV.get(1L),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUIV, 30L))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUIV, 30L))
             .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(68))
             .duration(1 * MINUTES + 20 * SECONDS)
             .eut(TierEU.RECIPE_UIV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMVBase, 33),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, MaterialsUEVplus.SpaceTime, 22),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMVBase, 33),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, MaterialsUEVplus.SpaceTime, 22),
                 ItemList.Electric_Pump_UMV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 33))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 33))
             .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(72))
             .duration(2 * MINUTES + 40 * SECONDS)
             .eut(TierEU.RECIPE_UMV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lead, 16),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1),
+                GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Lead, 16),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.ULV_Coil.get(1))
             .duration(10 * SECONDS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 16),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1),
+                GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 16),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.LV_Coil.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SteelMagnetic, 1),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Aluminium, 16),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.SteelMagnetic, 1),
+                GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Aluminium, 16),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.MV_Coil.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SteelMagnetic, 1),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.EnergeticAlloy, 16),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.SteelMagnetic, 1),
+                GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.EnergeticAlloy, 16),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.HV_Coil.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NeodymiumMagnetic, 1),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.TungstenSteel, 16),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.NeodymiumMagnetic, 1),
+                GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.TungstenSteel, 16),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.EV_Coil.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NeodymiumMagnetic, 1),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iridium, 16),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.NeodymiumMagnetic, 1),
+                GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Iridium, 16),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.IV_Coil.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, ExternalMaterials.getRuridit(), 16),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1),
+                GTOreDictUnificator.get(OrePrefixes.wireFine, ExternalMaterials.getRuridit(), 16),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.LuV_Coil.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 16),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1),
+                GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 16),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.ZPM_Coil.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_ZPM)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.ElectrumFlux, 16),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1),
+                GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.ElectrumFlux, 16),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.UV_Coil.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_UV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 16),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1),
+                GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 16),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.UHV_Coil.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_UHV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 6),
-                GT_Utility.getIntegratedCircuit(2))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Wood, 2))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 6),
+                GTUtility.getIntegratedCircuit(2))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Wood, 2))
             .fluidInputs(Materials.Glue.getFluid(10))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 3),
-                GT_Utility.getIntegratedCircuit(4))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Wood, 4))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 3),
+                GTUtility.getIntegratedCircuit(4))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Wood, 4))
             .fluidInputs(Materials.Glue.getFluid(20))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1),
-                GT_Utility.getIntegratedCircuit(12))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Wood, 6))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1),
+                GTUtility.getIntegratedCircuit(12))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Wood, 6))
             .fluidInputs(Materials.Glue.getFluid(60))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4),
-                GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Advanced, 4),
-                GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Diamond, 1),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4),
+                GTOreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Advanced, 4),
+                GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Diamond, 1),
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.Ingot_IridiumAlloy.get(1))
             .duration(60 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1),
                 ItemList.Electric_Motor_MV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Steel, 1),
+                GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Steel, 1),
                 new ItemStack(Blocks.iron_bars, 6),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Casing_Grate.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1),
                 ItemList.Electric_Motor_UV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Iridium, 1),
+                GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Iridium, 1),
                 ItemList.Component_Filter.get(8),
-                GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iridium, 8))
+                GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Iridium, 8))
             .itemOutputs(ItemList.Casing_Vent_T2.get(1))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
                 new ItemStack(Items.coal, 1, 32767))
             .itemOutputs(new ItemStack(Blocks.torch, 4))
             .duration(2 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 2),
-                GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Steel, 1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 2),
+                GTOreDictUnificator.get(OrePrefixes.spring, Materials.Steel, 1))
             .itemOutputs(new ItemStack(Blocks.light_weighted_pressure_plate, 1))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 2),
-                GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Steel, 1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 2),
+                GTOreDictUnificator.get(OrePrefixes.spring, Materials.Steel, 1))
             .itemOutputs(new ItemStack(Blocks.heavy_weighted_pressure_plate, 1))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 7),
-                GT_Utility.getIntegratedCircuit(7))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 7),
+                GTUtility.getIntegratedCircuit(7))
             .itemOutputs(new ItemStack(Items.cauldron, 1))
             .duration(35 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_ModHandler.getIC2Item("ironFence", 1))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTModHandler.getIC2Item("ironFence", 1))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 3),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 3),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(new ItemStack(Blocks.iron_bars, 4))
             .duration(15 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 7),
-                GT_Utility.getIntegratedCircuit(7))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 7),
+                GTUtility.getIntegratedCircuit(7))
             .itemOutputs(new ItemStack(Items.cauldron, 1))
             .duration(35 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_ModHandler.getIC2Item("ironFence", 1))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTModHandler.getIC2Item("ironFence", 1))
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 3),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 3),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(new ItemStack(Blocks.iron_bars, 4))
             .duration(15 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 3),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 3),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(new ItemStack(Blocks.fence, 1))
             .duration(15 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Iron, 2))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTOreDictUnificator.get(OrePrefixes.ring, Materials.Iron, 2))
             .itemOutputs(new ItemStack(Blocks.tripwire_hook, 1))
             .duration(20 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_OreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 2))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTOreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 2))
             .itemOutputs(new ItemStack(Blocks.tripwire_hook, 1))
             .duration(20 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 3),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 3),
                 new ItemStack(Items.string, 3, 32767))
             .itemOutputs(new ItemStack(Items.bow, 1))
             .duration(20 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 3),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 3),
                 ItemList.Component_Minecart_Wheels_Iron.get(2))
             .itemOutputs(new ItemStack(Items.minecart, 1))
             .duration(5 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 3),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 3),
                 ItemList.Component_Minecart_Wheels_Iron.get(2))
             .itemOutputs(new ItemStack(Items.minecart, 1))
             .duration(4 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 3),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 3),
                 ItemList.Component_Minecart_Wheels_Steel.get(2))
             .itemOutputs(new ItemStack(Items.minecart, 1))
             .duration(5 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1),
-                GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Iron, 2))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1),
+                GTOreDictUnificator.get(OrePrefixes.ring, Materials.Iron, 2))
             .itemOutputs(ItemList.Component_Minecart_Wheels_Iron.get(1))
             .duration(5 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1),
-                GT_OreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 2))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1),
+                GTOreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 2))
             .itemOutputs(ItemList.Component_Minecart_Wheels_Iron.get(1))
             .duration(4 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Steel, 2))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1),
+                GTOreDictUnificator.get(OrePrefixes.ring, Materials.Steel, 2))
             .itemOutputs(ItemList.Component_Minecart_Wheels_Steel.get(1))
             .duration(3 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.hopper, 1, 32767))
             .itemOutputs(new ItemStack(Items.hopper_minecart, 1))
             .duration(20 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.tnt, 1, 32767))
             .itemOutputs(new ItemStack(Items.tnt_minecart, 1))
             .duration(20 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.chest, 1, 32767))
             .itemOutputs(new ItemStack(Items.chest_minecart, 1))
             .duration(20 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.trapped_chest, 1, 32767))
             .itemOutputs(new ItemStack(Items.chest_minecart, 1))
             .duration(20 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.furnace, 1, 32767))
             .itemOutputs(new ItemStack(Items.furnace_minecart, 1))
             .duration(20 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.tripwire_hook, 1), new ItemStack(Blocks.chest, 1, 32767))
             .itemOutputs(new ItemStack(Blocks.trapped_chest, 1))
             .duration(10 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Blocks.stone, 1, 0), GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.stone, 1, 0), GTUtility.getIntegratedCircuit(4))
             .itemOutputs(new ItemStack(Blocks.stonebrick, 1, 0))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Blocks.sandstone, 1, 0), GT_Utility.getIntegratedCircuit(23))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.sandstone, 1, 0), GTUtility.getIntegratedCircuit(23))
             .itemOutputs(new ItemStack(Blocks.sandstone, 1, 2))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Blocks.sandstone, 1, 1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.sandstone, 1, 1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Blocks.sandstone, 1, 0))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Blocks.sandstone, 1, 2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.sandstone, 1, 2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Blocks.sandstone, 1, 0))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 8),
-                GT_Utility.getIntegratedCircuit(8))
-            .itemOutputs(GT_ModHandler.getIC2Item("machine", 1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 8),
+                GTUtility.getIntegratedCircuit(8))
+            .itemOutputs(GTModHandler.getIC2Item("machine", 1))
             .duration(1 * SECONDS + 5 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 8),
-                GT_Utility.getIntegratedCircuit(8))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 8),
+                GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.Casing_ULV.get(1))
             .duration(1 * SECONDS + 5 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 8),
-                GT_Utility.getIntegratedCircuit(8))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 8),
+                GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.Casing_LV.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 8),
-                GT_Utility.getIntegratedCircuit(8))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 8),
+                GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.Casing_MV.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 8),
-                GT_Utility.getIntegratedCircuit(8))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 8),
+                GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.Casing_HV.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 8),
-                GT_Utility.getIntegratedCircuit(8))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 8),
+                GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.Casing_EV.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 8),
-                GT_Utility.getIntegratedCircuit(8))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 8),
+                GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.Casing_IV.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, ExternalMaterials.getRhodiumPlatedPalladium(), 8),
-                GT_Utility.getIntegratedCircuit(8))
+                GTOreDictUnificator.get(OrePrefixes.plate, ExternalMaterials.getRhodiumPlatedPalladium(), 8),
+                GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.Casing_LuV.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 8),
-                GT_Utility.getIntegratedCircuit(8))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 8),
+                GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.Casing_ZPM.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 8),
-                GT_Utility.getIntegratedCircuit(8))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 8),
+                GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.Casing_UV.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8),
-                GT_Utility.getIntegratedCircuit(8))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8),
+                GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.Casing_MAX.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Invar, 6),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Invar, 1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Invar, 6),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Invar, 1))
             .itemOutputs(ItemList.Casing_HeatProof.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 6),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 6),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Casing_SolidSteel.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 6),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 6),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1))
             .itemOutputs(ItemList.Casing_FrostProof.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1))
             .itemOutputs(ItemList.Casing_RobustTungstenSteel.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 6),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 6),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1))
             .itemOutputs(ItemList.Casing_CleanStainlessSteel.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1))
             .itemOutputs(ItemList.Casing_StableTitanium.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 6),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 6),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 1))
             .itemOutputs(ItemList.Casing_MiningOsmiridium.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1))
             .itemOutputs(ItemList.Casing_MiningNeutronium.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 6),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackPlutonium, 1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 6),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackPlutonium, 1))
             .itemOutputs(ItemList.Casing_MiningBlackPlutonium.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 4), ItemList.Casing_LuV.get(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 4), ItemList.Casing_LuV.get(1))
             .itemOutputs(ItemList.Casing_Fusion.get(1))
             .fluidInputs(Materials.HSSG.getMolten(288))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 4),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 4),
                 ItemList.Casing_Fusion.get(1))
             .itemOutputs(ItemList.Casing_Fusion2.get(1))
             .fluidInputs(Materials.NaquadahAlloy.getMolten(288))
@@ -2631,93 +2623,93 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Magnalium, 6),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Magnalium, 6),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1))
             .itemOutputs(ItemList.Casing_Turbine.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 6),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 6),
                 ItemList.Casing_Turbine.get(1))
             .itemOutputs(ItemList.Casing_Turbine1.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6),
                 ItemList.Casing_Turbine.get(1))
             .itemOutputs(ItemList.Casing_Turbine2.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6),
                 ItemList.Casing_Turbine.get(1))
             .itemOutputs(ItemList.Casing_Turbine3.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6), ItemList.Casing_Turbine.get(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6), ItemList.Casing_Turbine.get(1))
             .itemOutputs(ItemList.Casing_TurbineGasAdvanced.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.Casing_SolidSteel.get(1), GT_Utility.getIntegratedCircuit(6))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.Casing_SolidSteel.get(1), GTUtility.getIntegratedCircuit(6))
             .itemOutputs(ItemList.Casing_Chemically_Inert.get(1))
             .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(216))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1))
             .itemOutputs(ItemList.Casing_Advanced_Iridium.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Lead, 2), ItemList.Casing_ULV.get(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Lead, 2), ItemList.Casing_ULV.get(1))
             .itemOutputs(ItemList.Hull_ULV.get(1))
             .fluidInputs(Materials.Plastic.getMolten(288))
             .duration(1 * SECONDS + 5 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 2), ItemList.Casing_LV.get(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 2), ItemList.Casing_LV.get(1))
             .itemOutputs(ItemList.Hull_LV.get(1))
             .fluidInputs(Materials.Plastic.getMolten(288))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 2), ItemList.Casing_MV.get(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 2), ItemList.Casing_MV.get(1))
             .itemOutputs(ItemList.Hull_MV.get(1))
             .fluidInputs(Materials.Plastic.getMolten(288))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 2),
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 2),
                 ItemList.Casing_MV.get(1))
             .itemOutputs(ItemList.Hull_MV.get(1))
             .fluidInputs(Materials.Plastic.getMolten(288))
@@ -2725,17 +2717,17 @@ public class AssemblerRecipes implements Runnable {
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 2), ItemList.Casing_HV.get(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 2), ItemList.Casing_HV.get(1))
             .itemOutputs(ItemList.Hull_HV.get(1))
             .fluidInputs(Materials.Plastic.getMolten(288))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2),
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2),
                 ItemList.Casing_EV.get(1))
             .itemOutputs(ItemList.Hull_EV.get(1))
             .fluidInputs(Materials.Plastic.getMolten(288))
@@ -2743,9 +2735,9 @@ public class AssemblerRecipes implements Runnable {
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 2),
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 2),
                 ItemList.Casing_IV.get(1))
             .itemOutputs(ItemList.Hull_IV.get(1))
             .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288))
@@ -2753,9 +2745,9 @@ public class AssemblerRecipes implements Runnable {
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.VanadiumGallium, 2),
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.VanadiumGallium, 2),
                 ItemList.Casing_LuV.get(1))
             .itemOutputs(ItemList.Hull_LuV.get(1))
             .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288))
@@ -2763,9 +2755,9 @@ public class AssemblerRecipes implements Runnable {
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2),
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2),
                 ItemList.Casing_ZPM.get(1))
             .itemOutputs(ItemList.Hull_ZPM.get(1))
             .fluidInputs(Materials.Polybenzimidazole.getMolten(288))
@@ -2773,9 +2765,9 @@ public class AssemblerRecipes implements Runnable {
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2),
+                GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2),
                 ItemList.Casing_UV.get(1))
             .itemOutputs(ItemList.Hull_UV.get(1))
             .fluidInputs(Materials.Polybenzimidazole.getMolten(288))
@@ -2783,9 +2775,9 @@ public class AssemblerRecipes implements Runnable {
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 2),
+                GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 2),
                 ItemList.Casing_MAX.get(1))
             .itemOutputs(ItemList.Hull_MAX.get(1))
             .fluidInputs(Materials.Polybenzimidazole.getMolten(288))
@@ -2793,491 +2785,491 @@ public class AssemblerRecipes implements Runnable {
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 1),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 1))
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 1),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 1))
             .itemOutputs(ItemList.Battery_Hull_LV.get(1))
             .fluidInputs(Materials.Plastic.getMolten(144))
             .duration(4 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 2),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 3))
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 3))
             .itemOutputs(ItemList.Battery_Hull_MV.get(1))
             .fluidInputs(Materials.Plastic.getMolten(432))
             .duration(16 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 2),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 3))
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 3))
             .itemOutputs(ItemList.Battery_Hull_MV.get(1))
             .fluidInputs(Materials.Plastic.getMolten(432))
             .duration(16 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 4),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 9))
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 4),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 9))
             .itemOutputs(ItemList.Battery_Hull_HV.get(1))
             .fluidInputs(Materials.Plastic.getMolten(1296))
             .duration(1 * MINUTES + 4 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.string, 4, 32767), new ItemStack(Items.slime_ball, 1, 32767))
             .itemOutputs(new ItemStack(Items.lead, 2))
             .duration(2 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("batPack", 1L, 32767), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("batPack", 1L, 32767), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.IC2_ReBattery.get(6))
             .duration(40 * SECONDS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("carbonFiber", 2), GT_Utility.getIntegratedCircuit(2))
-            .itemOutputs(GT_ModHandler.getIC2Item("carbonMesh", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("carbonFiber", 2), GTUtility.getIntegratedCircuit(2))
+            .itemOutputs(GTModHandler.getIC2Item("carbonMesh", 1))
             .duration(8 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 5),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 5),
                 new ItemStack(Blocks.chest, 1, 32767))
             .itemOutputs(new ItemStack(Blocks.hopper))
             .duration(8 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 5),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 5),
                 new ItemStack(Blocks.trapped_chest, 1, 32767))
             .itemOutputs(new ItemStack(Blocks.hopper))
             .duration(8 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 5),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 5),
                 new ItemStack(Blocks.chest, 1, 32767))
             .itemOutputs(new ItemStack(Blocks.hopper))
             .duration(8 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 5),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 5),
                 new ItemStack(Blocks.trapped_chest, 1, 32767))
             .itemOutputs(new ItemStack(Blocks.hopper))
             .duration(8 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.gear, Materials.CobaltBrass, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1))
+                GTOreDictUnificator.get(OrePrefixes.gear, Materials.CobaltBrass, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1))
             .itemOutputs(ItemList.Component_Sawblade_Diamond.get(1))
             .duration(16 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1))
             .itemOutputs(new ItemStack(Blocks.redstone_torch, 1))
             .duration(1 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1))
             .itemOutputs(new ItemStack(Blocks.torch, 2))
             .duration(2 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1))
             .itemOutputs(new ItemStack(Blocks.torch, 6))
             .duration(2 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), ItemList.IC2_Resin.get(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), ItemList.IC2_Resin.get(1))
             .itemOutputs(new ItemStack(Blocks.torch, 6))
             .duration(2 * SECONDS)
             .eut(20)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Wood, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Wood, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.wooden_sword, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Stone, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Stone, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.stone_sword, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Iron, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Iron, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.iron_sword, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Gold, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Gold, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.golden_sword, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Diamond, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Diamond, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.diamond_sword, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Bronze, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Bronze, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Tool_Sword_Bronze.getUndamaged(1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Steel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Steel, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Tool_Sword_Steel.getUndamaged(1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Wood, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Wood, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.wooden_pickaxe, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Stone, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Stone, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.stone_pickaxe, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Iron, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Iron, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.iron_pickaxe, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Gold, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Gold, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.golden_pickaxe, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Diamond, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Diamond, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.diamond_pickaxe, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Bronze, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Bronze, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Tool_Pickaxe_Bronze.getUndamaged(1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Steel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Steel, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Tool_Pickaxe_Steel.getUndamaged(1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Wood, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Wood, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.wooden_shovel, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Stone, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Stone, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.stone_shovel, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Iron, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Iron, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.iron_shovel, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Gold, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Gold, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.golden_shovel, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Diamond, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Diamond, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.diamond_shovel, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Bronze, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Bronze, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Tool_Shovel_Bronze.getUndamaged(1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Steel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Steel, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Tool_Shovel_Steel.getUndamaged(1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Wood, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Wood, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.wooden_axe, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Stone, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Stone, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.stone_axe, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Iron, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Iron, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.iron_axe, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Gold, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Gold, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.golden_axe, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Diamond, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Diamond, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.diamond_axe, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Bronze, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Bronze, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Tool_Axe_Bronze.getUndamaged(1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Steel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Steel, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Tool_Axe_Steel.getUndamaged(1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Wood, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Wood, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.wooden_hoe, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Stone, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Stone, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.stone_hoe, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Iron, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Iron, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.iron_hoe, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Gold, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Gold, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.golden_hoe, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Diamond, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Diamond, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.diamond_hoe, 1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Bronze, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Bronze, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Tool_Hoe_Bronze.getUndamaged(1))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Steel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Steel, 1),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Tool_Hoe_Steel.getUndamaged(1))
             .duration(5 * SECONDS)
             .eut(16)
@@ -3285,246 +3277,246 @@ public class AssemblerRecipes implements Runnable {
 
         // fuel rod assembler recipes
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.ThoriumCell_1.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4),
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.ThoriumCell_2.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.ThoriumCell_1.get(4),
-                GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6),
-                GT_Utility.getIntegratedCircuit(4))
+                GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6),
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(ItemList.ThoriumCell_4.get(1))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.ThoriumCell_2.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4),
-                GT_Utility.getIntegratedCircuit(5))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4),
+                GTUtility.getIntegratedCircuit(5))
             .itemOutputs(ItemList.ThoriumCell_4.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Uraniumcell_1.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4),
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.Uraniumcell_2.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Uraniumcell_1.get(4),
-                GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6),
-                GT_Utility.getIntegratedCircuit(4))
+                GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6),
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(ItemList.Uraniumcell_4.get(1))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Uraniumcell_2.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4),
-                GT_Utility.getIntegratedCircuit(5))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4),
+                GTUtility.getIntegratedCircuit(5))
             .itemOutputs(ItemList.Uraniumcell_4.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Moxcell_1.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4),
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.Moxcell_2.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Moxcell_1.get(4),
-                GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6),
-                GT_Utility.getIntegratedCircuit(4))
+                GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6),
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(ItemList.Moxcell_4.get(1))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Moxcell_2.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4),
-                GT_Utility.getIntegratedCircuit(5))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4),
+                GTUtility.getIntegratedCircuit(5))
             .itemOutputs(ItemList.Moxcell_4.get(1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.NaquadahCell_1.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4),
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.NaquadahCell_2.get(1))
             .duration(5 * SECONDS)
             .eut(400)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.NaquadahCell_1.get(4),
-                GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 6),
-                GT_Utility.getIntegratedCircuit(4))
+                GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 6),
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(ItemList.NaquadahCell_4.get(1))
             .duration(7 * SECONDS + 10 * TICKS)
             .eut(400)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.NaquadahCell_2.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4),
-                GT_Utility.getIntegratedCircuit(5))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4),
+                GTUtility.getIntegratedCircuit(5))
             .itemOutputs(ItemList.NaquadahCell_4.get(1))
             .duration(5 * SECONDS)
             .eut(400)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.MNqCell_1.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4),
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.MNqCell_2.get(1))
             .duration(5 * SECONDS)
             .eut(400)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.MNqCell_1.get(4),
-                GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 6),
-                GT_Utility.getIntegratedCircuit(4))
+                GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 6),
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(ItemList.MNqCell_4.get(1))
             .duration(7 * SECONDS + 10 * TICKS)
             .eut(400)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.MNqCell_2.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4),
-                GT_Utility.getIntegratedCircuit(5))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4),
+                GTUtility.getIntegratedCircuit(5))
             .itemOutputs(ItemList.MNqCell_4.get(1))
             .duration(5 * SECONDS)
             .eut(400)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 8),
-                GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iridium, 4))
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 8),
+                GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Iridium, 4))
             .itemOutputs(ItemList.neutroniumHeatCapacitor.get(1))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_ZPM)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 Materials.NaquadahAlloy.getPlates(8),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1))
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1))
             .itemOutputs(ItemList.RadiantNaquadahAlloyCasing.get(1))
             .duration(10 * TICKS)
             .eut(400000)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.KevlarFiber.get(8), GT_Utility.getIntegratedCircuit(8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.KevlarFiber.get(8), GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.WovenKevlar.get(1))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1),
                 ItemList.NC_SensorKit.get(1),
                 ItemList.Emitter_EV.get(1),
                 getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 28),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.Cover_Metrics_Transmitter.get(1))
             .fluidInputs(Materials.SolderingAlloy.getMolten(INGOTS))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        ItemStack[] plates = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
-            GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L),
-            GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L) };
+        ItemStack[] plates = new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
+            GTOreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L),
+            GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L) };
 
         for (Materials tMat : solderingMats) {
             int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1
                 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2;
 
             for (ItemStack tPlate : plates) {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(new ItemStack(Blocks.lever, 1, 32767), tPlate, GT_Utility.getIntegratedCircuit(1))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(new ItemStack(Blocks.lever, 1, 32767), tPlate, GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.Cover_Controller.get(1))
                     .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
                     .duration(40 * SECONDS)
                     .eut(16)
                     .addTo(assemblerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
                         new ItemStack(Blocks.redstone_torch, 1, 32767),
                         tPlate,
-                        GT_Utility.getIntegratedCircuit(1))
+                        GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.Cover_ActivityDetector.get(1))
                     .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
                     .duration(40 * SECONDS)
                     .eut(16)
                     .addTo(assemblerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
                         new ItemStack(Blocks.heavy_weighted_pressure_plate, 1, 32767),
                         tPlate,
-                        GT_Utility.getIntegratedCircuit(1))
+                        GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.Cover_FluidDetector.get(1))
                     .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
                     .duration(40 * SECONDS)
                     .eut(16)
                     .addTo(assemblerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
                         new ItemStack(Blocks.light_weighted_pressure_plate, 1, 32767),
                         tPlate,
-                        GT_Utility.getIntegratedCircuit(1))
+                        GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.Cover_ItemDetector.get(1))
                     .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
                     .duration(40 * SECONDS)
                     .eut(16)
                     .addTo(assemblerRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_ModHandler.getIC2Item("ecMeter", 1), tPlate, GT_Utility.getIntegratedCircuit(1))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTModHandler.getIC2Item("ecMeter", 1), tPlate, GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.Cover_EnergyDetector.get(1))
                     .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
                     .duration(40 * SECONDS)
@@ -3534,11 +3526,11 @@ public class AssemblerRecipes implements Runnable {
 
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeHuge, MaterialsUEVplus.TranscendentMetal, 1),
-                GT_OreDictUnificator.get(OrePrefixes.foil, Materials.SuperconductorUIVBase, 64),
-                ALLOY.QUANTUM.getPlate(8),
+                GTOreDictUnificator.get(OrePrefixes.pipeHuge, MaterialsUEVplus.TranscendentMetal, 1),
+                GTOreDictUnificator.get(OrePrefixes.foil, Materials.SuperconductorUIVBase, 64),
+                MaterialsAlloy.QUANTUM.getPlate(8),
                 ItemList.Electric_Pump_UIV.get(1))
             .fluidInputs(MaterialsUEVplus.PhononMedium.getFluid(100))
             .itemOutputs(ItemList.Thermal_Superconductor.get(1))
@@ -3546,12 +3538,12 @@ public class AssemblerRecipes implements Runnable {
             .eut(TierEU.RECIPE_UIV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Thermal_Superconductor.get(2),
-                ALLOY.QUANTUM.getPlate(12),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SuperconductorUIVBase, 8),
-                GT_OreDictUnificator.get(OrePrefixes.rotor, MaterialsUEVplus.SixPhasedCopper, 3),
+                MaterialsAlloy.QUANTUM.getPlate(12),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.SuperconductorUIVBase, 8),
+                GTOreDictUnificator.get(OrePrefixes.rotor, MaterialsUEVplus.SixPhasedCopper, 3),
                 ItemList.Field_Generator_UEV.get(1))
             .fluidInputs(MaterialsUEVplus.PhononMedium.getFluid(500))
             .itemOutputs(ItemList.Relativistic_Heat_Capacitor.get(1))
@@ -3566,44 +3558,44 @@ public class AssemblerRecipes implements Runnable {
     public void loadInputBusesRecipes() {
         // ULV input bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ULV.get(1),
                     getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1))
                 .fluidInputs(Materials.Glue.getFluid(1 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_ULV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ULV.get(1),
                     getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1))
                 .fluidInputs(Materials.Plastic.getMolten(1 * HALF_INGOT))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_ULV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ULV.get(1),
                     getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * EIGHTH_INGOT))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_ULV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ULV.get(1),
                     getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(4))
                 .duration(24 * SECONDS)
@@ -3613,32 +3605,32 @@ public class AssemblerRecipes implements Runnable {
 
         // LV input bus
         {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_LV.get(1))
                 .fluidInputs(Materials.Glue.getFluid(5 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_LV.get(1))
                 .fluidInputs(Materials.Plastic.getMolten(1 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_LV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * HALF_INGOT))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_LV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(9))
                 .duration(24 * SECONDS)
@@ -3648,33 +3640,33 @@ public class AssemblerRecipes implements Runnable {
 
         // MV input bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_MV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 3),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_MV.get(1))
                 .fluidInputs(Materials.Plastic.getMolten(2 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_MV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 3),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_MV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_MV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 3),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_MV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * EIGHTH_INGOT))
                 .duration(24 * SECONDS)
@@ -3684,33 +3676,33 @@ public class AssemblerRecipes implements Runnable {
 
         // HV input bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_HV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 0),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_HV.get(1))
                 .fluidInputs(Materials.Plastic.getMolten(3 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_HV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 0),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_HV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(2 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_HV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 0),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_HV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * QUARTER_INGOT))
                 .duration(24 * SECONDS)
@@ -3720,22 +3712,22 @@ public class AssemblerRecipes implements Runnable {
 
         // EV input bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_EV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_EV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(4 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_EV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_EV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_EV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * HALF_INGOT))
                 .duration(24 * SECONDS)
@@ -3745,22 +3737,22 @@ public class AssemblerRecipes implements Runnable {
 
         // IV input bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_IV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_IV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(8 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_IV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_IV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_IV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * INGOTS))
                 .duration(24 * SECONDS)
@@ -3770,22 +3762,22 @@ public class AssemblerRecipes implements Runnable {
 
         // LuV input bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_LuV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 2),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_LuV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(16 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_LuV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_LuV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 2),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_LuV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(2 * INGOTS))
                 .duration(24 * SECONDS)
@@ -3795,11 +3787,11 @@ public class AssemblerRecipes implements Runnable {
 
         // ZPM input bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ZPM.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 2, 5),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_ZPM.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(4 * INGOTS))
                 .duration(24 * SECONDS)
@@ -3809,11 +3801,11 @@ public class AssemblerRecipes implements Runnable {
 
         // UV input bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_UV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 2, 6),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_UV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(8 * INGOTS))
                 .duration(24 * SECONDS)
@@ -3823,11 +3815,11 @@ public class AssemblerRecipes implements Runnable {
 
         // UHV input bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_MAX.get(1),
                     getModItem(AvaritiaAddons.ID, "CompressedChest", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_Bus_MAX.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(16 * INGOTS))
                 .duration(24 * SECONDS)
@@ -3852,44 +3844,44 @@ public class AssemblerRecipes implements Runnable {
 
         // ULV output bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ULV.get(1),
                     getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1))
                 .fluidInputs(Materials.Glue.getFluid(1 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_ULV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ULV.get(1),
                     getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1))
                 .fluidInputs(Materials.Plastic.getMolten(1 * HALF_INGOT))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_ULV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ULV.get(1),
                     getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * EIGHTH_INGOT))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_ULV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ULV.get(1),
                     getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(4))
                 .duration(24 * SECONDS)
@@ -3899,32 +3891,32 @@ public class AssemblerRecipes implements Runnable {
 
         // LV output bus
         {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GT_Utility.getIntegratedCircuit(2))
+            GTValues.RA.stdBuilder()
+                .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1))
                 .fluidInputs(Materials.Glue.getFluid(5 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GT_Utility.getIntegratedCircuit(2))
+            GTValues.RA.stdBuilder()
+                .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1))
                 .fluidInputs(Materials.Plastic.getMolten(1 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GT_Utility.getIntegratedCircuit(2))
+            GTValues.RA.stdBuilder()
+                .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * HALF_INGOT))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GT_Utility.getIntegratedCircuit(2))
+            GTValues.RA.stdBuilder()
+                .itemInputs(ItemList.Hull_LV.get(1), new ItemStack(Blocks.chest), GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(9))
                 .duration(24 * SECONDS)
@@ -3938,33 +3930,33 @@ public class AssemblerRecipes implements Runnable {
 
         // MV output bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_MV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 3),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1))
                 .fluidInputs(Materials.Plastic.getMolten(2 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_MV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 3),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_MV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 3),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * EIGHTH_INGOT))
                 .duration(24 * SECONDS)
@@ -3974,33 +3966,33 @@ public class AssemblerRecipes implements Runnable {
 
         // HV output bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_HV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 0),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1))
                 .fluidInputs(Materials.Plastic.getMolten(3 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_HV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 0),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(2 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_HV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 0),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * QUARTER_INGOT))
                 .duration(24 * SECONDS)
@@ -4010,22 +4002,22 @@ public class AssemblerRecipes implements Runnable {
 
         // EV output bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_EV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 4),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(4 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_EV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_EV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 4),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * HALF_INGOT))
                 .duration(24 * SECONDS)
@@ -4035,22 +4027,22 @@ public class AssemblerRecipes implements Runnable {
 
         // IV output bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_IV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(8 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_IV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_IV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * INGOTS))
                 .duration(24 * SECONDS)
@@ -4060,22 +4052,22 @@ public class AssemblerRecipes implements Runnable {
 
         // LuV output bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_LuV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 2),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(16 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_LuV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_LuV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 1, 2),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(2 * INGOTS))
                 .duration(24 * SECONDS)
@@ -4085,11 +4077,11 @@ public class AssemblerRecipes implements Runnable {
 
         // ZPM output bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ZPM.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 2, 5),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_ZPM.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(4 * INGOTS))
                 .duration(24 * SECONDS)
@@ -4099,11 +4091,11 @@ public class AssemblerRecipes implements Runnable {
 
         // UV output bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_UV.get(1),
                     getModItem(IronChests.ID, "BlockIronChest", 2, 6),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_UV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(8 * INGOTS))
                 .duration(24 * SECONDS)
@@ -4117,11 +4109,11 @@ public class AssemblerRecipes implements Runnable {
 
         // UHV output bus
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_MAX.get(1),
                     getModItem(AvaritiaAddons.ID, "CompressedChest", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_Bus_MAX.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(16 * INGOTS))
                 .duration(24 * SECONDS)
@@ -4136,44 +4128,44 @@ public class AssemblerRecipes implements Runnable {
     public void loadInputHatchesRecipes() {
         // ULV input hatch
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ULV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_ULV.get(1))
                 .fluidInputs(Materials.Glue.getFluid(1 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_ULV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ULV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_ULV.get(1))
                 .fluidInputs(Materials.Plastic.getMolten(1 * HALF_INGOT))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_ULV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ULV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_ULV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * EIGHTH_INGOT))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_ULV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ULV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_ULV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(4))
                 .duration(24 * SECONDS)
@@ -4192,44 +4184,44 @@ public class AssemblerRecipes implements Runnable {
 
         // LV input hatch
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_LV.get(1),
                     getModItem(BuildCraftFactory.ID, "tankBlock", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_LV.get(1))
                 .fluidInputs(Materials.Glue.getFluid(5 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_LV.get(1),
                     getModItem(BuildCraftFactory.ID, "tankBlock", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_LV.get(1))
                 .fluidInputs(Materials.Plastic.getMolten(1 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_LV.get(1),
                     getModItem(BuildCraftFactory.ID, "tankBlock", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_LV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * HALF_INGOT))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_LV.get(1),
                     getModItem(BuildCraftFactory.ID, "tankBlock", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_LV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(9))
                 .duration(24 * SECONDS)
@@ -4243,33 +4235,33 @@ public class AssemblerRecipes implements Runnable {
 
         // MV input hatch
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_MV.get(1),
                     getModItem(IronTanks.ID, "copperTank", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_MV.get(1))
                 .fluidInputs(Materials.Plastic.getMolten(2 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_MV.get(1),
                     getModItem(IronTanks.ID, "copperTank", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_MV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_MV.get(1),
                     getModItem(IronTanks.ID, "copperTank", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_MV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * EIGHTH_INGOT))
                 .duration(24 * SECONDS)
@@ -4279,33 +4271,33 @@ public class AssemblerRecipes implements Runnable {
 
         // HV input hatch
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_HV.get(1),
                     getModItem(IronTanks.ID, "ironTank", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_HV.get(1))
                 .fluidInputs(Materials.Plastic.getMolten(3 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_HV.get(1),
                     getModItem(IronTanks.ID, "ironTank", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_HV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(2 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_HV.get(1),
                     getModItem(IronTanks.ID, "ironTank", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_HV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * QUARTER_INGOT))
                 .duration(24 * SECONDS)
@@ -4315,22 +4307,22 @@ public class AssemblerRecipes implements Runnable {
 
         // EV input hatch
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_EV.get(1),
                     getModItem(IronTanks.ID, "silverTank", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_EV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(4 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_EV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_EV.get(1),
                     getModItem(IronTanks.ID, "silverTank", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_EV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * HALF_INGOT))
                 .duration(24 * SECONDS)
@@ -4340,22 +4332,22 @@ public class AssemblerRecipes implements Runnable {
 
         // IV input hatch
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_IV.get(1),
                     getModItem(IronTanks.ID, "goldTank", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_IV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(8 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_IV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_IV.get(1),
                     getModItem(IronTanks.ID, "goldTank", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_IV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * INGOTS))
                 .duration(24 * SECONDS)
@@ -4365,22 +4357,22 @@ public class AssemblerRecipes implements Runnable {
 
         // LuV input hatch
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_LuV.get(1),
                     getModItem(IronTanks.ID, "diamondTank", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_LuV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(16 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_LuV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_LuV.get(1),
                     getModItem(IronTanks.ID, "diamondTank", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_LuV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(2 * INGOTS))
                 .duration(24 * SECONDS)
@@ -4390,11 +4382,11 @@ public class AssemblerRecipes implements Runnable {
 
         // ZPM input hatch
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ZPM.get(1),
                     getModItem(IronTanks.ID, "obsidianTank", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_ZPM.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(4 * INGOTS))
                 .duration(24 * SECONDS)
@@ -4404,8 +4396,8 @@ public class AssemblerRecipes implements Runnable {
 
         // UV input hatch
         {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(ItemList.Hull_UV.get(1), ItemList.Super_Tank_LV.get(1), GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(ItemList.Hull_UV.get(1), ItemList.Super_Tank_LV.get(1), GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_UV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(8 * INGOTS))
                 .duration(24 * SECONDS)
@@ -4415,8 +4407,8 @@ public class AssemblerRecipes implements Runnable {
 
         // UHV input hatch
         {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(ItemList.Hull_MAX.get(1), ItemList.Super_Tank_MV.get(1), GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(ItemList.Hull_MAX.get(1), ItemList.Super_Tank_MV.get(1), GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Hatch_Input_UHV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(16 * INGOTS))
                 .duration(24 * SECONDS)
@@ -4431,44 +4423,44 @@ public class AssemblerRecipes implements Runnable {
     public void loadOutputHatchesRecipes() {
         // ULV output hatch
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ULV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTOreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_ULV.get(1))
                 .fluidInputs(Materials.Glue.getFluid(1 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_ULV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ULV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTOreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_ULV.get(1))
                 .fluidInputs(Materials.Plastic.getMolten(1 * HALF_INGOT))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_ULV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ULV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTOreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_ULV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * EIGHTH_INGOT))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_ULV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ULV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTOreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1),
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_ULV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(4))
                 .duration(24 * SECONDS)
@@ -4487,44 +4479,44 @@ public class AssemblerRecipes implements Runnable {
 
         // LV output hatch
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_LV.get(1),
                     getModItem(BuildCraftFactory.ID, "tankBlock", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_LV.get(1))
                 .fluidInputs(Materials.Glue.getFluid(5 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_LV.get(1),
                     getModItem(BuildCraftFactory.ID, "tankBlock", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_LV.get(1))
                 .fluidInputs(Materials.Plastic.getMolten(1 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_LV.get(1),
                     getModItem(BuildCraftFactory.ID, "tankBlock", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_LV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * HALF_INGOT))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_LV.get(1),
                     getModItem(BuildCraftFactory.ID, "tankBlock", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_LV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(9))
                 .duration(24 * SECONDS)
@@ -4538,33 +4530,33 @@ public class AssemblerRecipes implements Runnable {
 
         // MV output hatch
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_MV.get(1),
                     getModItem(IronTanks.ID, "copperTank", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_MV.get(1))
                 .fluidInputs(Materials.Plastic.getMolten(2 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_MV.get(1),
                     getModItem(IronTanks.ID, "copperTank", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_MV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_MV.get(1),
                     getModItem(IronTanks.ID, "copperTank", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_MV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * EIGHTH_INGOT))
                 .duration(24 * SECONDS)
@@ -4574,33 +4566,33 @@ public class AssemblerRecipes implements Runnable {
 
         // HV output hatch
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_HV.get(1),
                     getModItem(IronTanks.ID, "ironTank", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_HV.get(1))
                 .fluidInputs(Materials.Plastic.getMolten(3 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_HV.get(1),
                     getModItem(IronTanks.ID, "ironTank", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_HV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(2 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_HV.get(1),
                     getModItem(IronTanks.ID, "ironTank", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_HV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * QUARTER_INGOT))
                 .duration(24 * SECONDS)
@@ -4610,22 +4602,22 @@ public class AssemblerRecipes implements Runnable {
 
         // EV output hatch
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_EV.get(1),
                     getModItem(IronTanks.ID, "silverTank", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_EV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(4 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_EV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_EV.get(1),
                     getModItem(IronTanks.ID, "silverTank", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_EV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * HALF_INGOT))
                 .duration(24 * SECONDS)
@@ -4635,22 +4627,22 @@ public class AssemblerRecipes implements Runnable {
 
         // IV output hatch
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_IV.get(1),
                     getModItem(IronTanks.ID, "goldTank", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_IV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(8 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_IV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_IV.get(1),
                     getModItem(IronTanks.ID, "goldTank", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_IV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(1 * INGOTS))
                 .duration(24 * SECONDS)
@@ -4660,22 +4652,22 @@ public class AssemblerRecipes implements Runnable {
 
         // LuV output hatch
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_LuV.get(1),
                     getModItem(IronTanks.ID, "diamondTank", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_LuV.get(1))
                 .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(16 * INGOTS))
                 .duration(24 * SECONDS)
                 .eut(TierEU.RECIPE_LuV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_LuV.get(1),
                     getModItem(IronTanks.ID, "diamondTank", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_LuV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(2 * INGOTS))
                 .duration(24 * SECONDS)
@@ -4685,11 +4677,11 @@ public class AssemblerRecipes implements Runnable {
 
         // ZPM output hatch
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hull_ZPM.get(1),
                     getModItem(IronTanks.ID, "obsidianTank", 1),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_ZPM.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(4 * INGOTS))
                 .duration(24 * SECONDS)
@@ -4699,8 +4691,8 @@ public class AssemblerRecipes implements Runnable {
 
         // UV output hatch
         {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(ItemList.Hull_UV.get(1), ItemList.Super_Tank_LV.get(1), GT_Utility.getIntegratedCircuit(2))
+            GTValues.RA.stdBuilder()
+                .itemInputs(ItemList.Hull_UV.get(1), ItemList.Super_Tank_LV.get(1), GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_UV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(8 * INGOTS))
                 .duration(24 * SECONDS)
@@ -4710,8 +4702,8 @@ public class AssemblerRecipes implements Runnable {
 
         // UHV output hatch
         {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(ItemList.Hull_MAX.get(1), ItemList.Super_Tank_MV.get(1), GT_Utility.getIntegratedCircuit(2))
+            GTValues.RA.stdBuilder()
+                .itemInputs(ItemList.Hull_MAX.get(1), ItemList.Super_Tank_MV.get(1), GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(ItemList.Hatch_Output_UHV.get(1))
                 .fluidInputs(Materials.Polybenzimidazole.getMolten(16 * INGOTS))
                 .duration(24 * SECONDS)
@@ -4726,267 +4718,267 @@ public class AssemblerRecipes implements Runnable {
     private void withRailcraft() {
         if (!Railcraft.isModLoaded()) return;
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.stone_slab, 1, 0),
                 ItemList.RC_Rebar.get(1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.RC_Tie_Stone.get(1))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.stone_slab, 1, 7),
                 ItemList.RC_Rebar.get(1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.RC_Tie_Stone.get(1))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3),
-                GT_Utility.getIntegratedCircuit(8))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3),
+                GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.RC_Rail_HS.get(16))
             .fluidInputs(Materials.Blaze.getMolten(216))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3),
-                GT_Utility.getIntegratedCircuit(9))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3),
+                GTUtility.getIntegratedCircuit(9))
             .itemOutputs(ItemList.RC_Rail_HS.get(8))
             .fluidInputs(Materials.ConductiveIron.getMolten(432))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3),
-                GT_Utility.getIntegratedCircuit(9))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3),
+                GTUtility.getIntegratedCircuit(9))
             .itemOutputs(ItemList.RC_Rail_HS.get(32))
             .fluidInputs(Materials.VibrantAlloy.getMolten(216))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3),
-                GT_Utility.getIntegratedCircuit(9))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3),
+                GTUtility.getIntegratedCircuit(9))
             .itemOutputs(ItemList.RC_Rail_HS.get(64))
             .fluidInputs(Materials.CrystallineAlloy.getMolten(216))
             .duration(5 * SECONDS)
             .eut(48)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Rail_Standard.get(3),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3),
-                GT_Utility.getIntegratedCircuit(8))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3),
+                GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.RC_Rail_Adv.get(8))
             .fluidInputs(Materials.Redstone.getMolten(216))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Rail_Standard.get(3),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3),
-                GT_Utility.getIntegratedCircuit(8))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3),
+                GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.RC_Rail_Adv.get(16))
             .fluidInputs(Materials.RedAlloy.getMolten(216))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Rail_Standard.get(3),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3),
-                GT_Utility.getIntegratedCircuit(8))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3),
+                GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.RC_Rail_Adv.get(32))
             .fluidInputs(Materials.ConductiveIron.getMolten(216))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Rail_Standard.get(3),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3),
-                GT_Utility.getIntegratedCircuit(8))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3),
+                GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemList.RC_Rail_Adv.get(64))
             .fluidInputs(Materials.VibrantAlloy.getMolten(216))
             .duration(5 * SECONDS)
             .eut(48)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Rail_Standard.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.RC_Rail_Electric.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Rail_Standard.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.AnnealedCopper, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.AnnealedCopper, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.RC_Rail_Electric.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Rail_Standard.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.RC_Rail_Electric.get(2))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Rail_Standard.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.RC_Rail_Electric.get(4))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Rail_Standard.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.RC_Rail_Electric.get(8))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Rail_Standard.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.RC_Rail_Electric.get(16))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(48)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Rail_Standard.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.HSSG, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.HSSG, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.RC_Rail_Electric.get(32))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(64)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Rail_Standard.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.RC_Rail_Electric.get(64))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(96)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Tie_Wood.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(ItemList.RC_Rail_Wooden.get(8))
             .duration(6 * SECONDS + 13 * TICKS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Tie_Wood.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1),
-                GT_Utility.getIntegratedCircuit(11))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1),
+                GTUtility.getIntegratedCircuit(11))
             .itemOutputs(ItemList.RC_Rail_Wooden.get(8))
             .duration(6 * SECONDS + 13 * TICKS)
             .eut(4)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Tie_Wood.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1),
-                GT_Utility.getIntegratedCircuit(11))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1),
+                GTUtility.getIntegratedCircuit(11))
             .itemOutputs(ItemList.RC_Rail_Wooden.get(16))
             .duration(6 * SECONDS + 13 * TICKS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Tie_Wood.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 1),
-                GT_Utility.getIntegratedCircuit(11))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 1),
+                GTUtility.getIntegratedCircuit(11))
             .itemOutputs(ItemList.RC_Rail_Wooden.get(32))
             .duration(6 * SECONDS + 13 * TICKS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Tie_Wood.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 1),
-                GT_Utility.getIntegratedCircuit(11))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 1),
+                GTUtility.getIntegratedCircuit(11))
             .itemOutputs(ItemList.RC_Rail_Wooden.get(64))
             .duration(6 * SECONDS + 13 * TICKS)
             .eut(48)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.RC_Tie_Wood.get(32), GT_Utility.getIntegratedCircuit(20))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.RC_Tie_Wood.get(32), GTUtility.getIntegratedCircuit(20))
             .itemOutputs(ItemList.RC_Bed_Wood.get(24))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.RC_Tie_Wood.get(64), GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.RC_Tie_Wood.get(64), GTUtility.getIntegratedCircuit(24))
             .itemOutputs(ItemList.RC_Bed_Wood.get(48))
             .duration(10 * SECONDS)
             .eut(48)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.RC_Tie_Stone.get(32), GT_Utility.getIntegratedCircuit(20))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.RC_Tie_Stone.get(32), GTUtility.getIntegratedCircuit(20))
             .itemOutputs(ItemList.RC_Bed_Stone.get(24))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.RC_Tie_Stone.get(64), GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.RC_Tie_Stone.get(64), GTUtility.getIntegratedCircuit(24))
             .itemOutputs(ItemList.RC_Bed_Stone.get(48))
             .duration(10 * SECONDS)
             .eut(48)
@@ -5003,42 +4995,42 @@ public class AssemblerRecipes implements Runnable {
             tTagWoodB.setString("track", "railcraft:track.slow.boost");
             tRailWoodB.stackTagCompound = tTagWoodB;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.RC_Bed_Wood.get(1),
                     ItemList.RC_Rail_Wooden.get(6),
-                    GT_Utility.getIntegratedCircuit(21))
+                    GTUtility.getIntegratedCircuit(21))
                 .itemOutputs(tRailWood)
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1),
-                    GT_Utility.getIntegratedCircuit(22))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1),
+                    GTUtility.getIntegratedCircuit(22))
                 .itemOutputs(tRailWoodB)
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
         }
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.rail, 1, 0),
                 ItemList.RC_Rail_Adv.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1),
-                GT_Utility.getIntegratedCircuit(22))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1),
+                GTUtility.getIntegratedCircuit(22))
             .itemOutputs(new ItemStack(Blocks.golden_rail, 16, 0))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Bed_Wood.get(1),
                 ItemList.RC_Rail_Standard.get(6),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(new ItemStack(Blocks.rail, 64, 0))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
@@ -5049,11 +5041,11 @@ public class AssemblerRecipes implements Runnable {
         tTagRe.setString("track", "railcraft:track.reinforced");
         tRailRe.stackTagCompound = tTagRe;
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Bed_Stone.get(1),
                 ItemList.RC_Rail_Reinforced.get(6),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(tRailRe)
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
@@ -5064,11 +5056,11 @@ public class AssemblerRecipes implements Runnable {
         tTagReB.setString("track", "railcraft:track.reinforced.boost");
         tRailReB.stackTagCompound = tTagReB;
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.copyAmount(2, tRailRe),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1),
-                GT_Utility.getIntegratedCircuit(22))
+                GTUtility.copyAmount(2, tRailRe),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1),
+                GTUtility.getIntegratedCircuit(22))
             .itemOutputs(tRailReB)
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_LV)
@@ -5079,11 +5071,11 @@ public class AssemblerRecipes implements Runnable {
         tTagEl.setString("track", "railcraft:track.electric");
         tRailEl.stackTagCompound = tTagEl;
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.RC_Bed_Stone.get(1),
                 ItemList.RC_Rail_Electric.get(6),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(tRailEl)
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
@@ -5095,11 +5087,11 @@ public class AssemblerRecipes implements Runnable {
             tTagHs.setString("track", "railcraft:track.speed");
             tRailHs.stackTagCompound = tTagHs;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.RC_Bed_Stone.get(1),
                     ItemList.RC_Rail_HS.get(6),
-                    GT_Utility.getIntegratedCircuit(21))
+                    GTUtility.getIntegratedCircuit(21))
                 .itemOutputs(tRailHs)
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
@@ -5110,11 +5102,11 @@ public class AssemblerRecipes implements Runnable {
         tTagHsB.setString("track", "railcraft:track.speed.boost");
         tRailHsB.stackTagCompound = tTagHsB;
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.copyAmount(2, tRailHs),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1),
-                GT_Utility.getIntegratedCircuit(22))
+                GTUtility.copyAmount(2, tRailHs),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1),
+                GTUtility.getIntegratedCircuit(22))
             .itemOutputs(tRailHsB)
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_LV)
@@ -5127,72 +5119,72 @@ public class AssemblerRecipes implements Runnable {
             tTagSS.setString("track", "railcraft:track.slow.switch");
             tRailSS.stackTagCompound = tTagSS;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.AnyIron, 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.AnyIron, 4),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(tRailSS)
                 .duration(5 * SECONDS)
                 .eut(8)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 2),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(2, tRailSS))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 2),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(2, tRailSS))
                 .duration(5 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(4, tRailSS))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(4, tRailSS))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(8, tRailSS))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(8, tRailSS))
                 .duration(5 * SECONDS)
                 .eut(48)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(16, tRailSS))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(16, tRailSS))
                 .duration(5 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(32, tRailSS))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(32, tRailSS))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(64, tRailSS))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(64, tRailSS))
                 .duration(5 * SECONDS)
                 .eut(256)
                 .addTo(assemblerRecipes);
@@ -5204,72 +5196,72 @@ public class AssemblerRecipes implements Runnable {
             tTagSW.setString("track", "railcraft:track.slow.wye");
             tRailSW.stackTagCompound = tTagSW;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.AnyIron, 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.AnyIron, 4),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(tRailSW)
                 .duration(5 * SECONDS)
                 .eut(8)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 2),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(2, tRailSW))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 2),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(2, tRailSW))
                 .duration(5 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(4, tRailSW))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(4, tRailSW))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(8, tRailSW))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(8, tRailSW))
                 .duration(5 * SECONDS)
                 .eut(48)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(16, tRailSW))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(16, tRailSW))
                 .duration(5 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(32, tRailSW))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(32, tRailSW))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(64, tRailSW))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(64, tRailSW))
                 .duration(5 * SECONDS)
                 .eut(256)
                 .addTo(assemblerRecipes);
@@ -5281,72 +5273,72 @@ public class AssemblerRecipes implements Runnable {
             tTagSJ.setString("track", "railcraft:track.slow.junction");
             tRailSJ.stackTagCompound = tTagSJ;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.AnyIron, 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.AnyIron, 4),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(tRailSJ)
                 .duration(5 * SECONDS)
                 .eut(8)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 2),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(2, tRailSJ))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 2),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(2, tRailSJ))
                 .duration(5 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(4, tRailSJ))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(4, tRailSJ))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(8, tRailSJ))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(8, tRailSJ))
                 .duration(5 * SECONDS)
                 .eut(48)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(16, tRailSJ))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(16, tRailSJ))
                 .duration(5 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(32, tRailSJ))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(32, tRailSJ))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailWood),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(64, tRailSJ))
+                    GTUtility.copyAmount(2, tRailWood),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(64, tRailSJ))
                 .duration(5 * SECONDS)
                 .eut(256)
                 .addTo(assemblerRecipes);
@@ -5358,72 +5350,72 @@ public class AssemblerRecipes implements Runnable {
             tTagNS.setString("track", "railcraft:track.switch");
             tRailNS.stackTagCompound = tTagNS;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(tRailNS)
                 .duration(10 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(2, tRailNS))
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(2, tRailNS))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(4, tRailNS))
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(4, tRailNS))
                 .duration(10 * SECONDS)
                 .eut(48)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(8, tRailNS))
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(8, tRailNS))
                 .duration(10 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(16, tRailNS))
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(16, tRailNS))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(32, tRailNS))
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(32, tRailNS))
                 .duration(10 * SECONDS)
                 .eut(256)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(64, tRailNS))
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(64, tRailNS))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
@@ -5436,72 +5428,72 @@ public class AssemblerRecipes implements Runnable {
             tTagNW.setString("track", "railcraft:track.wye");
             tRailNW.stackTagCompound = tTagNW;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(tRailNW)
                 .duration(10 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(2, tRailNW))
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(2, tRailNW))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(4, tRailNW))
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(4, tRailNW))
                 .duration(10 * SECONDS)
                 .eut(48)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(8, tRailNW))
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(8, tRailNW))
                 .duration(10 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(16, tRailNW))
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(16, tRailNW))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(32, tRailNW))
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(32, tRailNW))
                 .duration(10 * SECONDS)
                 .eut(256)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(64, tRailNW))
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(64, tRailNW))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
@@ -5513,72 +5505,72 @@ public class AssemblerRecipes implements Runnable {
             tTagNJ.setString("track", "railcraft:track.junction");
             tRailNJ.stackTagCompound = tTagNJ;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(tRailNJ)
                 .duration(10 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 2),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(2, tRailNJ))
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 2),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(2, tRailNJ))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(4, tRailNJ))
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(4, tRailNJ))
                 .duration(10 * SECONDS)
                 .eut(48)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(8, tRailNJ))
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(8, tRailNJ))
                 .duration(10 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(16, tRailNJ))
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(16, tRailNJ))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(32, tRailNJ))
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(32, tRailNJ))
                 .duration(10 * SECONDS)
                 .eut(256)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Blocks.rail, 2, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(64, tRailNJ))
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(64, tRailNJ))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
@@ -5590,72 +5582,72 @@ public class AssemblerRecipes implements Runnable {
             tTagRS.setString("track", "railcraft:track.reinforced.switch");
             tRailRS.stackTagCompound = tTagRS;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(tRailRS)
                 .duration(15 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(2, tRailRS))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(2, tRailRS))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(4, tRailRS))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(4, tRailRS))
                 .duration(15 * SECONDS)
                 .eut(48)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(8, tRailRS))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(8, tRailRS))
                 .duration(15 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(16, tRailRS))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(16, tRailRS))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(32, tRailRS))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(32, tRailRS))
                 .duration(15 * SECONDS)
                 .eut(256)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(64, tRailRS))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(64, tRailRS))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
@@ -5667,72 +5659,72 @@ public class AssemblerRecipes implements Runnable {
             tTagRW.setString("track", "railcraft:track.reinforced.wye");
             tRailRW.stackTagCompound = tTagRW;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(tRailRW)
                 .duration(15 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(2, tRailRW))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(2, tRailRW))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(4, tRailRW))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(4, tRailRW))
                 .duration(15 * SECONDS)
                 .eut(48)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(8, tRailRW))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(8, tRailRW))
                 .duration(15 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(16, tRailRW))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(16, tRailRW))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(32, tRailRW))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(32, tRailRW))
                 .duration(15 * SECONDS)
                 .eut(256)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(64, tRailRW))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(64, tRailRW))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
@@ -5744,72 +5736,72 @@ public class AssemblerRecipes implements Runnable {
             tTagRJ.setString("track", "railcraft:track.reinforced.junction");
             tRailRJ.stackTagCompound = tTagRJ;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(tRailRJ)
                 .duration(15 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 2),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(2, tRailRJ))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 2),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(2, tRailRJ))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(4, tRailRJ))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(4, tRailRJ))
                 .duration(15 * SECONDS)
                 .eut(48)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(8, tRailRJ))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(8, tRailRJ))
                 .duration(15 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(16, tRailRJ))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(16, tRailRJ))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(32, tRailRJ))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(32, tRailRJ))
                 .duration(15 * SECONDS)
                 .eut(256)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailRe),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(64, tRailRJ))
+                    GTUtility.copyAmount(2, tRailRe),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(64, tRailRJ))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
@@ -5821,72 +5813,72 @@ public class AssemblerRecipes implements Runnable {
             tTagRSSw.setString("track", "railcraft:track.speed.switch");
             tRailSSw.stackTagCompound = tTagRSSw;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.copyAmount(2, tRailHs),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(tRailSSw)
                 .duration(20 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(2, tRailSSw))
+                    GTUtility.copyAmount(2, tRailHs),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(2, tRailSSw))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(4, tRailSSw))
+                    GTUtility.copyAmount(2, tRailHs),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(4, tRailSSw))
                 .duration(20 * SECONDS)
                 .eut(48)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(8, tRailSSw))
+                    GTUtility.copyAmount(2, tRailHs),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(8, tRailSSw))
                 .duration(20 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(16, tRailSSw))
+                    GTUtility.copyAmount(2, tRailHs),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(16, tRailSSw))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(32, tRailSSw))
+                    GTUtility.copyAmount(2, tRailHs),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(32, tRailSSw))
                 .duration(20 * SECONDS)
                 .eut(256)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(64, tRailSSw))
+                    GTUtility.copyAmount(2, tRailHs),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(64, tRailSSw))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
@@ -5898,72 +5890,72 @@ public class AssemblerRecipes implements Runnable {
             tTagRSWy.setString("track", "railcraft:track.speed.wye");
             tRailSWy.stackTagCompound = tTagRSWy;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.copyAmount(2, tRailHs),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(tRailSWy)
                 .duration(20 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(2, tRailSWy))
+                    GTUtility.copyAmount(2, tRailHs),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(2, tRailSWy))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(4, tRailSWy))
+                    GTUtility.copyAmount(2, tRailHs),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(4, tRailSWy))
                 .duration(20 * SECONDS)
                 .eut(48)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(8, tRailSWy))
+                    GTUtility.copyAmount(2, tRailHs),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(8, tRailSWy))
                 .duration(20 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(16, tRailSWy))
+                    GTUtility.copyAmount(2, tRailHs),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(16, tRailSWy))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(32, tRailSWy))
+                    GTUtility.copyAmount(2, tRailHs),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(32, tRailSWy))
                 .duration(20 * SECONDS)
                 .eut(256)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(64, tRailSWy))
+                    GTUtility.copyAmount(2, tRailHs),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(64, tRailSWy))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
@@ -5975,57 +5967,57 @@ public class AssemblerRecipes implements Runnable {
             tTagRSTt.setString("track", "railcraft:track.speed.transition");
             tRailSTt.stackTagCompound = tTagRSTt;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
+                    GTUtility.copyAmount(2, tRailHs),
                     ItemList.RC_Bed_Stone.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(4, tRailSTt))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(4, tRailSTt))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
+                    GTUtility.copyAmount(2, tRailHs),
                     ItemList.RC_Bed_Stone.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ConductiveIron, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(8, tRailSTt))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.ConductiveIron, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(8, tRailSTt))
                 .duration(20 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
+                    GTUtility.copyAmount(2, tRailHs),
                     ItemList.RC_Bed_Stone.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(16, tRailSTt))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(16, tRailSTt))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
+                    GTUtility.copyAmount(2, tRailHs),
                     ItemList.RC_Bed_Stone.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(32, tRailSTt))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(32, tRailSTt))
                 .duration(20 * SECONDS)
                 .eut(256)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailHs),
+                    GTUtility.copyAmount(2, tRailHs),
                     ItemList.RC_Bed_Stone.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.MelodicAlloy, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(64, tRailSTt))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.MelodicAlloy, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(64, tRailSTt))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
@@ -6037,72 +6029,72 @@ public class AssemblerRecipes implements Runnable {
             tTagES.setString("track", "railcraft:track.electric.switch");
             tRailES.stackTagCompound = tTagES;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Copper, 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Copper, 4),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(tRailES)
                 .duration(20 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Gold, 2),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(2, tRailES))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Gold, 2),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(2, tRailES))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Electrum, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(4, tRailES))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Electrum, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(4, tRailES))
                 .duration(20 * SECONDS)
                 .eut(48)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(8, tRailES))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(8, tRailES))
                 .duration(20 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Platinum, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(16, tRailES))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Platinum, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(16, tRailES))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.VanadiumGallium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(32, tRailES))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.VanadiumGallium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(32, tRailES))
                 .duration(20 * SECONDS)
                 .eut(256)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Naquadah, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(64, tRailES))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Naquadah, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(64, tRailES))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
@@ -6114,72 +6106,72 @@ public class AssemblerRecipes implements Runnable {
             tTagEw.setString("track", "railcraft:track.electric.wye");
             tRailEw.stackTagCompound = tTagEw;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Copper, 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Copper, 4),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(tRailEw)
                 .duration(20 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Gold, 2),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(2, tRailEw))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Gold, 2),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(2, tRailEw))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Electrum, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(4, tRailEw))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Electrum, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(4, tRailEw))
                 .duration(20 * SECONDS)
                 .eut(48)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(8, tRailEw))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(8, tRailEw))
                 .duration(20 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Platinum, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(16, tRailEw))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Platinum, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(16, tRailEw))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.VanadiumGallium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(32, tRailEw))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.VanadiumGallium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(32, tRailEw))
                 .duration(20 * SECONDS)
                 .eut(256)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Naquadah, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(64, tRailEw))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Naquadah, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(64, tRailEw))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
@@ -6191,72 +6183,72 @@ public class AssemblerRecipes implements Runnable {
             tTagREJ.setString("track", "railcraft:track.electric.junction");
             tRailEJ.stackTagCompound = tTagREJ;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Copper, 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Copper, 4),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(tRailEJ)
                 .duration(20 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Gold, 2),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(2, tRailEJ))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Gold, 2),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(2, tRailEJ))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(4, tRailEJ))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(4, tRailEJ))
                 .duration(20 * SECONDS)
                 .eut(48)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(8, tRailEJ))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(8, tRailEJ))
                 .duration(20 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Platinum, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(16, tRailEJ))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Platinum, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(16, tRailEJ))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.VanadiumGallium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(32, tRailEJ))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.VanadiumGallium, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(32, tRailEJ))
                 .duration(20 * SECONDS)
                 .eut(256)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.copyAmount(2, tRailEl),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Naquadah, 1),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_Utility.copyAmount(64, tRailEJ))
+                    GTUtility.copyAmount(2, tRailEl),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Naquadah, 1),
+                    GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTUtility.copyAmount(64, tRailEJ))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(assemblerRecipes);
@@ -6266,77 +6258,77 @@ public class AssemblerRecipes implements Runnable {
             int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1
                 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1),
+                    GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.RC_ShuntingWire.get(1))
                 .fluidInputs(tMat.getMolten(16L * tMultiplier / 2))
                 .duration(10 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.AnnealedCopper, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.AnnealedCopper, 1),
+                    GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.RC_ShuntingWire.get(1))
                 .fluidInputs(tMat.getMolten(16L * tMultiplier / 2))
                 .duration(10 * SECONDS)
                 .eut(16)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1),
+                    GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.RC_ShuntingWire.get(4))
                 .fluidInputs(tMat.getMolten(16L * tMultiplier / 2))
                 .duration(10 * SECONDS)
                 .eut(24)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1),
+                    GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.RC_ShuntingWire.get(8))
                 .fluidInputs(tMat.getMolten(16L * tMultiplier / 2))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.RC_ShuntingWire.get(16))
                 .fluidInputs(tMat.getMolten(16L * tMultiplier / 2))
                 .duration(10 * SECONDS)
                 .eut(48)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Platinum, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Platinum, 1),
+                    GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.RC_ShuntingWire.get(32))
                 .fluidInputs(tMat.getMolten(16L * tMultiplier / 2))
                 .duration(10 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Platinum, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Platinum, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.RC_ShuntingWire.get(64))
                 .fluidInputs(tMat.getMolten(16L * tMultiplier / 2))
                 .duration(10 * SECONDS)
@@ -6345,13 +6337,13 @@ public class AssemblerRecipes implements Runnable {
 
             // chunkloader upgrade OC
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Plastic_Advanced.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Aluminium, 2),
+                    GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Aluminium, 2),
                     getModItem(Railcraft.ID, "machine.alpha", 1L, 0),
                     getModItem(OpenComputers.ID, "item", 1L, 26),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(getModItem(OpenComputers.ID, "item", 1L, 62))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
                 .duration(12 * SECONDS + 10 * TICKS)
@@ -6360,467 +6352,467 @@ public class AssemblerRecipes implements Runnable {
 
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.piston, 1, 0),
                 ItemList.FR_Casing_Sturdy.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1L, 0))
             .fluidInputs(Materials.SeedOil.getFluid(250))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.piston, 1, 0),
                 ItemList.FR_Casing_Sturdy.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1L, 0))
             .fluidInputs(Materials.Lubricant.getFluid(125))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(ExtraUtilities.ID, "trashcan", 1L, 0),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 4),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 4),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 11))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyCopper, 10),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.AnyCopper, 10),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 7))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 10),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 10),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 8))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 10),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 10),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 9))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Gold, 2),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 4),
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1),
-                GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Obsidian, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Gold, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 4),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1),
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Obsidian, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 1, 0))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2),
-                GT_Utility.getIntegratedCircuit(20))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2),
+                GTUtility.getIntegratedCircuit(20))
             .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 0))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2),
                 new ItemStack(Blocks.glass_pane, 2, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 2L, 1))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2),
                 getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 2L, 1))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Bronze, 2),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Bronze, 2),
                 new ItemStack(Blocks.iron_bars, 2, 0),
-                GT_Utility.getIntegratedCircuit(22))
+                GTUtility.getIntegratedCircuit(22))
             .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 2))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2),
-                GT_Utility.getIntegratedCircuit(20))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2),
+                GTUtility.getIntegratedCircuit(20))
             .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 13))
             .duration(10 * SECONDS)
             .eut(64)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2),
                 new ItemStack(Blocks.glass_pane, 2, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 2L, 14))
             .duration(20 * SECONDS)
             .eut(64)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2),
                 getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 2L, 14))
             .duration(20 * SECONDS)
             .eut(64)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 2),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 2),
                 getModItem(NewHorizonsCoreMod.ID, "item.SteelBars", 2),
-                GT_Utility.getIntegratedCircuit(22))
+                GTUtility.getIntegratedCircuit(22))
             .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 15))
             .duration(20 * SECONDS)
             .eut(64)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2),
-                GT_Utility.getIntegratedCircuit(20))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2),
+                GTUtility.getIntegratedCircuit(20))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 0))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2),
                 new ItemStack(Blocks.glass_pane, 2, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 1))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2),
                 getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 1))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Plastic, 2),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Plastic, 2),
                 getModItem(NewHorizonsCoreMod.ID, "item.AluminiumBars", 2),
-                GT_Utility.getIntegratedCircuit(22))
+                GTUtility.getIntegratedCircuit(22))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 2))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2),
-                GT_Utility.getIntegratedCircuit(20))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2),
+                GTUtility.getIntegratedCircuit(20))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 3))
             .duration(10 * SECONDS)
             .eut(256)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2),
                 new ItemStack(Blocks.glass_pane, 2, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 4))
             .duration(20 * SECONDS)
             .eut(256)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2),
                 getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 4))
             .duration(20 * SECONDS)
             .eut(256)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 2),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 2),
                 getModItem(NewHorizonsCoreMod.ID, "item.StainlessSteelBars", 2),
-                GT_Utility.getIntegratedCircuit(22))
+                GTUtility.getIntegratedCircuit(22))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 5))
             .duration(20 * SECONDS)
             .eut(256)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2),
-                GT_Utility.getIntegratedCircuit(20))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2),
+                GTUtility.getIntegratedCircuit(20))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 6))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2),
                 new ItemStack(Blocks.glass_pane, 2, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 7))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2),
                 getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 7))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 2),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 2),
                 getModItem(NewHorizonsCoreMod.ID, "item.TitaniumBars", 2),
-                GT_Utility.getIntegratedCircuit(22))
+                GTUtility.getIntegratedCircuit(22))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 8))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2),
-                GT_Utility.getIntegratedCircuit(20))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2),
+                GTUtility.getIntegratedCircuit(20))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 9))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2),
                 new ItemStack(Blocks.glass_pane, 2, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 10))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2),
                 getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 10))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 2),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 2),
                 getModItem(NewHorizonsCoreMod.ID, "item.TungstenSteelBars", 2),
-                GT_Utility.getIntegratedCircuit(22))
+                GTUtility.getIntegratedCircuit(22))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 11))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2),
-                GT_Utility.getIntegratedCircuit(20))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2),
+                GTUtility.getIntegratedCircuit(20))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 12))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2),
                 new ItemStack(Blocks.glass_pane, 2, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 13))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2),
                 getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 13))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NiobiumTitanium, 2),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NiobiumTitanium, 2),
                 getModItem(NewHorizonsCoreMod.ID, "item.ChromeBars", 2),
-                GT_Utility.getIntegratedCircuit(22))
+                GTUtility.getIntegratedCircuit(22))
             .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 14))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2),
-                GT_Utility.getIntegratedCircuit(20))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2),
+                GTUtility.getIntegratedCircuit(20))
             .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 0))
             .duration(10 * SECONDS)
             .eut(4096)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2),
                 new ItemStack(Blocks.glass_pane, 2, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 1))
             .duration(20 * SECONDS)
             .eut(4096)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2),
                 getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 1))
             .duration(20 * SECONDS)
             .eut(4096)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Enderium, 2),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Enderium, 2),
                 getModItem(NewHorizonsCoreMod.ID, "item.IridiumBars", 2),
-                GT_Utility.getIntegratedCircuit(22))
+                GTUtility.getIntegratedCircuit(22))
             .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 2))
             .duration(20 * SECONDS)
             .eut(4096)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2),
-                GT_Utility.getIntegratedCircuit(20))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2),
+                GTUtility.getIntegratedCircuit(20))
             .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 3))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2),
                 new ItemStack(Blocks.glass_pane, 2, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 4))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2),
                 getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 4))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2),
                 getModItem(NewHorizonsCoreMod.ID, "item.OsmiumBars", 2),
-                GT_Utility.getIntegratedCircuit(22))
+                GTUtility.getIntegratedCircuit(22))
             .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 5))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2),
-                GT_Utility.getIntegratedCircuit(20))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2),
+                GTUtility.getIntegratedCircuit(20))
             .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 6))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2),
                 new ItemStack(Blocks.glass_pane, 2, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 7))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2),
                 getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0),
-                GT_Utility.getIntegratedCircuit(21))
+                GTUtility.getIntegratedCircuit(21))
             .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 7))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 2),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 2),
                 getModItem(NewHorizonsCoreMod.ID, "item.NeutroniumBars", 2),
-                GT_Utility.getIntegratedCircuit(22))
+                GTUtility.getIntegratedCircuit(22))
             .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 8))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
@@ -6828,60 +6820,60 @@ public class AssemblerRecipes implements Runnable {
 
         // Water Tank
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2))
             .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 1L, 14))
             .fluidInputs(Materials.Glue.getFluid(36))
             .duration(10 * SECONDS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2))
             .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 1L, 14))
             .fluidInputs(Materials.Glue.getFluid(36))
             .duration(10 * SECONDS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2))
             .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 1L, 14))
             .fluidInputs(Materials.Glue.getFluid(36))
             .duration(10 * SECONDS)
             .eut(8)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Steel, 4),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 4))
+                GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Steel, 4),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 4))
             .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 3L, 14))
             .fluidInputs(Materials.Glue.getFluid(72))
             .duration(20 * SECONDS)
             .eut(30)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Steel, 2),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 1))
+                GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Steel, 2),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 1))
             .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 3L, 14))
             .fluidInputs(Materials.Plastic.getMolten(36))
             .duration(20 * SECONDS)
             .eut(30)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.StainlessSteel, 4),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 4))
+                GTOreDictUnificator.get(OrePrefixes.bolt, Materials.StainlessSteel, 4),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 4))
             .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 9L, 14))
             .fluidInputs(Materials.Plastic.getMolten(72))
             .duration(20 * SECONDS)
@@ -6890,15 +6882,15 @@ public class AssemblerRecipes implements Runnable {
 
         // Steam Boilers
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.IC2_Item_Casing_Iron.get(6), GT_Utility.getIntegratedCircuit(6))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.IC2_Item_Casing_Iron.get(6), GTUtility.getIntegratedCircuit(6))
             .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 3))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.IC2_Item_Casing_Steel.get(6), GT_Utility.getIntegratedCircuit(6))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.IC2_Item_Casing_Steel.get(6), GTUtility.getIntegratedCircuit(6))
             .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 4))
             .duration(20 * SECONDS)
             .eut(64)
@@ -6907,10 +6899,10 @@ public class AssemblerRecipes implements Runnable {
 
     public void withBartWorks() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, ExternalMaterials.getRhodiumPlatedPalladium(), 6),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Chrome, 1))
+                GTOreDictUnificator.get(OrePrefixes.plate, ExternalMaterials.getRhodiumPlatedPalladium(), 6),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Chrome, 1))
             .itemOutputs(ItemList.Casing_Advanced_Rhodium_Palladium.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(16)
@@ -6923,34 +6915,34 @@ public class AssemblerRecipes implements Runnable {
             return;
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.compressed, Materials.Bronze, 1),
-                GT_OreDictUnificator.get(OrePrefixes.compressed, Materials.Aluminium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.compressed, Materials.Steel, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.compressed, Materials.Bronze, 1),
+                GTOreDictUnificator.get(OrePrefixes.compressed, Materials.Aluminium, 1),
+                GTOreDictUnificator.get(OrePrefixes.compressed, Materials.Steel, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Ingot_Heavy1.get(1))
             .fluidInputs(Materials.StainlessSteel.getMolten(72))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(GalacticraftCore.ID, "item.heavyPlating", 1),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.MeteoricIron, 2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.MeteoricIron, 2),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Ingot_Heavy2.get(1))
             .fluidInputs(Materials.TungstenSteel.getMolten(72))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(GalacticraftMars.ID, "item.null", 1L, 3),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Desh, 4),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Desh, 4),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Ingot_Heavy3.get(1))
             .fluidInputs(Materials.Platinum.getMolten(72))
             .duration(15 * SECONDS)
@@ -6963,124 +6955,124 @@ public class AssemblerRecipes implements Runnable {
             return;
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Pentacadmiummagnesiumhexaoxid, 3),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 2),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Pentacadmiummagnesiumhexaoxid, 3),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 2),
                 ItemList.Electric_Pump_MV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 3))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 3))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 2000))
             .duration(16 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titaniumonabariumdecacoppereikosaoxid, 6),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 4),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titaniumonabariumdecacoppereikosaoxid, 6),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 4),
                 ItemList.Electric_Pump_HV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 6))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 6))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 4000))
             .duration(16 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Uraniumtriplatinid, 9),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.TungstenSteel, 6),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Uraniumtriplatinid, 9),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.TungstenSteel, 6),
                 ItemList.Electric_Pump_EV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 9))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 9))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 6000))
             .duration(16 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Vanadiumtriindinid, 12),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 8),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Vanadiumtriindinid, 12),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 8),
                 ItemList.Electric_Pump_IV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 12))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 12))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 8000))
             .duration(32 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(
+                GTOreDictUnificator.get(
                     OrePrefixes.wireGt01,
                     Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid,
                     15),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 10),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 10),
                 ItemList.Electric_Pump_LuV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 15))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 15))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 12000))
             .duration(32 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 18),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 12),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 18),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 12),
                 ItemList.Electric_Pump_ZPM.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 18))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 18))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 16000))
             .duration(1 * MINUTES + 4 * SECONDS)
             .eut(TierEU.RECIPE_ZPM)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuvwire, 21),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 14),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuvwire, 21),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 14),
                 ItemList.Electric_Pump_UV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 21))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 21))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 20000))
             .duration(1 * MINUTES + 4 * SECONDS)
             .eut(TierEU.RECIPE_UV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuhvwire, 24),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Bedrockium, 16),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuhvwire, 24),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Bedrockium, 16),
                 ItemList.Electric_Pump_UHV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 24000))
             .duration(2 * MINUTES + 8 * SECONDS)
             .eut(TierEU.RECIPE_UHV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEVBase, 27),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Infinity, 18),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEVBase, 27),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Infinity, 18),
                 ItemList.Electric_Pump_UEV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 27))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 27))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 28000))
             .duration(2 * MINUTES + 40 * SECONDS)
             .eut(TierEU.RECIPE_UEV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMVBase, 33),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, MaterialsUEVplus.SpaceTime, 22),
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMVBase, 33),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, MaterialsUEVplus.SpaceTime, 22),
                 ItemList.Electric_Pump_UMV.get(1),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 33))
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 33))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 36000))
             .duration(2 * MINUTES + 40 * SECONDS)
             .eut(TierEU.RECIPE_UMV)
@@ -7089,16 +7081,16 @@ public class AssemblerRecipes implements Runnable {
 
     public void withGTNHLanthAndGTPP() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_EV.get(4),
                 ItemList.Field_Generator_EV.get(4),
                 INCONEL_690.getPlate(4),
-                GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 16),
-                GT_OreDictUnificator.get(OrePrefixes.ring, Materials.BorosilicateGlass, 16),
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Polytetrafluoroethylene, 4),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 4),
+                GTOreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 16),
+                GTOreDictUnificator.get(OrePrefixes.ring, Materials.BorosilicateGlass, 16),
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2),
+                GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Polytetrafluoroethylene, 4),
+                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 4),
                 ItemList.Shape_Extruder_Wire.get(16))
             .itemOutputs(ItemList.Spinneret.get(1))
             .fluidInputs(Materials.SolderingAlloy.getMolten(144))
@@ -7112,125 +7104,123 @@ public class AssemblerRecipes implements Runnable {
             return;
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(IC2NuclearControl.ID, "ItemVanillaMachineCard", 1L, 0),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2))
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTModHandler.getIC2Item("electronicCircuit", 2))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(IC2NuclearControl.ID, "ItemInventoryScannerCard", 1L, 0),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2))
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTModHandler.getIC2Item("electronicCircuit", 2))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(IC2NuclearControl.ID, "ItemEnergySensorLocationCard", 1L, 0),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2))
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTModHandler.getIC2Item("electronicCircuit", 2))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(getModItem(IC2NuclearControl.ID, "RFSensorCard", 1L, 0), GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(getModItem(IC2NuclearControl.ID, "RFSensorCard", 1L, 0), GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTModHandler.getIC2Item("electronicCircuit", 2))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(IC2NuclearControl.ID, "ItemMultipleSensorLocationCard", 1L, 0),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 1))
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTModHandler.getIC2Item("electronicCircuit", 1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
         // counter
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(IC2NuclearControl.ID, "ItemMultipleSensorLocationCard", 1L, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 1))
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTModHandler.getIC2Item("electronicCircuit", 1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
         // liquid
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(IC2NuclearControl.ID, "ItemMultipleSensorLocationCard", 1L, 2),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2))
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTModHandler.getIC2Item("electronicCircuit", 2))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
         // generator
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(IC2NuclearControl.ID, "ItemLiquidArrayLocationCard", 1L, 0),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2))
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTModHandler.getIC2Item("electronicCircuit", 2))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
         // 2-6 liquid
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(IC2NuclearControl.ID, "ItemEnergyArrayLocationCard", 1L, 0),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2))
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTModHandler.getIC2Item("electronicCircuit", 2))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
         // 2-6 energy
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(IC2NuclearControl.ID, "ItemSensorLocationCard", 1L, 0),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2))
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
         // non-fluid nuke
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                getModItem(IC2NuclearControl.ID, "Item55ReactorCard", 1L, 0),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(getModItem(IC2NuclearControl.ID, "Item55ReactorCard", 1L, 0), GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(getModItem(IC2NuclearControl.ID, "CardAppeng", 1L, 0), GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(getModItem(IC2NuclearControl.ID, "CardAppeng", 1L, 0), GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTModHandler.getIC2Item("electronicCircuit", 2))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.NC_SensorCard.get(1), GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.NC_SensorCard.get(1), GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTModHandler.getIC2Item("electronicCircuit", 3))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java
index 2b4e957d34..28630668c0 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java
@@ -1,28 +1,27 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
-import static gregtech.api.util.GT_RecipeBuilder.HOURS;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeConstants.AssemblyLine;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME;
+import static gregtech.api.util.GTRecipeBuilder.HOURS;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeConstants.AssemblyLine;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import com.github.technus.tectech.thing.CustomItemList;
-
-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.enums.TierEU;
 import gregtech.api.util.ExternalMaterials;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import tectech.thing.CustomItemList;
 
 public class AssemblyLineRecipes implements Runnable {
 
@@ -52,15 +51,15 @@ public class AssemblyLineRecipes implements Runnable {
         // Motors
         {
             // LuV motor
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Electric_Motor_IV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.HSSS, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2))
+                    GTOreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1),
+                    GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.HSSS, 2),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2))
                 .fluidInputs(new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250))
                 .itemOutputs(ItemList.Electric_Motor_LuV.get(1))
                 .eut(TierEU.RECIPE_IV)
@@ -68,18 +67,18 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // ZPM motor
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Electric_Motor_LuV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 16),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2))
+                    GTOreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 2),
+                    GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 4),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4),
+                    GTOreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 16),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2))
                 .fluidInputs(new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750))
                 .itemOutputs(ItemList.Electric_Motor_ZPM.get(1))
                 .eut(TierEU.RECIPE_LuV)
@@ -87,21 +86,21 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // UV motor
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Electric_Motor_ZPM.get(1))
                 .metadata(RESEARCH_TIME, 4 * HOURS)
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 16),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2))
+                    GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 2),
+                    GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 4),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4),
+                    GTOreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 16),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2))
                 .fluidInputs(
                     Materials.Naquadria.getMolten(1296),
                     new FluidStack(solderIndalloy, 1296),
@@ -115,17 +114,17 @@ public class AssemblyLineRecipes implements Runnable {
         // Pumps
         {
             // LuV Pump
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Electric_Pump_IV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
                     ItemList.Electric_Motor_LuV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.NiobiumTitanium, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.HSSS, 8),
+                    GTOreDictUnificator.get(OrePrefixes.pipeSmall, Materials.NiobiumTitanium, 2),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 2),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.HSSS, 8),
                     new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 4 },
-                    GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.HSSS, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2))
+                    GTOreDictUnificator.get(OrePrefixes.rotor, Materials.HSSS, 2),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2))
                 .fluidInputs(new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250))
                 .itemOutputs(ItemList.Electric_Pump_LuV.get(1))
                 .eut(TierEU.RECIPE_IV)
@@ -133,17 +132,17 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // ZPM Pump
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Electric_Pump_LuV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
                     ItemList.Electric_Motor_ZPM.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 8),
+                    GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 2),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 2),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 8),
                     new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 8 },
-                    GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2))
+                    GTOreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 2),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2))
                 .fluidInputs(new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750))
                 .itemOutputs(ItemList.Electric_Pump_ZPM.get(1))
                 .eut(TierEU.RECIPE_LuV)
@@ -151,17 +150,17 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // UV Pump
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Electric_Pump_ZPM.get(1))
                 .metadata(RESEARCH_TIME, 4 * HOURS)
                 .itemInputs(
                     ItemList.Electric_Motor_UV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 8),
+                    GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 8),
                     new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 16 },
-                    GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2))
+                    GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 2),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2))
                 .itemOutputs(ItemList.Electric_Pump_UV.get(1))
                 .fluidInputs(
                     Materials.Naquadria.getMolten(1296),
@@ -175,15 +174,15 @@ public class AssemblyLineRecipes implements Runnable {
         // Conveyors
         {
             // LuV Conveyor
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Conveyor_Module_IV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
                     ItemList.Electric_Motor_LuV.get(2),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.HSSS, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.round, Materials.HSSS, 32),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 2),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.HSSS, 4),
+                    GTOreDictUnificator.get(OrePrefixes.round, Materials.HSSS, 32),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2),
                     new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 10 })
                 .itemOutputs(ItemList.Conveyor_Module_LuV.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250))
@@ -192,15 +191,15 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // ZPM Conveyor
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Conveyor_Module_LuV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
                     ItemList.Electric_Motor_ZPM.get(2),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 32),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 2),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4),
+                    GTOreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 32),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2),
                     new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 20 })
                 .itemOutputs(ItemList.Conveyor_Module_ZPM.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750))
@@ -209,15 +208,15 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // UV Conveyor
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Conveyor_Module_ZPM.get(1))
                 .metadata(RESEARCH_TIME, 4 * HOURS)
                 .itemInputs(
                     ItemList.Electric_Motor_UV.get(2),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 32),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4),
+                    GTOreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 32),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2),
                     new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 40 })
                 .itemOutputs(ItemList.Conveyor_Module_UV.get(1))
                 .fluidInputs(
@@ -232,18 +231,18 @@ public class AssemblyLineRecipes implements Runnable {
         // Pistons
         {
             // LuV Piston
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Electric_Piston_IV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
                     ItemList.Electric_Motor_LuV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.HSSS, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.round, Materials.HSSS, 32),
-                    GT_OreDictUnificator.get(OrePrefixes.stick, Materials.HSSS, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.gear, Materials.HSSS, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSS, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 4))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.HSSS, 4),
+                    GTOreDictUnificator.get(OrePrefixes.round, Materials.HSSS, 32),
+                    GTOreDictUnificator.get(OrePrefixes.stick, Materials.HSSS, 4),
+                    GTOreDictUnificator.get(OrePrefixes.gear, Materials.HSSS, 1),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSS, 2),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 4))
                 .itemOutputs(ItemList.Electric_Piston_LuV.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250))
                 .duration(30 * SECONDS)
@@ -251,18 +250,18 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // ZPM Pistons
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Electric_Piston_LuV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
                     ItemList.Electric_Motor_ZPM.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 6),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 32),
-                    GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahAlloy, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.gear, Materials.NaquadahAlloy, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.NaquadahAlloy, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 4))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 6),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4),
+                    GTOreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 32),
+                    GTOreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahAlloy, 4),
+                    GTOreDictUnificator.get(OrePrefixes.gear, Materials.NaquadahAlloy, 1),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.NaquadahAlloy, 2),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 4))
                 .itemOutputs(ItemList.Electric_Piston_ZPM.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750))
                 .duration(30 * SECONDS)
@@ -270,18 +269,18 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // UV Piston
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Electric_Piston_ZPM.get(1))
                 .metadata(RESEARCH_TIME, 4 * HOURS)
                 .itemInputs(
                     ItemList.Electric_Motor_UV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6),
-                    GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 32),
-                    GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Neutronium, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 4))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6),
+                    GTOreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4),
+                    GTOreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 32),
+                    GTOreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 4),
+                    GTOreDictUnificator.get(OrePrefixes.gear, Materials.Neutronium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 2),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 4))
                 .itemOutputs(ItemList.Electric_Piston_UV.get(1))
                 .fluidInputs(
                     Materials.Naquadria.getMolten(1296),
@@ -295,19 +294,19 @@ public class AssemblyLineRecipes implements Runnable {
         // RobotArms
         {
             // LuV Robot Arm
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Robot_Arm_IV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.HSSS, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.gear, Materials.HSSS, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSS, 3),
+                    GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.HSSS, 4),
+                    GTOreDictUnificator.get(OrePrefixes.gear, Materials.HSSS, 1),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSS, 3),
                     ItemList.Electric_Motor_LuV.get(2),
                     ItemList.Electric_Piston_LuV.get(1),
                     new Object[] { OrePrefixes.circuit.get(Materials.LuV), 2 },
                     new Object[] { OrePrefixes.circuit.get(Materials.IV), 4 },
                     new Object[] { OrePrefixes.circuit.get(Materials.EV), 8 },
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 6))
+                    GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 6))
                 .itemOutputs(ItemList.Robot_Arm_LuV.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 576), Materials.Lubricant.getFluid(250))
                 .duration(30 * SECONDS)
@@ -315,19 +314,19 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // ZPM Robot Arm
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Robot_Arm_LuV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.gear, Materials.NaquadahAlloy, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.NaquadahAlloy, 3),
+                    GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 4),
+                    GTOreDictUnificator.get(OrePrefixes.gear, Materials.NaquadahAlloy, 1),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.NaquadahAlloy, 3),
                     ItemList.Electric_Motor_ZPM.get(2),
                     ItemList.Electric_Piston_ZPM.get(1),
                     new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 2 },
                     new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 },
                     new Object[] { OrePrefixes.circuit.get(Materials.IV), 8 },
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 6))
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 6))
                 .itemOutputs(ItemList.Robot_Arm_ZPM.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 1152), Materials.Lubricant.getFluid(750))
                 .duration(30 * SECONDS)
@@ -335,19 +334,19 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // UV Robot Arm
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Robot_Arm_ZPM.get(1))
                 .metadata(RESEARCH_TIME, 4 * HOURS)
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Neutronium, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 3),
+                    GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 4),
+                    GTOreDictUnificator.get(OrePrefixes.gear, Materials.Neutronium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 3),
                     ItemList.Electric_Motor_UV.get(2),
                     ItemList.Electric_Piston_UV.get(1),
                     new Object[] { OrePrefixes.circuit.get(Materials.UV), 2 },
                     new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 },
                     new Object[] { OrePrefixes.circuit.get(Materials.LuV), 8 },
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 6))
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 6))
                 .itemOutputs(ItemList.Robot_Arm_UV.get(1))
                 .fluidInputs(
                     Materials.Naquadria.getMolten(1296),
@@ -361,19 +360,19 @@ public class AssemblyLineRecipes implements Runnable {
         // Emitters
         {
             // LuV Emitter
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Emitter_IV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1),
+                    GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1),
                     ItemList.Electric_Motor_LuV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.stick, LuVMat, 8),
+                    GTOreDictUnificator.get(OrePrefixes.stick, LuVMat, 8),
                     ItemList.QuantumStar.get(1),
                     new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 },
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 7))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 7))
                 .itemOutputs(ItemList.Emitter_LuV.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 576))
                 .duration(30 * SECONDS)
@@ -381,19 +380,19 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // ZPM Emitter
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Emitter_LuV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1),
+                    GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1),
                     ItemList.Electric_Motor_ZPM.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 8),
+                    GTOreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 8),
                     ItemList.QuantumStar.get(2),
                     new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 },
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 7))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 7))
                 .itemOutputs(ItemList.Emitter_ZPM.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 1152))
                 .duration(30 * SECONDS)
@@ -401,19 +400,19 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // UV Emitter
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Emitter_ZPM.get(1))
                 .metadata(RESEARCH_TIME, 4 * HOURS)
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1),
                     ItemList.Electric_Motor_UV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 8),
+                    GTOreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 8),
                     ItemList.Gravistar.get(4),
                     new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 },
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 7))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 7))
                 .itemOutputs(ItemList.Emitter_UV.get(1))
                 .fluidInputs(Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 2304))
                 .duration(30 * SECONDS)
@@ -424,19 +423,19 @@ public class AssemblyLineRecipes implements Runnable {
         // Sensors
         {
             // LuV Sensor
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Sensor_IV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1),
+                    GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1),
                     ItemList.Electric_Motor_LuV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, LuVMat, 8),
+                    GTOreDictUnificator.get(OrePrefixes.plate, LuVMat, 8),
                     ItemList.QuantumStar.get(1),
                     new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 },
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 7))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 7))
                 .itemOutputs(ItemList.Sensor_LuV.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 576))
                 .duration(30 * SECONDS)
@@ -444,19 +443,19 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // ZPM Sensor
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Sensor_LuV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1),
+                    GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1),
                     ItemList.Electric_Motor_ZPM.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 8),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 8),
                     ItemList.QuantumStar.get(2),
                     new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 },
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 7))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 7))
                 .itemOutputs(ItemList.Sensor_ZPM.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 1152))
                 .duration(30 * SECONDS)
@@ -464,19 +463,19 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // UV Sensor
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Sensor_ZPM.get(1))
                 .metadata(RESEARCH_TIME, 4 * HOURS)
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1),
                     ItemList.Electric_Motor_UV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8),
                     ItemList.Gravistar.get(4),
                     new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 },
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 7))
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 7))
                 .itemOutputs(ItemList.Sensor_UV.get(1))
                 .fluidInputs(Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 2304))
                 .duration(30 * SECONDS)
@@ -487,20 +486,20 @@ public class AssemblyLineRecipes implements Runnable {
         // Field Generators
         {
             // LuV Field Generator
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Field_Generator_IV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6),
+                    GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6),
                     ItemList.QuantumStar.get(2),
                     ItemList.Emitter_LuV.get(4),
                     new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 },
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 8))
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 8))
                 .itemOutputs(ItemList.Field_Generator_LuV.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 576))
                 .duration(30 * SECONDS)
@@ -508,20 +507,20 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // ZPM Field Generator
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Field_Generator_LuV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 6),
+                    GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 6),
                     ItemList.QuantumStar.get(2),
                     ItemList.Emitter_ZPM.get(4),
                     new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 },
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8))
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8))
                 .itemOutputs(ItemList.Field_Generator_ZPM.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 1152))
                 .duration(30 * SECONDS)
@@ -529,22 +528,22 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // UV Field Generator
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Field_Generator_ZPM.get(1))
                 .metadata(RESEARCH_TIME, 4 * HOURS)
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6),
+                    GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6),
                     ItemList.Gravistar.get(2),
                     ItemList.Emitter_UV.get(4),
                     new Object[] { OrePrefixes.circuit.get(Materials.UHV), 4 },
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8))
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
+                    GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8))
                 .itemOutputs(ItemList.Field_Generator_UV.get(1))
                 .fluidInputs(Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 2304))
                 .duration(30 * SECONDS)
@@ -555,12 +554,12 @@ public class AssemblyLineRecipes implements Runnable {
         // Energy Hatches
         {
             // LuV Energy Hatch
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Hatch_Energy_IV.get(1))
                 .metadata(RESEARCH_TIME, 60 * MINUTES)
                 .itemInputs(
                     ItemList.Hull_LuV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 2),
+                    GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 2),
                     ItemList.Circuit_Chip_UHPIC.get(2),
                     new Object[] { OrePrefixes.circuit.get(Materials.LuV), 2 },
                     ItemList.LuV_Coil.get(2),
@@ -578,12 +577,12 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // ZPM Energy Hatch
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Hatch_Energy_LuV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
                     ItemList.Hull_ZPM.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 2),
+                    GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 2),
                     ItemList.Circuit_Chip_NPIC.get(2),
                     new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 2 },
                     ItemList.ZPM_Coil.get(2),
@@ -601,12 +600,12 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // UV Energy Hatch
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Hatch_Energy_ZPM.get(1))
                 .metadata(RESEARCH_TIME, 4 * HOURS)
                 .itemInputs(
                     ItemList.Hull_UV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 2),
+                    GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 2),
                     ItemList.Circuit_Chip_PPIC.get(2),
                     new Object[] { OrePrefixes.circuit.get(Materials.UV), 2 },
                     ItemList.UV_Coil.get(2),
@@ -631,12 +630,12 @@ public class AssemblyLineRecipes implements Runnable {
         // Dynamo Hatches
         {
             // LuV Dynamo Hatch
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Hatch_Dynamo_IV.get(1))
                 .metadata(RESEARCH_TIME, 60 * MINUTES)
                 .itemInputs(
                     ItemList.Hull_LuV.get(1),
-                    GT_OreDictUnificator.get(
+                    GTOreDictUnificator.get(
                         OrePrefixes.spring,
                         Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid,
                         2),
@@ -657,12 +656,12 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // ZPM Dynamo Hatch
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Hatch_Dynamo_LuV.get(1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
                     ItemList.Hull_ZPM.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 4),
+                    GTOreDictUnificator.get(OrePrefixes.spring, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 4),
                     ItemList.Circuit_Chip_NPIC.get(2),
                     new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 2 },
                     ItemList.ZPM_Coil.get(2),
@@ -680,12 +679,12 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // UV Dynamo Hatch
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, ItemList.Hatch_Dynamo_ZPM.get(1))
                 .metadata(RESEARCH_TIME, 4 * HOURS)
                 .itemInputs(
                     ItemList.Hull_UV.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Longasssuperconductornameforuvwire, 4),
+                    GTOreDictUnificator.get(OrePrefixes.spring, Materials.Longasssuperconductornameforuvwire, 4),
                     ItemList.Circuit_Chip_PPIC.get(2),
                     new Object[] { OrePrefixes.circuit.get(Materials.UV), 2 },
                     ItemList.UV_Coil.get(2),
@@ -710,8 +709,8 @@ public class AssemblyLineRecipes implements Runnable {
         // Fusion Controller
         {
             // mkI
-            GT_Values.RA.stdBuilder()
-                .metadata(RESEARCH_ITEM, GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 1))
+            GTValues.RA.stdBuilder()
+                .metadata(RESEARCH_ITEM, GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 1))
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
                     ItemList.Casing_Fusion_Coil.get(1),
@@ -719,11 +718,11 @@ public class AssemblyLineRecipes implements Runnable {
                     new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 },
                     new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 },
                     new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 },
-                    GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 4),
+                    GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 4),
+                    GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 4),
                     ItemList.Field_Generator_LuV.get(2),
                     ItemList.Circuit_Wafer_UHPIC.get(32),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 32))
+                    GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 32))
                 .itemOutputs(ItemList.FusionComputer_LuV.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 2880), Materials.VanadiumGallium.getMolten(1152))
                 .duration(50 * SECONDS)
@@ -731,8 +730,8 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // mkII
-            GT_Values.RA.stdBuilder()
-                .metadata(RESEARCH_ITEM, GT_OreDictUnificator.get(OrePrefixes.block, Materials.Europium, 1))
+            GTValues.RA.stdBuilder()
+                .metadata(RESEARCH_ITEM, GTOreDictUnificator.get(OrePrefixes.block, Materials.Europium, 1))
                 .metadata(RESEARCH_TIME, 4 * HOURS)
                 .itemInputs(
                     ItemList.Casing_Fusion_Coil.get(1),
@@ -740,10 +739,10 @@ public class AssemblyLineRecipes implements Runnable {
                     new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 },
                     new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 },
                     new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 },
-                    GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 4),
+                    GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 4),
                     ItemList.Field_Generator_ZPM.get(2),
                     ItemList.Circuit_Wafer_PPIC.get(48),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 32))
+                    GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 32))
                 .itemOutputs(ItemList.FusionComputer_ZPMV.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 2880), Materials.NiobiumTitanium.getMolten(1152))
                 .duration(50 * SECONDS)
@@ -751,8 +750,8 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
 
             // mkIII
-            GT_Values.RA.stdBuilder()
-                .metadata(RESEARCH_ITEM, GT_OreDictUnificator.get(OrePrefixes.block, Materials.Americium, 1))
+            GTValues.RA.stdBuilder()
+                .metadata(RESEARCH_ITEM, GTOreDictUnificator.get(OrePrefixes.block, Materials.Americium, 1))
                 .metadata(RESEARCH_TIME, 6 * HOURS)
                 .itemInputs(
                     ItemList.Casing_Fusion_Coil.get(1),
@@ -760,10 +759,10 @@ public class AssemblyLineRecipes implements Runnable {
                     new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 },
                     new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 },
                     new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 },
-                    GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 4),
+                    GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 4),
                     ItemList.Field_Generator_UV.get(2),
                     ItemList.Circuit_Wafer_QPIC.get(64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 32))
+                    GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 32))
                 .itemOutputs(ItemList.FusionComputer_UV.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 2880), Materials.ElectrumFlux.getMolten(1152))
                 .duration(50 * SECONDS)
@@ -771,11 +770,11 @@ public class AssemblyLineRecipes implements Runnable {
                 .addTo(AssemblyLine);
         }
         // Energy Module
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, ItemList.Energy_LapotronicOrb2.get(1))
             .metadata(RESEARCH_TIME, 4 * HOURS)
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16),
                 new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 },
                 new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 },
                 new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 },
@@ -785,7 +784,7 @@ public class AssemblyLineRecipes implements Runnable {
                 ItemList.Circuit_Wafer_SoC2.get(64),
                 ItemList.Circuit_Wafer_SoC2.get(64),
                 ItemList.Circuit_Parts_DiodeASMD.get(8),
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32))
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32))
             .itemOutputs(ItemList.Energy_Module.get(1))
             .fluidInputs(
                 new FluidStack(solderIndalloy, 2880),
@@ -795,11 +794,11 @@ public class AssemblyLineRecipes implements Runnable {
             .addTo(AssemblyLine);
 
         // Energy Cluster
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, ItemList.Energy_Module.get(1))
             .metadata(RESEARCH_TIME, 4 * HOURS)
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 32),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 32),
                 new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 },
                 new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 },
                 new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 },
@@ -809,7 +808,7 @@ public class AssemblyLineRecipes implements Runnable {
                 ItemList.Circuit_Wafer_HPIC.get(64),
                 ItemList.Circuit_Wafer_HPIC.get(64),
                 ItemList.Circuit_Parts_DiodeASMD.get(16),
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32))
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32))
             .itemOutputs(ItemList.Energy_Cluster.get(1))
             .fluidInputs(
                 new FluidStack(solderIndalloy, 2880),
@@ -819,7 +818,7 @@ public class AssemblyLineRecipes implements Runnable {
             .addTo(AssemblyLine);
 
         // Integrated Ore Factory
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, ItemList.Machine_IV_OreWasher.get(1))
             .metadata(RESEARCH_TIME, 6 * HOURS)
             .itemInputs(
@@ -830,13 +829,13 @@ public class AssemblyLineRecipes implements Runnable {
                 ItemList.Conveyor_Module_UHV.get(8),
                 ItemList.Robot_Arm_UHV.get(8),
                 new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 },
-                new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Duranium, 32),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 32) },
-                GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 64),
+                new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Duranium, 32),
+                    GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 32) },
+                GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 64),
                 new ItemStack[] { ItemList.Component_Grinder_Tungsten.get(64),
                     ItemList.Component_Grinder_Diamond.get(64) },
-                GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.StainlessSteel, 32),
-                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Chrome, 16))
+                GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.StainlessSteel, 32),
+                GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Chrome, 16))
             .itemOutputs(ItemList.Ore_Processor.get(1))
             .fluidInputs(new FluidStack(solderIndalloy, 2880), Materials.Naquadria.getMolten(1440))
             .duration(60 * SECONDS)
@@ -844,17 +843,17 @@ public class AssemblyLineRecipes implements Runnable {
             .addTo(AssemblyLine);
 
         // Drone T2
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, ItemList.TierdDrone0.get(1))
             .metadata(RESEARCH_TIME, 2 * HOURS)
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 16),
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 16),
                 new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 },
                 NewHorizonsCoreMod.isModLoaded()
-                    ? GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier3", 4)
+                    ? GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier3", 4)
                     : ItemList.Casing_Firebox_TungstenSteel.get(16),
                 ItemList.Large_Fluid_Cell_Osmium.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.MysteriousCrystal, 1),
+                GTOreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.MysteriousCrystal, 1),
                 ItemList.Emitter_ZPM.get(4),
                 ItemList.Energy_Module.get(1),
                 ItemList.Cover_WirelessNeedsMaintainance.get(1))
@@ -865,11 +864,11 @@ public class AssemblyLineRecipes implements Runnable {
             .addTo(AssemblyLine);
 
         // Drone T3
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, ItemList.TierdDrone1.get(1))
             .metadata(RESEARCH_TIME, 8 * HOURS)
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16),
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16),
                 new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 },
                 ItemList.Field_Generator_UV.get(16),
                 ItemList.Gravistar.get(8),
diff --git a/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java
index 311c5b1941..932b1b71c5 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java
@@ -2,26 +2,26 @@ package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.Mods.AppliedEnergistics2;
 import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
-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.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class AutoclaveRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.IC2_Energium_Dust.get(9L))
             .itemOutputs(ItemList.IC2_EnergyCrystal.get(1L))
             .outputChances(10000)
@@ -30,7 +30,7 @@ public class AutoclaveRecipes implements Runnable {
             .eut(256)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.IC2_Energium_Dust.get(9L))
             .itemOutputs(ItemList.IC2_EnergyCrystal.get(1L))
             .outputChances(10000)
@@ -39,7 +39,7 @@ public class AutoclaveRecipes implements Runnable {
             .eut(256)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 0))
             .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10))
             .outputChances(8000)
@@ -48,7 +48,7 @@ public class AutoclaveRecipes implements Runnable {
             .eut(24)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 600))
             .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11))
             .outputChances(8000)
@@ -57,7 +57,7 @@ public class AutoclaveRecipes implements Runnable {
             .eut(24)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 1200))
             .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12))
             .outputChances(8000)
@@ -66,34 +66,34 @@ public class AutoclaveRecipes implements Runnable {
             .eut(24)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 0))
             .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10))
             .outputChances(9000)
-            .fluidInputs(GT_ModHandler.getDistilledWater(100L))
+            .fluidInputs(GTModHandler.getDistilledWater(100L))
             .duration(50 * SECONDS)
             .eut(24)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 600))
             .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11))
             .outputChances(9000)
-            .fluidInputs(GT_ModHandler.getDistilledWater(100L))
+            .fluidInputs(GTModHandler.getDistilledWater(100L))
             .duration(50 * SECONDS)
             .eut(24)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 1200))
             .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12))
             .outputChances(9000)
-            .fluidInputs(GT_ModHandler.getDistilledWater(100L))
+            .fluidInputs(GTModHandler.getDistilledWater(100L))
             .duration(50 * SECONDS)
             .eut(24)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 0))
             .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10))
             .outputChances(10000)
@@ -102,7 +102,7 @@ public class AutoclaveRecipes implements Runnable {
             .eut(24)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 600))
             .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11))
             .outputChances(10000)
@@ -111,7 +111,7 @@ public class AutoclaveRecipes implements Runnable {
             .eut(24)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 1200))
             .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12))
             .outputChances(10000)
@@ -120,53 +120,53 @@ public class AutoclaveRecipes implements Runnable {
             .eut(24)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 32))
-            .itemOutputs(GT_ModHandler.getIC2Item("carbonFiber", 64L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 32))
+            .itemOutputs(GTModHandler.getIC2Item("carbonFiber", 64L))
             .outputChances(10000)
             .fluidInputs(Materials.Polybenzimidazole.getMolten(36L))
             .duration(7 * SECONDS + 10 * TICKS)
             .eut((int) TierEU.RECIPE_EV)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64))
-            .itemOutputs(GT_ModHandler.getIC2Item("carbonFiber", 64L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64))
+            .itemOutputs(GTModHandler.getIC2Item("carbonFiber", 64L))
             .outputChances(10000)
             .fluidInputs(Materials.Epoxid.getMolten(144L))
             .duration(15 * SECONDS)
             .eut((int) TierEU.RECIPE_HV)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64))
-            .itemOutputs(GT_ModHandler.getIC2Item("carbonFiber", 32L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64))
+            .itemOutputs(GTModHandler.getIC2Item("carbonFiber", 32L))
             .outputChances(10000)
             .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288L))
             .duration(20 * SECONDS)
             .eut((int) TierEU.RECIPE_MV)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64))
-            .itemOutputs(GT_ModHandler.getIC2Item("carbonFiber", 16L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64))
+            .itemOutputs(GTModHandler.getIC2Item("carbonFiber", 16L))
             .outputChances(10000)
             .fluidInputs(Materials.Plastic.getMolten(576L))
             .duration(30 * SECONDS)
             .eut((int) TierEU.RECIPE_LV)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1))
             .outputChances(3333)
             .fluidInputs(Materials.UUMatter.getFluid(576L))
             .duration(60 * MINUTES)
             .eut((int) TierEU.RECIPE_HV)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(ItemList.QuantumStar.get(1L)))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(ItemList.QuantumStar.get(1L)))
             .itemOutputs(ItemList.Gravistar.get(1L))
             .outputChances(10000)
             .fluidInputs(Materials.Neutronium.getMolten(288))
@@ -174,8 +174,8 @@ public class AutoclaveRecipes implements Runnable {
             .eut((int) TierEU.RECIPE_IV)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(ItemList.Gravistar.get(16L)))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(ItemList.Gravistar.get(16L)))
             .itemOutputs(ItemList.NuclearStar.get(1L))
             .outputChances(10000)
             .fluidInputs(Materials.Infinity.getMolten(288))
@@ -183,7 +183,7 @@ public class AutoclaveRecipes implements Runnable {
             .eut(TierEU.RECIPE_UEV)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SiliconDioxide.getDust(1))
             .itemOutputs(Materials.Quartzite.getGems(1))
             .outputChances(750)
@@ -192,16 +192,16 @@ public class AutoclaveRecipes implements Runnable {
             .eut(24)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SiliconDioxide.getDust(1))
             .itemOutputs(Materials.Quartzite.getGems(1))
             .outputChances(1000)
-            .fluidInputs(GT_ModHandler.getDistilledWater(100L))
+            .fluidInputs(GTModHandler.getDistilledWater(100L))
             .duration(1 * MINUTES + 15 * SECONDS)
             .eut(24)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SiliconDioxide.getDust(1))
             .itemOutputs(Materials.Quartzite.getGems(1))
             .outputChances(10000)
@@ -210,40 +210,40 @@ public class AutoclaveRecipes implements Runnable {
             .eut(24)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3))
             .outputChances(7500)
             .fluidInputs(Materials.Water.getFluid(1000L))
             .duration(60 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3))
             .outputChances(9000)
-            .fluidInputs(GT_ModHandler.getDistilledWater(1000L))
+            .fluidInputs(GTModHandler.getDistilledWater(1000L))
             .duration(60 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.nanite, MaterialsUEVplus.TranscendentMetal, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.Mellion, 32L))
+                GTOreDictUnificator.get(OrePrefixes.nanite, MaterialsUEVplus.TranscendentMetal, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.Mellion, 32L))
             .itemOutputs(ItemList.Phononic_Seed_Crystal.get(8L))
             .fluidInputs(Materials.Grade8PurifiedWater.getFluid(32_000L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_UMV)
             .addTo(autoclaveRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.MagMatter, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.MagMatter, 1))
             .itemOutputs(ItemList.Phononic_Seed_Crystal.get(5))
             .fluidInputs(MaterialsUEVplus.PhononCrystalSolution.getFluid(250))
             .duration(2 * SECONDS + 10 * TICKS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java
index 33149b2ff3..8a4b48dc5e 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java
@@ -1,333 +1,333 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.benderRecipes;
-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 net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-import goodgenerator.items.MyMaterial;
-import gregtech.api.enums.GT_Values;
+import goodgenerator.items.GGMaterial;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 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.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class BenderRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Aluminium, 20L),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Aluminium, 20L),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(ItemList.RC_Rail_Standard.get(64L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 48L),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 48L),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(ItemList.RC_Rail_Standard.get(64L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 32L),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 32L),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(ItemList.RC_Rail_Standard.get(64L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Bronze, 32L),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Bronze, 32L),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(ItemList.RC_Rail_Standard.get(64L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 24L),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 24L),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(ItemList.RC_Rail_Standard.get(64L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 16L),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 16L),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(ItemList.RC_Rail_Standard.get(64L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 12L),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 12L),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(ItemList.RC_Rail_Standard.get(64L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 9L),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 9L),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(ItemList.RC_Rail_Standard.get(64L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 6L),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 6L),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(ItemList.RC_Rail_Standard.get(64L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmium, 3L),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Osmium, 3L),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(ItemList.RC_Rail_Standard.get(64L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 2L),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 2L),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(ItemList.RC_Rail_Standard.get(64L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Obsidian, 24L),
-                GT_Utility.getIntegratedCircuit(11))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Obsidian, 24L),
+                GTUtility.getIntegratedCircuit(11))
             .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 12L),
-                GT_Utility.getIntegratedCircuit(11))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 12L),
+                GTUtility.getIntegratedCircuit(11))
             .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 6L),
-                GT_Utility.getIntegratedCircuit(11))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 6L),
+                GTUtility.getIntegratedCircuit(11))
             .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 3L),
-                GT_Utility.getIntegratedCircuit(11))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 3L),
+                GTUtility.getIntegratedCircuit(11))
             .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmium, 1L),
-                GT_Utility.getIntegratedCircuit(11))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Osmium, 1L),
+                GTUtility.getIntegratedCircuit(11))
             .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Aluminium, 20L),
-                GT_Utility.getIntegratedCircuit(12))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Aluminium, 20L),
+                GTUtility.getIntegratedCircuit(12))
             .itemOutputs(ItemList.RC_Rebar.get(64L))
             .duration(10 * SECONDS)
             .eut(200)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 48L),
-                GT_Utility.getIntegratedCircuit(12))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 48L),
+                GTUtility.getIntegratedCircuit(12))
             .itemOutputs(ItemList.RC_Rebar.get(64L))
             .duration(10 * SECONDS)
             .eut(200)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 24L),
-                GT_Utility.getIntegratedCircuit(12))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 24L),
+                GTUtility.getIntegratedCircuit(12))
             .itemOutputs(ItemList.RC_Rebar.get(64L))
             .duration(10 * SECONDS)
             .eut(200)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Bronze, 32L),
-                GT_Utility.getIntegratedCircuit(12))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Bronze, 32L),
+                GTUtility.getIntegratedCircuit(12))
             .itemOutputs(ItemList.RC_Rebar.get(64L))
             .duration(10 * SECONDS)
             .eut(200)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 16L),
-                GT_Utility.getIntegratedCircuit(12))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 16L),
+                GTUtility.getIntegratedCircuit(12))
             .itemOutputs(ItemList.RC_Rebar.get(64L))
             .duration(10 * SECONDS)
             .eut(200)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 12L),
-                GT_Utility.getIntegratedCircuit(12))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 12L),
+                GTUtility.getIntegratedCircuit(12))
             .itemOutputs(ItemList.RC_Rebar.get(64L))
             .duration(10 * SECONDS)
             .eut(200)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 8),
-                GT_Utility.getIntegratedCircuit(12))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 8),
+                GTUtility.getIntegratedCircuit(12))
             .itemOutputs(ItemList.RC_Rebar.get(64L))
             .duration(10 * SECONDS)
             .eut(200)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 6L),
-                GT_Utility.getIntegratedCircuit(12))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 6L),
+                GTUtility.getIntegratedCircuit(12))
             .itemOutputs(ItemList.RC_Rebar.get(64L))
             .duration(10 * SECONDS)
             .eut(200)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 4L),
-                GT_Utility.getIntegratedCircuit(12))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 4L),
+                GTUtility.getIntegratedCircuit(12))
             .itemOutputs(ItemList.RC_Rebar.get(64L))
             .duration(10 * SECONDS)
             .eut(200)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmium, 2L),
-                GT_Utility.getIntegratedCircuit(12))
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Osmium, 2L),
+                GTUtility.getIntegratedCircuit(12))
             .itemOutputs(ItemList.RC_Rebar.get(64L))
             .duration(10 * SECONDS)
             .eut(200)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.IC2_Mixed_Metal_Ingot.get(1L), GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Advanced, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.IC2_Mixed_Metal_Ingot.get(1L), GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Advanced, 1L))
             .duration(5 * SECONDS)
             .eut(8)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 2L),
-                GT_Utility.getIntegratedCircuit(12))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 2L),
+                GTUtility.getIntegratedCircuit(12))
             .itemOutputs(ItemList.Cell_Empty.get(1L))
             .duration(10 * SECONDS)
             .eut(8)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L),
-                GT_Utility.getIntegratedCircuit(12))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L),
+                GTUtility.getIntegratedCircuit(12))
             .itemOutputs(ItemList.Cell_Empty.get(1L))
             .duration(5 * SECONDS)
             .eut(8)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L),
-                GT_Utility.getIntegratedCircuit(12))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L),
+                GTUtility.getIntegratedCircuit(12))
             .itemOutputs(ItemList.Cell_Empty.get(4L))
             .duration(5 * SECONDS)
             .eut(8)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 3L),
-                GT_Utility.getIntegratedCircuit(12))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 3L),
+                GTUtility.getIntegratedCircuit(12))
             .itemOutputs(new ItemStack(Items.bucket, 1, 0))
             .duration(10 * SECONDS)
             .eut(4)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 3L),
-                GT_Utility.getIntegratedCircuit(12))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 3L),
+                GTUtility.getIntegratedCircuit(12))
             .itemOutputs(new ItemStack(Items.bucket, 1, 0))
             .duration(10 * SECONDS)
             .eut(4)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Iron, 2L),
-                GT_Utility.getIntegratedCircuit(2))
-            .itemOutputs(GT_ModHandler.getIC2Item("fuelRod", 1L))
+                GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Iron, 2L),
+                GTUtility.getIntegratedCircuit(2))
+            .itemOutputs(GTModHandler.getIC2Item("fuelRod", 1L))
             .duration(5 * SECONDS)
             .eut(8)
             .addTo(benderRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(MyMaterial.tairitsu.get(OrePrefixes.ingot, 9), GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(MyMaterial.tairitsu.get(OrePrefixes.plateDense, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GGMaterial.tairitsu.get(OrePrefixes.ingot, 9), GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GGMaterial.tairitsu.get(OrePrefixes.plateDense, 1))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_ZPM)
             .addTo(benderRecipes);
 
-        if (GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 1L) != null) {
-            GT_Values.RA.stdBuilder()
+        if (GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 1L) != null) {
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 1L),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 1L),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.IC2_Food_Can_Empty.get(1L))
                 .duration(20 * TICKS)
                 .eut((int) TierEU.RECIPE_HV)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java
index 84833c933d..478b6f1514 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java
@@ -2,28 +2,27 @@ package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
 import static gregtech.api.recipe.RecipeMaps.primitiveBlastRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.ADDITIVE_AMOUNT;
-import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.ADDITIVE_AMOUNT;
+import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
+import bartworks.system.material.WerkstoffLoader;
+import gregtech.GTMod;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsKevlar;
 import gregtech.api.enums.MaterialsUEVplus;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class BlastFurnaceRecipes implements Runnable {
 
@@ -34,7 +33,7 @@ public class BlastFurnaceRecipes implements Runnable {
     }
 
     public void registerBlastFurnaceRecipes() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Gypsum.getDust(8))
             .itemOutputs(Materials.Quicklime.getDust(1))
             .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1500))
@@ -45,9 +44,9 @@ public class BlastFurnaceRecipes implements Runnable {
 
         // Carbothermic Reduction
         // Depend on real amount except real ores
-        int outputIngotAmount = GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre ? 2 : 3;
+        int outputIngotAmount = GTMod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre ? 2 : 3;
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.RoastedCopper.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Copper.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
             .outputChances(10000, 2222)
@@ -57,7 +56,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.RoastedAntimony.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Antimony.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
             .outputChances(10000, 2222)
@@ -67,7 +66,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.RoastedIron.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
             .outputChances(10000, 2222)
@@ -77,7 +76,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.RoastedNickel.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Nickel.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
             .outputChances(10000, 2222)
@@ -87,7 +86,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.RoastedZinc.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Zinc.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
             .outputChances(10000, 2222)
@@ -97,7 +96,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.RoastedCobalt.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Cobalt.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
             .outputChances(10000, 2222)
@@ -107,7 +106,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.RoastedArsenic.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Arsenic.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
             .outputChances(10000, 2222)
@@ -117,7 +116,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.RoastedLead.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Lead.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
             .outputChances(10000, 2222)
@@ -127,7 +126,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Malachite.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Copper.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
             .outputChances(10000, 2222)
@@ -137,7 +136,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.BandedIron.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2))
             .fluidOutputs(Materials.CarbonDioxide.getGas(1000))
@@ -146,7 +145,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Magnetite.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
             .outputChances(10000, 2222)
@@ -156,7 +155,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.YellowLimonite.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
             .outputChances(10000, 2222)
@@ -166,7 +165,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.BrownLimonite.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
             .outputChances(10000, 2222)
@@ -176,7 +175,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.BasalticMineralSand.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
             .outputChances(10000, 2222)
@@ -186,7 +185,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.GraniticMineralSand.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
             .outputChances(10000, 2222)
@@ -196,7 +195,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Cassiterite.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Tin.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
             .outputChances(10000, 2222)
@@ -206,7 +205,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.CassiteriteSand.getDust(2), Materials.Carbon.getDust(1))
             .itemOutputs(Materials.Tin.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
             .outputChances(10000, 2222)
@@ -216,7 +215,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SiliconDioxide.getDust(3), Materials.Carbon.getDust(2))
             .itemOutputs(Materials.Silicon.getIngots(1), Materials.Ash.getDust(1))
             .outputChances(10000, 1111)
@@ -226,8 +225,8 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        if (GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) {
-            GT_Values.RA.stdBuilder()
+        if (GTMod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) {
+            GTValues.RA.stdBuilder()
                 .itemInputs(Materials.CupricOxide.getDust(2), Materials.Carbon.getDustSmall(4))
                 .itemOutputs(Materials.Copper.getIngots(1), Materials.Ash.getDust(1))
                 .outputChances(10000, 2222)
@@ -237,7 +236,7 @@ public class BlastFurnaceRecipes implements Runnable {
                 .metadata(COIL_HEAT, 1200)
                 .addTo(blastFurnaceRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(Materials.Malachite.getDust(2), Materials.Carbon.getDustSmall(4))
                 .itemOutputs(Materials.Copper.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
                 .outputChances(10000, 2222)
@@ -247,7 +246,7 @@ public class BlastFurnaceRecipes implements Runnable {
                 .metadata(COIL_HEAT, 1200)
                 .addTo(blastFurnaceRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(Materials.AntimonyTrioxide.getDust(5), Materials.Carbon.getDustSmall(4))
                 .itemOutputs(Materials.Antimony.getIngots(2), Materials.Ash.getDust(1))
                 .outputChances(10000, 2222)
@@ -257,7 +256,7 @@ public class BlastFurnaceRecipes implements Runnable {
                 .metadata(COIL_HEAT, 1200)
                 .addTo(blastFurnaceRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(Materials.BandedIron.getDust(5), Materials.Carbon.getDustSmall(4))
                 .itemOutputs(Materials.Iron.getIngots(2), Materials.Ash.getDust(1))
                 .outputChances(10000, 2222)
@@ -267,7 +266,7 @@ public class BlastFurnaceRecipes implements Runnable {
                 .metadata(COIL_HEAT, 1200)
                 .addTo(blastFurnaceRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(Materials.Magnetite.getDust(2), Materials.Carbon.getDustSmall(4))
                 .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
                 .outputChances(10000, 2222)
@@ -277,7 +276,7 @@ public class BlastFurnaceRecipes implements Runnable {
                 .metadata(COIL_HEAT, 1200)
                 .addTo(blastFurnaceRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(Materials.YellowLimonite.getDust(2), Materials.Carbon.getDustSmall(4))
                 .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
                 .outputChances(10000, 2222)
@@ -287,7 +286,7 @@ public class BlastFurnaceRecipes implements Runnable {
                 .metadata(COIL_HEAT, 1200)
                 .addTo(blastFurnaceRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(Materials.BrownLimonite.getDust(2), Materials.Carbon.getDustSmall(4))
                 .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
                 .outputChances(10000, 2222)
@@ -297,7 +296,7 @@ public class BlastFurnaceRecipes implements Runnable {
                 .metadata(COIL_HEAT, 1200)
                 .addTo(blastFurnaceRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(Materials.BasalticMineralSand.getDust(2), Materials.Carbon.getDustSmall(4))
                 .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
                 .outputChances(10000, 2222)
@@ -307,7 +306,7 @@ public class BlastFurnaceRecipes implements Runnable {
                 .metadata(COIL_HEAT, 1200)
                 .addTo(blastFurnaceRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(Materials.GraniticMineralSand.getDust(2), Materials.Carbon.getDustSmall(4))
                 .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
                 .outputChances(10000, 2222)
@@ -317,7 +316,7 @@ public class BlastFurnaceRecipes implements Runnable {
                 .metadata(COIL_HEAT, 1200)
                 .addTo(blastFurnaceRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(Materials.Cassiterite.getDust(2), Materials.Carbon.getDustSmall(4))
                 .itemOutputs(Materials.Tin.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
                 .outputChances(10000, 2222)
@@ -327,7 +326,7 @@ public class BlastFurnaceRecipes implements Runnable {
                 .metadata(COIL_HEAT, 1200)
                 .addTo(blastFurnaceRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(Materials.CassiteriteSand.getDust(2), Materials.Carbon.getDustSmall(4))
                 .itemOutputs(Materials.Tin.getIngots(outputIngotAmount), Materials.Ash.getDust(1))
                 .outputChances(10000, 2222)
@@ -337,7 +336,7 @@ public class BlastFurnaceRecipes implements Runnable {
                 .metadata(COIL_HEAT, 1200)
                 .addTo(blastFurnaceRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(Materials.Garnierite.getDust(2), Materials.Carbon.getDustSmall(4))
                 .itemOutputs(Materials.Nickel.getIngots(1), Materials.Ash.getDust(1))
                 .outputChances(10000, 2222)
@@ -347,7 +346,7 @@ public class BlastFurnaceRecipes implements Runnable {
                 .metadata(COIL_HEAT, 1200)
                 .addTo(blastFurnaceRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(Materials.CobaltOxide.getDust(2), Materials.Carbon.getDustSmall(4))
                 .itemOutputs(Materials.Cobalt.getIngots(1), Materials.Ash.getDust(1))
                 .outputChances(10000, 2222)
@@ -357,7 +356,7 @@ public class BlastFurnaceRecipes implements Runnable {
                 .metadata(COIL_HEAT, 1200)
                 .addTo(blastFurnaceRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(Materials.ArsenicTrioxide.getDust(5), Materials.Carbon.getDustSmall(4))
                 .itemOutputs(Materials.Arsenic.getIngots(2), Materials.Ash.getDust(1))
                 .outputChances(10000, 2222)
@@ -367,7 +366,7 @@ public class BlastFurnaceRecipes implements Runnable {
                 .metadata(COIL_HEAT, 1200)
                 .addTo(blastFurnaceRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(Materials.Massicot.getDust(2), Materials.Carbon.getDustSmall(4))
                 .itemOutputs(Materials.Lead.getIngots(1), Materials.Ash.getDust(1))
                 .outputChances(10000, 2222)
@@ -378,23 +377,23 @@ public class BlastFurnaceRecipes implements Runnable {
                 .addTo(blastFurnaceRecipes);
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 32),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 32),
                 ItemList.GalliumArsenideCrystalSmallPart.get(1),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.Circuit_Silicon_Ingot.get(1))
             .duration(7 * MINUTES + 30 * SECONDS)
             .eut((int) TierEU.RECIPE_MV)
             .metadata(COIL_HEAT, 1784)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 64),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 64),
                 ItemList.GalliumArsenideCrystalSmallPart.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 8),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 8),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Circuit_Silicon_Ingot2.get(1))
             .fluidInputs(Materials.Nitrogen.getGas(8000))
             .duration(10 * MINUTES)
@@ -402,12 +401,12 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 2484)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 16),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 16),
                 ItemList.GalliumArsenideCrystal.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Circuit_Silicon_Ingot3.get(1))
             .fluidInputs(Materials.Argon.getGas(8000))
             .duration(12 * MINUTES + 30 * SECONDS)
@@ -415,12 +414,12 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 4484)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 32),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 32),
                 ItemList.GalliumArsenideCrystal.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Europium, 2),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Europium, 2),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Circuit_Silicon_Ingot4.get(1))
             .fluidInputs(Materials.Radon.getGas(8000))
             .duration(15 * MINUTES)
@@ -428,12 +427,12 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 6484)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 64),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 64),
                 ItemList.GalliumArsenideCrystal.get(4),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Americium, 4),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Americium, 4),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Circuit_Silicon_Ingot5.get(1))
             .fluidInputs(Materials.Radon.getGas(16000))
             .duration(17 * MINUTES + 30 * SECONDS)
@@ -443,32 +442,32 @@ public class BlastFurnaceRecipes implements Runnable {
 
         // CaH2 + 2Si = CaSi2 + 2H
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calciumhydride, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CalciumDisilicide, 3))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calciumhydride, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.CalciumDisilicide, 3))
             .fluidOutputs(Materials.Hydrogen.getGas(2000))
             .duration(15 * SECONDS)
             .eut((int) TierEU.RECIPE_MV)
             .metadata(COIL_HEAT, 1273)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUEVBase, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUEVBase, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUEVBase, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUEVBase, 1))
             .duration(16 * MINUTES + 23 * SECONDS)
             .eut((int) TierEU.RECIPE_UV)
             .metadata(COIL_HEAT, 11800)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUEVBase, 1),
-                GT_Utility.getIntegratedCircuit(11))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUEVBase, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUEVBase, 1),
+                GTUtility.getIntegratedCircuit(11))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUEVBase, 1))
             .fluidInputs(Materials.Radon.getGas(1000))
             .duration(7 * MINUTES + 22 * SECONDS + 7 * TICKS)
             .eut((int) TierEU.RECIPE_UV)
@@ -477,21 +476,21 @@ public class BlastFurnaceRecipes implements Runnable {
 
         // 0.45 * 19660 = 8847
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUIVBase, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUIVBase, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1))
             .duration(16 * MINUTES + 23 * SECONDS)
             .eut((int) TierEU.RECIPE_UHV)
             .metadata(COIL_HEAT, 12700)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUIVBase, 1),
-                GT_Utility.getIntegratedCircuit(11))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUIVBase, 1),
+                GTUtility.getIntegratedCircuit(11))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1))
             .fluidInputs(Materials.Radon.getGas(1000))
             .duration(7 * MINUTES + 22 * SECONDS + 7 * TICKS)
             .eut((int) TierEU.RECIPE_UHV)
@@ -500,21 +499,21 @@ public class BlastFurnaceRecipes implements Runnable {
 
         // 0.45 * 19660 = 8847
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUMVBase, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUMVBase, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1))
             .duration(16 * MINUTES + 23 * SECONDS)
             .eut((int) TierEU.RECIPE_UEV)
             .metadata(COIL_HEAT, 13600)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUMVBase, 1),
-                GT_Utility.getIntegratedCircuit(11))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUMVBase, 1),
+                GTUtility.getIntegratedCircuit(11))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1))
             .fluidInputs(Materials.Radon.getGas(1000))
             .duration(7 * MINUTES + 22 * SECONDS + 7 * TICKS)
             .eut((int) TierEU.RECIPE_UEV)
@@ -524,7 +523,7 @@ public class BlastFurnaceRecipes implements Runnable {
         // 0.45 * 19660 = 8847
         // CaO + 3C = CaC2 + CO
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Quicklime.getDust(2), Materials.Carbon.getDust(3))
             .itemOutputs(MaterialsKevlar.CalciumCarbide.getDust(3))
             .fluidOutputs(Materials.CarbonMonoxide.getGas(1000))
@@ -535,7 +534,7 @@ public class BlastFurnaceRecipes implements Runnable {
 
         // Ni + 3Al = NiAl3
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Nickel.getDust(1), Materials.Aluminium.getDust(3))
             .itemOutputs(MaterialsKevlar.NickelAluminide.getIngots(4))
             .duration(45 * SECONDS)
@@ -549,7 +548,7 @@ public class BlastFurnaceRecipes implements Runnable {
         // Roasting
 
         for (ItemStack silicon : tSiliconDioxide) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(Materials.Chalcopyrite.getDust(1), silicon)
                 .itemOutputs(Materials.RoastedCopper.getDust(1), Materials.Ferrosilite.getDust(5))
                 .fluidInputs(Materials.Oxygen.getGas(3000))
@@ -560,7 +559,7 @@ public class BlastFurnaceRecipes implements Runnable {
                 .addTo(blastFurnaceRecipes);
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Tetrahedrite.getDust(1))
             .itemOutputs(Materials.RoastedCopper.getDust(1), Materials.RoastedAntimony.getDustTiny(3))
             .fluidInputs(Materials.Oxygen.getGas(3000))
@@ -569,7 +568,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Pyrite.getDust(1))
             .itemOutputs(Materials.RoastedIron.getDust(1), Materials.Ash.getDust(1))
             .outputChances(10000, 1111)
@@ -579,7 +578,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Pentlandite.getDust(1))
             .itemOutputs(Materials.RoastedNickel.getDust(1), Materials.Ash.getDust(1))
             .outputChances(10000, 1111)
@@ -589,7 +588,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Sphalerite.getDust(1))
             .itemOutputs(Materials.RoastedZinc.getDust(1), Materials.Ash.getDust(1))
             .outputChances(10000, 1111)
@@ -599,7 +598,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Cobaltite.getDust(1))
             .itemOutputs(Materials.RoastedCobalt.getDust(1), Materials.RoastedArsenic.getDust(1))
             .fluidInputs(Materials.Oxygen.getGas(3000))
@@ -608,7 +607,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Stibnite.getDust(1))
             .itemOutputs(Materials.RoastedAntimony.getDust(1), Materials.Ash.getDust(1))
             .outputChances(10000, 1111)
@@ -618,7 +617,7 @@ public class BlastFurnaceRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Galena.getDust(1))
             .itemOutputs(Materials.RoastedLead.getDust(1), Materials.Ash.getDust(1))
             .outputChances(10000, 1111)
@@ -629,9 +628,9 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(MaterialsUEVplus.TranscendentMetal.getDust(1), GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.TranscendentMetal, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(MaterialsUEVplus.TranscendentMetal.getDust(1), GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.TranscendentMetal, 1))
             .fluidInputs(Materials.Tungsten.getMolten(144))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 72))
             .duration(3 * MINUTES)
@@ -641,10 +640,10 @@ public class BlastFurnaceRecipes implements Runnable {
 
         // Rh + 3Cl = RhCl3
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(WerkstoffLoader.items.get(OrePrefixes.dust), 1, 78),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(MaterialsKevlar.RhodiumChloride.getDust(4))
             .fluidInputs(Materials.Chlorine.getGas(3000))
             .duration(30 * SECONDS)
@@ -652,12 +651,12 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 573)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Phononic_Seed_Crystal.get(1),
                 MaterialsUEVplus.SixPhasedCopper.getNanite(1),
                 Materials.Dilithium.getDust(16),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .fluidInputs(MaterialsUEVplus.Mellion.getMolten(128 * 144L))
             .fluidOutputs(MaterialsUEVplus.PhononCrystalSolution.getFluid(1000))
             .duration(300 * SECONDS)
@@ -665,9 +664,9 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 17000)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(MaterialsUEVplus.Mellion.getDust(1), GT_Utility.getIntegratedCircuit(11))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.Mellion, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(MaterialsUEVplus.Mellion.getDust(1), GTUtility.getIntegratedCircuit(11))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.Mellion, 1))
             .fluidInputs(Materials.Radon.getGas(1000))
             .duration(50 * SECONDS)
             .eut((int) TierEU.RECIPE_UXV)
@@ -676,28 +675,28 @@ public class BlastFurnaceRecipes implements Runnable {
     }
 
     public void registerPrimitiveBlastFurnaceRecipes() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Iron.getIngots(1))
             .itemOutputs(Materials.Steel.getIngots(1))
             .duration(6 * MINUTES)
             .metadata(ADDITIVE_AMOUNT, 4)
             .addTo(primitiveBlastRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Iron.getDust(1))
             .itemOutputs(Materials.Steel.getIngots(1))
             .duration(6 * MINUTES)
             .metadata(ADDITIVE_AMOUNT, 4)
             .addTo(primitiveBlastRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Iron.getBlocks(1))
             .itemOutputs(Materials.Steel.getIngots(9))
             .duration(54 * MINUTES)
             .metadata(ADDITIVE_AMOUNT, 36)
             .addTo(primitiveBlastRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Steel.getDust(1))
             .itemOutputs(Materials.Steel.getIngots(1))
             .duration(6 * MINUTES)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java
index 7538b50c6c..8e4fb0bc58 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java
@@ -3,9 +3,9 @@ package gregtech.loaders.postload.recipes;
 import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Mods.IndustrialCraft2;
 import static gregtech.api.recipe.RecipeMaps.brewingRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 import static net.minecraftforge.fluids.FluidRegistry.getFluidStack;
 
 import net.minecraft.init.Blocks;
@@ -15,25 +15,25 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-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.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 BreweryRecipes implements Runnable {
 
     @Override
     public void run() {
-        ItemStack[] brewingItems = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Talc, 1L),
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 1L),
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L) };
+        ItemStack[] brewingItems = new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Talc, 1L),
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 1L),
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L) };
 
         for (ItemStack item : brewingItems) {
             // creosote to lubricant recipes
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(item)
                 .fluidInputs(getFluidStack("creosote", 750))
                 .fluidOutputs(getFluidStack("lubricant", 750))
@@ -42,7 +42,7 @@ public class BreweryRecipes implements Runnable {
                 .addTo(brewingRecipes);
 
             // seed oil to lubricant recipes
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(item)
                 .fluidInputs(getFluidStack("seedoil", 750))
                 .fluidOutputs(getFluidStack("lubricant", 750))
@@ -52,7 +52,7 @@ public class BreweryRecipes implements Runnable {
 
             // lubricant recipes
             {
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(item)
                     .fluidInputs(getFluidStack("oil", 750))
                     .fluidOutputs(getFluidStack("lubricant", 750))
@@ -60,7 +60,7 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(item)
                     .fluidInputs(getFluidStack("liquid_light_oil", 750))
                     .fluidOutputs(getFluidStack("lubricant", 500))
@@ -68,7 +68,7 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(item)
                     .fluidInputs(getFluidStack("liquid_medium_oil", 750))
                     .fluidOutputs(getFluidStack("lubricant", 500))
@@ -76,7 +76,7 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(item)
                     .fluidInputs(getFluidStack("liquid_heavy_oil", 500))
                     .fluidOutputs(getFluidStack("lubricant", 750))
@@ -95,93 +95,93 @@ public class BreweryRecipes implements Runnable {
              * loading twice.
              */
             if (IndustrialCraft2.isModLoaded()) {
-                waterArray = new Fluid[] { FluidRegistry.WATER, GT_ModHandler.getDistilledWater(1L)
+                waterArray = new Fluid[] { FluidRegistry.WATER, GTModHandler.getDistilledWater(1L)
                     .getFluid() };
             } else {
                 waterArray = new Fluid[] { FluidRegistry.WATER };
             }
             for (Fluid tFluid : waterArray) {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Milk, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Milk, 1L))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("milk", 750))
                     .duration(6 * SECONDS + 8 * TICKS)
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.wheatyjuice", 750))
                     .duration(6 * SECONDS + 8 * TICKS)
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.mineralwater", 750))
                     .duration(6 * SECONDS + 8 * TICKS)
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.mineralwater", 750))
                     .duration(6 * SECONDS + 8 * TICKS)
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.mineralwater", 750))
                     .duration(6 * SECONDS + 8 * TICKS)
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 1L))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.mineralwater", 750))
                     .duration(6 * SECONDS + 8 * TICKS)
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.thick", 750))
                     .duration(6 * SECONDS + 8 * TICKS)
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.mundane", 750))
                     .duration(6 * SECONDS + 8 * TICKS)
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.mundane", 750))
                     .duration(6 * SECONDS + 8 * TICKS)
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1L))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.mundane", 750))
                     .duration(6 * SECONDS + 8 * TICKS)
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(new ItemStack(Items.magma_cream, 1, 0))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.mundane", 750))
@@ -189,7 +189,7 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(new ItemStack(Items.fermented_spider_eye, 1, 0))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.mundane", 750))
@@ -197,7 +197,7 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(new ItemStack(Items.spider_eye, 1, 0))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.mundane", 750))
@@ -205,7 +205,7 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(new ItemStack(Items.speckled_melon, 1, 0))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.mundane", 750))
@@ -213,7 +213,7 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(new ItemStack(Items.ghast_tear, 1, 0))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.mundane", 750))
@@ -221,7 +221,7 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(new ItemStack(Items.nether_wart, 1, 0))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.awkward", 750))
@@ -229,7 +229,7 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(new ItemStack(Blocks.red_mushroom, 1, 0))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.poison", 750))
@@ -237,7 +237,7 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(new ItemStack(Items.fish, 1, 3))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.poison.strong", 750))
@@ -245,7 +245,7 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(ItemList.IC2_Grin_Powder.get(1L))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.poison.strong", 750))
@@ -253,7 +253,7 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(new ItemStack(Items.reeds, 1, 0))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.reedwater", 750))
@@ -261,7 +261,7 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(new ItemStack(Items.apple, 1, 0))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.applejuice", 750))
@@ -269,7 +269,7 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(new ItemStack(Items.golden_apple, 1, 0))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.goldenapplejuice", 750))
@@ -277,7 +277,7 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(new ItemStack(Items.golden_apple, 1, 1))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.idunsapplejuice", 750))
@@ -285,7 +285,7 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(ItemList.IC2_Hops.get(1L))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.hopsjuice", 750))
@@ -293,16 +293,16 @@ public class BreweryRecipes implements Runnable {
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.darkcoffee", 750))
                     .duration(6 * SECONDS + 8 * TICKS)
                     .eut(4)
                     .addTo(brewingRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L))
                     .fluidInputs(new FluidStack(tFluid, 750))
                     .fluidOutputs(getFluidStack("potion.chillysauce", 750))
                     .duration(6 * SECONDS + 8 * TICKS)
@@ -314,47 +314,47 @@ public class BreweryRecipes implements Runnable {
 
         // potion brewing 1
         {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L))
                 .fluidInputs(getFluidStack("potion.chillysauce", 750))
                 .fluidOutputs(getFluidStack("potion.hotsauce", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L))
                 .fluidInputs(getFluidStack("potion.hotsauce", 750))
                 .fluidOutputs(getFluidStack("potion.diabolosauce", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L))
                 .fluidInputs(getFluidStack("potion.diabolosauce", 750))
                 .fluidOutputs(getFluidStack("potion.diablosauce", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L))
                 .fluidInputs(getFluidStack("milk", 750))
                 .fluidOutputs(getFluidStack("potion.coffee", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L))
                 .fluidInputs(getFluidStack("milk", 750))
                 .fluidOutputs(getFluidStack("potion.darkchocolatemilk", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.IC2_Hops.get(1L))
                 .fluidInputs(getFluidStack("potion.wheatyjuice", 750))
                 .fluidOutputs(getFluidStack("potion.wheatyhopsjuice", 750))
@@ -362,87 +362,87 @@ public class BreweryRecipes implements Runnable {
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L))
                 .fluidInputs(getFluidStack("potion.hopsjuice", 750))
                 .fluidOutputs(getFluidStack("potion.wheatyhopsjuice", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
                 .fluidInputs(getFluidStack("potion.tea", 750))
                 .fluidOutputs(getFluidStack("potion.sweettea", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
                 .fluidInputs(getFluidStack("potion.coffee", 750))
                 .fluidOutputs(getFluidStack("potion.cafeaulait", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
                 .fluidInputs(getFluidStack("potion.cafeaulait", 750))
                 .fluidOutputs(getFluidStack("potion.laitaucafe", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
                 .fluidInputs(getFluidStack("potion.lemonjuice", 750))
                 .fluidOutputs(getFluidStack("potion.lemonade", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
                 .fluidInputs(getFluidStack("potion.darkcoffee", 750))
                 .fluidOutputs(getFluidStack("potion.darkcafeaulait", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
                 .fluidInputs(getFluidStack("potion.darkchocolatemilk", 750))
                 .fluidOutputs(getFluidStack("potion.chocolatemilk", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L))
                 .fluidInputs(getFluidStack("potion.tea", 750))
                 .fluidOutputs(getFluidStack("potion.icetea", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1L))
                 .fluidInputs(getFluidStack("potion.lemonade", 750))
                 .fluidOutputs(getFluidStack("potion.cavejohnsonsgrenadejuice", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
                 .fluidInputs(getFluidStack("potion.mundane", 750))
                 .fluidOutputs(getFluidStack("potion.purpledrink", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(new ItemStack(Items.fermented_spider_eye, 1, 0))
                 .fluidInputs(getFluidStack("potion.mundane", 750))
                 .fluidOutputs(getFluidStack("potion.weakness", 750))
@@ -450,7 +450,7 @@ public class BreweryRecipes implements Runnable {
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(new ItemStack(Items.fermented_spider_eye, 1, 0))
                 .fluidInputs(getFluidStack("potion.thick", 750))
                 .fluidOutputs(getFluidStack("potion.weakness", 750))
@@ -461,23 +461,23 @@ public class BreweryRecipes implements Runnable {
 
         // biomass recipes
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Forestry.ID, "fertilizerBio", 4L, 0))
-                .fluidInputs(GT_ModHandler.getWater(750L))
+                .fluidInputs(GTModHandler.getWater(750L))
                 .fluidOutputs(getFluidStack("biomass", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Forestry.ID, "mulch", 16L, 0))
-                .fluidInputs(GT_ModHandler.getDistilledWater(750L))
+                .fluidInputs(GTModHandler.getDistilledWater(750L))
                 .fluidOutputs(getFluidStack("biomass", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(4)
                 .addTo(brewingRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Forestry.ID, "mulch", 8L, 0))
                 .fluidInputs(getFluidStack("juice", 500))
                 .fluidOutputs(getFluidStack("biomass", 750))
@@ -488,9 +488,9 @@ public class BreweryRecipes implements Runnable {
 
         // ic2 biomass recipes
         {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_ModHandler.getIC2Item("biochaff", 1))
-                .fluidInputs(GT_ModHandler.getWater(1000L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTModHandler.getIC2Item("biochaff", 1))
+                .fluidInputs(GTModHandler.getWater(1000L))
                 .fluidOutputs(getFluidStack("ic2biomass", 1000))
                 .duration(8 * SECONDS + 10 * TICKS)
                 .eut(4)
@@ -498,9 +498,9 @@ public class BreweryRecipes implements Runnable {
 
             // Would add 2 different amount of water input if IC2 isn't loaded
             if (IndustrialCraft2.isModLoaded()) {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_ModHandler.getIC2Item("biochaff", 1))
-                    .fluidInputs(GT_ModHandler.getDistilledWater(500L))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTModHandler.getIC2Item("biochaff", 1))
+                    .fluidInputs(GTModHandler.getDistilledWater(500L))
                     .fluidOutputs(getFluidStack("ic2biomass", 1000))
                     .duration(10 * TICKS)
                     .eut((int) TierEU.RECIPE_LV)
@@ -517,14 +517,14 @@ public class BreweryRecipes implements Runnable {
             this.addPotionRecipes("poison", new ItemStack(Items.spider_eye, 1, 0));
             this.addPotionRecipes("health", new ItemStack(Items.speckled_melon, 1, 0));
             this.addPotionRecipes("regen", new ItemStack(Items.ghast_tear, 1, 0));
-            this.addPotionRecipes("speed", GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L));
-            this.addPotionRecipes("strength", GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1L));
+            this.addPotionRecipes("speed", GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L));
+            this.addPotionRecipes("strength", GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1L));
         }
     }
 
     public void addPotionRecipes(String aName, ItemStack aItem) {
         // normal
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(aItem)
             .fluidInputs(getFluidStack("potion.awkward", 750))
             .fluidOutputs(getFluidStack("potion." + aName, 750))
@@ -537,7 +537,7 @@ public class BreweryRecipes implements Runnable {
             || aName.equals("health")
             || aName.equals("strength")
             || aName.equals("poison")) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(aItem)
                 .fluidInputs(getFluidStack("potion.thick", 750))
                 .fluidOutputs(getFluidStack("potion." + aName + ".strong", 750))
@@ -548,8 +548,8 @@ public class BreweryRecipes implements Runnable {
 
         // long
         if (!aName.equals("health")) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L))
                 .fluidInputs(getFluidStack("potion." + aName, 750))
                 .fluidOutputs(getFluidStack("potion." + aName + ".long", 750))
                 .duration(6 * SECONDS + 8 * TICKS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java
index c9e8e631bf..7707b985d6 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java
@@ -2,90 +2,90 @@ package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.Mods.IndustrialCraft2;
 import static gregtech.api.recipe.RecipeMaps.cannerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
-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.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 CannerRecipes implements Runnable {
 
     @Override
     public void run() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 2L),
                 ItemList.Battery_Hull_LV.get(1L))
             .itemOutputs(ItemList.Battery_RE_LV_Cadmium.get(1L))
             .duration(5 * SECONDS)
             .eut(2)
             .addTo(cannerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 2L),
                 ItemList.Battery_Hull_LV.get(1L))
             .itemOutputs(ItemList.Battery_RE_LV_Lithium.get(1L))
             .duration(5 * SECONDS)
             .eut(2)
             .addTo(cannerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 2L),
                 ItemList.Battery_Hull_LV.get(1L))
             .itemOutputs(ItemList.Battery_RE_LV_Sodium.get(1L))
             .duration(5 * SECONDS)
             .eut(2)
             .addTo(cannerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 8L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 8L),
                 ItemList.Battery_Hull_MV.get(1L))
             .itemOutputs(ItemList.Battery_RE_MV_Cadmium.get(1L))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(cannerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 8L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 8L),
                 ItemList.Battery_Hull_MV.get(1L))
             .itemOutputs(ItemList.Battery_RE_MV_Lithium.get(1L))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(cannerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 8L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 8L),
                 ItemList.Battery_Hull_MV.get(1L))
             .itemOutputs(ItemList.Battery_RE_MV_Sodium.get(1L))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(cannerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 32L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 32L),
                 ItemList.Battery_Hull_HV.get(1L))
             .itemOutputs(ItemList.Battery_RE_HV_Cadmium.get(1L))
             .duration(1 * MINUTES + 20 * SECONDS)
             .eut(2)
             .addTo(cannerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 32L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 32L),
                 ItemList.Battery_Hull_HV.get(1L))
             .itemOutputs(ItemList.Battery_RE_HV_Lithium.get(1L))
             .duration(1 * MINUTES + 20 * SECONDS)
             .eut(2)
             .addTo(cannerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 32L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 32L),
                 ItemList.Battery_Hull_HV.get(1L))
             .itemOutputs(ItemList.Battery_RE_HV_Sodium.get(1L))
             .duration(1 * MINUTES + 20 * SECONDS)
@@ -94,9 +94,9 @@ public class CannerRecipes implements Runnable {
         // Recipes to actually fill the empty hulls with content
         // IV 2048
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 4L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 4L),
                 ItemList.BatteryHull_EV.get(1L))
             .itemOutputs(ItemList.BatteryHull_EV_Full.get(1L))
             .duration(5 * SECONDS)
@@ -104,9 +104,9 @@ public class CannerRecipes implements Runnable {
             .addTo(cannerRecipes);
         // EV 8192
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 16L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 16L),
                 ItemList.BatteryHull_IV.get(1L))
             .itemOutputs(ItemList.BatteryHull_IV_Full.get(1L))
             .duration(7 * SECONDS + 10 * TICKS)
@@ -114,9 +114,9 @@ public class CannerRecipes implements Runnable {
             .addTo(cannerRecipes);
         // LuV 32768
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 32L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 32L),
                 ItemList.BatteryHull_LuV.get(1L))
             .itemOutputs(ItemList.BatteryHull_LuV_Full.get(1L))
             .duration(10 * SECONDS)
@@ -124,9 +124,9 @@ public class CannerRecipes implements Runnable {
             .addTo(cannerRecipes);
         // ZPM 131072
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 16L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 16L),
                 ItemList.BatteryHull_ZPM.get(1L))
             .itemOutputs(ItemList.BatteryHull_ZPM_Full.get(1L))
             .duration(12 * SECONDS + 10 * TICKS)
@@ -134,9 +134,9 @@ public class CannerRecipes implements Runnable {
             .addTo(cannerRecipes);
         // UV 524288
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 32L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 32L),
                 ItemList.BatteryHull_UV.get(1L))
             .itemOutputs(ItemList.BatteryHull_UV_Full.get(1L))
             .duration(15 * SECONDS)
@@ -144,9 +144,9 @@ public class CannerRecipes implements Runnable {
             .addTo(cannerRecipes);
         // UHV 2097152
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 16L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 16L),
                 ItemList.BatteryHull_UHV.get(1L))
             .itemOutputs(ItemList.BatteryHull_UHV_Full.get(1L))
             .duration(17 * SECONDS + 10 * TICKS)
@@ -154,9 +154,9 @@ public class CannerRecipes implements Runnable {
             .addTo(cannerRecipes);
         // UEV 8388608
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 32L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 32L),
                 ItemList.BatteryHull_UEV.get(1L))
             .itemOutputs(ItemList.BatteryHull_UEV_Full.get(1L))
             .duration(20 * SECONDS)
@@ -164,9 +164,9 @@ public class CannerRecipes implements Runnable {
             .addTo(cannerRecipes);
         // UIV 33554432
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 64L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 64L),
                 ItemList.BatteryHull_UIV.get(1L))
             .itemOutputs(ItemList.BatteryHull_UIV_Full.get(1L))
             .duration(22 * SECONDS + 10 * TICKS)
@@ -174,9 +174,9 @@ public class CannerRecipes implements Runnable {
             .addTo(cannerRecipes);
         // UMV 134217728
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 4L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 4L),
                 ItemList.BatteryHull_UMV.get(1L))
             .itemOutputs(ItemList.BatteryHull_UMV_Full.get(1L))
             .duration(25 * SECONDS)
@@ -184,9 +184,9 @@ public class CannerRecipes implements Runnable {
             .addTo(cannerRecipes);
         // UxV 536870912
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 8L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 8L),
                 ItemList.BatteryHull_UxV.get(1L))
             .itemOutputs(ItemList.BatteryHull_UxV_Full.get(1L))
             .duration(30 * SECONDS)
@@ -197,52 +197,52 @@ public class CannerRecipes implements Runnable {
 
         if (IndustrialCraft2.isModLoaded()) {
             // todo: remove tiny dust in this recipe
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_ModHandler.getIC2Item("fuelRod", 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 1L))
-                .itemOutputs(GT_ModHandler.getIC2Item("reactorLithiumCell", 1, 1))
+                    GTModHandler.getIC2Item("fuelRod", 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 1L))
+                .itemOutputs(GTModHandler.getIC2Item("reactorLithiumCell", 1, 1))
                 .duration(16 * TICKS)
                 .eut(64)
                 .addTo(cannerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_ModHandler.getIC2Item("fuelRod", 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 3))
+                    GTModHandler.getIC2Item("fuelRod", 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 3))
                 .itemOutputs(ItemList.ThoriumCell_1.get(1L))
                 .duration(1 * SECONDS + 10 * TICKS)
                 .eut(16)
                 .addTo(cannerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_ModHandler.getIC2Item("fuelRod", 1), GT_ModHandler.getIC2Item("UranFuel", 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTModHandler.getIC2Item("fuelRod", 1), GTModHandler.getIC2Item("UranFuel", 1))
                 .itemOutputs(ItemList.Uraniumcell_1.get(1))
                 .duration(1 * SECONDS + 10 * TICKS)
                 .eut(16)
                 .addTo(cannerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_ModHandler.getIC2Item("fuelRod", 1), GT_ModHandler.getIC2Item("MOXFuel", 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTModHandler.getIC2Item("fuelRod", 1), GTModHandler.getIC2Item("MOXFuel", 1))
                 .itemOutputs(ItemList.Moxcell_1.get(1))
                 .duration(1 * SECONDS + 10 * TICKS)
                 .eut(16)
                 .addTo(cannerRecipes);
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Large_Fluid_Cell_TungstenSteel.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 3))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 3))
             .itemOutputs(ItemList.NaquadahCell_1.get(1L))
             .duration(1 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(cannerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Large_Fluid_Cell_TungstenSteel.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 3))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 3))
             .itemOutputs(ItemList.MNqCell_1.get(1L))
             .duration(1 * SECONDS + 10 * TICKS)
             .eut(16)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java
index c4cfca5aba..e792638307 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java
@@ -6,37 +6,37 @@ import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.enums.Mods.ThaumicTinkerer;
 import static gregtech.api.enums.Mods.TwilightForest;
 import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.loaders.misc.GT_Bees.combs;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.loaders.misc.GTBees.combs;
 import static net.minecraftforge.fluids.FluidRegistry.getFluidStack;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-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.MaterialsOreAlum;
 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.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class CentrifugeRecipes implements Runnable {
 
     @Override
     public void run() {
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedGold, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.InfusedGold, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1),
                 getModItem(Thaumcraft.ID, "ItemResource", 2L, 14))
             .outputChances(10000, 10000, 9000)
             .fluidInputs(Materials.Mercury.getFluid(200))
@@ -44,30 +44,30 @@ public class CentrifugeRecipes implements Runnable {
             .eut((int) TierEU.RECIPE_MV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Cell_Empty.get(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1))
             .fluidInputs(Materials.Air.getGas(10000))
             .fluidOutputs(Materials.Nitrogen.getGas(3900))
             .duration(1 * MINUTES + 20 * SECONDS)
             .eut(8)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 9))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 3))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 9),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 9),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 3))
             .outputChances(10000, 10000, 10000, 9500, 9000, 8500)
             .duration(6 * MINUTES + 45 * SECONDS)
             .eut(30)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemOutputs(
                 Materials.Stone.getDust(1),
                 Materials.Iron.getDust(1),
@@ -84,318 +84,314 @@ public class CentrifugeRecipes implements Runnable {
 
         // food ->CH4
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.golden_apple, 1, 1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.golden_apple, 1, 1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.gold_ingot, 64))
             .fluidOutputs(Materials.Methane.getGas(4608))
             .duration(7 * MINUTES + 40 * SECONDS + 16 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.golden_apple, 1, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.golden_apple, 1, 0), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.gold_ingot, 7))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(7 * MINUTES + 40 * SECONDS + 16 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.golden_carrot, 1, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.golden_carrot, 1, 0), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.gold_nugget, 6))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(7 * MINUTES + 40 * SECONDS + 16 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.speckled_melon, 1, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.speckled_melon, 1, 0), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.gold_nugget, 6))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(7 * MINUTES + 40 * SECONDS + 16 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.mushroom_stew, 16, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.mushroom_stew, 16, 0), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Items.bowl, 16, 0))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.apple, 32, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.apple, 32, 0), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.bread, 64, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.bread, 64, 0), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.porkchop, 12, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.porkchop, 12, 0), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.cooked_porkchop, 16, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.cooked_porkchop, 16, 0), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.beef, 12, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.beef, 12, 0), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.cooked_beef, 16, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.cooked_beef, 16, 0), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.fish, 12, 32767), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.fish, 12, 32767), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.cooked_fished, 16, 32767), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.cooked_fished, 16, 32767), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.chicken, 12, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.chicken, 12, 0), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.cooked_chicken, 16, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.cooked_chicken, 16, 0), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.melon, 64, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.melon, 64, 0), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Blocks.pumpkin, 16, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.pumpkin, 16, 0), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.rotten_flesh, 16, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.rotten_flesh, 16, 0), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.spider_eye, 32, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.spider_eye, 32, 0), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.carrot, 16, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.carrot, 16, 0), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.Food_Raw_Potato.get(16), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.Food_Raw_Potato.get(16), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.Food_Poisonous_Potato.get(12), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.Food_Poisonous_Potato.get(12), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.Food_Baked_Potato.get(24), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.Food_Baked_Potato.get(24), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.cookie, 64, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.cookie, 64, 0), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.cake, 8, 0), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.cake, 8, 0), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Blocks.brown_mushroom_block, 12, 32767), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.brown_mushroom_block, 12, 32767), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Blocks.red_mushroom_block, 12, 32767), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.red_mushroom_block, 12, 32767), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Blocks.brown_mushroom, 32, 32767), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.brown_mushroom, 32, 32767), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Blocks.red_mushroom, 32, 32767), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.red_mushroom, 32, 32767), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.nether_wart, 32, 32767), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.nether_wart, 32, 32767), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("terraWart", 16), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("terraWart", 16), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(getModItem(TwilightForest.ID, "item.meefRaw", 12L, 32767), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(getModItem(TwilightForest.ID, "item.meefRaw", 12L, 32767), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(getModItem(TwilightForest.ID, "item.meefSteak", 16L, 32767), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(getModItem(TwilightForest.ID, "item.meefSteak", 16L, 32767), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                getModItem(TwilightForest.ID, "item.venisonRaw", 12L, 32767),
-                GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(getModItem(TwilightForest.ID, "item.venisonRaw", 12L, 32767), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(TwilightForest.ID, "item.venisonCooked", 16L, 32767),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(576))
             .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1),
-                GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1), GTUtility.getIntegratedCircuit(1))
             .fluidOutputs(Materials.Methane.getGas(60))
             .duration(10 * SECONDS)
             .eut(20)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.sand, 1, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Diamond, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Diamond, 1),
                 new ItemStack(Blocks.sand, 1))
             .outputChances(5000, 100, 5000)
             .duration(30 * SECONDS)
             .eut((int) TierEU.RECIPE_MV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.dirt, 1, 32767))
             .itemOutputs(
                 ItemList.IC2_Plantball.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Clay, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Clay, 1),
                 new ItemStack(Blocks.sand, 1))
             .outputChances(1250, 5000, 5000)
             .duration(12 * SECONDS + 10 * TICKS)
             .eut(30)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.grass, 1, 32767))
             .itemOutputs(
                 ItemList.IC2_Plantball.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Clay, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Clay, 1),
                 new ItemStack(Blocks.sand, 1))
             .outputChances(2500, 5000, 5000)
             .duration(12 * SECONDS + 10 * TICKS)
             .eut(30)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.mycelium, 1, 32767))
             .itemOutputs(
                 new ItemStack(Blocks.brown_mushroom, 1),
                 new ItemStack(Blocks.red_mushroom, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Clay, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Clay, 1),
                 new ItemStack(Blocks.sand, 1))
             .outputChances(2500, 2500, 5000, 5000)
             .duration(32 * SECONDS + 10 * TICKS)
             .eut(30)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.IC2_Resin.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3),
                 ItemList.IC2_Plantball.get(1))
             .outputChances(10000, 1000)
             .fluidOutputs(Materials.Glue.getFluid(100))
@@ -403,13 +399,13 @@ public class CentrifugeRecipes implements Runnable {
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium235, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Uranium235, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1))
             .outputChances(1000, 500)
             .duration(1 * MINUTES + 40 * SECONDS)
             .eut((int) TierEU.RECIPE_HV)
@@ -417,80 +413,80 @@ public class CentrifugeRecipes implements Runnable {
 
         // Uranium Enrichment in Centrifuge by adding Fluorine (Uranium Hexafluoride)
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium235, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Uranium235, 1))
             .outputChances(10000)
             .fluidInputs(Materials.Fluorine.getGas(4000))
             .duration(3 * MINUTES + 20 * SECONDS)
             .eut((int) TierEU.RECIPE_EV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium241, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1))
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium241, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1))
             .outputChances(2000, 3000)
             .duration(1 * MINUTES + 20 * SECONDS)
             .eut(320)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 9))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1))
             .outputChances(5000, 1000)
             .duration(24 * MINUTES)
             .eut(320)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 4))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1))
             .outputChances(2000, 3000)
             .duration(21 * MINUTES + 20 * SECONDS)
             .eut(640)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Hydrogen.getGas(160))
             .fluidOutputs(Materials.Deuterium.getGas(40))
             .duration(8 * SECONDS)
             .eut(20)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Deuterium.getGas(160))
             .fluidOutputs(Materials.Tritium.getGas(40))
             .duration(8 * SECONDS)
             .eut(80)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Helium.getGas(80))
             .fluidOutputs(Materials.Helium_3.getGas(5))
             .duration(8 * SECONDS)
             .eut(80)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 2))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1))
             .duration(48 * SECONDS + 16 * TICKS)
             .eut(80)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 36))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 36))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungstate, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tungstate, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1),
                 new ItemStack(Blocks.sand, 36))
             .outputChances(3750, 2500, 9000)
             .fluidOutputs(Materials.Helium.getGas(4320))
@@ -498,20 +494,20 @@ public class CentrifugeRecipes implements Runnable {
             .eut(20)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Netherrack, 36))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Netherrack, 36))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 4),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 4),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 4),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 9),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 4),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1))
             .outputChances(5625, 9900, 5625, 2500)
             .duration(4 * MINUTES + 48 * SECONDS)
             .eut(20)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(10))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(10))
             .itemOutputs(
                 Materials.SiliconDioxide.getDust(1),
                 Materials.Magnesia.getDust(1),
@@ -525,8 +521,8 @@ public class CentrifugeRecipes implements Runnable {
             .eut(80)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(20))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(20))
             .itemOutputs(
                 Materials.SiliconDioxide.getDust(5),
                 Materials.Magnesia.getDust(1),
@@ -540,11 +536,11 @@ public class CentrifugeRecipes implements Runnable {
             .eut(80)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.soul_sand, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1),
                 new ItemStack(Blocks.sand, 1))
             .outputChances(1000, 700, 9000)
             .fluidOutputs(Materials.Oil.getFluid(200))
@@ -552,63 +548,63 @@ public class CentrifugeRecipes implements Runnable {
             .eut(12)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(10))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(10))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Copper, 1),
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1),
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Silver, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Scheelite, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Bauxite, 1))
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Copper, 1),
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1),
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Silver, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Scheelite, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Bauxite, 1))
             .outputChances(2000, 1000, 250, 50, 250, 500)
             .fluidInputs(getFluidStack("ic2pahoehoelava", 100))
             .duration(2 * SECONDS)
             .eut(1024)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(20))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(20))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Scheelite, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bauxite, 1))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Scheelite, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bauxite, 1))
             .outputChances(8000, 4000, 1000, 450, 2250, 4500)
             .fluidInputs(getFluidStack("ic2pahoehoelava", 3600))
             .duration(16 * SECONDS + 8 * TICKS)
             .eut(4096)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 45),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.BasalticMineralSand, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Olivine, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Obsidian, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Basalt, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Flint, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.RareEarth, 1))
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.BasalticMineralSand, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Olivine, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Obsidian, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Basalt, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Flint, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.RareEarth, 1))
             .outputChances(2000, 2000, 2000, 2000, 2000, 2000)
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(20)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 36L, 45),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BasalticMineralSand, 2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Olivine, 2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Basalt, 2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Flint, 2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.BasalticMineralSand, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Olivine, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Basalt, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Flint, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 2))
             .outputChances(9000, 9000, 9000, 9000, 9000, 9000)
             .duration(25 * SECONDS + 18 * TICKS)
             .eut(80)
@@ -616,7 +612,7 @@ public class CentrifugeRecipes implements Runnable {
 
         // Ash centrifuge recipes
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Ash.getDust(36))
             .itemOutputs(
                 Materials.Quicklime.getDust(18),
@@ -632,7 +628,7 @@ public class CentrifugeRecipes implements Runnable {
 
         // Stone Dust and Metal Mixture centrifuge recipes
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Stone.getDust(36))
             .itemOutputs(
                 Materials.Quartzite.getDust(9),
@@ -646,7 +642,7 @@ public class CentrifugeRecipes implements Runnable {
             .eut(30)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.MetalMixture.getDust(36))
             .itemOutputs(
                 Materials.BandedIron.getDust(9),
@@ -660,24 +656,24 @@ public class CentrifugeRecipes implements Runnable {
             .eut((int) TierEU.RECIPE_EV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Propane.getGas(320))
             .fluidOutputs(Materials.LPG.getFluid(290))
             .duration(20 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Butane.getGas(320))
             .fluidOutputs(Materials.LPG.getFluid(370))
             .duration(20 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 8))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 8),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 8))
             .outputChances(10000, 10000)
             .fluidInputs(Materials.EnrichedNaquadria.getFluid(9216))
             .fluidOutputs(Materials.FluidNaquadahFuel.getFluid(4806))
@@ -685,16 +681,16 @@ public class CentrifugeRecipes implements Runnable {
             .eut(TierEU.RECIPE_UHV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1))
             .duration(12 * SECONDS + 10 * TICKS)
             .eut(5)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.magma_cream, 1))
             .itemOutputs(new ItemStack(Items.blaze_powder, 1), new ItemStack(Items.slime_ball, 1))
             .duration(25 * SECONDS)
@@ -704,62 +700,62 @@ public class CentrifugeRecipes implements Runnable {
         if (Thaumcraft.isModLoaded()) {
             // air
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(combs, 1, 144), GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedAir, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(combs, 1, 144), GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.InfusedAir, 1))
                 .duration(51 * SECONDS + 4 * TICKS)
                 .eut(12)
                 .addTo(centrifugeRecipes);
 
             // fire
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(combs, 1, 146), GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedFire, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(combs, 1, 146), GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.InfusedFire, 1))
                 .duration(51 * SECONDS + 4 * TICKS)
                 .eut(12)
                 .addTo(centrifugeRecipes);
 
             // aqua
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(combs, 1, 147), GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedWater, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(combs, 1, 147), GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.InfusedWater, 1))
                 .duration(51 * SECONDS + 4 * TICKS)
                 .eut(12)
                 .addTo(centrifugeRecipes);
 
             // terra
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(combs, 1, 145), GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEarth, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(combs, 1, 145), GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEarth, 1))
                 .duration(51 * SECONDS + 4 * TICKS)
                 .eut(12)
                 .addTo(centrifugeRecipes);
 
             // ordo
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(combs, 1, 148), GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedOrder, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(combs, 1, 148), GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.InfusedOrder, 1))
                 .duration(51 * SECONDS + 4 * TICKS)
                 .eut(12)
                 .addTo(centrifugeRecipes);
 
             // perditio
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(combs, 1, 149), GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(combs, 1, 149), GTUtility.getIntegratedCircuit(1))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1))
                 .duration(51 * SECONDS + 4 * TICKS)
                 .eut(12)
                 .addTo(centrifugeRecipes);
 
             // Nethershard
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(combs, 1, 152), GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(combs, 1, 152), GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 6))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(TierEU.RECIPE_HV)
@@ -767,8 +763,8 @@ public class CentrifugeRecipes implements Runnable {
 
             // Endshard
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(combs, 1, 153), GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(combs, 1, 153), GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 7))
                 .duration(6 * SECONDS + 8 * TICKS)
                 .eut(TierEU.RECIPE_HV)
@@ -778,8 +774,8 @@ public class CentrifugeRecipes implements Runnable {
         if (ExtraUtilities.isModLoaded()) {
             // Caelestis red
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(combs, 1, 154), GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(combs, 1, 154), GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(
                     getModItem(ExtraUtilities.ID, "greenscreen", 1L, 2),
                     getModItem(ExtraUtilities.ID, "greenscreen", 1L, 10),
@@ -793,8 +789,8 @@ public class CentrifugeRecipes implements Runnable {
 
             // Caelestis green
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(combs, 1, 155), GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(combs, 1, 155), GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(
                     getModItem(ExtraUtilities.ID, "greenscreen", 1L, 13),
                     getModItem(ExtraUtilities.ID, "greenscreen", 1L, 5),
@@ -807,8 +803,8 @@ public class CentrifugeRecipes implements Runnable {
 
             // Caelestis blue
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(combs, 1, 156), GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(combs, 1, 156), GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(
                     getModItem(ExtraUtilities.ID, "greenscreen", 1L, 3),
                     getModItem(ExtraUtilities.ID, "greenscreen", 1L, 9),
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java
index 7be13ecbe4..e500844b37 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java
@@ -2,10 +2,10 @@ package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.Mods.BuildCraftTransport;
 import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -13,24 +13,23 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-
-import gregtech.api.GregTech_API;
+import bartworks.system.material.WerkstoffLoader;
+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.MaterialsKevlar;
 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 ChemicalBathRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Food_Raw_Fries.get(1))
             .itemOutputs(ItemList.Food_Fries.get(1))
             .fluidInputs(Materials.FryingOilHot.getFluid(10))
@@ -38,35 +37,35 @@ public class ChemicalBathRecipes implements Runnable {
             .eut(4)
             .addTo(chemicalBathRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("dynamite", 1))
-            .itemOutputs(GT_ModHandler.getIC2Item("stickyDynamite", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("dynamite", 1))
+            .itemOutputs(GTModHandler.getIC2Item("stickyDynamite", 1))
             .fluidInputs(Materials.Glue.getFluid(10))
             .duration(16 * TICKS)
             .eut(4)
             .addTo(chemicalBathRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1))
-            .itemOutputs(GT_ModHandler.getIC2Item("reinforcedStone", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1))
+            .itemOutputs(GTModHandler.getIC2Item("reinforcedStone", 1))
             .fluidInputs(Materials.Concrete.getMolten(144))
             .duration(10 * SECONDS)
             .eut(4)
             .addTo(chemicalBathRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HydratedCoal, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.HydratedCoal, 1))
             .fluidInputs(Materials.Water.getFluid(125))
             .duration(12 * TICKS)
             .eut(4)
             .addTo(chemicalBathRecipes);
 
         // paper creation recipes
-        ItemStack[] paperSources = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L),
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 1L), new ItemStack(Items.reeds, 1, 32767) };
+        ItemStack[] paperSources = new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L),
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 1L), new ItemStack(Items.reeds, 1, 32767) };
         for (ItemStack paperSource : paperSources) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(paperSource)
                 .itemOutputs(new ItemStack(Items.paper, 1, 0))
                 .fluidInputs(Materials.Water.getFluid(100))
@@ -74,26 +73,26 @@ public class ChemicalBathRecipes implements Runnable {
                 .eut(4)
                 .addTo(chemicalBathRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(paperSource)
                 .itemOutputs(new ItemStack(Items.paper, 1, 0))
-                .fluidInputs(GT_ModHandler.getDistilledWater(100))
+                .fluidInputs(GTModHandler.getDistilledWater(100))
                 .duration(10 * SECONDS)
                 .eut(4)
                 .addTo(chemicalBathRecipes);
         }
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HydratedCoal, 1))
-            .fluidInputs(GT_ModHandler.getDistilledWater(125))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.HydratedCoal, 1))
+            .fluidInputs(GTModHandler.getDistilledWater(125))
             .duration(12 * TICKS)
             .eut(4)
             .addTo(chemicalBathRecipes);
 
         for (int i = 1; i < 16; i++) {
             // wool cleaning recipes
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(new ItemStack(Blocks.wool, 1, i))
                 .itemOutputs(new ItemStack(Blocks.wool, 1, 0))
                 .fluidInputs(Materials.Chlorine.getGas(50))
@@ -102,7 +101,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .addTo(chemicalBathRecipes);
 
             // carpet cleaning recipes
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(new ItemStack(Blocks.carpet, 1, 32767))
                 .itemOutputs(new ItemStack(Blocks.carpet, 1, 0))
                 .fluidInputs(Materials.Chlorine.getGas(25))
@@ -112,7 +111,7 @@ public class ChemicalBathRecipes implements Runnable {
         }
 
         // stained hardened clay cleaning
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.stained_hardened_clay, 1, 32767))
             .itemOutputs(new ItemStack(Blocks.hardened_clay, 1, 0))
             .fluidInputs(Materials.Chlorine.getGas(50))
@@ -121,7 +120,7 @@ public class ChemicalBathRecipes implements Runnable {
             .addTo(chemicalBathRecipes);
 
         // stained glass cleaning
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.stained_glass, 1, 32767))
             .itemOutputs(new ItemStack(Blocks.glass, 1, 0))
             .fluidInputs(Materials.Chlorine.getGas(50))
@@ -130,7 +129,7 @@ public class ChemicalBathRecipes implements Runnable {
             .addTo(chemicalBathRecipes);
 
         // stained glass pane cleaning
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.stained_glass_pane, 1, 32767))
             .itemOutputs(new ItemStack(Blocks.glass_pane, 1, 0))
             .fluidInputs(Materials.Chlorine.getGas(20))
@@ -140,18 +139,18 @@ public class ChemicalBathRecipes implements Runnable {
 
         // light -> dark concrete recipes
         for (int i = 0; i < 8; i++) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(GregTech_API.sBlockConcretes, 1, i + 8))
-                .itemOutputs(new ItemStack(GregTech_API.sBlockConcretes, 1, i))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(GregTechAPI.sBlockConcretes, 1, i + 8))
+                .itemOutputs(new ItemStack(GregTechAPI.sBlockConcretes, 1, i))
                 .fluidInputs(Materials.Water.getFluid(250))
                 .duration(10 * SECONDS)
                 .eut(4)
                 .addTo(chemicalBathRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(GregTech_API.sBlockConcretes, 1, i + 8))
-                .itemOutputs(new ItemStack(GregTech_API.sBlockConcretes, 1, i))
-                .fluidInputs(GT_ModHandler.getDistilledWater(250))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(GregTechAPI.sBlockConcretes, 1, i + 8))
+                .itemOutputs(new ItemStack(GregTechAPI.sBlockConcretes, 1, i))
+                .fluidInputs(GTModHandler.getDistilledWater(250))
                 .duration(10 * SECONDS)
                 .eut(4)
                 .addTo(chemicalBathRecipes);
@@ -159,64 +158,64 @@ public class ChemicalBathRecipes implements Runnable {
 
         // reinforced blocks
         {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Bronze, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Bronze, 1))
                 .itemOutputs(ItemList.Block_BronzePlate.get(1))
                 .fluidInputs(Materials.Concrete.getMolten(144))
                 .duration(10 * SECONDS)
                 .eut(4)
                 .addTo(chemicalBathRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1))
                 .itemOutputs(ItemList.Block_SteelPlate.get(1))
                 .fluidInputs(Materials.Steel.getMolten(288))
                 .duration(12 * SECONDS + 10 * TICKS)
                 .eut(16)
                 .addTo(chemicalBathRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1))
                 .itemOutputs(ItemList.Block_TitaniumPlate.get(1))
                 .fluidInputs(Materials.Titanium.getMolten(144))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(chemicalBathRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1))
                 .itemOutputs(ItemList.Block_TungstenSteelReinforced.get(1))
                 .fluidInputs(Materials.TungstenSteel.getMolten(144))
                 .duration(17 * SECONDS + 10 * TICKS)
                 .eut(64)
                 .addTo(chemicalBathRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1))
                 .itemOutputs(ItemList.Block_IridiumTungstensteel.get(1))
                 .fluidInputs(Materials.Iridium.getMolten(144))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(chemicalBathRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah, 1))
                 .itemOutputs(ItemList.Block_NaquadahPlate.get(1))
                 .fluidInputs(Materials.Osmium.getMolten(144))
                 .duration(22 * SECONDS + 10 * TICKS)
                 .eut(256)
                 .addTo(chemicalBathRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1))
                 .itemOutputs(ItemList.Block_NeutroniumPlate.get(1))
                 .fluidInputs(Materials.Naquadria.getMolten(144))
                 .duration(25 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(chemicalBathRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1))
                 .itemOutputs(ItemList.Block_TungstenSteelReinforced.get(1))
                 .fluidInputs(Materials.Concrete.getMolten(144))
                 .duration(10 * SECONDS)
@@ -225,8 +224,8 @@ public class ChemicalBathRecipes implements Runnable {
         }
 
         for (int j = 0; j < Dyes.dyeRed.getSizeOfFluidList(); j++) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1))
                 .itemOutputs(getModItem(BuildCraftTransport.ID, "pipeWire", 4L, 0))
                 .fluidInputs(Dyes.dyeRed.getFluidDye(j, 72))
                 .duration(1 * SECONDS + 12 * TICKS)
@@ -234,8 +233,8 @@ public class ChemicalBathRecipes implements Runnable {
                 .addTo(chemicalBathRecipes);
         }
         for (int j = 0; j < Dyes.dyeBlue.getSizeOfFluidList(); j++) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1))
                 .itemOutputs(getModItem(BuildCraftTransport.ID, "pipeWire", 4L, 1))
                 .fluidInputs(Dyes.dyeBlue.getFluidDye(j, 72))
                 .duration(1 * SECONDS + 12 * TICKS)
@@ -243,8 +242,8 @@ public class ChemicalBathRecipes implements Runnable {
                 .addTo(chemicalBathRecipes);
         }
         for (int j = 0; j < Dyes.dyeGreen.getSizeOfFluidList(); j++) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1))
                 .itemOutputs(getModItem(BuildCraftTransport.ID, "pipeWire", 4L, 2))
                 .fluidInputs(Dyes.dyeGreen.getFluidDye(j, 72))
                 .duration(1 * SECONDS + 12 * TICKS)
@@ -252,8 +251,8 @@ public class ChemicalBathRecipes implements Runnable {
                 .addTo(chemicalBathRecipes);
         }
         for (int j = 0; j < Dyes.dyeYellow.getSizeOfFluidList(); j++) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1))
                 .itemOutputs(getModItem(BuildCraftTransport.ID, "pipeWire", 4L, 3))
                 .fluidInputs(Dyes.dyeYellow.getFluidDye(j, 72))
                 .duration(1 * SECONDS + 12 * TICKS)
@@ -263,7 +262,7 @@ public class ChemicalBathRecipes implements Runnable {
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {
             for (int j = 0; j < Dyes.VALUES[i].getSizeOfFluidList(); j++) {
                 if (i != 15) {
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(new ItemStack(Blocks.wool, 1, 0))
                         .itemOutputs(new ItemStack(Blocks.wool, 1, 15 - i))
                         .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 72))
@@ -272,7 +271,7 @@ public class ChemicalBathRecipes implements Runnable {
                         .addTo(chemicalBathRecipes);
                 }
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(new ItemStack(Blocks.glass, 1, 0))
                     .itemOutputs(new ItemStack(Blocks.stained_glass, 1, 15 - i))
                     .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 18))
@@ -280,7 +279,7 @@ public class ChemicalBathRecipes implements Runnable {
                     .eut(2)
                     .addTo(chemicalBathRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(new ItemStack(Blocks.hardened_clay, 1, 0))
                     .itemOutputs(new ItemStack(Blocks.stained_hardened_clay, 1, 15 - i))
                     .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 18))
@@ -291,23 +290,23 @@ public class ChemicalBathRecipes implements Runnable {
         }
 
         // Rn relate quantum recipe
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderEye, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.EnderEye, 1))
             .itemOutputs(ItemList.QuantumEye.get(1))
             .fluidInputs(Materials.Radon.getGas(250))
             .duration(24 * SECONDS)
             .eut(384)
             .addTo(chemicalBathRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1))
             .itemOutputs(ItemList.QuantumStar.get(1))
             .fluidInputs(Materials.Radon.getGas(1250))
             .duration(1 * MINUTES + 36 * SECONDS)
             .eut(384)
             .addTo(chemicalBathRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.WovenKevlar.get(1))
             .itemOutputs(MaterialsKevlar.Kevlar.getPlates(1))
             .fluidInputs(MaterialsKevlar.PolyurethaneResin.getFluid(1000))
@@ -315,7 +314,7 @@ public class ChemicalBathRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(chemicalBathRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(WerkstoffLoader.CubicZirconia.get(OrePrefixes.gemExquisite, 1))
             .itemOutputs(Materials.Firestone.getGems(1))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2hotcoolant"), 250))
@@ -324,7 +323,7 @@ public class ChemicalBathRecipes implements Runnable {
             .addTo(chemicalBathRecipes);
 
         // Na + H2O = NaOH + H
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Sodium.getDust(1))
             .itemOutputs(Materials.SodiumHydroxide.getDust(3))
             .fluidInputs(Materials.Water.getFluid(1000))
@@ -335,78 +334,78 @@ public class ChemicalBathRecipes implements Runnable {
 
         // Custom Sodium Persulfate Ore Processing Recipes
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Tantalite, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Tantalite, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Tantalite, 1),
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Tantalite, 1),
                 Materials.Tantalum.getDust(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
             .outputChances(10000, 3000, 4000)
             .fluidInputs(Materials.SodiumPersulfate.getFluid(100))
             .duration(40 * SECONDS)
             .eut(8)
             .addTo(chemicalBathRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Pyrolusite, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Pyrolusite, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Pyrolusite, 1),
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Pyrolusite, 1),
                 Materials.Manganese.getDust(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
             .outputChances(10000, 7000, 4000)
             .fluidInputs(Materials.SodiumPersulfate.getFluid(100))
             .duration(40 * SECONDS)
             .eut(8)
             .addTo(chemicalBathRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Quartzite, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Quartzite, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Quartzite, 1),
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Quartzite, 1),
                 Materials.CertusQuartz.getDust(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
             .outputChances(10000, 3000, 4000)
             .fluidInputs(Materials.SodiumPersulfate.getFluid(100))
             .duration(40 * SECONDS)
             .eut(8)
             .addTo(chemicalBathRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.CertusQuartz, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.crushed, Materials.CertusQuartz, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.CertusQuartz, 1),
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.CertusQuartz, 1),
                 Materials.Barium.getDust(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
             .outputChances(10000, 7000, 4000)
             .fluidInputs(Materials.SodiumPersulfate.getFluid(100))
             .duration(40 * SECONDS)
             .eut(8)
             .addTo(chemicalBathRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bauxite, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Bauxite, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Bauxite, 1),
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Bauxite, 1),
                 Materials.Rutile.getDust(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
             .outputChances(10000, 5000, 4000)
             .fluidInputs(Materials.SodiumPersulfate.getFluid(100))
             .duration(40 * SECONDS)
             .eut(8)
             .addTo(chemicalBathRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Thorium, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Thorium, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Thorium, 1),
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Thorium, 1),
                 Materials.Uranium.getDust(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
             .outputChances(10000, 3000, 4000)
             .fluidInputs(Materials.SodiumPersulfate.getFluid(100))
             .duration(40 * SECONDS)
             .eut(8)
             .addTo(chemicalBathRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Stibnite, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Stibnite, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Stibnite, 1),
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Stibnite, 1),
                 Materials.Antimony.getDust(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
             .outputChances(10000, 5000, 4000)
             .fluidInputs(Materials.SodiumPersulfate.getFluid(100))
             .duration(40 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java
index 3df932edd2..ab3cd43dce 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java
@@ -6,13 +6,13 @@ import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.enums.Mods.Railcraft;
 import static gregtech.api.recipe.RecipeMaps.chemicalReactorRecipes;
 import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
-import static gtPlusPlus.core.material.MISC_MATERIALS.CALCIUM_CHLORIDE;
-import static gtPlusPlus.core.material.MISC_MATERIALS.SODIUM_NITRATE;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
+import static gtPlusPlus.core.material.MaterialMisc.CALCIUM_CHLORIDE;
+import static gtPlusPlus.core.material.MaterialMisc.SODIUM_NITRATE;
 import static net.minecraftforge.fluids.FluidRegistry.getFluidStack;
 
 import net.minecraft.init.Blocks;
@@ -22,18 +22,17 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-
+import bartworks.system.material.WerkstoffLoader;
 import cpw.mods.fml.common.registry.GameRegistry;
-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.MaterialsKevlar;
 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.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.item.ModItems;
 
 public class ChemicalRecipes implements Runnable {
@@ -48,30 +47,30 @@ public class ChemicalRecipes implements Runnable {
     }
 
     public void registerBoth() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.paper, 1), new ItemStack(Items.string, 1))
-            .itemOutputs(GT_ModHandler.getIC2Item("dynamite", 1))
+            .itemOutputs(GTModHandler.getIC2Item("dynamite", 1))
             .fluidInputs(Materials.Glyceryl.getFluid(500))
             .duration(8 * SECONDS)
             .eut(4)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Indium, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Indium, 1))
             .fluidInputs(new FluidStack(ItemList.sIndiumConcentrate, 8000))
             .fluidOutputs(new FluidStack(ItemList.sLeadZincSolution, 8000))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_HV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 36),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 36),
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 1))
             .fluidInputs(new FluidStack(ItemList.sIndiumConcentrate, 72000))
             .fluidOutputs(new FluidStack(ItemList.sLeadZincSolution, 72000))
             .duration(22 * SECONDS + 10 * TICKS)
@@ -80,22 +79,22 @@ public class ChemicalRecipes implements Runnable {
 
         // Platinum Group Sludge chain
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Pentlandite, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.PlatinumGroupSludge, 1))
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Pentlandite, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.PlatinumGroupSludge, 1))
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000))
             .fluidOutputs(new FluidStack(ItemList.sNickelSulfate, 2000))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(30)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.PlatinumGroupSludge, 1))
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.PlatinumGroupSludge, 1))
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000))
             .fluidOutputs(new FluidStack(ItemList.sBlueVitriol, 2000))
             .duration(2 * SECONDS + 10 * TICKS)
@@ -104,26 +103,26 @@ public class ChemicalRecipes implements Runnable {
 
         // Fe + 3HCl = FeCl3 + 3H
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), ItemList.Cell_Empty.get(3))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), ItemList.Cell_Empty.get(3))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(3000))
             .fluidOutputs(Materials.IronIIIChloride.getFluid(1000))
             .duration(20 * SECONDS)
             .eut(30)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedGold, 8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 8))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thaumium, 16))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.InfusedGold, 8),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 8))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Thaumium, 16))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2coolant"), 1000))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(GalaxySpace.ID, "item.UnknowCrystal", 4), Materials.Osmiridium.getDust(2))
             .itemOutputs(ItemList.Circuit_Chip_Stemcell.get(64))
             .fluidInputs(Materials.GrowthMediumSterilized.getFluid(1000))
@@ -132,10 +131,10 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LuV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Circuit_Chip_Stemcell.get(32),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CosmicNeutronium, 4))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.CosmicNeutronium, 4))
             .itemOutputs(ItemList.Circuit_Chip_Biocell.get(32))
             .fluidInputs(Materials.BioMediumSterilized.getFluid(2000))
             .fluidOutputs(getFluidStack("mutagen", 2000))
@@ -143,47 +142,45 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_UV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                new ItemStack(Items.sugar),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plastic, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.sugar), GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plastic, 1))
             .itemOutputs(ItemList.GelledToluene.get(2))
             .fluidInputs(new FluidStack(ItemList.sToluene, 133))
             .duration(7 * SECONDS)
             .eut(192)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.sugar, 9), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.sugar, 9), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 1))
             .itemOutputs(ItemList.GelledToluene.get(18))
             .fluidInputs(new FluidStack(ItemList.sToluene, 1197))
             .duration(1 * MINUTES + 3 * SECONDS)
             .eut(192)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.GelledToluene.get(4), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.GelledToluene.get(4), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(Blocks.tnt, 1))
             .fluidInputs(Materials.SulfuricAcid.getFluid(250))
             .duration(10 * SECONDS)
             .eut(24)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.GelledToluene.get(4), GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_ModHandler.getIC2Item("industrialTnt", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.GelledToluene.get(4), GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTModHandler.getIC2Item("industrialTnt", 1))
             .fluidInputs(new FluidStack(ItemList.sNitrationMixture, 200))
             .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(150))
             .duration(4 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2),
-                GT_Utility.getIntegratedCircuit(4))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2),
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1),
                 Materials.Empty.getCells(1))
             .fluidInputs(Materials.NatruralGas.getGas(16000))
             .fluidOutputs(Materials.Gas.getGas(16000))
@@ -191,23 +188,23 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NatruralGas, 2),
-                GT_Utility.getIntegratedCircuit(4))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 2))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.NatruralGas, 2),
+                GTUtility.getIntegratedCircuit(4))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 2))
             .fluidInputs(Materials.Hydrogen.getGas(250))
             .fluidOutputs(Materials.HydricSulfide.getGas(125))
             .duration(1 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2),
-                GT_Utility.getIntegratedCircuit(4))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2),
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1),
                 Materials.Empty.getCells(1))
             .fluidInputs(Materials.SulfuricGas.getGas(16000))
             .fluidOutputs(Materials.Gas.getGas(16000))
@@ -215,23 +212,23 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricGas, 2),
-                GT_Utility.getIntegratedCircuit(4))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 2))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricGas, 2),
+                GTUtility.getIntegratedCircuit(4))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 2))
             .fluidInputs(Materials.Hydrogen.getGas(250))
             .fluidOutputs(Materials.HydricSulfide.getGas(125))
             .duration(1 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2),
-                GT_Utility.getIntegratedCircuit(4))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2),
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1),
                 Materials.Empty.getCells(1))
             .fluidInputs(Materials.SulfuricNaphtha.getFluid(12000))
             .fluidOutputs(Materials.Naphtha.getFluid(12000))
@@ -239,23 +236,23 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricNaphtha, 3),
-                GT_Utility.getIntegratedCircuit(4))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naphtha, 3))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricNaphtha, 3),
+                GTUtility.getIntegratedCircuit(4))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Naphtha, 3))
             .fluidInputs(Materials.Hydrogen.getGas(500))
             .fluidOutputs(Materials.HydricSulfide.getGas(250))
             .duration(2 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2),
-                GT_Utility.getIntegratedCircuit(4))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2),
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1),
                 Materials.Empty.getCells(1))
             .fluidInputs(Materials.SulfuricLightFuel.getFluid(12000))
             .fluidOutputs(Materials.LightFuel.getFluid(12000))
@@ -263,23 +260,23 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricLightFuel, 3),
-                GT_Utility.getIntegratedCircuit(4))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 3))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricLightFuel, 3),
+                GTUtility.getIntegratedCircuit(4))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 3))
             .fluidInputs(Materials.Hydrogen.getGas(500))
             .fluidOutputs(Materials.HydricSulfide.getGas(250))
             .duration(2 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2),
-                GT_Utility.getIntegratedCircuit(4))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2),
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1),
                 Materials.Empty.getCells(1))
             .fluidInputs(Materials.SulfuricHeavyFuel.getFluid(8000))
             .fluidOutputs(Materials.HeavyFuel.getFluid(8000))
@@ -287,285 +284,285 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricHeavyFuel, 1),
-                GT_Utility.getIntegratedCircuit(4))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricHeavyFuel, 1),
+                GTUtility.getIntegratedCircuit(4))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1))
             .fluidInputs(Materials.Hydrogen.getGas(250))
             .fluidOutputs(Materials.HydricSulfide.getGas(125))
             .duration(1 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Potassium, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Potassium, 1))
             .fluidInputs(Materials.Naphtha.getFluid(576))
             .fluidOutputs(Materials.Polycaprolactam.getMolten(1296))
             .duration(32 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 9),
-                GT_Utility.getIntegratedCircuit(9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 9),
+                GTUtility.getIntegratedCircuit(9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1))
             .fluidInputs(Materials.Naphtha.getFluid(5184))
             .fluidOutputs(Materials.Polycaprolactam.getMolten(11664))
             .duration(4 * MINUTES + 48 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        for (Fluid tFluid : new Fluid[] { FluidRegistry.WATER, GT_ModHandler.getDistilledWater(1L)
+        for (Fluid tFluid : new Fluid[] { FluidRegistry.WATER, GTModHandler.getDistilledWater(1L)
             .getFluid() }) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(2))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(3))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(2))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(1))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(1))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(3))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(4))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(3))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(2))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(2))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(3))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(4))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(3))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(2))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(2))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(3))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(4))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(3))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(2))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(2))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(3))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(4))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(3))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(2))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1))
                 .itemOutputs(ItemList.IC2_Fertilizer.get(2))
                 .fluidInputs(new FluidStack(tFluid, 1000))
                 .duration(10 * SECONDS)
@@ -575,99 +572,99 @@ public class ChemicalRecipes implements Runnable {
 
         // 3quartz dust + Na + H2O = 3quartz gem (Na loss
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 3))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 3))
             .fluidInputs(Materials.Water.getFluid(1000))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 3))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 3))
             .fluidInputs(Materials.Water.getFluid(1000))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Quartzite, 3))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Quartzite, 3))
             .fluidInputs(Materials.Water.getFluid(1000))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 3))
-            .fluidInputs(GT_ModHandler.getDistilledWater(1000))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 3))
+            .fluidInputs(GTModHandler.getDistilledWater(1000))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 3))
-            .fluidInputs(GT_ModHandler.getDistilledWater(1000))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 3))
+            .fluidInputs(GTModHandler.getDistilledWater(1000))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Quartzite, 3))
-            .fluidInputs(GT_ModHandler.getDistilledWater(1000))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Quartzite, 3))
+            .fluidInputs(GTModHandler.getDistilledWater(1000))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
         // 3UO2 + 4Al = 3U + 2Al2O3
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uraninite, 9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Uraninite, 9),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 10))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 10))
             .duration(50 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
         // UO2 + 2Mg = U + 2MgO
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uraninite, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Uraninite, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4))
             .duration(50 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
         // Ca + C + 3O = CaCO3
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 5))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 5))
             .fluidInputs(Materials.Oxygen.getGas(3000))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
@@ -675,8 +672,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C + 4H = CH4
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Carbon.getDust(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Carbon.getDust(1), GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Hydrogen.getGas(4000))
             .fluidOutputs(Materials.Methane.getGas(1000))
             .duration(10 * SECONDS)
@@ -685,31 +682,31 @@ public class ChemicalRecipes implements Runnable {
 
         // TiO2 + 2C + 4Cl = TiCl4 + 2CO
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Rutile, 3),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Carbon, 2))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.CarbonMonoxide, 2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Rutile, 3),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Carbon, 2))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.CarbonMonoxide, 2))
             .fluidInputs(Materials.Chlorine.getGas(4000))
             .fluidOutputs(Materials.Titaniumtetrachloride.getFluid(1000))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Rutile, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Rutile, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 2))
             .fluidInputs(Materials.Chlorine.getGas(4000))
             .fluidOutputs(Materials.Titaniumtetrachloride.getFluid(1000))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Rutile, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Rutile, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 2))
             .fluidInputs(Materials.Chlorine.getGas(4000))
             .fluidOutputs(Materials.CarbonMonoxide.getGas(2000), Materials.Titaniumtetrachloride.getFluid(1000))
             .duration(20 * SECONDS)
@@ -718,32 +715,32 @@ public class ChemicalRecipes implements Runnable {
 
         // 4Na + 2MgCl2 = 2Mg + 4NaCl
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 4),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 6))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 4),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 6))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 8))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 8))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(UniversalChemical);
 
         // rubber
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 9),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1))
             .fluidOutputs(Materials.Rubber.getMolten(1296))
             .duration(30 * SECONDS)
             .eut(16)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Sulfur, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Sulfur, 1))
             .fluidOutputs(Materials.Rubber.getMolten(144))
             .duration(5 * SECONDS)
             .eut(16)
@@ -751,54 +748,54 @@ public class ChemicalRecipes implements Runnable {
 
         // vanilla recipe
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 8),
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 8),
                 new ItemStack(Items.melon, 1, 32767))
             .itemOutputs(new ItemStack(Items.speckled_melon, 1, 0))
             .duration(50)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 8),
+                GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 8),
                 new ItemStack(Items.carrot, 1, 32767))
             .itemOutputs(new ItemStack(Items.golden_carrot, 1, 0))
             .duration(50)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 8),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 8),
                 new ItemStack(Items.apple, 1, 32767))
             .itemOutputs(new ItemStack(Items.golden_apple, 1, 0))
             .duration(50)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Gold, 8),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Gold, 8),
                 new ItemStack(Items.apple, 1, 32767))
             .itemOutputs(new ItemStack(Items.golden_apple, 1, 1))
             .duration(50)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1),
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderEye, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.EnderEye, 1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1),
                 new ItemStack(Items.slime_ball, 1, 32767))
             .itemOutputs(new ItemStack(Items.magma_cream, 1, 0))
             .duration(50)
@@ -807,11 +804,11 @@ public class ChemicalRecipes implements Runnable {
 
         // 1/9U +Air ==Pu== 0.1Rn
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Plutonium, 8),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 8))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Plutonium, 8),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 8))
             .fluidInputs(Materials.Air.getGas(1000))
             .fluidOutputs(Materials.Radon.getGas(100))
             .duration(10 * MINUTES)
@@ -821,59 +818,59 @@ public class ChemicalRecipes implements Runnable {
         // Silicon Line
         // SiO2 + 2Mg = 2MgO + Si
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4))
             .duration(5 * SECONDS)
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4))
             .duration(5 * SECONDS)
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 6),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 6),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4))
             .duration(5 * SECONDS)
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4))
             .duration(5 * SECONDS)
             .eut(8)
             .addTo(UniversalChemical);
 
         // 3SiF4 + 4Al = 3Si + 4AlF3
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.AluminiumFluoride, 16))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.AluminiumFluoride, 16))
             .fluidInputs(Materials.SiliconTetrafluoride.getGas(3000))
             .duration(30 * SECONDS)
             .eut(30)
@@ -881,40 +878,40 @@ public class ChemicalRecipes implements Runnable {
 
         // SiO2 + 4HF = SiF4 + 2H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3),
+                GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.HydrofluoricAcid.getFluid(4000))
             .fluidOutputs(Materials.SiliconTetrafluoride.getGas(1000))
             .duration(15 * SECONDS)
             .eut(30)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3),
+                GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.HydrofluoricAcid.getFluid(4000))
             .fluidOutputs(Materials.SiliconTetrafluoride.getGas(1000))
             .duration(15 * SECONDS)
             .eut(30)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3),
+                GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.HydrofluoricAcid.getFluid(4000))
             .fluidOutputs(Materials.SiliconTetrafluoride.getGas(1000))
             .duration(15 * SECONDS)
             .eut(30)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 6),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 6),
+                GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.HydrofluoricAcid.getFluid(4000))
             .fluidOutputs(Materials.SiliconTetrafluoride.getGas(1000))
             .duration(15 * SECONDS)
@@ -923,13 +920,13 @@ public class ChemicalRecipes implements Runnable {
 
         // 4Na + SiCl4 = 4NaCl + Si
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 4),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 4),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 8))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 8))
             .fluidInputs(Materials.SiliconTetrachloride.getFluid(1000))
             .duration(5 * SECONDS)
             .eut(30)
@@ -937,22 +934,22 @@ public class ChemicalRecipes implements Runnable {
 
         // HSiCl3 + 2H = 3HCl + Si
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), ItemList.Cell_Empty.get(2))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), ItemList.Cell_Empty.get(2))
             .fluidInputs(Materials.Trichlorosilane.getFluid(1000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(3000))
             .duration(15 * SECONDS)
             .eut(30)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Trichlorosilane, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), ItemList.Cell_Empty.get(1))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Trichlorosilane, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), ItemList.Cell_Empty.get(1))
             .fluidInputs(Materials.Hydrogen.getGas(2000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(3000))
             .duration(15 * SECONDS)
@@ -961,9 +958,9 @@ public class ChemicalRecipes implements Runnable {
 
         // 4HSiCl3 = 3SiCl4 + SiH4
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.Cell_Empty.get(1), GT_Utility.getIntegratedCircuit(2))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Silane, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.Cell_Empty.get(1), GTUtility.getIntegratedCircuit(2))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Silane, 1))
             .fluidInputs(Materials.Trichlorosilane.getFluid(4000))
             .fluidOutputs(Materials.SiliconTetrachloride.getFluid(3000))
             .duration(12 * SECONDS)
@@ -972,9 +969,9 @@ public class ChemicalRecipes implements Runnable {
 
         // SiH4 = Si + 4H
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1))
             .fluidInputs(Materials.Silane.getGas(1000))
             .fluidOutputs(Materials.Hydrogen.getGas(4000))
             .duration(15 * SECONDS)
@@ -983,11 +980,11 @@ public class ChemicalRecipes implements Runnable {
 
         // Ca + 2H = CaH2
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calciumhydride, 3))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calciumhydride, 3))
             .fluidInputs(Materials.Hydrogen.getGas(2000))
             .duration(20 * SECONDS)
             .eut(30)
@@ -995,10 +992,10 @@ public class ChemicalRecipes implements Runnable {
 
         // Si + 4Cl = SiCl4
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
+                GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.Chlorine.getGas(4000))
             .fluidOutputs(Materials.SiliconTetrachloride.getFluid(1000))
             .duration(20 * SECONDS)
@@ -1007,7 +1004,7 @@ public class ChemicalRecipes implements Runnable {
 
         // 2Na + S = Na2S
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Sodium.getDust(2), Materials.Sulfur.getDust(1))
             .itemOutputs(Materials.SodiumSulfide.getDust(3))
             .duration(60)
@@ -1016,7 +1013,7 @@ public class ChemicalRecipes implements Runnable {
 
         // H2S + H2O + (O2) = 0.5H2SO4(Diluted) ( S loss
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.HydricSulfide.getCells(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Water.getFluid(1000))
@@ -1025,7 +1022,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Water.getCells(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.HydricSulfide.getGas(1000))
@@ -1036,29 +1033,29 @@ public class ChemicalRecipes implements Runnable {
 
         // Ni + 4CO = Ni(CO)4
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.CarbonMonoxide, 4))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.CarbonMonoxide, 4))
             .itemOutputs(ItemList.Cell_Empty.get(4))
             .fluidOutputs(MaterialsKevlar.NickelTetracarbonyl.getFluid(1000))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1),
+                GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.CarbonMonoxide.getGas(4000))
             .fluidOutputs(MaterialsKevlar.NickelTetracarbonyl.getFluid(1000))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), ItemList.Cell_Empty.get(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.NickelTetracarbonyl, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), ItemList.Cell_Empty.get(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.NickelTetracarbonyl, 1))
             .fluidInputs(Materials.CarbonMonoxide.getGas(4000))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_EV)
@@ -1066,10 +1063,10 @@ public class ChemicalRecipes implements Runnable {
 
         // C2H4O + H2O = C2H6O2
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.EthyleneOxide, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.EthyleneOxide, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Cell_Empty.get(1))
             .fluidInputs(Materials.Water.getFluid(1000))
             .fluidOutputs(MaterialsKevlar.Ethyleneglycol.getFluid(1000))
@@ -1079,10 +1076,10 @@ public class ChemicalRecipes implements Runnable {
 
         // C2H4 + O = C2H4O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ethylene, 2),
-                GT_Utility.getIntegratedCircuit(4))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Ethylene, 2),
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(ItemList.Cell_Empty.get(2))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .fluidOutputs(MaterialsKevlar.Acetaldehyde.getGas(1000))
@@ -1090,10 +1087,10 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1),
-                GT_Utility.getIntegratedCircuit(5))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1),
+                GTUtility.getIntegratedCircuit(5))
             .itemOutputs(ItemList.Cell_Empty.get(1))
             .fluidInputs(Materials.Ethylene.getGas(2000))
             .fluidOutputs(MaterialsKevlar.Acetaldehyde.getGas(1000))
@@ -1103,12 +1100,12 @@ public class ChemicalRecipes implements Runnable {
 
         // NiAl3 + 2NaOH + 2H2O = NiAl + 2NaAlO2 + 6H
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, MaterialsKevlar.NickelAluminide, 4),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6))
+                GTOreDictUnificator.get(OrePrefixes.ingot, MaterialsKevlar.NickelAluminide, 4),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RaneyNickelActivated, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RaneyNickelActivated, 2),
                 Materials.SodiumAluminate.getDust(8))
             .fluidInputs(Materials.Water.getFluid(2000))
             .fluidOutputs(Materials.Hydrogen.getGas(6000))
@@ -1118,22 +1115,22 @@ public class ChemicalRecipes implements Runnable {
 
         // Cu + O = CuO
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 2),
                 ItemList.Cell_Empty.get(1))
             .duration(5 * SECONDS)
             .eut(30)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 2))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .duration(5 * SECONDS)
             .eut(30)
@@ -1141,22 +1138,22 @@ public class ChemicalRecipes implements Runnable {
 
         // 2Bi + 3O = Bi2O3
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 4),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 6))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 4),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 6))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 10),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 10),
                 ItemList.Cell_Empty.get(6))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 4),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 10))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 4),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 10))
             .fluidInputs(Materials.Oxygen.getGas(6000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_MV)
@@ -1164,21 +1161,21 @@ public class ChemicalRecipes implements Runnable {
 
         // C4H6O2 + CNH5 = C5H9NO + H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Methylamine, 1),
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.GammaButyrolactone, 1))
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Methylamine, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.GammaButyrolactone, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.NMethylIIPyrrolidone, 1),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1))
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.NMethylIIPyrrolidone, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8),
+                GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.Chlorine.getGas(16000))
             .fluidOutputs(MaterialsKevlar.SulfurDichloride.getFluid(8000))
             .duration(40 * SECONDS)
@@ -1187,12 +1184,12 @@ public class ChemicalRecipes implements Runnable {
 
         // SCl2 + SO3 = SO2 + SOCl2
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfurTrioxide, 1),
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 1))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfurTrioxide, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.ThionylChloride, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.ThionylChloride, 1),
                 ItemList.Cell_Empty.get(1))
             .fluidOutputs(Materials.SulfurDioxide.getGas(1000))
             .duration(7 * SECONDS + 10 * TICKS)
@@ -1201,11 +1198,11 @@ public class ChemicalRecipes implements Runnable {
 
         // C8H10 + 6O =CoC22H14O4= C8H6O4 + 2H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.IVDimethylbenzene, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIINaphthenate, 41))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.TerephthalicAcid, 1))
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.IVDimethylbenzene, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIINaphthenate, 41))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.TerephthalicAcid, 1))
             .fluidInputs(Materials.Oxygen.getGas(6000))
             .fluidOutputs(Materials.Water.getFluid(2000))
             .duration(7 * SECONDS + 10 * TICKS)
@@ -1214,8 +1211,8 @@ public class ChemicalRecipes implements Runnable {
 
         // 2CH4 + C6H6 = C8H10 + 4H
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methane.getCells(2), GT_Utility.getIntegratedCircuit(13))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methane.getCells(2), GTUtility.getIntegratedCircuit(13))
             .itemOutputs(MaterialsKevlar.IIIDimethylbenzene.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Benzene.getFluid(1000))
             .fluidOutputs(Materials.Hydrogen.getGas(4000))
@@ -1223,8 +1220,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(14))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Benzene.getCells(1), GTUtility.getIntegratedCircuit(14))
             .itemOutputs(MaterialsKevlar.IIIDimethylbenzene.getCells(1))
             .fluidInputs(Materials.Methane.getGas(2000))
             .fluidOutputs(Materials.Hydrogen.getGas(4000))
@@ -1234,8 +1231,8 @@ public class ChemicalRecipes implements Runnable {
 
         // 2CH4 + C6H6 = C8H10 + 4H
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methane.getCells(2), GT_Utility.getIntegratedCircuit(15))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methane.getCells(2), GTUtility.getIntegratedCircuit(15))
             .itemOutputs(MaterialsKevlar.IVDimethylbenzene.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Benzene.getFluid(1000))
             .fluidOutputs(Materials.Hydrogen.getGas(4000))
@@ -1243,8 +1240,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(16))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Benzene.getCells(1), GTUtility.getIntegratedCircuit(16))
             .itemOutputs(MaterialsKevlar.IVDimethylbenzene.getCells(1))
             .fluidInputs(Materials.Methane.getGas(2000))
             .fluidOutputs(Materials.Hydrogen.getGas(4000))
@@ -1252,16 +1249,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(MaterialsKevlar.CobaltIIHydroxide.getDust(5), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(MaterialsKevlar.CobaltIIHydroxide.getDust(5), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(MaterialsKevlar.CobaltIINaphthenate.getDust(41))
             .fluidInputs(MaterialsKevlar.NaphthenicAcid.getFluid(1000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(MaterialsKevlar.CobaltIIAcetate.getDust(15), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(MaterialsKevlar.CobaltIIAcetate.getDust(15), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(MaterialsKevlar.CobaltIINaphthenate.getDust(41))
             .fluidInputs(MaterialsKevlar.NaphthenicAcid.getFluid(1000))
             .fluidOutputs(Materials.AceticAcid.getFluid(1500))
@@ -1271,18 +1268,18 @@ public class ChemicalRecipes implements Runnable {
 
         // Co + 2HNO3 = Co(NO3)2 + 2H
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Cobalt.getDust(1), Materials.NitricAcid.getCells(2))
             .itemOutputs(
                 MaterialsKevlar.CobaltIINitrate.getDust(9),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
         // Co(NO3)2 + 2KOH = CoH2O2 + 2KNO3
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 MaterialsKevlar.CobaltIINitrate.getDust(9),
                 getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 6L, 0))
@@ -1293,7 +1290,7 @@ public class ChemicalRecipes implements Runnable {
 
         // CoO + 2C2H4O2 = CoC4H6O4 + 2H
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.CobaltOxide.getDust(2), Materials.AceticAcid.getCells(2))
             .itemOutputs(MaterialsKevlar.CobaltIIAcetate.getDust(15), ItemList.Cell_Empty.get(2))
             .fluidOutputs(Materials.Water.getFluid(2000))
@@ -1301,16 +1298,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Phosphorus.getDust(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Phosphorus.getDust(1), GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Chlorine.getGas(3000))
             .fluidOutputs(MaterialsKevlar.PhosphorusTrichloride.getFluid(1000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Phosphorus.getDust(9), GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Phosphorus.getDust(9), GTUtility.getIntegratedCircuit(9))
             .fluidInputs(Materials.Chlorine.getGas(27000))
             .fluidOutputs(MaterialsKevlar.PhosphorusTrichloride.getFluid(9000))
             .duration(1 * MINUTES + 15 * SECONDS)
@@ -1319,8 +1316,8 @@ public class ChemicalRecipes implements Runnable {
 
         // Na + H = NaH
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Sodium.getDust(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Sodium.getDust(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(MaterialsKevlar.SodiumHydride.getDust(2))
             .fluidInputs(Materials.Hydrogen.getGas(1000))
             .duration(10 * SECONDS)
@@ -1329,8 +1326,8 @@ public class ChemicalRecipes implements Runnable {
 
         // CH3ONa + H2O = CH4O + NaOH
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(MaterialsKevlar.SodiumMethoxide.getDust(6), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(MaterialsKevlar.SodiumMethoxide.getDust(6), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.SodiumHydroxide.getDust(3))
             .fluidInputs(Materials.Water.getFluid(1000))
             .fluidOutputs(Materials.Methanol.getFluid(1000))
@@ -1340,8 +1337,8 @@ public class ChemicalRecipes implements Runnable {
 
         // K + HNO3 = KNO3 + H (not real, but gameplay
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Potassium.getDust(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Potassium.getDust(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Saltpeter.getDust(5))
             .fluidInputs(Materials.NitricAcid.getFluid(1000))
             .fluidOutputs(Materials.Hydrogen.getGas(1000))
@@ -1351,8 +1348,8 @@ public class ChemicalRecipes implements Runnable {
 
         // CH3COOH + CH3OH = CH3COOCH3 + H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.AceticAcid.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Water.getCells(1))
             .fluidInputs(Materials.Methanol.getFluid(1000))
             .fluidOutputs(Materials.MethylAcetate.getFluid(1000))
@@ -1360,8 +1357,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methanol.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Water.getCells(1))
             .fluidInputs(Materials.AceticAcid.getFluid(1000))
             .fluidOutputs(Materials.MethylAcetate.getFluid(1000))
@@ -1369,8 +1366,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.AceticAcid.getCells(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Methanol.getFluid(1000))
             .fluidOutputs(Materials.MethylAcetate.getFluid(1000))
@@ -1378,8 +1375,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methanol.getCells(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.AceticAcid.getFluid(1000))
             .fluidOutputs(Materials.MethylAcetate.getFluid(1000))
@@ -1387,8 +1384,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.AceticAcid.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.MethylAcetate.getCells(1))
             .fluidInputs(Materials.Methanol.getFluid(1000))
             .fluidOutputs(Materials.Water.getFluid(1000))
@@ -1396,8 +1393,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methanol.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.MethylAcetate.getCells(1))
             .fluidInputs(Materials.AceticAcid.getFluid(1000))
             .fluidOutputs(Materials.Water.getFluid(1000))
@@ -1405,16 +1402,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.AceticAcid.getCells(1), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.MethylAcetate.getCells(1))
             .fluidInputs(Materials.Methanol.getFluid(1000))
             .duration(12 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methanol.getCells(1), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.MethylAcetate.getCells(1))
             .fluidInputs(Materials.AceticAcid.getFluid(1000))
             .duration(12 * SECONDS)
@@ -1423,16 +1420,16 @@ public class ChemicalRecipes implements Runnable {
 
         // CO and CO2 recipes
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Carbon.getDust(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Carbon.getDust(1), GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .fluidOutputs(Materials.CarbonMonoxide.getGas(1000))
             .duration(2 * SECONDS)
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Coal.getGems(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Coal.getGems(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Ash.getDustTiny(1))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .fluidOutputs(Materials.CarbonMonoxide.getGas(1000))
@@ -1440,8 +1437,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Coal.getDust(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Coal.getDust(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Ash.getDustTiny(1))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .fluidOutputs(Materials.CarbonMonoxide.getGas(1000))
@@ -1449,8 +1446,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Charcoal.getGems(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Charcoal.getGems(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Ash.getDustTiny(1))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .fluidOutputs(Materials.CarbonMonoxide.getGas(1000))
@@ -1458,8 +1455,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Charcoal.getDust(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Charcoal.getDust(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Ash.getDustTiny(1))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .fluidOutputs(Materials.CarbonMonoxide.getGas(1000))
@@ -1467,16 +1464,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Carbon.getDust(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Carbon.getDust(1), GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.Oxygen.getGas(2000))
             .fluidOutputs(Materials.CarbonDioxide.getGas(1000))
             .duration(2 * SECONDS)
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Coal.getGems(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Coal.getGems(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Ash.getDustTiny(1))
             .fluidInputs(Materials.Oxygen.getGas(2000))
             .fluidOutputs(Materials.CarbonDioxide.getGas(1000))
@@ -1484,8 +1481,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Coal.getDust(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Coal.getDust(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Ash.getDustTiny(1))
             .fluidInputs(Materials.Oxygen.getGas(2000))
             .fluidOutputs(Materials.CarbonDioxide.getGas(1000))
@@ -1493,8 +1490,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Charcoal.getGems(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Charcoal.getGems(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Ash.getDustTiny(1))
             .fluidInputs(Materials.Oxygen.getGas(2000))
             .fluidOutputs(Materials.CarbonDioxide.getGas(1000))
@@ -1502,8 +1499,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Charcoal.getDust(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Charcoal.getDust(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Ash.getDustTiny(1))
             .fluidInputs(Materials.Oxygen.getGas(2000))
             .fluidOutputs(Materials.CarbonDioxide.getGas(1000))
@@ -1511,7 +1508,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Carbon.getDust(1))
             .fluidInputs(Materials.CarbonDioxide.getGas(1000))
             .fluidOutputs(Materials.CarbonMonoxide.getGas(2000))
@@ -1519,8 +1516,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Coal.getGems(9), GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Coal.getGems(9), GTUtility.getIntegratedCircuit(9))
             .itemOutputs(Materials.Ash.getDust(1))
             .fluidInputs(Materials.Oxygen.getGas(9000))
             .fluidOutputs(Materials.CarbonMonoxide.getGas(9000))
@@ -1528,8 +1525,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Coal.getDust(9), GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Coal.getDust(9), GTUtility.getIntegratedCircuit(9))
             .itemOutputs(Materials.Ash.getDust(1))
             .fluidInputs(Materials.Oxygen.getGas(9000))
             .fluidOutputs(Materials.CarbonMonoxide.getGas(9000))
@@ -1537,8 +1534,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Charcoal.getGems(9), GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Charcoal.getGems(9), GTUtility.getIntegratedCircuit(9))
             .itemOutputs(Materials.Ash.getDust(1))
             .fluidInputs(Materials.Oxygen.getGas(9000))
             .fluidOutputs(Materials.CarbonMonoxide.getGas(9000))
@@ -1546,8 +1543,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Charcoal.getDust(9), GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Charcoal.getDust(9), GTUtility.getIntegratedCircuit(9))
             .itemOutputs(Materials.Ash.getDust(1))
             .fluidInputs(Materials.Oxygen.getGas(9000))
             .fluidOutputs(Materials.CarbonMonoxide.getGas(9000))
@@ -1555,8 +1552,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Coal.getGems(9), GT_Utility.getIntegratedCircuit(8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Coal.getGems(9), GTUtility.getIntegratedCircuit(8))
             .itemOutputs(Materials.Ash.getDust(1))
             .fluidInputs(Materials.Oxygen.getGas(18000))
             .fluidOutputs(Materials.CarbonDioxide.getGas(9000))
@@ -1564,8 +1561,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Coal.getDust(9), GT_Utility.getIntegratedCircuit(8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Coal.getDust(9), GTUtility.getIntegratedCircuit(8))
             .itemOutputs(Materials.Ash.getDust(1))
             .fluidInputs(Materials.Oxygen.getGas(18000))
             .fluidOutputs(Materials.CarbonDioxide.getGas(9000))
@@ -1573,8 +1570,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Charcoal.getGems(9), GT_Utility.getIntegratedCircuit(8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Charcoal.getGems(9), GTUtility.getIntegratedCircuit(8))
             .itemOutputs(Materials.Ash.getDust(1))
             .fluidInputs(Materials.Oxygen.getGas(18000))
             .fluidOutputs(Materials.CarbonDioxide.getGas(9000))
@@ -1582,8 +1579,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Charcoal.getDust(9), GT_Utility.getIntegratedCircuit(8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Charcoal.getDust(9), GTUtility.getIntegratedCircuit(8))
             .itemOutputs(Materials.Ash.getDust(1))
             .fluidInputs(Materials.Oxygen.getGas(18000))
             .fluidOutputs(Materials.CarbonDioxide.getGas(9000))
@@ -1593,8 +1590,8 @@ public class ChemicalRecipes implements Runnable {
 
         // CO + 4H = CH3OH
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.CarbonMonoxide.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.CarbonMonoxide.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Hydrogen.getGas(4000))
             .fluidOutputs(Materials.Methanol.getFluid(1000))
@@ -1602,8 +1599,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(96)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Hydrogen.getCells(4), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Hydrogen.getCells(4), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(4))
             .fluidInputs(Materials.CarbonMonoxide.getGas(1000))
             .fluidOutputs(Materials.Methanol.getFluid(1000))
@@ -1611,16 +1608,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(96)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.CarbonMonoxide.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.CarbonMonoxide.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Methanol.getCells(1))
             .fluidInputs(Materials.Hydrogen.getGas(4000))
             .duration(6 * SECONDS)
             .eut(96)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Hydrogen.getCells(4), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Hydrogen.getCells(4), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Methanol.getCells(1), Materials.Empty.getCells(3))
             .fluidInputs(Materials.CarbonMonoxide.getGas(1000))
             .duration(6 * SECONDS)
@@ -1629,8 +1626,8 @@ public class ChemicalRecipes implements Runnable {
 
         // CO2 + 6H = CH3OH + H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.CarbonDioxide.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.CarbonDioxide.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Water.getCells(1))
             .fluidInputs(Materials.Hydrogen.getGas(6000))
             .fluidOutputs(Materials.Methanol.getFluid(1000))
@@ -1638,8 +1635,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(96)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Hydrogen.getCells(6), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Hydrogen.getCells(6), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(5))
             .fluidInputs(Materials.CarbonDioxide.getGas(1000))
             .fluidOutputs(Materials.Methanol.getFluid(1000))
@@ -1647,8 +1644,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(96)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.CarbonDioxide.getCells(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.CarbonDioxide.getCells(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Hydrogen.getGas(6000))
             .fluidOutputs(Materials.Methanol.getFluid(1000))
@@ -1656,8 +1653,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(96)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Hydrogen.getCells(6), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Hydrogen.getCells(6), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Empty.getCells(6))
             .fluidInputs(Materials.CarbonDioxide.getGas(1000))
             .fluidOutputs(Materials.Methanol.getFluid(1000))
@@ -1665,16 +1662,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(96)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.CarbonDioxide.getCells(1), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.CarbonDioxide.getCells(1), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.Methanol.getCells(1))
             .fluidInputs(Materials.Hydrogen.getGas(6000))
             .duration(6 * SECONDS)
             .eut(96)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Hydrogen.getCells(6), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Hydrogen.getCells(6), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.Methanol.getCells(1), Materials.Empty.getCells(5))
             .fluidInputs(Materials.CarbonDioxide.getGas(1000))
             .duration(6 * SECONDS)
@@ -1683,8 +1680,8 @@ public class ChemicalRecipes implements Runnable {
 
         // CH3OH + CO = CH3COOH
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methanol.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.CarbonMonoxide.getGas(1000))
             .fluidOutputs(Materials.AceticAcid.getFluid(1000))
@@ -1692,8 +1689,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.CarbonMonoxide.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.CarbonMonoxide.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Methanol.getFluid(1000))
             .fluidOutputs(Materials.AceticAcid.getFluid(1000))
@@ -1701,16 +1698,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methanol.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.AceticAcid.getCells(1))
             .fluidInputs(Materials.CarbonMonoxide.getGas(1000))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.CarbonMonoxide.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.CarbonMonoxide.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.AceticAcid.getCells(1))
             .fluidInputs(Materials.Methanol.getFluid(1000))
             .duration(15 * SECONDS)
@@ -1719,8 +1716,8 @@ public class ChemicalRecipes implements Runnable {
 
         // CH2CH2 + 2O = CH3COOH
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ethylene.getCells(1), GTUtility.getIntegratedCircuit(9))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(2000))
             .fluidOutputs(Materials.AceticAcid.getFluid(1000))
@@ -1728,8 +1725,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(2), GTUtility.getIntegratedCircuit(9))
             .itemOutputs(Materials.Empty.getCells(2))
             .fluidInputs(Materials.Ethylene.getGas(1000))
             .fluidOutputs(Materials.AceticAcid.getFluid(1000))
@@ -1737,16 +1734,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(19))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ethylene.getCells(1), GTUtility.getIntegratedCircuit(19))
             .itemOutputs(Materials.AceticAcid.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(2000))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(19))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(2), GTUtility.getIntegratedCircuit(19))
             .itemOutputs(Materials.AceticAcid.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Ethylene.getGas(1000))
             .duration(5 * SECONDS)
@@ -1755,7 +1752,7 @@ public class ChemicalRecipes implements Runnable {
 
         // O + C2H4O2 + C2H4 = C4H6O2 + H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Ethylene.getCells(1), Materials.AceticAcid.getCells(1))
             .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(1000))
@@ -1764,7 +1761,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.AceticAcid.getCells(1), Materials.Oxygen.getCells(1))
             .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Ethylene.getGas(1000))
@@ -1773,7 +1770,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Oxygen.getCells(1), Materials.Ethylene.getCells(1))
             .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.AceticAcid.getFluid(1000))
@@ -1784,8 +1781,8 @@ public class ChemicalRecipes implements Runnable {
 
         // Ethanol -> Ethylene (Intended loss for Sulfuric Acid)
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ethanol.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ethanol.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Ethylene.getCells(1))
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000))
             .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000))
@@ -1793,8 +1790,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SulfuricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SulfuricAcid.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Ethylene.getCells(1))
             .fluidInputs(Materials.Ethanol.getFluid(1000))
             .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000))
@@ -1802,8 +1799,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ethanol.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ethanol.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1))
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000))
             .fluidOutputs(Materials.Ethylene.getGas(1000))
@@ -1811,8 +1808,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SulfuricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SulfuricAcid.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1))
             .fluidInputs(Materials.Ethanol.getFluid(1000))
             .fluidOutputs(Materials.Ethylene.getGas(1000))
@@ -1822,8 +1819,8 @@ public class ChemicalRecipes implements Runnable {
 
         // H2O + Na = NaOH + H
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Sodium.getDust(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Sodium.getDust(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.SodiumHydroxide.getDust(3))
             .fluidInputs(Materials.Water.getFluid(1000))
             .fluidOutputs(Materials.Hydrogen.getGas(1000))
@@ -1833,8 +1830,8 @@ public class ChemicalRecipes implements Runnable {
 
         // H + Cl = HCl
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorine.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorine.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Hydrogen.getGas(1000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000))
@@ -1842,8 +1839,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Hydrogen.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Hydrogen.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Chlorine.getGas(1000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000))
@@ -1851,16 +1848,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorine.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorine.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.HydrochloricAcid.getCells(1))
             .fluidInputs(Materials.Hydrogen.getGas(1000))
             .duration(3 * SECONDS)
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Hydrogen.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Hydrogen.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.HydrochloricAcid.getCells(1))
             .fluidInputs(Materials.Chlorine.getGas(1000))
             .duration(3 * SECONDS)
@@ -1869,8 +1866,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C3H6 + 2Cl = HCl + C3H5Cl
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorine.getCells(2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Propene.getGas(1000))
             .fluidOutputs(Materials.AllylChloride.getFluid(1000))
@@ -1878,8 +1875,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Propene.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Propene.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.HydrochloricAcid.getCells(1))
             .fluidInputs(Materials.Chlorine.getGas(2000))
             .fluidOutputs(Materials.AllylChloride.getFluid(1000))
@@ -1887,8 +1884,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorine.getCells(2), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.AllylChloride.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Propene.getGas(1000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000))
@@ -1896,8 +1893,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Propene.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Propene.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.AllylChloride.getCells(1))
             .fluidInputs(Materials.Chlorine.getGas(2000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000))
@@ -1907,8 +1904,8 @@ public class ChemicalRecipes implements Runnable {
 
         // 2Cl + H2O = HCl + HClO (Intended loss)
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorine.getCells(2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.DilutedHydrochloricAcid.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Water.getFluid(1000))
             .fluidOutputs(Materials.HypochlorousAcid.getFluid(1000))
@@ -1916,8 +1913,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Water.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.DilutedHydrochloricAcid.getCells(1))
             .fluidInputs(Materials.Chlorine.getGas(2000))
             .fluidOutputs(Materials.HypochlorousAcid.getFluid(1000))
@@ -1925,8 +1922,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorine.getCells(2), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.HypochlorousAcid.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Water.getFluid(1000))
             .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000))
@@ -1934,8 +1931,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Water.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.HypochlorousAcid.getCells(1))
             .fluidInputs(Materials.Chlorine.getGas(2000))
             .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000))
@@ -1945,7 +1942,7 @@ public class ChemicalRecipes implements Runnable {
 
         // HClO + NaOH + C3H5Cl = C3H5ClO + NaCl·H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.HypochlorousAcid.getCells(1), Materials.SodiumHydroxide.getDust(3))
             .itemOutputs(Materials.SaltWater.getCells(1))
             .fluidInputs(Materials.AllylChloride.getFluid(1000))
@@ -1954,7 +1951,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDust(3), Materials.AllylChloride.getCells(1))
             .itemOutputs(Materials.SaltWater.getCells(1))
             .fluidInputs(Materials.HypochlorousAcid.getFluid(1000))
@@ -1963,7 +1960,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(1))
             .itemOutputs(Materials.Water.getCells(2))
             .fluidInputs(Materials.Glycerol.getFluid(1000))
@@ -1972,7 +1969,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Glycerol.getCells(1), Materials.Empty.getCells(1))
             .itemOutputs(Materials.Water.getCells(2))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
@@ -1981,8 +1978,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HydrochloricAcid.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Epichlorohydrin.getCells(1))
             .fluidInputs(Materials.Glycerol.getFluid(1000))
             .fluidOutputs(Materials.Water.getFluid(2000))
@@ -1990,8 +1987,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Glycerol.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Glycerol.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Epichlorohydrin.getCells(1))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
             .fluidOutputs(Materials.Water.getFluid(2000))
@@ -1999,8 +1996,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HydrochloricAcid.getCells(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Glycerol.getFluid(1000))
             .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000))
@@ -2008,8 +2005,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Glycerol.getCells(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Glycerol.getCells(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
             .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000))
@@ -2017,16 +2014,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HydrochloricAcid.getCells(1), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.Epichlorohydrin.getCells(1))
             .fluidInputs(Materials.Glycerol.getFluid(1000))
             .duration(24 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Glycerol.getCells(1), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Glycerol.getCells(1), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.Epichlorohydrin.getCells(1))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
             .duration(24 * SECONDS)
@@ -2035,7 +2032,7 @@ public class ChemicalRecipes implements Runnable {
 
         // P4O10 + 6H2O = 4H3PO4
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.PhosphorousPentoxide.getDust(14))
             .fluidInputs(Materials.Water.getFluid(6000))
             .fluidOutputs(Materials.PhosphoricAcid.getFluid(4000))
@@ -2045,8 +2042,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C9H12 + 2O = C6H6O + C3H6O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Cumene.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Cumene.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Phenol.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(2000))
             .fluidOutputs(Materials.Acetone.getFluid(1000))
@@ -2054,8 +2051,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Phenol.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Cumene.getFluid(1000))
             .fluidOutputs(Materials.Acetone.getFluid(1000))
@@ -2063,8 +2060,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Cumene.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Cumene.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Acetone.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(2000))
             .fluidOutputs(Materials.Phenol.getFluid(1000))
@@ -2072,8 +2069,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(2), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Acetone.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Cumene.getFluid(1000))
             .fluidOutputs(Materials.Phenol.getFluid(1000))
@@ -2083,7 +2080,7 @@ public class ChemicalRecipes implements Runnable {
 
         // C15H16O2 + 2C3H5ClO + 2NaOH = C15H14O2(C3H5O)2 + 2NaCl·H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDust(6), Materials.Epichlorohydrin.getCells(2))
             .itemOutputs(Materials.SaltWater.getCells(2))
             .fluidInputs(Materials.BisphenolA.getFluid(1000))
@@ -2094,8 +2091,8 @@ public class ChemicalRecipes implements Runnable {
 
         // CH4O + HCl = CH3Cl + H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methanol.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Water.getCells(1))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
             .fluidOutputs(Materials.Chloromethane.getGas(1000))
@@ -2103,8 +2100,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HydrochloricAcid.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Water.getCells(1))
             .fluidInputs(Materials.Methanol.getFluid(1000))
             .fluidOutputs(Materials.Chloromethane.getGas(1000))
@@ -2112,8 +2109,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methanol.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Chloromethane.getCells(1))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
             .fluidOutputs(Materials.Water.getFluid(1000))
@@ -2121,8 +2118,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HydrochloricAcid.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Chloromethane.getCells(1))
             .fluidInputs(Materials.Methanol.getFluid(1000))
             .fluidOutputs(Materials.Water.getFluid(1000))
@@ -2130,8 +2127,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methanol.getCells(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
             .fluidOutputs(Materials.Chloromethane.getGas(1000))
@@ -2139,8 +2136,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HydrochloricAcid.getCells(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Methanol.getFluid(1000))
             .fluidOutputs(Materials.Chloromethane.getGas(1000))
@@ -2148,24 +2145,24 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methanol.getCells(1), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.Chloromethane.getCells(1))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
             .duration(8 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HydrochloricAcid.getCells(1), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.Chloromethane.getCells(1))
             .fluidInputs(Materials.Methanol.getFluid(1000))
             .duration(8 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorine.getCells(2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Methane.getGas(1000))
             .fluidOutputs(Materials.Chloromethane.getGas(1000))
@@ -2173,8 +2170,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methane.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methane.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.HydrochloricAcid.getCells(1))
             .fluidInputs(Materials.Chlorine.getGas(2000))
             .fluidOutputs(Materials.Chloromethane.getGas(1000))
@@ -2182,8 +2179,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorine.getCells(2), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Chloromethane.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Methane.getGas(1000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000))
@@ -2191,8 +2188,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methane.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methane.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Chloromethane.getCells(1))
             .fluidInputs(Materials.Chlorine.getGas(2000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000))
@@ -2202,8 +2199,8 @@ public class ChemicalRecipes implements Runnable {
 
         // Cl6 + CH4 = CHCl3 + 3HCl
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorine.getCells(6), GT_Utility.getIntegratedCircuit(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorine.getCells(6), GTUtility.getIntegratedCircuit(3))
             .itemOutputs(Materials.HydrochloricAcid.getCells(3), Materials.Empty.getCells(3))
             .fluidInputs(Materials.Methane.getGas(1000))
             .fluidOutputs(Materials.Chloroform.getFluid(1000))
@@ -2211,8 +2208,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorine.getCells(6), GT_Utility.getIntegratedCircuit(13))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorine.getCells(6), GTUtility.getIntegratedCircuit(13))
             .itemOutputs(Materials.Chloroform.getCells(1), Materials.Empty.getCells(5))
             .fluidInputs(Materials.Methane.getGas(1000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(3000))
@@ -2220,8 +2217,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methane.getCells(1), GT_Utility.getIntegratedCircuit(13))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methane.getCells(1), GTUtility.getIntegratedCircuit(13))
             .itemOutputs(Materials.Chloroform.getCells(1))
             .fluidInputs(Materials.Chlorine.getGas(6000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(3000))
@@ -2231,8 +2228,8 @@ public class ChemicalRecipes implements Runnable {
 
         // H + F = HF
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Fluorine.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Fluorine.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Hydrogen.getGas(1000))
             .fluidOutputs(Materials.HydrofluoricAcid.getFluid(1000))
@@ -2240,8 +2237,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Hydrogen.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Hydrogen.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Fluorine.getGas(1000))
             .fluidOutputs(Materials.HydrofluoricAcid.getFluid(1000))
@@ -2249,16 +2246,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Fluorine.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Fluorine.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.HydrofluoricAcid.getCells(1))
             .fluidInputs(Materials.Hydrogen.getGas(1000))
             .duration(3 * SECONDS)
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Hydrogen.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Hydrogen.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.HydrofluoricAcid.getCells(1))
             .fluidInputs(Materials.Fluorine.getGas(1000))
             .duration(3 * SECONDS)
@@ -2267,7 +2264,7 @@ public class ChemicalRecipes implements Runnable {
 
         // 4HF + 2CHCl3 = C2F4 + 6HCl
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Chloroform.getCells(2), Materials.HydrofluoricAcid.getCells(4))
             .itemOutputs(Materials.HydrochloricAcid.getCells(6))
             .fluidOutputs(Materials.Tetrafluoroethylene.getGas(1000))
@@ -2275,7 +2272,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Chloroform.getCells(2), Materials.Empty.getCells(4))
             .itemOutputs(Materials.HydrochloricAcid.getCells(6))
             .fluidInputs(Materials.HydrofluoricAcid.getFluid(4000))
@@ -2284,7 +2281,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.HydrofluoricAcid.getCells(4), Materials.Empty.getCells(2))
             .itemOutputs(Materials.HydrochloricAcid.getCells(6))
             .fluidInputs(Materials.Chloroform.getFluid(2000))
@@ -2293,8 +2290,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HydrofluoricAcid.getCells(4), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HydrofluoricAcid.getCells(4), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Tetrafluoroethylene.getCells(1), Materials.Empty.getCells(3))
             .fluidInputs(Materials.Chloroform.getFluid(2000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(6000))
@@ -2302,8 +2299,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chloroform.getCells(2), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chloroform.getCells(2), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Tetrafluoroethylene.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.HydrofluoricAcid.getFluid(4000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(6000))
@@ -2313,16 +2310,16 @@ public class ChemicalRecipes implements Runnable {
 
         // Si + 2CH3Cl = C2H6Cl2Si
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Silicon.getDust(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Silicon.getDust(1), GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Chloromethane.getGas(2000))
             .fluidOutputs(Materials.Dimethyldichlorosilane.getFluid(1000))
             .duration(12 * SECONDS)
             .eut(96)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Dimethyldichlorosilane.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Dimethyldichlorosilane.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Polydimethylsiloxane.getDust(3), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Water.getFluid(1000))
             .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000))
@@ -2330,8 +2327,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(96)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Water.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Polydimethylsiloxane.getDust(3), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Dimethyldichlorosilane.getFluid(1000))
             .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000))
@@ -2339,23 +2336,23 @@ public class ChemicalRecipes implements Runnable {
             .eut(96)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Dimethyldichlorosilane.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Dimethyldichlorosilane.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Polydimethylsiloxane.getDust(3), Materials.DilutedHydrochloricAcid.getCells(1))
             .fluidInputs(Materials.Water.getFluid(1000))
             .duration(12 * SECONDS)
             .eut(96)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Water.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Polydimethylsiloxane.getDust(3), Materials.DilutedHydrochloricAcid.getCells(1))
             .fluidInputs(Materials.Dimethyldichlorosilane.getFluid(1000))
             .duration(12 * SECONDS)
             .eut(96)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Polydimethylsiloxane.getDust(9), Materials.Sulfur.getDust(1))
             .fluidOutputs(Materials.Silicone.getMolten(1296))
             .duration(30 * SECONDS)
@@ -2365,8 +2362,8 @@ public class ChemicalRecipes implements Runnable {
         // Potassium Nitride
         // K + HNO3 = KNO3 + H
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Potassium.getDust(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Potassium.getDust(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.PotassiumNitrade.getDust(5))
             .fluidInputs(Materials.NitricAcid.getFluid(1000))
             .fluidOutputs(Materials.Hydrogen.getGas(1000))
@@ -2377,8 +2374,8 @@ public class ChemicalRecipes implements Runnable {
         // Chromium Trioxide
         // CrO2 + O = CrO3
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.ChromiumDioxide.getDust(3), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.ChromiumDioxide.getDust(3), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.ChromiumTrioxide.getDust(4))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .duration(5 * SECONDS)
@@ -2388,8 +2385,8 @@ public class ChemicalRecipes implements Runnable {
         // Nitrochlorobenzene
         // C6H5Cl + HNO3 = C6H4ClNO2 + H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorobenzene.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorobenzene.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Nitrochlorobenzene.getCells(1))
             .fluidInputs(Materials.NitrationMixture.getFluid(2000))
             .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000))
@@ -2397,8 +2394,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorobenzene.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorobenzene.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1))
             .fluidInputs(Materials.NitrationMixture.getFluid(2000))
             .fluidOutputs(Materials.Nitrochlorobenzene.getFluid(1000))
@@ -2406,8 +2403,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.NitrationMixture.getCells(2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.NitrationMixture.getCells(2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Nitrochlorobenzene.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Chlorobenzene.getFluid(1000))
             .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000))
@@ -2415,8 +2412,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.NitrationMixture.getCells(2), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.NitrationMixture.getCells(2), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Chlorobenzene.getFluid(1000))
             .fluidOutputs(Materials.Nitrochlorobenzene.getFluid(1000))
@@ -2426,8 +2423,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C6H6 + 2CH4 = C8H10 + 4H
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methane.getCells(2), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methane.getCells(2), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Dimethylbenzene.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Benzene.getFluid(1000))
             .fluidOutputs(Materials.Hydrogen.getGas(4000))
@@ -2435,8 +2432,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Benzene.getCells(1), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.Dimethylbenzene.getCells(1))
             .fluidInputs(Materials.Methane.getGas(2000))
             .fluidOutputs(Materials.Hydrogen.getGas(4000))
@@ -2447,7 +2444,7 @@ public class ChemicalRecipes implements Runnable {
         // Phthalic Acid
         // C8H10 + 6O =K2Cr2O7= C8H6O4 + 2H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Dimethylbenzene.getCells(1), Materials.Potassiumdichromate.getDustTiny(1))
             .itemOutputs(Materials.PhthalicAcid.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(6000))
@@ -2456,7 +2453,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Oxygen.getCells(6), Materials.Potassiumdichromate.getDustTiny(1))
             .itemOutputs(Materials.PhthalicAcid.getCells(1), ItemList.Cell_Empty.get(5))
             .fluidInputs(Materials.Dimethylbenzene.getFluid(1000))
@@ -2465,7 +2462,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Dimethylbenzene.getCells(9), Materials.Potassiumdichromate.getDust(1))
             .itemOutputs(Materials.PhthalicAcid.getCells(9))
             .fluidInputs(Materials.Oxygen.getGas(54000))
@@ -2474,7 +2471,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Oxygen.getCells(54), Materials.Potassiumdichromate.getDust(1))
             .itemOutputs(Materials.PhthalicAcid.getCells(9), ItemList.Cell_Empty.get(45))
             .fluidInputs(Materials.Dimethylbenzene.getFluid(9000))
@@ -2487,16 +2484,16 @@ public class ChemicalRecipes implements Runnable {
         // But they are kept in gamewise, too much existed setup will be broken.
         // Dichlorobenzidine
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Copper.getDustTiny(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Copper.getDustTiny(1), GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Nitrochlorobenzene.getFluid(2000))
             .fluidOutputs(Materials.Dichlorobenzidine.getFluid(1000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Copper.getDust(1), GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Copper.getDust(1), GTUtility.getIntegratedCircuit(9))
             .fluidInputs(Materials.Nitrochlorobenzene.getFluid(18000))
             .fluidOutputs(Materials.Dichlorobenzidine.getFluid(9000))
             .duration(1 * MINUTES + 30 * SECONDS)
@@ -2505,7 +2502,7 @@ public class ChemicalRecipes implements Runnable {
 
         // Diphenyl Isophthalate
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.PhthalicAcid.getCells(1), Materials.SulfuricAcid.getCells(1))
             .itemOutputs(Materials.Diphenylisophthalate.getCells(1), ItemList.Cell_Empty.get(1))
             .fluidInputs(Materials.Phenol.getFluid(2000))
@@ -2514,7 +2511,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_IV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.PhthalicAcid.getCells(1), Materials.Phenol.getCells(2))
             .itemOutputs(Materials.Diphenylisophthalate.getCells(1), ItemList.Cell_Empty.get(2))
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000))
@@ -2523,7 +2520,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_IV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SulfuricAcid.getCells(1), Materials.Phenol.getCells(2))
             .itemOutputs(Materials.Diphenylisophthalate.getCells(1), ItemList.Cell_Empty.get(2))
             .fluidInputs(Materials.PhthalicAcid.getFluid(1000))
@@ -2534,7 +2531,7 @@ public class ChemicalRecipes implements Runnable {
 
         // Diaminobenzidin
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Ammonia.getCells(2), Materials.Zinc.getDust(1))
             .itemOutputs(Materials.Diaminobenzidin.getCells(1), ItemList.Cell_Empty.get(1))
             .fluidInputs(Materials.Dichlorobenzidine.getFluid(1000))
@@ -2546,7 +2543,7 @@ public class ChemicalRecipes implements Runnable {
         // Polybenzimidazole
         // C12H14N4 + C20H14O4 = C20H12N4 + 2C6H6O + 2H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Diphenylisophthalate.getCells(1), Materials.Diaminobenzidin.getCells(1))
             .itemOutputs(Materials.Phenol.getCells(2))
             .fluidOutputs(Materials.Polybenzimidazole.getMolten(1000))
@@ -2554,10 +2551,10 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_IV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1))
             .itemOutputs(getModItem(Railcraft.ID, "glass", 6))
             .fluidInputs(Materials.Glass.getMolten(864))
             .duration(2 * SECONDS + 10 * TICKS)
@@ -2566,8 +2563,8 @@ public class ChemicalRecipes implements Runnable {
 
         // NH3 + 2CH4O = C2H7N + 2H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methanol.getCells(2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methanol.getCells(2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Water.getCells(2))
             .fluidInputs(Materials.Ammonia.getGas(1000))
             .fluidOutputs(Materials.Dimethylamine.getGas(1000))
@@ -2575,8 +2572,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methanol.getCells(2), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methanol.getCells(2), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Dimethylamine.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Ammonia.getGas(1000))
             .fluidOutputs(Materials.Water.getFluid(1000))
@@ -2584,8 +2581,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ammonia.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Dimethylamine.getCells(1))
             .fluidInputs(Materials.Methanol.getFluid(2000))
             .fluidOutputs(Materials.Water.getFluid(1000))
@@ -2593,8 +2590,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methanol.getCells(2), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methanol.getCells(2), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Empty.getCells(2))
             .fluidInputs(Materials.Ammonia.getGas(1000))
             .fluidOutputs(Materials.Dimethylamine.getGas(1000))
@@ -2602,16 +2599,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Methanol.getCells(2), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Methanol.getCells(2), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.Dimethylamine.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Ammonia.getGas(1000))
             .duration(12 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ammonia.getCells(1), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.Dimethylamine.getCells(1))
             .fluidInputs(Materials.Methanol.getFluid(2000))
             .duration(12 * SECONDS)
@@ -2620,8 +2617,8 @@ public class ChemicalRecipes implements Runnable {
 
         // NH3 + HClO = NH2Cl + H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ammonia.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Water.getCells(1))
             .fluidInputs(Materials.HypochlorousAcid.getFluid(1000))
             .fluidOutputs(Materials.Chloramine.getFluid(1000))
@@ -2629,8 +2626,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HypochlorousAcid.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HypochlorousAcid.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Water.getCells(1))
             .fluidInputs(Materials.Ammonia.getGas(1000))
             .fluidOutputs(Materials.Chloramine.getFluid(1000))
@@ -2638,8 +2635,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ammonia.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Chloramine.getCells(1))
             .fluidInputs(Materials.HypochlorousAcid.getFluid(1000))
             .fluidOutputs(Materials.Water.getFluid(1000))
@@ -2647,8 +2644,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HypochlorousAcid.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HypochlorousAcid.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Chloramine.getCells(1))
             .fluidInputs(Materials.Ammonia.getGas(1000))
             .fluidOutputs(Materials.Water.getFluid(1000))
@@ -2656,8 +2653,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ammonia.getCells(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.HypochlorousAcid.getFluid(1000))
             .fluidOutputs(Materials.Chloramine.getFluid(1000))
@@ -2665,8 +2662,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HypochlorousAcid.getCells(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HypochlorousAcid.getCells(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Ammonia.getGas(1000))
             .fluidOutputs(Materials.Chloramine.getFluid(1000))
@@ -2674,16 +2671,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ammonia.getCells(1), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.Chloramine.getCells(1))
             .fluidInputs(Materials.HypochlorousAcid.getFluid(1000))
             .duration(8 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HypochlorousAcid.getCells(1), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HypochlorousAcid.getCells(1), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.Chloramine.getCells(1))
             .fluidInputs(Materials.Ammonia.getGas(1000))
             .duration(8 * SECONDS)
@@ -2692,24 +2689,24 @@ public class ChemicalRecipes implements Runnable {
 
         // 2NO2 = N2O4
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.NitrogenDioxide.getGas(2000))
             .fluidOutputs(Materials.DinitrogenTetroxide.getGas(1000))
             .duration(32 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.NitrogenDioxide.getCells(2), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.NitrogenDioxide.getCells(2), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Empty.getCells(2))
             .fluidOutputs(Materials.DinitrogenTetroxide.getGas(1000))
             .duration(32 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.NitrogenDioxide.getCells(2), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.NitrogenDioxide.getCells(2), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.DinitrogenTetroxide.getCells(1), Materials.Empty.getCells(1))
             .duration(32 * SECONDS)
             .eut(TierEU.RECIPE_LV)
@@ -2717,8 +2714,8 @@ public class ChemicalRecipes implements Runnable {
 
         // 2NH3 + 5O = 2NO + 3H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ammonia.getCells(4), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ammonia.getCells(4), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.NitricOxide.getCells(4))
             .fluidInputs(Materials.Oxygen.getGas(10000))
             .fluidOutputs(Materials.Water.getFluid(6000))
@@ -2726,8 +2723,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(10), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(10), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.NitricOxide.getCells(4), Materials.Empty.getCells(6))
             .fluidInputs(Materials.Ammonia.getGas(4000))
             .fluidOutputs(Materials.Water.getFluid(6000))
@@ -2735,8 +2732,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(10), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(10), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Water.getCells(6), Materials.Empty.getCells(4))
             .fluidInputs(Materials.Ammonia.getGas(4000))
             .fluidOutputs(Materials.NitricOxide.getGas(4000))
@@ -2744,24 +2741,24 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ammonia.getCells(4), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ammonia.getCells(4), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.NitricOxide.getCells(4))
             .fluidInputs(Materials.Oxygen.getGas(10000))
             .duration(16 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(10), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(10), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.NitricOxide.getCells(4), Materials.Empty.getCells(6))
             .fluidInputs(Materials.Ammonia.getGas(4000))
             .duration(16 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(10), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(10), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.Empty.getCells(10))
             .fluidInputs(Materials.Ammonia.getGas(4000))
             .fluidOutputs(Materials.NitricOxide.getGas(4000))
@@ -2771,8 +2768,8 @@ public class ChemicalRecipes implements Runnable {
 
         // NO + O = NO2
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.NitricOxide.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.NitricOxide.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .fluidOutputs(Materials.NitrogenDioxide.getGas(1000))
@@ -2780,8 +2777,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.NitricOxide.getGas(1000))
             .fluidOutputs(Materials.NitrogenDioxide.getGas(1000))
@@ -2789,16 +2786,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.NitricOxide.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.NitricOxide.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.NitrogenDioxide.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .duration(8 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.NitrogenDioxide.getCells(1))
             .fluidInputs(Materials.NitricOxide.getGas(1000))
             .duration(8 * SECONDS)
@@ -2807,8 +2804,8 @@ public class ChemicalRecipes implements Runnable {
 
         // H2O + 3NO2 = 2HNO3 + NO
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Water.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.NitricOxide.getCells(1))
             .fluidInputs(Materials.NitrogenDioxide.getGas(3000))
             .fluidOutputs(Materials.NitricAcid.getFluid(2000))
@@ -2816,8 +2813,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.NitrogenDioxide.getCells(3), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.NitrogenDioxide.getCells(3), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.NitricOxide.getCells(1), Materials.Empty.getCells(2))
             .fluidInputs(Materials.Water.getFluid(1000))
             .fluidOutputs(Materials.NitricAcid.getFluid(2000))
@@ -2825,8 +2822,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.NitrogenDioxide.getCells(3), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.NitrogenDioxide.getCells(3), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.NitricAcid.getCells(2), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Water.getFluid(1000))
             .fluidOutputs(Materials.NitricOxide.getGas(1000))
@@ -2836,8 +2833,8 @@ public class ChemicalRecipes implements Runnable {
 
         // S + 2H = H2S
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Sulfur.getDust(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Sulfur.getDust(1), GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Hydrogen.getGas(2000))
             .fluidOutputs(Materials.HydricSulfide.getGas(1000))
             .duration(3 * SECONDS)
@@ -2846,8 +2843,8 @@ public class ChemicalRecipes implements Runnable {
 
         // S + 2O = SO2
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Sulfur.getDust(1), GT_Utility.getIntegratedCircuit(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Sulfur.getDust(1), GTUtility.getIntegratedCircuit(3))
             .fluidInputs(Materials.Oxygen.getGas(2000))
             .fluidOutputs(Materials.SulfurDioxide.getGas(1000))
             .duration(3 * SECONDS)
@@ -2856,8 +2853,8 @@ public class ChemicalRecipes implements Runnable {
 
         // H2S + 3O = SO2 + H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HydricSulfide.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HydricSulfide.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Water.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(3000))
             .fluidOutputs(Materials.SulfurDioxide.getGas(1000))
@@ -2865,8 +2862,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(3), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(3), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(2))
             .fluidInputs(Materials.HydricSulfide.getGas(1000))
             .fluidOutputs(Materials.SulfurDioxide.getGas(1000))
@@ -2874,8 +2871,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HydricSulfide.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HydricSulfide.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.SulfurDioxide.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(3000))
             .fluidOutputs(Materials.Water.getFluid(1000))
@@ -2883,8 +2880,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(3), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(3), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.SulfurDioxide.getCells(1), Materials.Empty.getCells(2))
             .fluidInputs(Materials.HydricSulfide.getGas(1000))
             .fluidOutputs(Materials.Water.getFluid(1000))
@@ -2892,8 +2889,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HydricSulfide.getCells(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HydricSulfide.getCells(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(3000))
             .fluidOutputs(Materials.SulfurDioxide.getGas(1000))
@@ -2901,8 +2898,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(3), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(3), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Empty.getCells(3))
             .fluidInputs(Materials.HydricSulfide.getGas(1000))
             .fluidOutputs(Materials.SulfurDioxide.getGas(1000))
@@ -2910,16 +2907,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HydricSulfide.getCells(1), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HydricSulfide.getCells(1), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.SulfurDioxide.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(3000))
             .duration(6 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(3), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(3), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.SulfurDioxide.getCells(1), Materials.Empty.getCells(2))
             .fluidInputs(Materials.HydricSulfide.getGas(1000))
             .duration(6 * SECONDS)
@@ -2928,8 +2925,8 @@ public class ChemicalRecipes implements Runnable {
 
         // 2H2S + SO2 = 3S + 2H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SulfurDioxide.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SulfurDioxide.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Sulfur.getDust(3), Materials.Empty.getCells(1))
             .fluidInputs(Materials.HydricSulfide.getGas(2000))
             .fluidOutputs(Materials.Water.getFluid(2000))
@@ -2937,8 +2934,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HydricSulfide.getCells(2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HydricSulfide.getCells(2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Sulfur.getDust(3), Materials.Empty.getCells(2))
             .fluidInputs(Materials.SulfurDioxide.getGas(1000))
             .fluidOutputs(Materials.Water.getFluid(2000))
@@ -2946,16 +2943,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SulfurDioxide.getCells(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SulfurDioxide.getCells(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Sulfur.getDust(3), Materials.Empty.getCells(1))
             .fluidInputs(Materials.HydricSulfide.getGas(2000))
             .duration(6 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HydricSulfide.getCells(2), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HydricSulfide.getCells(2), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Sulfur.getDust(3), Materials.Empty.getCells(2))
             .fluidInputs(Materials.SulfurDioxide.getGas(1000))
             .duration(6 * SECONDS)
@@ -2964,8 +2961,8 @@ public class ChemicalRecipes implements Runnable {
 
         // SO2 + O = SO3
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.SulfurDioxide.getGas(1000))
             .fluidOutputs(Materials.SulfurTrioxide.getGas(1000))
@@ -2973,8 +2970,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SulfurDioxide.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SulfurDioxide.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .fluidOutputs(Materials.SulfurTrioxide.getGas(1000))
@@ -2982,16 +2979,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.SulfurTrioxide.getCells(1))
             .fluidInputs(Materials.SulfurDioxide.getGas(1000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SulfurDioxide.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SulfurDioxide.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.SulfurTrioxide.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .duration(10 * SECONDS)
@@ -3000,8 +2997,8 @@ public class ChemicalRecipes implements Runnable {
 
         // SO3 + H2O = H2SO4
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Water.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.SulfurTrioxide.getGas(1000))
             .fluidOutputs(Materials.SulfuricAcid.getFluid(1000))
@@ -3009,8 +3006,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SulfurTrioxide.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SulfurTrioxide.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Water.getFluid(1000))
             .fluidOutputs(Materials.SulfuricAcid.getFluid(1000))
@@ -3018,16 +3015,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Water.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.SulfuricAcid.getCells(1))
             .fluidInputs(Materials.SulfurTrioxide.getGas(1000))
             .duration(16 * SECONDS)
             .eut(8)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SulfurTrioxide.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SulfurTrioxide.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.SulfuricAcid.getCells(1))
             .fluidInputs(Materials.Water.getFluid(1000))
             .duration(16 * SECONDS)
@@ -3036,8 +3033,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C2H4 + 2Cl = C2H3Cl + HCl
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorine.getCells(2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Ethylene.getGas(1000))
             .fluidOutputs(Materials.VinylChloride.getGas(1000))
@@ -3045,8 +3042,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ethylene.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.HydrochloricAcid.getCells(1))
             .fluidInputs(Materials.Chlorine.getGas(2000))
             .fluidOutputs(Materials.VinylChloride.getGas(1000))
@@ -3054,8 +3051,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorine.getCells(2), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.VinylChloride.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Ethylene.getGas(1000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000))
@@ -3063,8 +3060,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ethylene.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.VinylChloride.getCells(1))
             .fluidInputs(Materials.Chlorine.getGas(2000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000))
@@ -3074,8 +3071,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C2H4O2 =H2SO4= C2H2O + H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.AceticAcid.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Ethenone.getCells(1))
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000))
             .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000))
@@ -3083,8 +3080,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SulfuricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SulfuricAcid.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Ethenone.getCells(1))
             .fluidInputs(Materials.AceticAcid.getFluid(1000))
             .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000))
@@ -3092,8 +3089,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.AceticAcid.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1))
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000))
             .fluidOutputs(Materials.Ethenone.getGas(1000))
@@ -3101,8 +3098,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SulfuricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SulfuricAcid.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1))
             .fluidInputs(Materials.AceticAcid.getFluid(1000))
             .fluidOutputs(Materials.Ethenone.getGas(1000))
@@ -3113,7 +3110,7 @@ public class ChemicalRecipes implements Runnable {
         // C2H2O + 8HNO3 = 2CN4O8 + 9H2O
         // Chemically this recipe is wrong, but kept for minimizing breaking change.
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Ethenone.getCells(1), Materials.Empty.getCells(1))
             .itemOutputs(Materials.Tetranitromethane.getCells(2))
             .fluidInputs(Materials.NitricAcid.getFluid(8000))
@@ -3122,8 +3119,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ethenone.getCells(1), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ethenone.getCells(1), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.NitricAcid.getFluid(8000))
             .fluidOutputs(Materials.Tetranitromethane.getFluid(2000))
@@ -3131,8 +3128,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.NitricAcid.getCells(8), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.NitricAcid.getCells(8), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Tetranitromethane.getCells(2), Materials.Empty.getCells(6))
             .fluidInputs(Materials.Ethenone.getGas(1000))
             .fluidOutputs(Materials.Water.getFluid(9000))
@@ -3140,16 +3137,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.NitricAcid.getCells(8), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.NitricAcid.getCells(8), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Tetranitromethane.getCells(2), Materials.Empty.getCells(6))
             .fluidInputs(Materials.Ethenone.getGas(1000))
             .duration(24 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.NitricAcid.getCells(8), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.NitricAcid.getCells(8), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.Empty.getCells(8))
             .fluidInputs(Materials.Ethenone.getGas(1000))
             .fluidOutputs(Materials.Tetranitromethane.getFluid(2000))
@@ -3157,7 +3154,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.NitricAcid.getCells(8), Materials.Empty.getCells(1))
             .itemOutputs(Materials.Water.getCells(9))
             .fluidInputs(Materials.Ethenone.getGas(1000))
@@ -3166,7 +3163,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Ethenone.getCells(1), Materials.NitricAcid.getCells(8))
             .itemOutputs(Materials.Water.getCells(9))
             .fluidOutputs(Materials.Tetranitromethane.getFluid(2000))
@@ -3176,7 +3173,7 @@ public class ChemicalRecipes implements Runnable {
 
         // C3H6 + C2H4 = C5H8 + 2H
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Propene.getCells(1), Materials.Empty.getCells(1))
             .itemOutputs(Materials.Hydrogen.getCells(2))
             .fluidInputs(Materials.Ethylene.getGas(1000))
@@ -3185,7 +3182,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Ethylene.getCells(1), Materials.Empty.getCells(1))
             .itemOutputs(Materials.Hydrogen.getCells(2))
             .fluidInputs(Materials.Propene.getGas(1000))
@@ -3194,8 +3191,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Propene.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Propene.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Isoprene.getCells(1))
             .fluidInputs(Materials.Ethylene.getGas(1000))
             .fluidOutputs(Materials.Hydrogen.getGas(2000))
@@ -3203,8 +3200,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ethylene.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Isoprene.getCells(1))
             .fluidInputs(Materials.Propene.getGas(1000))
             .fluidOutputs(Materials.Hydrogen.getGas(2000))
@@ -3212,8 +3209,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(5))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Empty.getCells(1), GTUtility.getIntegratedCircuit(5))
             .itemOutputs(Materials.Methane.getCells(1))
             .fluidInputs(Materials.Propene.getGas(2000))
             .fluidOutputs(Materials.Isoprene.getFluid(1000))
@@ -3221,16 +3218,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Propene.getCells(2), GT_Utility.getIntegratedCircuit(5))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Propene.getCells(2), GTUtility.getIntegratedCircuit(5))
             .itemOutputs(Materials.Methane.getCells(1), Materials.Empty.getCells(1))
             .fluidOutputs(Materials.Isoprene.getFluid(1000))
             .duration(6 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(15))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Empty.getCells(1), GTUtility.getIntegratedCircuit(15))
             .itemOutputs(Materials.Isoprene.getCells(1))
             .fluidInputs(Materials.Propene.getGas(2000))
             .fluidOutputs(Materials.Methane.getGas(1000))
@@ -3238,48 +3235,48 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Propene.getCells(2), GT_Utility.getIntegratedCircuit(15))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Propene.getCells(2), GTUtility.getIntegratedCircuit(15))
             .itemOutputs(Materials.Isoprene.getCells(1), Materials.Empty.getCells(1))
             .fluidOutputs(Materials.Methane.getGas(1000))
             .duration(6 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.Cell_Air.get(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.Cell_Air.get(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.RawRubber.getDust(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Isoprene.getFluid(144))
             .duration(8 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.RawRubber.getDust(3), Materials.Empty.getCells(2))
             .fluidInputs(Materials.Isoprene.getFluid(288))
             .duration(16 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Isoprene.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Isoprene.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.RawRubber.getDust(7), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Air.getGas(14000))
             .duration(56 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Isoprene.getCells(2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Isoprene.getCells(2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.RawRubber.getDust(21), Materials.Empty.getCells(2))
             .fluidInputs(Materials.Oxygen.getGas(14000))
             .duration(1 * MINUTES + 52 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Benzene.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Styrene.getCells(1))
             .fluidInputs(Materials.Ethylene.getGas(1000))
             .fluidOutputs(Materials.Hydrogen.getGas(2000))
@@ -3287,8 +3284,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Ethylene.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Styrene.getCells(1))
             .fluidInputs(Materials.Benzene.getFluid(1000))
             .fluidOutputs(Materials.Hydrogen.getGas(2000))
@@ -3296,7 +3293,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.RawStyreneButadieneRubber.getDust(9), Materials.Sulfur.getDust(1))
             .fluidOutputs(Materials.StyreneButadieneRubber.getMolten(1296))
             .duration(30 * SECONDS)
@@ -3305,8 +3302,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C6H6 + 4Cl = C6H4Cl2 + 2HCl
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Benzene.getCells(1), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Dichlorobenzene.getCells(1))
             .fluidInputs(Materials.Chlorine.getGas(4000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(2000))
@@ -3314,8 +3311,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorine.getCells(4), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorine.getCells(4), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Dichlorobenzene.getCells(1), Materials.Empty.getCells(3))
             .fluidInputs(Materials.Benzene.getFluid(1000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(2000))
@@ -3323,8 +3320,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorine.getCells(4), GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorine.getCells(4), GTUtility.getIntegratedCircuit(12))
             .itemOutputs(Materials.HydrochloricAcid.getCells(2), Materials.Empty.getCells(2))
             .fluidInputs(Materials.Benzene.getFluid(1000))
             .fluidOutputs(Materials.Dichlorobenzene.getFluid(1000))
@@ -3332,7 +3329,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumSulfide.getDust(3), ItemList.Cell_Air.get(8))
             .itemOutputs(Materials.Salt.getDust(4), Materials.Empty.getCells(8))
             .fluidInputs(Materials.Dichlorobenzene.getFluid(1000))
@@ -3341,7 +3338,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumSulfide.getDust(3), Materials.Oxygen.getCells(8))
             .itemOutputs(Materials.Salt.getDust(4), Materials.Empty.getCells(8))
             .fluidInputs(Materials.Dichlorobenzene.getFluid(1000))
@@ -3352,8 +3349,8 @@ public class ChemicalRecipes implements Runnable {
 
         // NaCl + H2SO4 = NaHSO4 + HCl
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Salt.getDust(2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Salt.getDust(2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.SodiumBisulfate.getDust(7))
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000))
@@ -3363,8 +3360,8 @@ public class ChemicalRecipes implements Runnable {
 
         // NaOH + H2SO4 = NaHSO4 + H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SodiumHydroxide.getDust(3), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.SodiumBisulfate.getDust(7))
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000))
             .fluidOutputs(Materials.Water.getFluid(1000))
@@ -3374,7 +3371,7 @@ public class ChemicalRecipes implements Runnable {
 
         // Biodiesel recipes
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.Methanol.getCells(1))
             .itemOutputs(Materials.Glycerol.getCells(1))
             .fluidInputs(Materials.SeedOil.getFluid(6000))
@@ -3383,7 +3380,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.SeedOil.getCells(6))
             .itemOutputs(Materials.BioDiesel.getCells(6))
             .fluidInputs(Materials.Methanol.getFluid(1000))
@@ -3392,7 +3389,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.Methanol.getCells(1))
             .itemOutputs(Materials.Glycerol.getCells(1))
             .fluidInputs(Materials.FishOil.getFluid(6000))
@@ -3401,7 +3398,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.FishOil.getCells(6))
             .itemOutputs(Materials.BioDiesel.getCells(6))
             .fluidInputs(Materials.Methanol.getFluid(1000))
@@ -3410,7 +3407,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.Ethanol.getCells(1))
             .itemOutputs(Materials.Glycerol.getCells(1))
             .fluidInputs(Materials.SeedOil.getFluid(6000))
@@ -3419,7 +3416,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.SeedOil.getCells(6))
             .itemOutputs(Materials.BioDiesel.getCells(6))
             .fluidInputs(Materials.Ethanol.getFluid(1000))
@@ -3428,7 +3425,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.Ethanol.getCells(1))
             .itemOutputs(Materials.Glycerol.getCells(1))
             .fluidInputs(Materials.FishOil.getFluid(6000))
@@ -3437,7 +3434,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.FishOil.getCells(6))
             .itemOutputs(Materials.BioDiesel.getCells(6))
             .fluidInputs(Materials.Ethanol.getFluid(1000))
@@ -3446,7 +3443,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.Methanol.getCells(9))
             .itemOutputs(Materials.Glycerol.getCells(9))
             .fluidInputs(Materials.SeedOil.getFluid(54000))
@@ -3455,7 +3452,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.SeedOil.getCells(54))
             .itemOutputs(Materials.BioDiesel.getCells(54))
             .fluidInputs(Materials.Methanol.getFluid(9000))
@@ -3464,7 +3461,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.Methanol.getCells(9))
             .itemOutputs(Materials.Glycerol.getCells(9))
             .fluidInputs(Materials.FishOil.getFluid(54000))
@@ -3473,7 +3470,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.FishOil.getCells(54))
             .itemOutputs(Materials.BioDiesel.getCells(54))
             .fluidInputs(Materials.Methanol.getFluid(9000))
@@ -3482,7 +3479,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.Ethanol.getCells(9))
             .itemOutputs(Materials.Glycerol.getCells(9))
             .fluidInputs(Materials.SeedOil.getFluid(54000))
@@ -3491,7 +3488,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.SeedOil.getCells(54))
             .itemOutputs(Materials.BioDiesel.getCells(54))
             .fluidInputs(Materials.Ethanol.getFluid(9000))
@@ -3500,7 +3497,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.Ethanol.getCells(9))
             .itemOutputs(Materials.Glycerol.getCells(9))
             .fluidInputs(Materials.FishOil.getFluid(54000))
@@ -3509,7 +3506,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.FishOil.getCells(54))
             .itemOutputs(Materials.BioDiesel.getCells(54))
             .fluidInputs(Materials.Ethanol.getFluid(9000))
@@ -3520,8 +3517,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C3H8O3 + 3HNO3 =H2SO4= C3H5N3O9 + 3H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Glycerol.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Glycerol.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Glyceryl.getCells(1))
             .fluidInputs(Materials.NitrationMixture.getFluid(6000))
             .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(3000))
@@ -3529,8 +3526,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.NitrationMixture.getCells(6), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.NitrationMixture.getCells(6), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Glyceryl.getCells(1), Materials.Empty.getCells(5))
             .fluidInputs(Materials.Glycerol.getFluid(1000))
             .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(3000))
@@ -3538,8 +3535,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.NitrationMixture.getCells(6), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.NitrationMixture.getCells(6), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.DilutedSulfuricAcid.getCells(3), Materials.Empty.getCells(3))
             .fluidInputs(Materials.Glycerol.getFluid(1000))
             .fluidOutputs(Materials.Glyceryl.getFluid(1000))
@@ -3549,7 +3546,7 @@ public class ChemicalRecipes implements Runnable {
 
         // CaO + CO2 = CaCO3
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Quicklime.getDust(2))
             .itemOutputs(Materials.Calcite.getDust(5))
             .fluidInputs(Materials.CarbonDioxide.getGas(1000))
@@ -3557,8 +3554,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Calcite.getDust(5), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Calcite.getDust(5), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Quicklime.getDust(2))
             .fluidOutputs(Materials.CarbonDioxide.getGas(1000))
             .duration(12 * SECONDS)
@@ -3567,7 +3564,7 @@ public class ChemicalRecipes implements Runnable {
 
         // MgO + CO2 = MgCO3
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Magnesia.getDust(2))
             .itemOutputs(Materials.Magnesite.getDust(5))
             .fluidInputs(Materials.CarbonDioxide.getGas(1000))
@@ -3575,8 +3572,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Magnesite.getDust(5), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Magnesite.getDust(5), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Magnesia.getDust(2))
             .fluidOutputs(Materials.CarbonDioxide.getGas(1000))
             .duration(12 * SECONDS)
@@ -3585,8 +3582,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C6H6 + 2Cl = C6H5Cl + HCl
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Benzene.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Chlorobenzene.getCells(1))
             .fluidInputs(Materials.Chlorine.getGas(2000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000))
@@ -3594,8 +3591,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorine.getCells(2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Chlorobenzene.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Benzene.getFluid(1000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000))
@@ -3603,8 +3600,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorine.getCells(2), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Benzene.getFluid(1000))
             .fluidOutputs(Materials.Chlorobenzene.getFluid(1000))
@@ -3614,8 +3611,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C6H5Cl + H2O = C6H6O + HCl
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Water.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.DilutedHydrochloricAcid.getCells(1))
             .fluidInputs(Materials.Chlorobenzene.getFluid(1000))
             .fluidOutputs(Materials.Phenol.getFluid(1000))
@@ -3623,8 +3620,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorobenzene.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorobenzene.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.DilutedHydrochloricAcid.getCells(1))
             .fluidInputs(Materials.Water.getFluid(1000))
             .fluidOutputs(Materials.Phenol.getFluid(1000))
@@ -3632,8 +3629,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Water.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Phenol.getCells(1))
             .fluidInputs(Materials.Chlorobenzene.getFluid(1000))
             .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000))
@@ -3641,8 +3638,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Chlorobenzene.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Chlorobenzene.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Phenol.getCells(1))
             .fluidInputs(Materials.Water.getFluid(1000))
             .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000))
@@ -3652,8 +3649,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C6H5Cl + NaOH = C6H6O + NaCl
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SodiumHydroxide.getDust(12), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SodiumHydroxide.getDust(12), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Salt.getDust(8))
             .fluidInputs(Materials.Chlorobenzene.getFluid(4000))
             .fluidOutputs(Materials.Phenol.getFluid(4000))
@@ -3663,40 +3660,40 @@ public class ChemicalRecipes implements Runnable {
 
         // Oxide Recipe
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2), Materials.Antimony.getDust(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2), Materials.Antimony.getDust(2))
             .itemOutputs(Materials.AntimonyTrioxide.getDust(5))
             .fluidInputs(Materials.Oxygen.getGas(3000))
             .duration(20 * TICKS)
             .eut(30)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2), Materials.Lead.getDust(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2), Materials.Lead.getDust(1))
             .itemOutputs(Materials.Massicot.getDust(2))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .duration(20 * TICKS)
             .eut(30)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2), Materials.Arsenic.getDust(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2), Materials.Arsenic.getDust(2))
             .itemOutputs(Materials.ArsenicTrioxide.getDust(5))
             .fluidInputs(Materials.Oxygen.getGas(3000))
             .duration(20 * TICKS)
             .eut(30)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2), Materials.Cobalt.getDust(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2), Materials.Cobalt.getDust(1))
             .itemOutputs(Materials.CobaltOxide.getDust(2))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .duration(20 * TICKS)
             .eut(30)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2), Materials.Zinc.getDust(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2), Materials.Zinc.getDust(1))
             .itemOutputs(Materials.Zincite.getDust(2))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .duration(20 * TICKS)
@@ -3705,12 +3702,12 @@ public class ChemicalRecipes implements Runnable {
 
         // CaSi2 + 2HCl = 2Si + CaCl2 + 2H
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CalciumDisilicide, 3),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.CalciumDisilicide, 3),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2),
                 new ItemStack(WerkstoffLoader.items.get(OrePrefixes.dust), 3, 63))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(2000))
             .fluidOutputs(Materials.Hydrogen.getGas(2000))
@@ -3720,12 +3717,10 @@ public class ChemicalRecipes implements Runnable {
 
         // SiCl4 + 2Zn = 2ZnCl2 + Si
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 2),
-                GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1),
                 new ItemStack(WerkstoffLoader.items.get(OrePrefixes.dust), 6, 10052))
             .fluidInputs(Materials.SiliconTetrachloride.getFluid(1000))
             .duration(20 * SECONDS)
@@ -3734,10 +3729,10 @@ public class ChemicalRecipes implements Runnable {
 
         // C4H8O + 2H =Pd= C4H10O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Butyraldehyde, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Palladium, 1))
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Butyraldehyde, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Palladium, 1))
             .itemOutputs(ItemList.Cell_Empty.get(1))
             .fluidInputs(Materials.Hydrogen.getGas(2000))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("butanol"), 1000))
@@ -3747,13 +3742,13 @@ public class ChemicalRecipes implements Runnable {
 
         // 4CH2O + C2H4O =NaOH= C5H12O4 + CO
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs( // very poor way of looking for it, but getModItem on GT++ within GT5U jar is prohibited now,
                 // and i don't feel like reworking GT++ cell registration for now
                 GameRegistry.findItemStack(GTPlusPlus.ID, "Formaldehyde", 4),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21),
                 Materials.Empty.getCells(4))
             .fluidInputs(MaterialsKevlar.Acetaldehyde.getGas(1000))
             .fluidOutputs(Materials.CarbonMonoxide.getGas(1000))
@@ -3763,12 +3758,12 @@ public class ChemicalRecipes implements Runnable {
 
         // 4CH2O + C2H4O =NaOH= C5H12O4 + CO
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Acetaldehyde, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1))
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Acetaldehyde, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21),
                 Materials.Empty.getCells(1))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 4000))
             .fluidOutputs(Materials.CarbonMonoxide.getGas(1000))
@@ -3778,10 +3773,10 @@ public class ChemicalRecipes implements Runnable {
 
         // CaC2 + 2H2O = Ca(OH)2 + C2H2
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CalciumCarbide, 3),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CalciumCarbide, 3),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(new ItemStack(ModItems.dustCalciumHydroxide, 5))
             .fluidInputs(Materials.Water.getFluid(2000))
             .fluidOutputs(MaterialsKevlar.Acetylene.getGas(1000))
@@ -3791,10 +3786,10 @@ public class ChemicalRecipes implements Runnable {
 
         // Co(NO3)2 + 2NaOH = Co(OH)2 + 2NaNO3
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 MaterialsKevlar.CobaltIINitrate.getDust(9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6))
             .itemOutputs(MaterialsKevlar.CobaltIIHydroxide.getDust(5), SODIUM_NITRATE.getDust(10))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_MV)
@@ -3803,8 +3798,8 @@ public class ChemicalRecipes implements Runnable {
 
     public void addDefaultPolymerizationRecipes(Fluid aBasicMaterial, ItemStack aBasicMaterialCell, Fluid aPolymer) {
         // Oxygen/Titaniumtetrafluoride -> +50% Output each
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.Cell_Air.get(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.Cell_Air.get(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(new FluidStack(aBasicMaterial, 144))
             .fluidOutputs(new FluidStack(aPolymer, 144))
@@ -3812,8 +3807,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(new FluidStack(aBasicMaterial, 144))
             .fluidOutputs(new FluidStack(aPolymer, 216))
@@ -3821,8 +3816,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(aBasicMaterialCell, GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(aBasicMaterialCell, GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Air.getGas(14000))
             .fluidOutputs(new FluidStack(aPolymer, 1000))
@@ -3830,8 +3825,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(aBasicMaterialCell, GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(aBasicMaterialCell, GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(7000))
             .fluidOutputs(new FluidStack(aPolymer, 1500))
@@ -3839,8 +3834,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(
                 new FluidStack(aBasicMaterial, 2160),
                 Materials.Air.getGas(7500),
@@ -3850,8 +3845,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(
                 new FluidStack(aBasicMaterial, 2160),
                 Materials.Oxygen.getGas(7500),
@@ -3892,14 +3887,14 @@ public class ChemicalRecipes implements Runnable {
 
     public void singleBlockOnly() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.GasolineRaw.getCells(10), Materials.Toluene.getCells(1))
             .itemOutputs(Materials.GasolineRegular.getCells(11))
             .duration(10 * TICKS)
             .eut(TierEU.RECIPE_HV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Benzene.getCells(1), Materials.Empty.getCells(1))
             .itemOutputs(Materials.Hydrogen.getCells(2))
             .fluidInputs(Materials.Ethylene.getGas(1000))
@@ -3908,7 +3903,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Ethylene.getCells(1), Materials.Empty.getCells(1))
             .itemOutputs(Materials.Hydrogen.getCells(2))
             .fluidInputs(Materials.Benzene.getFluid(1000))
@@ -3917,7 +3912,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_LV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Methane.getCells(1), Materials.Empty.getCells(2))
             .itemOutputs(Materials.HydrochloricAcid.getCells(3))
             .fluidInputs(Materials.Chlorine.getGas(6000))
@@ -3926,7 +3921,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Silicon.getDust(1), Materials.Chloromethane.getCells(2))
             .itemOutputs(Materials.Empty.getCells(2))
             .fluidOutputs(Materials.Dimethyldichlorosilane.getFluid(1000))
@@ -3934,7 +3929,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(96)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Dimethyldichlorosilane.getCells(1), Materials.Water.getCells(1))
             .itemOutputs(Materials.Polydimethylsiloxane.getDust(3), Materials.Empty.getCells(2))
             .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000))
@@ -3944,7 +3939,7 @@ public class ChemicalRecipes implements Runnable {
 
         // Ca5(PO4)3Cl + 5H2SO4 + 10H2O = 5CaSO4(H2O)2 + HCl + 3H3PO4
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Apatite.getDust(9), Materials.SulfuricAcid.getCells(5))
             .itemOutputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(4))
             .fluidInputs(Materials.Water.getFluid(10000))
@@ -3955,7 +3950,7 @@ public class ChemicalRecipes implements Runnable {
 
         // 10O + 4P = P4O10
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Phosphorus.getDust(4))
             .itemOutputs(Materials.PhosphorousPentoxide.getDust(14))
             .fluidInputs(Materials.Oxygen.getGas(10000))
@@ -3965,7 +3960,7 @@ public class ChemicalRecipes implements Runnable {
 
         // HCl + C3H8O3 = C3H5ClO + 2H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.HydrochloricAcid.getCells(1), Materials.Glycerol.getCells(1))
             .itemOutputs(Materials.Water.getCells(2))
             .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000))
@@ -3975,7 +3970,7 @@ public class ChemicalRecipes implements Runnable {
 
         // H2O + Cl =Hg= HClO + H
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Chlorine.getCells(10), Materials.Mercury.getCells(1))
             .itemOutputs(Materials.Hydrogen.getCells(10), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Water.getFluid(10000))
@@ -3984,7 +3979,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Water.getCells(10), Materials.Mercury.getCells(1))
             .itemOutputs(Materials.Hydrogen.getCells(10), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Chlorine.getGas(10000))
@@ -3993,7 +3988,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(8)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Chlorine.getCells(1), Materials.Water.getCells(1))
             .itemOutputs(Materials.Hydrogen.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Mercury.getFluid(100))
@@ -4004,7 +3999,7 @@ public class ChemicalRecipes implements Runnable {
 
         // P + 3Cl = PCl3
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Phosphorus.getDust(1), Materials.Chlorine.getCells(3))
             .itemOutputs(ItemList.Cell_Empty.get(3))
             .fluidOutputs(MaterialsKevlar.PhosphorusTrichloride.getFluid(1000))
@@ -4012,10 +4007,10 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.EthyleneOxide, 1),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 5))
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.EthyleneOxide, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Water, 5))
             .itemOutputs(ItemList.Cell_Empty.get(6))
             .fluidInputs(Materials.Dimethyldichlorosilane.getFluid(4000))
             .fluidOutputs(MaterialsKevlar.SiliconOil.getFluid(5000))
@@ -4023,10 +4018,10 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.EthyleneOxide, 1),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Dimethyldichlorosilane, 4))
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.EthyleneOxide, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Dimethyldichlorosilane, 4))
             .itemOutputs(ItemList.Cell_Empty.get(5))
             .fluidInputs(Materials.Water.getFluid(5000))
             .fluidOutputs(MaterialsKevlar.SiliconOil.getFluid(5000))
@@ -4034,10 +4029,10 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1),
-                GT_Utility.getIntegratedCircuit(2))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1),
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.Cell_Empty.get(1))
             .fluidInputs(MaterialsKevlar.EthyleneOxide.getGas(1000))
             .fluidOutputs(MaterialsKevlar.Ethyleneglycol.getFluid(1000))
@@ -4045,14 +4040,14 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(MaterialsKevlar.CobaltIIHydroxide.getDust(5), MaterialsKevlar.NaphthenicAcid.getCells(1))
             .itemOutputs(MaterialsKevlar.CobaltIINaphthenate.getDust(41), ItemList.Cell_Empty.get(1))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(MaterialsKevlar.CobaltIIAcetate.getDust(15), MaterialsKevlar.NaphthenicAcid.getCells(1))
             .itemOutputs(MaterialsKevlar.CobaltIINaphthenate.getDust(41), ItemList.Cell_Empty.get(1))
             .fluidOutputs(Materials.AceticAcid.getFluid(1500))
@@ -4060,27 +4055,27 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 4))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 4))
             .itemOutputs(ItemList.Cell_Empty.get(4))
             .fluidOutputs(Materials.SiliconTetrachloride.getFluid(1000))
             .duration(20 * SECONDS)
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Galena, 3),
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Sphalerite, 1))
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Galena, 3),
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Sphalerite, 1))
             .fluidInputs(Materials.SulfuricAcid.getFluid(4000))
             .fluidOutputs(new FluidStack(ItemList.sIndiumConcentrate, 8000))
             .duration(3 * SECONDS)
             .eut(150)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Carbon.getDust(1), Materials.Empty.getCells(1))
             .itemOutputs(Materials.Methane.getCells(1))
             .fluidInputs(Materials.Hydrogen.getGas(4000))
@@ -4090,74 +4085,74 @@ public class ChemicalRecipes implements Runnable {
 
         // O + 2H = H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1),
-                GT_Utility.getIntegratedCircuit(22))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1),
+                GTUtility.getIntegratedCircuit(22))
             .itemOutputs(ItemList.Cell_Empty.get(1))
             .fluidInputs(Materials.Hydrogen.getGas(2000))
-            .fluidOutputs(GT_ModHandler.getDistilledWater(1000))
+            .fluidOutputs(GTModHandler.getDistilledWater(1000))
             .duration(10 * TICKS)
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1),
-                GT_Utility.getIntegratedCircuit(22))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1),
+                GTUtility.getIntegratedCircuit(22))
             .itemOutputs(ItemList.Cell_Empty.get(1))
             .fluidInputs(Materials.Oxygen.getGas(500))
-            .fluidOutputs(GT_ModHandler.getDistilledWater(500))
+            .fluidOutputs(GTModHandler.getDistilledWater(500))
             .duration(5 * TICKS)
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
         // Si + 4Cl = SiCl4
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), ItemList.Cell_Empty.get(2))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), ItemList.Cell_Empty.get(2))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(3000))
             .fluidOutputs(Materials.Trichlorosilane.getFluid(1000))
             .duration(15 * SECONDS)
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Silane, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), ItemList.Cell_Empty.get(1))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Silane, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), ItemList.Cell_Empty.get(1))
             .fluidOutputs(Materials.Hydrogen.getGas(4000))
             .duration(15 * SECONDS)
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Silane, 1), ItemList.Cell_Empty.get(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Silane, 1), ItemList.Cell_Empty.get(3))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 4))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 4))
             .duration(15 * SECONDS)
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
         // S + 2Cl = SCl2
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 16))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 16))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 8),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 8),
                 ItemList.Cell_Empty.get(8))
             .duration(40 * SECONDS)
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8), ItemList.Cell_Empty.get(8))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8), ItemList.Cell_Empty.get(8))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 8))
             .fluidInputs(Materials.Chlorine.getGas(16000))
             .duration(40 * SECONDS)
             .eut(30)
@@ -4165,7 +4160,7 @@ public class ChemicalRecipes implements Runnable {
 
         // C6H6 + C3H6 = C9H12
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Propene.getCells(8), Materials.PhosphoricAcid.getCells(1))
             .itemOutputs(Materials.Empty.getCells(9))
             .fluidInputs(Materials.Benzene.getFluid(8000))
@@ -4174,7 +4169,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.PhosphoricAcid.getCells(1), Materials.Benzene.getCells(8))
             .itemOutputs(Materials.Empty.getCells(9))
             .fluidInputs(Materials.Propene.getGas(8000))
@@ -4183,7 +4178,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Benzene.getCells(1), Materials.Propene.getCells(1))
             .itemOutputs(Materials.Empty.getCells(2))
             .fluidInputs(Materials.PhosphoricAcid.getFluid(125))
@@ -4194,7 +4189,7 @@ public class ChemicalRecipes implements Runnable {
 
         // C3H6O + 2C6H6O =HCl= C15H16O2 + H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Acetone.getCells(1), Materials.Phenol.getCells(2))
             .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(2))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
@@ -4203,7 +4198,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.HydrochloricAcid.getCells(1), Materials.Acetone.getCells(1))
             .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Phenol.getFluid(2000))
@@ -4212,7 +4207,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Phenol.getCells(2), Materials.HydrochloricAcid.getCells(1))
             .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(2))
             .fluidInputs(Materials.Acetone.getFluid(1000))
@@ -4223,8 +4218,8 @@ public class ChemicalRecipes implements Runnable {
 
         // N + 3H = NH3
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Nitrogen.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Nitrogen.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Hydrogen.getGas(3000))
             .fluidOutputs(Materials.Ammonia.getGas(1000))
@@ -4232,8 +4227,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.HV * 3 / 4)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Hydrogen.getCells(3), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Hydrogen.getCells(3), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(3))
             .fluidInputs(Materials.Nitrogen.getGas(1000))
             .fluidOutputs(Materials.Ammonia.getGas(1000))
@@ -4241,23 +4236,23 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.HV * 3 / 4)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Nitrogen.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Nitrogen.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Ammonia.getCells(1))
             .fluidInputs(Materials.Hydrogen.getGas(3000))
             .duration(16 * SECONDS)
             .eut(TierEU.HV * 3 / 4)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Hydrogen.getCells(3), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Hydrogen.getCells(3), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Ammonia.getCells(1), Materials.Empty.getCells(2))
             .fluidInputs(Materials.Nitrogen.getGas(1000))
             .duration(16 * SECONDS)
             .eut(TierEU.HV * 3 / 4)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Ammonia.getCells(1), Materials.Empty.getCells(1))
             .itemOutputs(Materials.Water.getCells(2))
             .fluidInputs(Materials.Methanol.getFluid(2000))
@@ -4266,7 +4261,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Ammonia.getCells(4), Materials.Empty.getCells(2))
             .itemOutputs(Materials.Water.getCells(6))
             .fluidInputs(Materials.Oxygen.getGas(10000))
@@ -4275,7 +4270,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Water.getCells(1), Materials.Empty.getCells(1))
             .itemOutputs(Materials.NitricAcid.getCells(2))
             .fluidInputs(Materials.NitrogenDioxide.getGas(3000))
@@ -4286,7 +4281,7 @@ public class ChemicalRecipes implements Runnable {
 
         // 2NO2 + O + H2O = 2HNO3
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.NitrogenDioxide.getCells(2), Materials.Oxygen.getCells(1))
             .itemOutputs(Materials.Empty.getCells(3))
             .fluidInputs(Materials.Water.getFluid(1000))
@@ -4295,7 +4290,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Oxygen.getCells(1), Materials.Water.getCells(1))
             .itemOutputs(Materials.Empty.getCells(2))
             .fluidInputs(Materials.NitrogenDioxide.getGas(2000))
@@ -4304,7 +4299,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Water.getCells(1), Materials.NitrogenDioxide.getCells(2))
             .itemOutputs(Materials.Empty.getCells(3))
             .fluidInputs(Materials.Oxygen.getGas(1000))
@@ -4313,7 +4308,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Sulfur.getDust(1), Materials.Empty.getCells(1))
             .itemOutputs(Materials.HydricSulfide.getCells(1))
             .fluidInputs(Materials.Hydrogen.getGas(2000))
@@ -4323,7 +4318,7 @@ public class ChemicalRecipes implements Runnable {
 
         // C2H4 + HCl + O = C2H3Cl + H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Ethylene.getCells(1), Materials.HydrochloricAcid.getCells(1))
             .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(1000))
@@ -4332,7 +4327,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.HydrochloricAcid.getCells(1), Materials.Oxygen.getCells(1))
             .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Ethylene.getGas(1000))
@@ -4341,7 +4336,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Oxygen.getCells(1), Materials.Ethylene.getCells(1))
             .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
@@ -4350,7 +4345,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Butadiene.getCells(1), ItemList.Cell_Air.get(5))
             .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(9), Materials.Empty.getCells(6))
             .fluidInputs(Materials.Styrene.getFluid(350))
@@ -4358,7 +4353,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Butadiene.getCells(1), Materials.Oxygen.getCells(5))
             .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(13), Materials.Empty.getCells(6))
             .fluidInputs(Materials.Styrene.getFluid(350))
@@ -4366,7 +4361,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Styrene.getCells(1), ItemList.Cell_Air.get(15))
             .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(27), Materials.Empty.getCells(16))
             .fluidInputs(Materials.Butadiene.getGas(3000))
@@ -4374,7 +4369,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Styrene.getCells(1), Materials.Oxygen.getCells(15))
             .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(41), Materials.Empty.getCells(16))
             .fluidInputs(Materials.Butadiene.getGas(3000))
@@ -4382,7 +4377,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Styrene.getCells(1), Materials.Butadiene.getCells(3))
             .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(27), Materials.Empty.getCells(4))
             .fluidInputs(Materials.Air.getGas(15000))
@@ -4390,7 +4385,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Styrene.getCells(1), Materials.Butadiene.getCells(3))
             .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(41), Materials.Empty.getCells(4))
             .fluidInputs(Materials.Oxygen.getGas(15000))
@@ -4398,7 +4393,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Benzene.getCells(1), Materials.Empty.getCells(1))
             .itemOutputs(Materials.HydrochloricAcid.getCells(2))
             .fluidInputs(Materials.Chlorine.getGas(4000))
@@ -4407,7 +4402,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Glycerol.getCells(1), Materials.Empty.getCells(2))
             .itemOutputs(Materials.DilutedSulfuricAcid.getCells(3))
             .fluidInputs(Materials.NitrationMixture.getFluid(6000))
@@ -4416,7 +4411,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDust(12), Materials.Empty.getCells(4))
             .itemOutputs(Materials.Salt.getDust(8), Materials.Phenol.getCells(4))
             .fluidInputs(Materials.Chlorobenzene.getFluid(4000))
@@ -4424,7 +4419,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDust(12), Materials.Chlorobenzene.getCells(4))
             .itemOutputs(Materials.Salt.getDust(8), Materials.Phenol.getCells(4))
             .duration(48 * SECONDS)
@@ -4434,15 +4429,15 @@ public class ChemicalRecipes implements Runnable {
         // Recipes for gasoline
         // 2N + O = N2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Nitrogen.getCells(2), Materials.Oxygen.getCells(1))
             .itemOutputs(Materials.NitrousOxide.getCells(1), Materials.Empty.getCells(2))
             .duration(10 * SECONDS)
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Nitrogen.getCells(2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Nitrogen.getCells(2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(2))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .fluidOutputs(Materials.NitrousOxide.getGas(1000))
@@ -4450,16 +4445,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Nitrogen.getCells(2), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Nitrogen.getCells(2), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.NitrousOxide.getCells(1), Materials.Empty.getCells(1))
             .fluidInputs(Materials.Oxygen.getGas(1000))
             .duration(10 * SECONDS)
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Nitrogen.getGas(2000))
             .fluidOutputs(Materials.NitrousOxide.getGas(1000))
@@ -4467,8 +4462,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Oxygen.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.NitrousOxide.getCells(1))
             .fluidInputs(Materials.Nitrogen.getGas(2000))
             .duration(10 * SECONDS)
@@ -4477,7 +4472,7 @@ public class ChemicalRecipes implements Runnable {
 
         // C2H6O + C4H8 = C6H14O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Ethanol.getCells(1), Materials.Butene.getCells(1))
             .itemOutputs(Materials.AntiKnock.getCells(1), Materials.Empty.getCells(1))
             .duration(20 * SECONDS)
@@ -4487,7 +4482,7 @@ public class ChemicalRecipes implements Runnable {
         // Potassium Dichromate
         // 2KNO3 + 2CrO3 = K2Cr2O7 + 2NO + 3O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Saltpeter.getDust(10), Materials.ChromiumTrioxide.getDust(8))
             .itemOutputs(Materials.Potassiumdichromate.getDust(11))
             .fluidOutputs(Materials.NitricOxide.getGas(2000))
@@ -4495,7 +4490,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(chemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.PotassiumNitrade.getDust(10), Materials.ChromiumTrioxide.getDust(8))
             .itemOutputs(Materials.Potassiumdichromate.getDust(11))
             .fluidOutputs(Materials.NitricOxide.getGas(2000))
@@ -4506,15 +4501,15 @@ public class ChemicalRecipes implements Runnable {
 
     public void multiblockOnly() {
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(22))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(22))
             .fluidInputs(Materials.Hydrogen.getGas(16000), Materials.Oxygen.getGas(8000))
-            .fluidOutputs(GT_ModHandler.getDistilledWater(8000))
+            .fluidOutputs(GTModHandler.getDistilledWater(8000))
             .duration(4 * SECONDS)
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.PotassiumNitrade.getDust(10), Materials.ChromiumTrioxide.getDust(8))
             .itemOutputs(Materials.Potassiumdichromate.getDust(11))
             .fluidOutputs(Materials.NitricOxide.getGas(2000), Materials.Oxygen.getGas(3000))
@@ -4522,7 +4517,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Saltpeter.getDust(10), Materials.ChromiumTrioxide.getDust(8))
             .itemOutputs(Materials.Potassiumdichromate.getDust(11))
             .fluidOutputs(Materials.NitricOxide.getGas(2000), Materials.Oxygen.getGas(3000))
@@ -4533,13 +4528,13 @@ public class ChemicalRecipes implements Runnable {
         // Potassium Dichromate shortcut
         // 2 Cr + 6O + 10 Saltpeter/Potassium Dichromate = 10 K2Cr2O7 + 2NO + 3O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 Materials.PotassiumNitrade.getDust(64),
                 Materials.PotassiumNitrade.getDust(64),
                 Materials.PotassiumNitrade.getDust(32),
                 Materials.Chrome.getDust(2 * 16),
-                GT_Utility.getIntegratedCircuit(11))
+                GTUtility.getIntegratedCircuit(11))
             .itemOutputs(
                 Materials.Potassiumdichromate.getDust(64),
                 Materials.Potassiumdichromate.getDust(64),
@@ -4547,16 +4542,16 @@ public class ChemicalRecipes implements Runnable {
             .fluidInputs(Materials.Oxygen.getGas(6000 * 16))
             .fluidOutputs(Materials.NitricOxide.getGas(2000 * 16), Materials.Oxygen.getGas(3000 * 16))
             .duration(2 * MINUTES + 8 * SECONDS)
-            .eut((int) GT_Values.VP[7])
+            .eut((int) GTValues.VP[7])
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 Materials.Saltpeter.getDust(64),
                 Materials.Saltpeter.getDust(64),
                 Materials.Saltpeter.getDust(32),
                 Materials.Chrome.getDust(2 * 16),
-                GT_Utility.getIntegratedCircuit(11))
+                GTUtility.getIntegratedCircuit(11))
             .itemOutputs(
                 Materials.Potassiumdichromate.getDust(64),
                 Materials.Potassiumdichromate.getDust(64),
@@ -4564,67 +4559,67 @@ public class ChemicalRecipes implements Runnable {
             .fluidInputs(Materials.Oxygen.getGas(6000 * 16))
             .fluidOutputs(Materials.NitricOxide.getGas(2000 * 16), Materials.Oxygen.getGas(3000 * 16))
             .duration(2 * MINUTES + 8 * SECONDS)
-            .eut((int) GT_Values.VP[7])
+            .eut((int) GTValues.VP[7])
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Benzene.getFluid(1000), Materials.Methane.getGas(2000))
             .fluidOutputs(Materials.Dimethylbenzene.getFluid(1000), Materials.Hydrogen.getGas(4000))
             .duration(3 * MINUTES + 20 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(1),
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Galena, 3),
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Sphalerite, 1))
+                GTUtility.getIntegratedCircuit(1),
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Galena, 3),
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Sphalerite, 1))
             .fluidInputs(Materials.SulfuricAcid.getFluid(4000))
             .fluidOutputs(new FluidStack(ItemList.sIndiumConcentrate, 8000))
             .duration(3 * SECONDS)
             .eut(150)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(8),
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Galena, 27),
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Sphalerite, 9))
+                GTUtility.getIntegratedCircuit(8),
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Galena, 27),
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Sphalerite, 9))
             .fluidInputs(Materials.SulfuricAcid.getFluid(36000))
             .fluidOutputs(new FluidStack(ItemList.sIndiumConcentrate, 72000))
             .duration(8 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(9),
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Pentlandite, 9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 1))
+                GTUtility.getIntegratedCircuit(9),
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Pentlandite, 9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 1))
             .fluidInputs(Materials.SulfuricAcid.getFluid(9000))
             .fluidOutputs(new FluidStack(ItemList.sNickelSulfate, 18000))
             .duration(1 * SECONDS + 5 * TICKS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(9),
-                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 1))
+                GTUtility.getIntegratedCircuit(9),
+                GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 1))
             .fluidInputs(Materials.SulfuricAcid.getFluid(9000))
             .fluidOutputs(new FluidStack(ItemList.sBlueVitriol, 18000))
             .duration(1 * SECONDS + 5 * TICKS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Plutonium, 64),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1),
-                GT_Utility.getIntegratedCircuit(8))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 64))
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Plutonium, 64),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1),
+                GTUtility.getIntegratedCircuit(8))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 64))
             .fluidInputs(Materials.Air.getGas(8000))
             .fluidOutputs(Materials.Radon.getGas(800))
             .duration(1 * MINUTES + 15 * SECONDS)
@@ -4633,24 +4628,24 @@ public class ChemicalRecipes implements Runnable {
 
         // 3SiO2 + 4Al = 3Si + 2Al2O3
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4))
+                GTUtility.getIntegratedCircuit(1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 10))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 10))
             .duration(10 * TICKS)
             .eut(TierEU.RECIPE_MV)
             .addTo(multiblockChemicalReactorRecipes);
 
         // 10Si + 30HCl -> 0.3 SiH2Cl2 + 9 HSiCl3 + 0.3 SiCl4 + 0.2 Si2Cl6 + 20.4H
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 10))
+                GTUtility.getIntegratedCircuit(9),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 10))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(30000))
             .fluidOutputs(
                 Materials.Trichlorosilane.getFluid(9000),
@@ -4664,8 +4659,8 @@ public class ChemicalRecipes implements Runnable {
 
         // 2CO + 2C3H6 + 4H =RhHCO(P(C6H5)3)3= C4H8O + C4H8O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(4), MaterialsKevlar.OrganorhodiumCatalyst.getDustTiny(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(4), MaterialsKevlar.OrganorhodiumCatalyst.getDustTiny(1))
             .fluidInputs(
                 Materials.Hydrogen.getGas(4000),
                 Materials.Propene.getGas(2000),
@@ -4675,8 +4670,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9), MaterialsKevlar.OrganorhodiumCatalyst.getDust(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9), MaterialsKevlar.OrganorhodiumCatalyst.getDust(1))
             .fluidInputs(
                 Materials.Hydrogen.getGas(36000),
                 Materials.Propene.getGas(18000),
@@ -4688,30 +4683,30 @@ public class ChemicalRecipes implements Runnable {
 
         // C2H4 + O =Al2O3,Ag= C2H4O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1))
+                GTUtility.getIntegratedCircuit(2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1))
             .fluidInputs(Materials.Ethylene.getGas(1000), Materials.Oxygen.getGas(1000))
             .fluidOutputs(MaterialsKevlar.EthyleneOxide.getGas(1000))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9))
+                GTUtility.getIntegratedCircuit(8),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 9),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9))
             .fluidInputs(Materials.Ethylene.getGas(9000), Materials.Oxygen.getGas(9000))
             .fluidOutputs(MaterialsKevlar.EthyleneOxide.getGas(9000))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(
                 MaterialsKevlar.EthyleneOxide.getGas(1000),
                 Materials.Dimethyldichlorosilane.getFluid(4000),
@@ -4721,8 +4716,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(8))
             .fluidInputs(
                 MaterialsKevlar.EthyleneOxide.getGas(9000),
                 Materials.Dimethyldichlorosilane.getFluid(36000),
@@ -4734,35 +4729,35 @@ public class ChemicalRecipes implements Runnable {
 
         // NH3 + CH4O =SiO2,Al2O3= CH5N + H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(10),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1))
+                GTUtility.getIntegratedCircuit(10),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1))
             .fluidInputs(Materials.Methanol.getFluid(1000), Materials.Ammonia.getGas(1000))
             .fluidOutputs(MaterialsKevlar.Methylamine.getGas(1000), Materials.Water.getFluid(1000))
             .duration(1 * MINUTES + 15 * SECONDS)
             .eut(TierEU.RECIPE_UV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 5))
+                GTUtility.getIntegratedCircuit(1),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 5))
             .fluidInputs(MaterialsKevlar.Ethyleneglycol.getFluid(4000), MaterialsKevlar.SiliconOil.getFluid(1000))
             .fluidOutputs(MaterialsKevlar.PolyurethaneResin.getFluid(1000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_UV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 45))
+                GTUtility.getIntegratedCircuit(9),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 9),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 9),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 45))
             .fluidInputs(MaterialsKevlar.Ethyleneglycol.getFluid(36000), MaterialsKevlar.SiliconOil.getFluid(9000))
             .fluidOutputs(MaterialsKevlar.PolyurethaneResin.getFluid(9000))
             .duration(1 * MINUTES + 15 * SECONDS)
@@ -4771,11 +4766,11 @@ public class ChemicalRecipes implements Runnable {
 
         // 3NH3 + 6CH4O =Al2O3,SiO2= CH5N + C2H7N + C3H9N + 6H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1))
+                GTUtility.getIntegratedCircuit(3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1))
             .fluidInputs(Materials.Methanol.getFluid(6000), Materials.Ammonia.getGas(3000))
             .fluidOutputs(
                 MaterialsKevlar.Methylamine.getGas(1000),
@@ -4786,11 +4781,11 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(11),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9))
+                GTUtility.getIntegratedCircuit(11),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9))
             .fluidInputs(Materials.Methanol.getFluid(54000), Materials.Ammonia.getGas(27000))
             .fluidOutputs(
                 MaterialsKevlar.Methylamine.getGas(9000),
@@ -4803,11 +4798,11 @@ public class ChemicalRecipes implements Runnable {
 
         // 18SOCl2 + 5C10H10O4 + 6CO2 = 7C8H4Cl2O2 + 22HCl + 18SO2
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 64),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 48))
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 64),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 48))
             .fluidInputs(
                 MaterialsKevlar.ThionylChloride.getFluid(18000),
                 MaterialsKevlar.DimethylTerephthalate.getFluid(5000),
@@ -4819,8 +4814,8 @@ public class ChemicalRecipes implements Runnable {
 
         // 2CH4O + C8H6O4 =H2SO4= C10H10O4 + 2H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(
                 MaterialsKevlar.TerephthalicAcid.getFluid(1000),
                 Materials.Methanol.getFluid(2000),
@@ -4832,8 +4827,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9))
             .fluidInputs(
                 MaterialsKevlar.TerephthalicAcid.getFluid(9000),
                 Materials.Methanol.getFluid(18000),
@@ -4845,26 +4840,26 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.Benzene.getFluid(1000), Materials.Methane.getGas(2000))
             .fluidOutputs(MaterialsKevlar.IIIDimethylbenzene.getFluid(1000), Materials.Hydrogen.getGas(4000))
             .duration(3 * MINUTES + 20 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(3))
             .fluidInputs(Materials.Benzene.getFluid(1000), Materials.Methane.getGas(2000))
             .fluidOutputs(MaterialsKevlar.IVDimethylbenzene.getFluid(1000), Materials.Hydrogen.getGas(4000))
             .duration(3 * MINUTES + 20 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIHydroxide, 45))
+                GTUtility.getIntegratedCircuit(9),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIHydroxide, 45))
             .itemOutputs(
                 MaterialsKevlar.CobaltIINaphthenate.getDust(64),
                 MaterialsKevlar.CobaltIINaphthenate.getDust(64),
@@ -4877,12 +4872,12 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 64),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 64),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 7))
+                GTUtility.getIntegratedCircuit(9),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 64),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 64),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 7))
             .itemOutputs(
                 MaterialsKevlar.CobaltIINaphthenate.getDust(64),
                 MaterialsKevlar.CobaltIINaphthenate.getDust(64),
@@ -4898,10 +4893,10 @@ public class ChemicalRecipes implements Runnable {
 
         // PCl3 + 3C6H5Cl + 6Na = 6NaCl + C18H15P
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 6))
+                GTUtility.getIntegratedCircuit(1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 6))
             .itemOutputs(MaterialsKevlar.Triphenylphosphene.getDust(34), Materials.Salt.getDust(12))
             .fluidInputs(MaterialsKevlar.PhosphorusTrichloride.getFluid(1000), Materials.Chlorobenzene.getFluid(3000))
             .duration(20 * SECONDS)
@@ -4910,16 +4905,16 @@ public class ChemicalRecipes implements Runnable {
 
         // 4NaH + C3H9BO3 = NaBH4 + 3CH3ONa
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1), MaterialsKevlar.SodiumHydride.getDust(8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1), MaterialsKevlar.SodiumHydride.getDust(8))
             .itemOutputs(MaterialsKevlar.SodiumBorohydride.getDust(6), MaterialsKevlar.SodiumMethoxide.getDust(18))
             .fluidInputs(MaterialsKevlar.TrimethylBorate.getFluid(1000))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9), MaterialsKevlar.SodiumHydride.getDust(64))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9), MaterialsKevlar.SodiumHydride.getDust(64))
             .itemOutputs(
                 MaterialsKevlar.SodiumBorohydride.getDust(48),
                 MaterialsKevlar.SodiumMethoxide.getDust(64),
@@ -4932,8 +4927,8 @@ public class ChemicalRecipes implements Runnable {
 
         // 2CH3COOH = CH3COCH3 + CO2 + H
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(0, Materials.Calcite.getDust(5)), GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(0, Materials.Calcite.getDust(5)), GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.AceticAcid.getFluid(2000))
             .fluidOutputs(
                 Materials.Acetone.getFluid(1000),
@@ -4943,8 +4938,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(0, Materials.Calcium.getDust(1)), GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(0, Materials.Calcium.getDust(1)), GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.AceticAcid.getFluid(2000))
             .fluidOutputs(
                 Materials.Acetone.getFluid(1000),
@@ -4954,8 +4949,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(0, Materials.Quicklime.getDust(2)), GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(0, Materials.Quicklime.getDust(2)), GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.AceticAcid.getFluid(2000))
             .fluidOutputs(
                 Materials.Acetone.getFluid(1000),
@@ -4967,8 +4962,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C + 4H + O = CH3OH
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Carbon.getDust(1), GT_Utility.getIntegratedCircuit(23))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Carbon.getDust(1), GTUtility.getIntegratedCircuit(23))
             .fluidInputs(Materials.Hydrogen.getGas(4000), Materials.Oxygen.getGas(1000))
             .fluidOutputs(Materials.Methanol.getFluid(1000))
             .duration(16 * SECONDS)
@@ -4978,8 +4973,8 @@ public class ChemicalRecipes implements Runnable {
         // This recipe collides with one for Vinyl Chloride
         // 2C + 4H + 2O = CH3COOH
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Carbon.getDust(2), GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Carbon.getDust(2), GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.Hydrogen.getGas(4000), Materials.Oxygen.getGas(2000))
             .fluidOutputs(Materials.AceticAcid.getFluid(1000))
             .duration(24 * SECONDS)
@@ -4988,24 +4983,24 @@ public class ChemicalRecipes implements Runnable {
 
         // 2CO + 4H = CH3COOH
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.CarbonMonoxide.getGas(2000), Materials.Hydrogen.getGas(4000))
             .fluidOutputs(Materials.AceticAcid.getFluid(1000))
             .duration(16 * SECONDS)
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(8))
             .fluidInputs(Materials.Hydrogen.getGas(9000), Materials.Chlorine.getGas(9000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(9000))
             .duration(7 * TICKS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(
                 Materials.Chlorine.getGas(10000),
                 Materials.Water.getFluid(10000),
@@ -5017,8 +5012,8 @@ public class ChemicalRecipes implements Runnable {
 
         // H2O + 4Cl + C3H6 + NaOH = C3H5ClO + NaCl·H2O + 2HCl
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(23))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SodiumHydroxide.getDust(3), GTUtility.getIntegratedCircuit(23))
             .fluidInputs(
                 Materials.Propene.getGas(1000),
                 Materials.Chlorine.getGas(4000),
@@ -5033,8 +5028,8 @@ public class ChemicalRecipes implements Runnable {
 
         // H2O + 2Cl + C3H6 + NaOH =Hg= C3H5ClO + NaCl·H2O + 2H
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SodiumHydroxide.getDust(3), GTUtility.getIntegratedCircuit(24))
             .fluidInputs(
                 Materials.Propene.getGas(1000),
                 Materials.Chlorine.getGas(2000),
@@ -5050,8 +5045,8 @@ public class ChemicalRecipes implements Runnable {
 
         // HClO + 2Cl + C3H6 + NaOH = C3H5ClO + NaCl·H2O + HCl
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SodiumHydroxide.getDust(3), GTUtility.getIntegratedCircuit(24))
             .fluidInputs(
                 Materials.Propene.getGas(1000),
                 Materials.Chlorine.getGas(2000),
@@ -5064,7 +5059,7 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Apatite.getDust(9))
             .itemOutputs(Materials.Gypsum.getDust(40))
             .fluidInputs(Materials.SulfuricAcid.getFluid(5000), Materials.Water.getFluid(10000))
@@ -5073,8 +5068,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Phosphorus.getDust(4), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Phosphorus.getDust(4), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.PhosphorousPentoxide.getDust(14))
             .fluidInputs(Materials.Oxygen.getGas(10000))
             .duration(2 * SECONDS)
@@ -5083,16 +5078,16 @@ public class ChemicalRecipes implements Runnable {
 
         // 2P + 5O + 3H2O = 2H3PO4
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Phosphorus.getDust(1), GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Phosphorus.getDust(1), GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.Oxygen.getGas(2500), Materials.Water.getFluid(1500))
             .fluidOutputs(Materials.PhosphoricAcid.getFluid(1000))
             .duration(16 * SECONDS)
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(
                 Materials.Propene.getGas(8000),
                 Materials.Benzene.getFluid(8000),
@@ -5102,8 +5097,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(
                 Materials.Propene.getGas(1000),
                 Materials.Benzene.getFluid(1000),
@@ -5114,8 +5109,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(
                 Materials.Acetone.getFluid(1000),
                 Materials.Phenol.getFluid(2000),
@@ -5125,8 +5120,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SodiumHydroxide.getDust(6), GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SodiumHydroxide.getDust(6), GTUtility.getIntegratedCircuit(24))
             .fluidInputs(
                 Materials.Acetone.getFluid(1000),
                 Materials.Phenol.getFluid(2000),
@@ -5137,16 +5132,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9))
             .fluidInputs(Materials.Hydrogen.getGas(9000), Materials.Fluorine.getGas(9000))
             .fluidOutputs(Materials.HydrofluoricAcid.getFluid(9000))
             .duration(7 * TICKS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(
                 Materials.HydrofluoricAcid.getFluid(4000),
                 Materials.Methane.getGas(2000),
@@ -5156,8 +5151,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Silicon.getDust(1), GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Silicon.getDust(1), GTUtility.getIntegratedCircuit(24))
             .itemOutputs(Materials.Polydimethylsiloxane.getDust(3))
             .fluidInputs(
                 Materials.Methane.getGas(2000),
@@ -5168,8 +5163,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(96)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Silicon.getDust(1), GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Silicon.getDust(1), GTUtility.getIntegratedCircuit(24))
             .itemOutputs(Materials.Polydimethylsiloxane.getDust(3))
             .fluidInputs(Materials.Methanol.getFluid(2000), Materials.HydrochloricAcid.getFluid(2000))
             .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(2000))
@@ -5177,16 +5172,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(96)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Nitrogen.getGas(1000), Materials.Hydrogen.getGas(3000))
             .fluidOutputs(Materials.Ammonia.getGas(1000))
             .duration(16 * SECONDS)
             .eut(TierEU.HV * 3 / 4)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.Nitrogen.getGas(10000), Materials.Hydrogen.getGas(30000))
             .fluidOutputs(Materials.Ammonia.getGas(10000))
             .duration(2 * MINUTES + 40 * SECONDS)
@@ -5195,8 +5190,8 @@ public class ChemicalRecipes implements Runnable {
 
         // 2NH3 + 7O = N2O4 + 3H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(23))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(23))
             .fluidInputs(Materials.Ammonia.getGas(2000), Materials.Oxygen.getGas(7000))
             .fluidOutputs(Materials.DinitrogenTetroxide.getGas(1000), Materials.Water.getFluid(3000))
             .duration(24 * SECONDS)
@@ -5205,8 +5200,8 @@ public class ChemicalRecipes implements Runnable {
 
         // 7O + 6H + 2N = N2O4 + 3H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(23))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(23))
             .fluidInputs(
                 Materials.Nitrogen.getGas(2000),
                 Materials.Hydrogen.getGas(6000),
@@ -5216,40 +5211,40 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9))
             .fluidInputs(Materials.Oxygen.getGas(100000), Materials.Ammonia.getGas(36000))
             .fluidOutputs(Materials.NitricOxide.getGas(36000), Materials.Water.getFluid(54000))
             .duration(8 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(8))
             .fluidInputs(Materials.Oxygen.getGas(100000), Materials.Ammonia.getGas(36000))
             .fluidOutputs(Materials.NitricOxide.getGas(36000))
             .duration(8 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9))
             .fluidInputs(Materials.NitricOxide.getGas(9000), Materials.Oxygen.getGas(9000))
             .fluidOutputs(Materials.NitrogenDioxide.getGas(9000))
             .duration(4 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9))
             .fluidInputs(Materials.NitrogenDioxide.getGas(27000), Materials.Water.getFluid(9000))
             .fluidOutputs(Materials.NitricAcid.getFluid(18000), Materials.NitricOxide.getGas(9000))
             .duration(6 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(
                 Materials.Hydrogen.getGas(3000),
                 Materials.Nitrogen.getGas(1000),
@@ -5259,16 +5254,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.Ammonia.getGas(1000), Materials.Oxygen.getGas(4000))
             .fluidOutputs(Materials.NitricAcid.getFluid(1000), Materials.Water.getFluid(1000))
             .duration(16 * SECONDS)
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(
                 Materials.NitrogenDioxide.getGas(2000),
                 Materials.Oxygen.getGas(1000),
@@ -5278,48 +5273,48 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.Sulfur.getDust(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9), Materials.Sulfur.getDust(9))
             .fluidInputs(Materials.Hydrogen.getGas(18000))
             .fluidOutputs(Materials.HydricSulfide.getGas(9000))
             .duration(4 * TICKS)
             .eut(TierEU.RECIPE_MV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.Sulfur.getDust(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9), Materials.Sulfur.getDust(9))
             .fluidInputs(Materials.Oxygen.getGas(18000))
             .fluidOutputs(Materials.SulfurDioxide.getGas(9000))
             .duration(4 * TICKS)
             .eut(TierEU.RECIPE_MV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9))
             .fluidInputs(Materials.HydricSulfide.getGas(9000), Materials.Oxygen.getGas(27000))
             .fluidOutputs(Materials.SulfurDioxide.getGas(9000), Materials.Water.getFluid(9000))
             .duration(3 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(8))
             .fluidInputs(Materials.HydricSulfide.getGas(9000), Materials.Oxygen.getGas(27000))
             .fluidOutputs(Materials.SulfurDioxide.getGas(9000))
             .duration(3 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(7))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(7))
             .itemOutputs(Materials.Sulfur.getDust(27))
             .fluidInputs(Materials.SulfurDioxide.getGas(9000), Materials.HydricSulfide.getGas(18000))
             .duration(3 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9))
             .fluidInputs(Materials.SulfurTrioxide.getGas(9000), Materials.Water.getFluid(9000))
             .fluidOutputs(Materials.SulfuricAcid.getFluid(9000))
             .duration(13 * SECONDS)
@@ -5328,16 +5323,16 @@ public class ChemicalRecipes implements Runnable {
 
         // S + O3 + H2O = H2SO4
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24), Materials.Sulfur.getDust(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24), Materials.Sulfur.getDust(1))
             .fluidInputs(Materials.Oxygen.getGas(3000), Materials.Water.getFluid(1000))
             .fluidOutputs(Materials.SulfuricAcid.getFluid(1000))
             .duration(24 * SECONDS)
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(7), Materials.Sulfur.getDust(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(7), Materials.Sulfur.getDust(9))
             .fluidInputs(Materials.Oxygen.getGas(27000), Materials.Water.getFluid(9000))
             .fluidOutputs(Materials.SulfuricAcid.getFluid(9000))
             .duration(13 * SECONDS)
@@ -5346,8 +5341,8 @@ public class ChemicalRecipes implements Runnable {
 
         // H2S + O4 = H2SO4
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.HydricSulfide.getGas(1000), Materials.Oxygen.getGas(4000))
             .fluidOutputs(Materials.SulfuricAcid.getFluid(1000))
             .duration(24 * SECONDS)
@@ -5356,8 +5351,8 @@ public class ChemicalRecipes implements Runnable {
 
         // SO2 + O + H2O = H2SO4
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(
                 Materials.SulfurDioxide.getGas(1000),
                 Materials.Oxygen.getGas(1000),
@@ -5367,8 +5362,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9))
             .fluidInputs(
                 Materials.SulfurDioxide.getGas(9000),
                 Materials.Oxygen.getGas(9000),
@@ -5378,8 +5373,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(
                 Materials.HydrochloricAcid.getFluid(1000),
                 Materials.Ethylene.getGas(1000),
@@ -5389,8 +5384,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(
                 Materials.Chlorine.getGas(2000),
                 Materials.Ethylene.getGas(2000),
@@ -5400,8 +5395,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.RawRubber.getDust(18))
             .fluidInputs(
                 Materials.Isoprene.getFluid(1728),
@@ -5411,8 +5406,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.RawRubber.getDust(24))
             .fluidInputs(
                 Materials.Isoprene.getFluid(1728),
@@ -5422,24 +5417,24 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(3))
             .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(1))
             .fluidInputs(Materials.Styrene.getFluid(36), Materials.Butadiene.getGas(108), Materials.Air.getGas(2000))
             .duration(8 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(3))
             .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(3))
             .fluidInputs(Materials.Styrene.getFluid(72), Materials.Butadiene.getGas(216), Materials.Oxygen.getGas(2000))
             .duration(8 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(4))
             .itemOutputs(
                 Materials.RawStyreneButadieneRubber.getDust(22),
                 Materials.RawStyreneButadieneRubber.getDustSmall(2))
@@ -5452,8 +5447,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(4))
             .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(30))
             .fluidInputs(
                 Materials.Styrene.getFluid(540),
@@ -5464,8 +5459,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.Salt.getDust(18))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9), Materials.Salt.getDust(18))
             .itemOutputs(Materials.SodiumBisulfate.getDust(63))
             .fluidInputs(Materials.SulfuricAcid.getFluid(9000))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(9000))
@@ -5473,8 +5468,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.SodiumHydroxide.getDust(27))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9), Materials.SodiumHydroxide.getDust(27))
             .itemOutputs(Materials.SodiumBisulfate.getDust(63))
             .fluidInputs(Materials.SulfuricAcid.getFluid(9000))
             .fluidOutputs(Materials.Water.getFluid(9000))
@@ -5482,8 +5477,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(
                 Materials.Benzene.getFluid(1000),
                 Materials.Chlorine.getGas(2000),
@@ -5498,8 +5493,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C6H6 + 2Cl + NaOH = C6H6O + NaCl + HCl
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.SodiumHydroxide.getDust(6), GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.SodiumHydroxide.getDust(6), GTUtility.getIntegratedCircuit(24))
             .itemOutputs(Materials.Salt.getDust(4))
             .fluidInputs(Materials.Benzene.getFluid(2000), Materials.Chlorine.getGas(4000))
             .fluidOutputs(Materials.Phenol.getFluid(2000), Materials.HydrochloricAcid.getFluid(2000))
@@ -5507,24 +5502,24 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.LightFuel.getFluid(20000), Materials.HeavyFuel.getFluid(4000))
             .fluidOutputs(Materials.Fuel.getFluid(24000))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.Fuel.getFluid(10000), Materials.Tetranitromethane.getFluid(200))
             .fluidOutputs(Materials.NitroFuel.getFluid(10000))
             .duration(6 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.BioDiesel.getFluid(10000), Materials.Tetranitromethane.getFluid(400))
             .fluidOutputs(Materials.NitroFuel.getFluid(9000))
             .duration(6 * SECONDS)
@@ -5533,9 +5528,9 @@ public class ChemicalRecipes implements Runnable {
 
         // CH4 + 2H2O = CO2 + 8H
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(11))
-            .fluidInputs(Materials.Methane.getGas(5000), GT_ModHandler.getDistilledWater(10000))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(11))
+            .fluidInputs(Materials.Methane.getGas(5000), GTModHandler.getDistilledWater(10000))
             .fluidOutputs(Materials.CarbonDioxide.getGas(5000), Materials.Hydrogen.getGas(40000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_HV)
@@ -5543,24 +5538,24 @@ public class ChemicalRecipes implements Runnable {
 
         // CH4 + H2O = CO + 6H
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(12))
-            .fluidInputs(Materials.Methane.getGas(5000), GT_ModHandler.getDistilledWater(5000))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(12))
+            .fluidInputs(Materials.Methane.getGas(5000), GTModHandler.getDistilledWater(5000))
             .fluidOutputs(Materials.CarbonMonoxide.getGas(5000), Materials.Hydrogen.getGas(30000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.Nitrogen.getGas(20000), Materials.Oxygen.getGas(10000))
             .fluidOutputs(Materials.NitrousOxide.getGas(10000))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(
                 Materials.Naphtha.getFluid(16000),
                 Materials.Gas.getGas(2000),
@@ -5571,16 +5566,16 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.GasolineRaw.getFluid(10000), Materials.Toluene.getFluid(1000))
             .fluidOutputs(Materials.GasolineRegular.getFluid(11000))
             .duration(10 * TICKS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(
                 Materials.GasolineRegular.getFluid(20000),
                 Materials.Octane.getFluid(2000),
@@ -5594,8 +5589,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C2H6O + C4H8 = C6H14O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.Ethanol.getFluid(1000), Materials.Butene.getGas(1000))
             .fluidOutputs(Materials.AntiKnock.getFluid(1000))
             .duration(20 * SECONDS)
@@ -5604,24 +5599,24 @@ public class ChemicalRecipes implements Runnable {
 
         // CH4O + C4H8 = C5H12O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.Methanol.getFluid(1000), Materials.Butene.getGas(1000))
             .fluidOutputs(Materials.MTBEMixture.getGas(1000))
             .duration(20 * TICKS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.Methanol.getFluid(1000), Materials.Butane.getGas(1000))
             .fluidOutputs(Materials.MTBEMixtureAlt.getGas(1000))
             .duration(20 * TICKS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(
                 Materials.Naquadria.getMolten(4608),
                 Materials.ElectrumFlux.getMolten(4608),
@@ -5633,8 +5628,8 @@ public class ChemicalRecipes implements Runnable {
 
         // CH2O + 2C6H7N + HCl = C13H14N2(HCl) + H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(
                 new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 1000),
                 new FluidStack(FluidRegistry.getFluid("aniline"), 2000),
@@ -5646,10 +5641,10 @@ public class ChemicalRecipes implements Runnable {
 
         // C6H5NO2 + 6H =Pd= C6H7N + 2H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1))
+                GTUtility.getIntegratedCircuit(1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("nitrobenzene"), 9000), Materials.Hydrogen.getGas(54000))
             .fluidOutputs(Materials.Water.getFluid(18000), new FluidStack(FluidRegistry.getFluid("aniline"), 9000))
             .duration(45 * SECONDS)
@@ -5658,13 +5653,13 @@ public class ChemicalRecipes implements Runnable {
 
         // C6H6 + HNO3 =H2SO4= C6H5NO2 + H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(
                 Materials.Benzene.getFluid(5000),
                 Materials.SulfuricAcid.getFluid(3000),
                 Materials.NitricAcid.getFluid(5000),
-                GT_ModHandler.getDistilledWater(10000))
+                GTModHandler.getDistilledWater(10000))
             .fluidOutputs(
                 new FluidStack(FluidRegistry.getFluid("nitrobenzene"), 5000),
                 Materials.DilutedSulfuricAcid.getFluid(3000))
@@ -5674,8 +5669,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C13H14N2(HCl) + 2COCl2 = C15H10N2O2(5HCl)
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(
                 MaterialsKevlar.DiaminodiphenylmethanMixture.getFluid(1000),
                 new FluidStack(FluidRegistry.getFluid("phosgene"), 2000))
@@ -5684,21 +5679,19 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1))
+                GTUtility.getIntegratedCircuit(9),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1))
             .fluidInputs(MaterialsKevlar.Butyraldehyde.getFluid(9000), Materials.Hydrogen.getGas(18000))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("butanol"), 9000))
             .duration(4 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                GT_Utility.getIntegratedCircuit(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 1))
             .fluidInputs(
                 new FluidStack(FluidRegistry.getFluid("butanol"), 2000),
                 new FluidStack(FluidRegistry.getFluid("propionicacid"), 1000),
@@ -5707,11 +5700,9 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                GT_Utility.getIntegratedCircuit(9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 9))
             .fluidInputs(
                 new FluidStack(FluidRegistry.getFluid("butanol"), 18000),
                 new FluidStack(FluidRegistry.getFluid("propionicacid"), 9000),
@@ -5722,8 +5713,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C2H4 + CO + H2O =C4NiO= C3H6O2
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(
                 Materials.Ethylene.getGas(1000),
                 Materials.CarbonMonoxide.getGas(1000),
@@ -5734,8 +5725,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9))
             .fluidInputs(
                 Materials.Ethylene.getGas(9000),
                 Materials.CarbonMonoxide.getGas(9000),
@@ -5748,8 +5739,8 @@ public class ChemicalRecipes implements Runnable {
 
         // C6H7N + HNO3 =H2SO4,C4H6O3= C6H6N2O2 + H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(
                 new FluidStack(FluidRegistry.getFluid("aniline"), 1000),
                 new FluidStack(FluidRegistry.getFluid("molten.aceticanhydride"), 100),
@@ -5759,8 +5750,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9))
             .fluidInputs(
                 new FluidStack(FluidRegistry.getFluid("aniline"), 9000),
                 new FluidStack(FluidRegistry.getFluid("molten.aceticanhydride"), 900),
@@ -5772,11 +5763,11 @@ public class ChemicalRecipes implements Runnable {
 
         // C6H6N2O2 + 6H =Pd,NO2= C6H8N2 + 2H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 16))
+                GTUtility.getIntegratedCircuit(1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 16))
             .fluidInputs(
                 Materials.NitrogenDioxide.getGas(100),
                 Materials.Hydrogen.getGas(6000),
@@ -5788,20 +5779,20 @@ public class ChemicalRecipes implements Runnable {
 
         // C4H10O2 =Cu= C4H6O2 + 4H
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1))
+                GTUtility.getIntegratedCircuit(1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 1000))
             .fluidOutputs(MaterialsKevlar.GammaButyrolactone.getFluid(1000), Materials.Hydrogen.getGas(4000))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 9))
+                GTUtility.getIntegratedCircuit(9),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 9))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 9000))
             .fluidOutputs(MaterialsKevlar.GammaButyrolactone.getFluid(9000), Materials.Hydrogen.getGas(36000))
             .duration(35 * SECONDS)
@@ -5810,13 +5801,13 @@ public class ChemicalRecipes implements Runnable {
 
         // 2CH2O + C2H2 =SiO2,CuO,Bi2O3= C4H6O2
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 12))
+                GTUtility.getIntegratedCircuit(1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 12))
             .fluidInputs(
                 MaterialsKevlar.Acetylene.getGas(1000),
                 new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 2000))
@@ -5824,15 +5815,15 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9))
+                GTUtility.getIntegratedCircuit(9),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 9),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 9),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 64),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 44))
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 64),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 44))
             .fluidInputs(
                 MaterialsKevlar.Acetylene.getGas(9000),
                 new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 18000))
@@ -5842,23 +5833,23 @@ public class ChemicalRecipes implements Runnable {
 
         // C4H6O2 + 4H =NiAl= C4H10O2
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 12),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RaneyNickelActivated, 1))
+                GTUtility.getIntegratedCircuit(1),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 12),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RaneyNickelActivated, 1))
             .fluidInputs(Materials.Hydrogen.getGas(4000))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 1000))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_UV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(1),
+                GTUtility.getIntegratedCircuit(1),
                 CALCIUM_CHLORIDE.getDust(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 9))
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 9),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 9))
             .fluidInputs(MaterialsKevlar.NMethylIIPyrrolidone.getFluid(1000))
             .fluidOutputs(
                 MaterialsKevlar.LiquidCrystalKevlar.getFluid(9000),
@@ -5867,12 +5858,12 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_UV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(9),
+                GTUtility.getIntegratedCircuit(9),
                 CALCIUM_CHLORIDE.getDust(7),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 63),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 63))
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 63),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 63))
             .fluidInputs(MaterialsKevlar.NMethylIIPyrrolidone.getFluid(7000))
             .fluidOutputs(
                 MaterialsKevlar.LiquidCrystalKevlar.getFluid(63000),
@@ -5883,10 +5874,10 @@ public class ChemicalRecipes implements Runnable {
 
         // Na2B4O7(H2O)10 + 2HCl = 2NaCl + 4H3BO3 + 5H2O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Borax, 23))
+                GTUtility.getIntegratedCircuit(1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Borax, 23))
             .itemOutputs(Materials.Salt.getDust(4))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(2000))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("boricacid"), 4000), Materials.Water.getFluid(5000))
@@ -5896,8 +5887,8 @@ public class ChemicalRecipes implements Runnable {
 
         // H3BO3 + 3CH4O =H2SO4= C3H9BO3 + 3H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(
                 Materials.Methanol.getFluid(3000),
                 new FluidStack(FluidRegistry.getFluid("boricacid"), 1000),
@@ -5907,8 +5898,8 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9))
             .fluidInputs(
                 Materials.Methanol.getFluid(27000),
                 new FluidStack(FluidRegistry.getFluid("boricacid"), 9000),
@@ -5920,10 +5911,10 @@ public class ChemicalRecipes implements Runnable {
 
         // RhCl3 + 3C18H15P + 3NaBH4 + CO = RhC55H46P3O + 3NaCl + 3B + 11H
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RhodiumChloride, 4),
+                GTUtility.getIntegratedCircuit(1),
+                GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RhodiumChloride, 4),
                 MaterialsKevlar.Triphenylphosphene.getDust(64),
                 MaterialsKevlar.Triphenylphosphene.getDust(38),
                 MaterialsKevlar.SodiumBorohydride.getDust(18))
@@ -5940,9 +5931,9 @@ public class ChemicalRecipes implements Runnable {
 
         // 2NaOH + N2H4 =Mn= 2N + 2H2O + 2NaH
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(9),
+                GTUtility.getIntegratedCircuit(9),
                 Materials.SodiumHydroxide.getDust(6),
                 Materials.Manganese.getDustTiny(1))
             .itemOutputs(MaterialsKevlar.SodiumHydride.getDust(4))
@@ -5952,9 +5943,9 @@ public class ChemicalRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(multiblockChemicalReactorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(18),
+                GTUtility.getIntegratedCircuit(18),
                 Materials.SodiumHydroxide.getDust(54),
                 Materials.Manganese.getDust(1))
             .itemOutputs(MaterialsKevlar.SodiumHydride.getDust(36))
diff --git a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java
index 072992d07e..b17eecc748 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java
@@ -4,20 +4,20 @@ import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.enums.Mods.Railcraft;
 import static gregtech.api.recipe.RecipeMaps.circuitAssemblerRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.loaders.postload.GT_MachineRecipeLoader.solderingMats;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.loaders.postload.MachineRecipeLoader.solderingMats;
 
 import net.minecraft.item.ItemStack;
 
-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.enums.SubTag;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class CircuitAssemblerRecipes implements Runnable {
 
@@ -39,10 +39,10 @@ public class CircuitAssemblerRecipes implements Runnable {
 
             // Railcraft Circuits
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Coated_Basic.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1),
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1),
                     ItemList.Cover_Controller.get(1))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 4L, 0))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -50,10 +50,10 @@ public class CircuitAssemblerRecipes implements Runnable {
                 .eut((int) TierEU.RECIPE_LV)
                 .addTo(circuitAssemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Coated_Basic.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1),
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1),
                     ItemList.Sensor_LV.get(1))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 4L, 1))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -61,10 +61,10 @@ public class CircuitAssemblerRecipes implements Runnable {
                 .eut((int) TierEU.RECIPE_LV)
                 .addTo(circuitAssemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Coated_Basic.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1),
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1),
                     getModItem(Railcraft.ID, "part.signal.lamp", 1L, 0))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 4L, 2))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -72,10 +72,10 @@ public class CircuitAssemblerRecipes implements Runnable {
                 .eut((int) TierEU.RECIPE_LV)
                 .addTo(circuitAssemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Phenolic_Good.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1),
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1),
                     ItemList.Cover_Controller.get(1))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 8L, 0))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -83,10 +83,10 @@ public class CircuitAssemblerRecipes implements Runnable {
                 .eut((int) TierEU.RECIPE_LV)
                 .addTo(circuitAssemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Phenolic_Good.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1),
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1),
                     ItemList.Sensor_LV.get(1))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 8L, 1))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -94,10 +94,10 @@ public class CircuitAssemblerRecipes implements Runnable {
                 .eut((int) TierEU.RECIPE_LV)
                 .addTo(circuitAssemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Phenolic_Good.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1),
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1),
                     getModItem(Railcraft.ID, "part.signal.lamp", 1L, 0))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 8L, 2))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -105,10 +105,10 @@ public class CircuitAssemblerRecipes implements Runnable {
                 .eut((int) TierEU.RECIPE_LV)
                 .addTo(circuitAssemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Epoxy_Advanced.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1),
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1),
                     ItemList.Cover_Controller.get(1))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 16L, 0))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -116,10 +116,10 @@ public class CircuitAssemblerRecipes implements Runnable {
                 .eut((int) TierEU.RECIPE_LV)
                 .addTo(circuitAssemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Epoxy_Advanced.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1),
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1),
                     ItemList.Sensor_LV.get(1))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 16L, 1))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -127,10 +127,10 @@ public class CircuitAssemblerRecipes implements Runnable {
                 .eut((int) TierEU.RECIPE_LV)
                 .addTo(circuitAssemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Epoxy_Advanced.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1),
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1),
                     getModItem(Railcraft.ID, "part.signal.lamp", 1L, 0))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 16L, 2))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -138,56 +138,56 @@ public class CircuitAssemblerRecipes implements Runnable {
                 .eut((int) TierEU.RECIPE_LV)
                 .addTo(circuitAssemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Coated_Basic.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 0))
                 .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2))
                 .duration(10 * SECONDS)
                 .eut((int) TierEU.RECIPE_LV)
                 .addTo(circuitAssemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Coated_Basic.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 1))
                 .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2))
                 .duration(10 * SECONDS)
                 .eut((int) TierEU.RECIPE_LV)
                 .addTo(circuitAssemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Phenolic_Good.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 2))
                 .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2))
                 .duration(10 * SECONDS)
                 .eut((int) TierEU.RECIPE_LV)
                 .addTo(circuitAssemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Phenolic_Good.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 3))
                 .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2))
                 .duration(10 * SECONDS)
@@ -204,12 +204,12 @@ public class CircuitAssemblerRecipes implements Runnable {
 
         // alternative version of the copper electron tube
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1),
-                GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2),
-                GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.AnnealedCopper, 2))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1),
+                GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2),
+                GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2),
+                GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.AnnealedCopper, 2))
             .itemOutputs(getModItem(Forestry.ID, "thermionicTubes", 4L, 0))
             .fluidInputs(Materials.Glass.getMolten(576))
             .duration(10 * SECONDS)
@@ -218,12 +218,12 @@ public class CircuitAssemblerRecipes implements Runnable {
 
         // alternative version of the iron electron tube
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1),
-                GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2),
-                GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.WroughtIron, 2))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1),
+                GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2),
+                GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2),
+                GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.WroughtIron, 2))
             .itemOutputs(getModItem(Forestry.ID, "thermionicTubes", 4L, 3))
             .fluidInputs(Materials.Glass.getMolten(576))
             .duration(10 * SECONDS)
@@ -231,27 +231,27 @@ public class CircuitAssemblerRecipes implements Runnable {
             .addTo(circuitAssemblerRecipes);
 
         ItemStack[] rodMaterials = new ItemStack[] {
-            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Copper, 2L),
-            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Tin, 2L),
-            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Bronze, 2L),
-            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iron, 2L),
-            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Gold, 2L),
-            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Diamond, 2L),
+            GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Copper, 2L),
+            GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Tin, 2L),
+            GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Bronze, 2L),
+            GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Iron, 2L),
+            GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Gold, 2L),
+            GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Diamond, 2L),
             getModItem(NewHorizonsCoreMod.ID, "item.LongObsidianRod", 2L, 0),
-            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Blaze, 2L),
-            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Rubber, 2L),
-            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Emerald, 2L),
-            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Apatite, 2L),
-            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Lapis, 2L),
-            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.EnderEye, 2L),
-            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Uranium, 2L), };
+            GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Blaze, 2L),
+            GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Rubber, 2L),
+            GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Emerald, 2L),
+            GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Apatite, 2L),
+            GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Lapis, 2L),
+            GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.EnderEye, 2L),
+            GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Uranium, 2L), };
 
         for (int metaid = 0; metaid < rodMaterials.length; metaid++) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1),
+                    GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2),
                     rodMaterials[metaid])
                 .itemOutputs(getModItem(Forestry.ID, "thermionicTubes", 4L, metaid))
                 .fluidInputs(Materials.Glass.getMolten(576))
@@ -265,56 +265,56 @@ public class CircuitAssemblerRecipes implements Runnable {
             int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1
                 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2;
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Coated_Basic.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 0))
                 .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2))
                 .duration(10 * SECONDS)
                 .eut((int) TierEU.RECIPE_LV)
                 .addTo(circuitAssemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Coated_Basic.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 1))
                 .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2))
                 .duration(10 * SECONDS)
                 .eut((int) TierEU.RECIPE_LV)
                 .addTo(circuitAssemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Phenolic_Good.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 2))
                 .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2))
                 .duration(10 * SECONDS)
                 .eut((int) TierEU.RECIPE_LV)
                 .addTo(circuitAssemblerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Phenolic_Good.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2),
+                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 3))
                 .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2))
                 .duration(10 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
index a5144260c2..21e6421a62 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
@@ -3,22 +3,21 @@ package gregtech.loaders.postload.recipes;
 import static gregtech.api.enums.Mods.AppliedEnergistics2;
 import static gregtech.api.enums.Mods.Railcraft;
 import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator.sapling_Rainforest;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator.sapling_Rainforest;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-
-import gregtech.api.enums.GT_Values;
+import bartworks.system.material.WerkstoffLoader;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
 import mods.railcraft.common.blocks.aesthetics.cube.EnumCube;
 import mods.railcraft.common.items.RailcraftToolItems;
 
@@ -26,203 +25,203 @@ public class CompressorRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Cell_Empty.get(1))
             .itemOutputs(ItemList.Cell_Air.get(1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.sand, 4))
             .itemOutputs(new ItemStack(Blocks.sandstone, 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("iridiumShard", 9))
-            .itemOutputs(GT_ModHandler.getIC2Item("iridiumOre", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("iridiumShard", 9))
+            .itemOutputs(GTModHandler.getIC2Item("iridiumOre", 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.clay_ball, 4))
             .itemOutputs(new ItemStack(Blocks.clay, 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.brick, 4))
             .itemOutputs(new ItemStack(Blocks.brick_block, 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.netherbrick, 4))
             .itemOutputs(new ItemStack(Blocks.nether_brick, 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("smallPlutonium", 9))
-            .itemOutputs(GT_ModHandler.getIC2Item("Plutonium", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("smallPlutonium", 9))
+            .itemOutputs(GTModHandler.getIC2Item("Plutonium", 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("smallUran235", 9))
-            .itemOutputs(GT_ModHandler.getIC2Item("Uran235", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("smallUran235", 9))
+            .itemOutputs(GTModHandler.getIC2Item("Uran235", 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.water_bucket, 1))
             .itemOutputs(new ItemStack(Blocks.snow, 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.snowball, 4))
             .itemOutputs(new ItemStack(Blocks.snow, 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Cell_Water.get(1))
             .itemOutputs(new ItemStack(Blocks.snow, 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.snow, 1))
             .itemOutputs(new ItemStack(Blocks.ice, 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("carbonMesh", 1))
-            .itemOutputs(GT_ModHandler.getIC2Item("carbonPlate", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("carbonMesh", 1))
+            .itemOutputs(GTModHandler.getIC2Item("carbonPlate", 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("coalBall", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("coalBall", 1))
             .itemOutputs(ItemList.IC2_Compressed_Coal_Ball.get(1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 8L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 8L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(sapling_Rainforest, 8))
             .itemOutputs(ItemList.IC2_Plantball.get(1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.IC2_Compressed_Coal_Chunk.get(1))
             .itemOutputs(ItemList.IC2_Industrial_Diamond.get(1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1))
-            .itemOutputs(GT_ModHandler.getIC2Item("Uran238", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1))
+            .itemOutputs(GTModHandler.getIC2Item("Uran238", 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium235, 1))
-            .itemOutputs(GT_ModHandler.getIC2Item("Uran235", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Uranium235, 1))
+            .itemOutputs(GTModHandler.getIC2Item("Uran235", 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1))
-            .itemOutputs(GT_ModHandler.getIC2Item("Plutonium", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1))
+            .itemOutputs(GTModHandler.getIC2Item("Plutonium", 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium235, 1))
-            .itemOutputs(GT_ModHandler.getIC2Item("smallUran235", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium235, 1))
+            .itemOutputs(GTModHandler.getIC2Item("smallUran235", 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1))
-            .itemOutputs(GT_ModHandler.getIC2Item("smallPlutonium", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1))
+            .itemOutputs(GTModHandler.getIC2Item("smallPlutonium", 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.ice, 2, 32767))
             .itemOutputs(new ItemStack(Blocks.packed_ice, 1, 0))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1))
             .itemOutputs(new ItemStack(Blocks.ice, 1, 0))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 4))
             .itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 10))
             .itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 11))
             .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 0))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 12))
             .itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockFluix", 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.quartz, 4, 0))
             .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 0))
             .duration(15 * SECONDS)
@@ -235,21 +234,21 @@ public class CompressorRecipes implements Runnable {
          * .addTo(sCompressorRecipes);
          */
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 4))
             .itemOutputs(new ItemStack(Blocks.glowstone, 1))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Fireclay.getDust(1))
             .itemOutputs(ItemList.CompressedFireclay.get(1))
             .duration(4 * SECONDS)
             .eut(4)
             .addTo(compressorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.gem, 9))
             .itemOutputs(WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.block, 1))
             .duration(15 * SECONDS)
@@ -257,7 +256,7 @@ public class CompressorRecipes implements Runnable {
             .addTo(compressorRecipes);
 
         if (Railcraft.isModLoaded()) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(RailcraftToolItems.getCoalCoke(9))
                 .itemOutputs(EnumCube.COKE_BLOCK.getItem())
                 .duration(15 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java
index 6fc53a5675..7833b6fc5f 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java
@@ -1,20 +1,20 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-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.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTUtility;
 
 public class CropProcessingRecipes implements Runnable {
 
@@ -123,17 +123,17 @@ public class CropProcessingRecipes implements Runnable {
 
     public void addProcess(ItemStack tCrop, Materials aMaterial, Materials aMaterialOut, int chance,
         boolean aMainOutput) {
-        if (tCrop == null || aMaterial == null || GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1) == null)
+        if (tCrop == null || aMaterial == null || GTOreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1) == null)
             return;
 
         FluidStack fluidOutputChemReactor = aMaterialOut.mOreByProducts.isEmpty() ? null
             : aMaterialOut.mOreByProducts.get(0)
                 .getMolten(144);
 
-        GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+        GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder();
         recipeBuilder
-            .itemInputs(GT_Utility.copyAmount(9, tCrop), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4))
+            .itemInputs(GTUtility.copyAmount(9, tCrop), GTOreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4))
             .fluidInputs(Materials.Water.getFluid(1000));
         if (fluidOutputChemReactor != null) {
             recipeBuilder.fluidOutputs(fluidOutputChemReactor);
@@ -142,9 +142,9 @@ public class CropProcessingRecipes implements Runnable {
             .eut(24)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(16, tCrop))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(16, tCrop))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1))
             .fluidInputs(Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + 9) / 10))))
             .duration((int) (aMaterial.getMass() * 128))
             .eut(384)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java
index 1d0eeecd8b..915c254ba1 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java
@@ -4,21 +4,21 @@ import static gregtech.api.enums.Mods.BuildCraftTransport;
 import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Mods.TinkerConstruct;
 import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
-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.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 CuttingRecipes implements Runnable {
 
@@ -29,7 +29,7 @@ public class CuttingRecipes implements Runnable {
             recipeWithClassicFluids(
                 new ItemStack[] { ItemList.Circuit_Silicon_Ingot.get(1) },
                 new ItemStack[] { ItemList.Circuit_Silicon_Wafer.get(16),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 4) },
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 4) },
                 20 * SECONDS,
                 TierEU.RECIPE_LV,
                 false);
@@ -37,7 +37,7 @@ public class CuttingRecipes implements Runnable {
             recipeWithClassicFluids(
                 new ItemStack[] { ItemList.Circuit_Silicon_Ingot2.get(1) },
                 new ItemStack[] { ItemList.Circuit_Silicon_Wafer2.get(32),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 8) },
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 8) },
                 40 * SECONDS,
                 TierEU.RECIPE_MV,
                 true);
@@ -45,7 +45,7 @@ public class CuttingRecipes implements Runnable {
             recipeWithClassicFluids(
                 new ItemStack[] { ItemList.Circuit_Silicon_Ingot3.get(1) },
                 new ItemStack[] { ItemList.Circuit_Silicon_Wafer3.get(64),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 16) },
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 16) },
                 1 * MINUTES + 20 * SECONDS,
                 TierEU.RECIPE_HV,
                 true);
@@ -53,7 +53,7 @@ public class CuttingRecipes implements Runnable {
             recipeWithPurifiedWater(
                 new ItemStack[] { ItemList.Circuit_Silicon_Ingot3.get(1) },
                 new ItemStack[] { ItemList.Circuit_Silicon_Wafer3.get(128),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 16) },
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 16) },
                 Materials.Grade1PurifiedWater,
                 Materials.Grade2PurifiedWater,
                 (int) ((1 * MINUTES + 20 * SECONDS) * 0.75),
@@ -63,7 +63,7 @@ public class CuttingRecipes implements Runnable {
             recipeWithPurifiedWater(
                 new ItemStack[] { ItemList.Circuit_Silicon_Ingot4.get(1) },
                 new ItemStack[] { ItemList.Circuit_Silicon_Wafer4.get(64), ItemList.Circuit_Silicon_Wafer4.get(32),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 32) },
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 32) },
                 Materials.Grade3PurifiedWater,
                 Materials.Grade4PurifiedWater,
                 2 * MINUTES,
@@ -73,7 +73,7 @@ public class CuttingRecipes implements Runnable {
             recipeWithPurifiedWater(
                 new ItemStack[] { ItemList.Circuit_Silicon_Ingot5.get(1) },
                 new ItemStack[] { ItemList.Circuit_Silicon_Wafer5.get(64), ItemList.Circuit_Silicon_Wafer5.get(64),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 64) },
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 64) },
                 Materials.Grade5PurifiedWater,
                 Materials.Grade6PurifiedWater,
                 2 * MINUTES + 40 * SECONDS,
@@ -166,7 +166,7 @@ public class CuttingRecipes implements Runnable {
 
         recipeWithClassicFluids(
             new ItemStack[] { new ItemStack(Blocks.glowstone, 1, 0) },
-            new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Glowstone, 4) },
+            new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.plate, Materials.Glowstone, 4) },
             5 * SECONDS,
             16,
             false);
@@ -241,7 +241,7 @@ public class CuttingRecipes implements Runnable {
 
     public void recipeWithPurifiedWater(ItemStack[] inputs, ItemStack[] outputs, Materials lowTierWater,
         Materials highTierWater, int duration, int boostedDuration, long eut) {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(inputs)
             .itemOutputs(outputs)
             .fluidInputs(lowTierWater.getFluid(100L))
@@ -249,7 +249,7 @@ public class CuttingRecipes implements Runnable {
             .eut(eut)
             .addTo(cutterRecipes);
         // Bonus for using higher tier water
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(inputs)
             .itemOutputs(outputs)
             .fluidInputs(highTierWater.getFluid(100L))
@@ -261,7 +261,7 @@ public class CuttingRecipes implements Runnable {
     public void recipeWithClassicFluids(ItemStack[] inputs, ItemStack[] outputs, int duration, long eut,
         boolean cleanroomRequired) {
         if (cleanroomRequired) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(inputs)
                 .itemOutputs(outputs)
                 .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, duration * eut / 320))))
@@ -270,16 +270,16 @@ public class CuttingRecipes implements Runnable {
                 .requiresCleanRoom()
                 .addTo(cutterRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(inputs)
                 .itemOutputs(outputs)
-                .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, duration * eut / 426))))
+                .fluidInputs(GTModHandler.getDistilledWater(Math.max(3, Math.min(750, duration * eut / 426))))
                 .duration(2 * duration)
                 .eut(eut)
                 .requiresCleanRoom()
                 .addTo(cutterRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(inputs)
                 .itemOutputs(outputs)
                 .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, duration * eut / 1280))))
@@ -288,7 +288,7 @@ public class CuttingRecipes implements Runnable {
                 .requiresCleanRoom()
                 .addTo(cutterRecipes);
         } else {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(inputs)
                 .itemOutputs(outputs)
                 .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, duration * eut / 320))))
@@ -296,15 +296,15 @@ public class CuttingRecipes implements Runnable {
                 .eut(eut)
                 .addTo(cutterRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(inputs)
                 .itemOutputs(outputs)
-                .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, duration * eut / 426))))
+                .fluidInputs(GTModHandler.getDistilledWater(Math.max(3, Math.min(750, duration * eut / 426))))
                 .duration(2 * duration)
                 .eut(eut)
                 .addTo(cutterRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(inputs)
                 .itemOutputs(outputs)
                 .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, duration * eut / 1280))))
diff --git a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java
index dfbb2501f0..5354067da3 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java
@@ -3,26 +3,26 @@ package gregtech.loaders.postload.recipes;
 import static gregtech.api.enums.Mods.TinkerConstruct;
 import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes;
 import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 import static net.minecraftforge.fluids.FluidRegistry.getFluidStack;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-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.MaterialsKevlar;
 import gregtech.api.enums.MaterialsOreAlum;
 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.GT_RecipeBuilder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTUtility;
 
 public class DistilleryRecipes implements Runnable {
 
@@ -32,104 +32,104 @@ public class DistilleryRecipes implements Runnable {
         distillationTowerRecipes();
         universalDistillationTowerRecipes();
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.Creosote.getFluid(100L))
             .fluidOutputs(Materials.Lubricant.getFluid(32L))
             .duration(12 * SECONDS)
             .eut(30)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.SeedOil.getFluid(32L))
             .fluidOutputs(Materials.Lubricant.getFluid(8L))
             .duration(4 * SECONDS)
             .eut(30)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.FishOil.getFluid(32L))
             .fluidOutputs(Materials.Lubricant.getFluid(8L))
             .duration(4 * SECONDS)
             .eut(30)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.Oil.getFluid(120L))
             .fluidOutputs(Materials.Lubricant.getFluid(60L))
             .duration(8 * SECONDS)
             .eut(30)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.OilLight.getFluid(120L))
             .fluidOutputs(Materials.Lubricant.getFluid(30L))
             .duration(8 * SECONDS)
             .eut(30)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.OilMedium.getFluid(120L))
             .fluidOutputs(Materials.Lubricant.getFluid(60L))
             .duration(8 * SECONDS)
             .eut(30)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(Materials.OilHeavy.getFluid(120L))
             .fluidOutputs(Materials.Lubricant.getFluid(90L))
             .duration(8 * SECONDS)
             .eut(30)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Biomass.getFluid(40L))
             .fluidOutputs(Materials.Ethanol.getFluid(12L))
             .duration(16 * TICKS)
             .eut(24)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(5))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(5))
             .fluidInputs(Materials.Biomass.getFluid(40L))
             .fluidOutputs(Materials.Water.getFluid(12L))
             .duration(16 * TICKS)
             .eut(24)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(5))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(5))
             .fluidInputs(Materials.Water.getFluid(5L))
-            .fluidOutputs(GT_ModHandler.getDistilledWater(5L))
+            .fluidOutputs(GTModHandler.getDistilledWater(5L))
             .duration(16 * TICKS)
             .eut(10)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(getFluidStack("potion.potatojuice", 2))
             .fluidOutputs(getFluidStack("potion.vodka", 1))
             .duration(16 * TICKS)
             .eut(16)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(getFluidStack("potion.lemonade", 2))
             .fluidOutputs(getFluidStack("potion.alcopops", 1))
             .duration(16 * TICKS)
             .eut(16)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(MaterialsOreAlum.SluiceSand.getDust(1))
             .fluidInputs(MaterialsOreAlum.SluiceJuice.getFluid(1000))
             .fluidOutputs(Materials.Water.getFluid(500))
@@ -137,32 +137,32 @@ public class DistilleryRecipes implements Runnable {
             .eut(16)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(6))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(6))
             .fluidInputs(Materials.WoodTar.getFluid(200))
             .fluidOutputs(MaterialsKevlar.IIIDimethylbenzene.getFluid(30))
             .duration(16 * TICKS)
             .eut(64)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(6))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(6))
             .fluidInputs(Materials.CharcoalByproducts.getGas(200))
             .fluidOutputs(MaterialsKevlar.IIIDimethylbenzene.getFluid(20))
             .duration(5 * SECONDS)
             .eut(64)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(7))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(7))
             .fluidInputs(Materials.WoodTar.getFluid(200))
             .fluidOutputs(MaterialsKevlar.IVDimethylbenzene.getFluid(30))
             .duration(16 * TICKS)
             .eut(64)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(7))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(7))
             .fluidInputs(Materials.CharcoalByproducts.getGas(200))
             .fluidOutputs(MaterialsKevlar.IVDimethylbenzene.getFluid(20))
             .duration(5 * SECONDS)
@@ -170,17 +170,17 @@ public class DistilleryRecipes implements Runnable {
             .addTo(distilleryRecipes);
         // (NaCl·H2O) = NaCl + H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Salt.getDust(2))
             .fluidInputs(Materials.SaltWater.getFluid(1000))
-            .fluidOutputs(GT_ModHandler.getDistilledWater(1000))
+            .fluidOutputs(GTModHandler.getDistilledWater(1000))
             .duration(1 * MINUTES + 20 * SECONDS)
             .eut(30)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.IC2_Fertilizer.get(1))
             .fluidInputs(Materials.FermentedBiomass.getFluid(1000))
             .fluidOutputs(Materials.AceticAcid.getFluid(25))
@@ -188,8 +188,8 @@ public class DistilleryRecipes implements Runnable {
             .eut(8)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemList.IC2_Fertilizer.get(1))
             .fluidInputs(Materials.FermentedBiomass.getFluid(1000))
             .fluidOutputs(Materials.Water.getFluid(375))
@@ -197,8 +197,8 @@ public class DistilleryRecipes implements Runnable {
             .eut(8)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.IC2_Fertilizer.get(1))
             .fluidInputs(Materials.FermentedBiomass.getFluid(1000))
             .fluidOutputs(Materials.Ethanol.getFluid(150))
@@ -206,8 +206,8 @@ public class DistilleryRecipes implements Runnable {
             .eut(8)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(4))
             .itemOutputs(ItemList.IC2_Fertilizer.get(1))
             .fluidInputs(Materials.FermentedBiomass.getFluid(1000))
             .fluidOutputs(Materials.Methanol.getFluid(150))
@@ -215,8 +215,8 @@ public class DistilleryRecipes implements Runnable {
             .eut(8)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(5))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(5))
             .itemOutputs(ItemList.IC2_Fertilizer.get(1))
             .fluidInputs(Materials.FermentedBiomass.getFluid(1000))
             .fluidOutputs(Materials.Ammonia.getGas(100))
@@ -224,8 +224,8 @@ public class DistilleryRecipes implements Runnable {
             .eut(8)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(6))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(6))
             .itemOutputs(ItemList.IC2_Fertilizer.get(1))
             .fluidInputs(Materials.FermentedBiomass.getFluid(1000))
             .fluidOutputs(Materials.CarbonDioxide.getGas(400))
@@ -233,8 +233,8 @@ public class DistilleryRecipes implements Runnable {
             .eut(8)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(7))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(7))
             .itemOutputs(ItemList.IC2_Fertilizer.get(1))
             .fluidInputs(Materials.FermentedBiomass.getFluid(1000))
             .fluidOutputs(Materials.Methane.getGas(600))
@@ -242,8 +242,8 @@ public class DistilleryRecipes implements Runnable {
             .eut(8)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(17))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(17))
             .itemOutputs(ItemList.IC2_Fertilizer.get(1))
             .fluidInputs(Materials.FermentedBiomass.getFluid(1000))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 1800))
@@ -251,24 +251,24 @@ public class DistilleryRecipes implements Runnable {
             .eut(8)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Methane.getGas(1000))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 3000))
             .duration(8 * SECONDS)
             .eut(8)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.HeavyFuel.getFluid(100))
             .fluidOutputs(Materials.Benzene.getFluid(40))
             .duration(8 * SECONDS)
             .eut(24)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(3))
             .fluidInputs(Materials.HeavyFuel.getFluid(100))
             .fluidOutputs(Materials.Phenol.getFluid(25))
             .duration(8 * SECONDS)
@@ -276,64 +276,64 @@ public class DistilleryRecipes implements Runnable {
             .addTo(distilleryRecipes);
         // Dimethylbenzene
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(5))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(5))
             .fluidInputs(Materials.WoodTar.getFluid(200))
             .fluidOutputs(Materials.Dimethylbenzene.getFluid(30))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(5))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(5))
             .fluidInputs(Materials.CharcoalByproducts.getGas(200))
             .fluidOutputs(Materials.Dimethylbenzene.getFluid(20))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(new FluidStack(ItemList.sOilExtraHeavy, 10))
             .fluidOutputs(Materials.OilHeavy.getFluid(15))
             .duration(16 * TICKS)
             .eut(24)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.HeavyFuel.getFluid(10L))
             .fluidOutputs(new FluidStack(ItemList.sToluene, 4))
             .duration(16 * TICKS)
             .eut(24)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(new FluidStack(ItemList.sToluene, 30))
             .fluidOutputs(Materials.LightFuel.getFluid(30L))
             .duration(16 * TICKS)
             .eut(24)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 20))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 32))
             .duration(2 * SECONDS)
             .eut(16)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 4))
             .fluidOutputs(Materials.Water.getFluid(2))
             .duration(4 * SECONDS)
             .eut(30)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(getFluidStack("potion.wheatyjuice", 75))
             .fluidOutputs(getFluidStack("potion.scotch", 1))
             .duration(1 * SECONDS)
@@ -342,16 +342,16 @@ public class DistilleryRecipes implements Runnable {
 
         if (TinkerConstruct.isModLoaded()) {
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(1))
                 .fluidInputs(Materials.Glue.getFluid(8L))
                 .fluidOutputs(getFluidStack("glue", 8))
                 .duration(1 * TICKS)
                 .eut(24)
                 .addTo(distilleryRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(1))
                 .fluidInputs(getFluidStack("glue", 8))
                 .fluidOutputs(Materials.Glue.getFluid(4L))
                 .duration(1 * TICKS)
@@ -362,63 +362,63 @@ public class DistilleryRecipes implements Runnable {
     }
 
     public void distillationTowerRecipes() {
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.Creosote.getFluid(1000L))
             .fluidOutputs(Materials.Lubricant.getFluid(500L))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.SeedOil.getFluid(1400L))
             .fluidOutputs(Materials.Lubricant.getFluid(500L))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.FishOil.getFluid(1200L))
             .fluidOutputs(Materials.Lubricant.getFluid(500L))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L))
+        GTValues.RA.stdBuilder()
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L))
             .fluidInputs(Materials.Biomass.getFluid(1000L))
             .fluidOutputs(Materials.Ethanol.getFluid(600L), Materials.Water.getFluid(300L))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(400)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Water.getFluid(1000L))
-            .fluidOutputs(GT_ModHandler.getDistilledWater(1000L))
+            .fluidOutputs(GTModHandler.getDistilledWater(1000L))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(TierEU.RECIPE_MV)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.OilLight.getFluid(1000L))
             .fluidOutputs(Materials.Lubricant.getFluid(250L))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.OilMedium.getFluid(1000L))
             .fluidOutputs(Materials.Lubricant.getFluid(500L))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.OilHeavy.getFluid(1000L))
             .fluidOutputs(Materials.Lubricant.getFluid(750L))
             .duration(20 * SECONDS)
@@ -426,16 +426,16 @@ public class DistilleryRecipes implements Runnable {
             .addTo(distillationTowerRecipes);
         // C15H10N2O2(5HCl) = C15H10N2O2 + 5HCl
 
-        GT_Values.RA.stdBuilder()
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 29L))
+        GTValues.RA.stdBuilder()
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 29L))
             .fluidInputs(MaterialsKevlar.DiphenylmethaneDiisocyanateMixture.getFluid(1000L))
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(5000L))
             .duration(2 * MINUTES + 5 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Charcoal.getDustSmall(1))
             .fluidInputs(Materials.CharcoalByproducts.getGas(1000))
             .fluidOutputs(
@@ -447,8 +447,8 @@ public class DistilleryRecipes implements Runnable {
             .eut(256)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.WoodTar.getFluid(1000))
             .fluidOutputs(
                 Materials.Creosote.getFluid(250),
@@ -460,8 +460,8 @@ public class DistilleryRecipes implements Runnable {
             .eut(256)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(3))
             .itemOutputs(Materials.Charcoal.getDustSmall(1))
             .fluidInputs(Materials.CharcoalByproducts.getGas(1000))
             .fluidOutputs(
@@ -473,8 +473,8 @@ public class DistilleryRecipes implements Runnable {
             .eut(256)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(4))
             .itemOutputs(Materials.Charcoal.getDustSmall(1))
             .fluidInputs(Materials.CharcoalByproducts.getGas(1000))
             .fluidOutputs(
@@ -488,8 +488,8 @@ public class DistilleryRecipes implements Runnable {
             .eut(256)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(4))
             .fluidInputs(Materials.WoodTar.getFluid(1000))
             .fluidOutputs(
                 Materials.Creosote.getFluid(250),
@@ -503,8 +503,8 @@ public class DistilleryRecipes implements Runnable {
             .eut(256)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9))
             .fluidInputs(Materials.OilLight.getFluid(1000))
             .fluidOutputs(
                 Materials.SulfuricHeavyFuel.getFluid(70),
@@ -516,8 +516,8 @@ public class DistilleryRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9))
             .fluidInputs(Materials.OilMedium.getFluid(1000))
             .fluidOutputs(
                 Materials.SulfuricHeavyFuel.getFluid(100),
@@ -529,8 +529,8 @@ public class DistilleryRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9))
             .fluidInputs(Materials.Oil.getFluid(1000L))
             .fluidOutputs(
                 Materials.SulfuricHeavyFuel.getFluid(300),
@@ -542,8 +542,8 @@ public class DistilleryRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9))
             .fluidInputs(Materials.OilHeavy.getFluid(1000))
             .fluidOutputs(
                 Materials.SulfuricHeavyFuel.getFluid(450),
@@ -556,7 +556,7 @@ public class DistilleryRecipes implements Runnable {
             .addTo(distillationTowerRecipes);
         // 9C5H12O = 4C6H14O + 5CH4O + 4C4H8
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.MTBEMixture.getGas(900L))
             .fluidOutputs(
                 Materials.AntiKnock.getFluid(400L),
@@ -566,7 +566,7 @@ public class DistilleryRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.MTBEMixtureAlt.getGas(900L))
             .fluidOutputs(
                 Materials.AntiKnock.getFluid(400L),
@@ -576,7 +576,7 @@ public class DistilleryRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemOutputs(ItemList.IC2_Fertilizer.get(1))
             .fluidInputs(Materials.FermentedBiomass.getFluid(1000))
             .fluidOutputs(
@@ -591,14 +591,14 @@ public class DistilleryRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(distillationTowerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemOutputs(ItemList.IC2_Fertilizer.get(1))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 3000))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 8000), Materials.Water.getFluid(125L))
             .duration(12 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_HV)
             .addTo(distillationTowerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(new FluidStack(ItemList.sOilExtraHeavy, 1000))
             .fluidOutputs(Materials.OilHeavy.getFluid(1500))
             .duration(16 * TICKS)
@@ -609,17 +609,17 @@ public class DistilleryRecipes implements Runnable {
     public void universalDistillationTowerRecipes() {
         addUniversalDistillationRecipewithCircuit(
             Materials.WoodTar.getFluid(1000),
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(3) },
+            new ItemStack[] { GTUtility.getIntegratedCircuit(3) },
             new FluidStack[] { Materials.Creosote.getFluid(250), Materials.Phenol.getFluid(100),
                 Materials.Benzene.getFluid(400), Materials.Toluene.getFluid(100),
                 MaterialsKevlar.IVDimethylbenzene.getFluid(150) },
-            GT_Values.NI,
+            GTValues.NI,
             40,
             256);
 
         addUniversalDistillationRecipewithCircuit(
             Materials.CharcoalByproducts.getGas(1000),
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(1) },
+            new ItemStack[] { GTUtility.getIntegratedCircuit(1) },
             new FluidStack[] { Materials.WoodTar.getFluid(250), Materials.WoodVinegar.getFluid(400),
                 Materials.WoodGas.getGas(250), Materials.Dimethylbenzene.getFluid(100) },
             Materials.Charcoal.getDustSmall(1),
@@ -628,34 +628,34 @@ public class DistilleryRecipes implements Runnable {
 
         addUniversalDistillationRecipewithCircuit(
             Materials.WoodGas.getGas(1000),
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(1) },
+            new ItemStack[] { GTUtility.getIntegratedCircuit(1) },
             new FluidStack[] { Materials.CarbonDioxide.getGas(390), Materials.Ethylene.getGas(120),
                 Materials.Methane.getGas(130), Materials.CarbonMonoxide.getGas(240), Materials.Hydrogen.getGas(120) },
-            GT_Values.NI,
+            GTValues.NI,
             40,
             256);
         addUniversalDistillationRecipewithCircuit(
             Materials.WoodVinegar.getFluid(1000),
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(1) },
+            new ItemStack[] { GTUtility.getIntegratedCircuit(1) },
             new FluidStack[] { Materials.AceticAcid.getFluid(100), Materials.Water.getFluid(500),
                 Materials.Ethanol.getFluid(10), Materials.Methanol.getFluid(300), Materials.Acetone.getFluid(50),
                 Materials.MethylAcetate.getFluid(10) },
-            GT_Values.NI,
+            GTValues.NI,
             40,
             256);
         addUniversalDistillationRecipewithCircuit(
             Materials.WoodTar.getFluid(1000),
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(1) },
+            new ItemStack[] { GTUtility.getIntegratedCircuit(1) },
             new FluidStack[] { Materials.Creosote.getFluid(250), Materials.Phenol.getFluid(100),
                 Materials.Benzene.getFluid(400), Materials.Toluene.getFluid(100),
                 Materials.Dimethylbenzene.getFluid(150) },
-            GT_Values.NI,
+            GTValues.NI,
             40,
             256);
 
         addUniversalDistillationRecipewithCircuit(
             Materials.OilLight.getFluid(100),
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(1) },
+            new ItemStack[] { GTUtility.getIntegratedCircuit(1) },
             new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(7), Materials.SulfuricLightFuel.getFluid(13),
                 Materials.SulfuricNaphtha.getFluid(20), Materials.SulfuricGas.getGas(160) },
             null,
@@ -663,7 +663,7 @@ public class DistilleryRecipes implements Runnable {
             96);
         addUniversalDistillationRecipewithCircuit(
             Materials.OilMedium.getFluid(100),
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(1) },
+            new ItemStack[] { GTUtility.getIntegratedCircuit(1) },
             new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(10), Materials.SulfuricLightFuel.getFluid(50),
                 Materials.SulfuricNaphtha.getFluid(150), Materials.SulfuricGas.getGas(60) },
             null,
@@ -671,7 +671,7 @@ public class DistilleryRecipes implements Runnable {
             96);
         addUniversalDistillationRecipewithCircuit(
             Materials.Oil.getFluid(100L),
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(1) },
+            new ItemStack[] { GTUtility.getIntegratedCircuit(1) },
             new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(30), Materials.SulfuricLightFuel.getFluid(100),
                 Materials.SulfuricNaphtha.getFluid(40), Materials.SulfuricGas.getGas(120) },
             null,
@@ -679,7 +679,7 @@ public class DistilleryRecipes implements Runnable {
             96);
         addUniversalDistillationRecipewithCircuit(
             Materials.OilHeavy.getFluid(100),
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(1) },
+            new ItemStack[] { GTUtility.getIntegratedCircuit(1) },
             new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(100), Materials.SulfuricLightFuel.getFluid(45),
                 Materials.SulfuricNaphtha.getFluid(15), Materials.SulfuricGas.getGas(60) },
             null,
@@ -690,14 +690,14 @@ public class DistilleryRecipes implements Runnable {
         addUniversalDistillationRecipe(
             Materials.DilutedHydrochloricAcid.getFluid(2000),
             new FluidStack[] { Materials.Water.getFluid(1000), Materials.HydrochloricAcid.getFluid(1000) },
-            GT_Values.NI,
+            GTValues.NI,
             600,
             64);
 
         addUniversalDistillationRecipe(
             getFluidStack("potion.vinegar", 40),
             new FluidStack[] { Materials.AceticAcid.getFluid(5), Materials.Water.getFluid(35) },
-            GT_Values.NI,
+            GTValues.NI,
             20,
             64);
 
@@ -711,7 +711,7 @@ public class DistilleryRecipes implements Runnable {
         addUniversalDistillationRecipe(
             Materials.DilutedSulfuricAcid.getFluid(3000),
             new FluidStack[] { Materials.SulfuricAcid.getFluid(2000), Materials.Water.getFluid(1000) },
-            GT_Values.NI,
+            GTValues.NI,
             600,
             120);
 
@@ -719,7 +719,7 @@ public class DistilleryRecipes implements Runnable {
         addUniversalDistillationRecipe(
             Materials.Acetone.getFluid(1000),
             new FluidStack[] { Materials.Ethenone.getGas(1000), Materials.Methane.getGas(1000) },
-            GT_Values.NI,
+            GTValues.NI,
             80,
             640);
 
@@ -727,14 +727,14 @@ public class DistilleryRecipes implements Runnable {
             Materials.Gas.getGas(1000),
             new FluidStack[] { Materials.Butane.getGas(60), Materials.Propane.getGas(70), Materials.Ethane.getGas(100),
                 Materials.Methane.getGas(750), Materials.Helium.getGas(20) },
-            GT_Values.NI,
+            GTValues.NI,
             240,
             120);
 
         addUniversalDistillationRecipe(
             Materials.Ethylene.getLightlyHydroCracked(1000),
             new FluidStack[] { Materials.Ethane.getGas(1000) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
@@ -746,7 +746,7 @@ public class DistilleryRecipes implements Runnable {
         addUniversalDistillationRecipe(
             Materials.Ethylene.getSeverelyHydroCracked(1000),
             new FluidStack[] { Materials.Methane.getGas(2000), Materials.Hydrogen.getGas(2000) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
@@ -771,19 +771,19 @@ public class DistilleryRecipes implements Runnable {
         addUniversalDistillationRecipe(
             Materials.Ethane.getLightlyHydroCracked(1000),
             new FluidStack[] { Materials.Methane.getGas(2000) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
             Materials.Ethane.getModeratelyHydroCracked(1000),
             new FluidStack[] { Materials.Methane.getGas(2000), Materials.Hydrogen.getGas(2000) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
             Materials.Ethane.getSeverelyHydroCracked(1000),
             new FluidStack[] { Materials.Methane.getGas(2000), Materials.Hydrogen.getGas(4000) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
@@ -809,19 +809,19 @@ public class DistilleryRecipes implements Runnable {
             Materials.Propene.getLightlyHydroCracked(1000),
             new FluidStack[] { Materials.Propane.getGas(500), Materials.Ethylene.getGas(500),
                 Materials.Methane.getGas(500) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
             Materials.Propene.getModeratelyHydroCracked(1000),
             new FluidStack[] { Materials.Ethane.getGas(1000), Materials.Methane.getGas(1000) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
             Materials.Propene.getSeverelyHydroCracked(1000),
             new FluidStack[] { Materials.Methane.getGas(3000) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
@@ -846,19 +846,19 @@ public class DistilleryRecipes implements Runnable {
         addUniversalDistillationRecipe(
             Materials.Propane.getLightlyHydroCracked(1000),
             new FluidStack[] { Materials.Ethane.getGas(1000), Materials.Methane.getGas(1000) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
             Materials.Propane.getModeratelyHydroCracked(1000),
             new FluidStack[] { Materials.Methane.getGas(3000) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
             Materials.Propane.getSeverelyHydroCracked(1000),
             new FluidStack[] { Materials.Methane.getGas(3000), Materials.Hydrogen.getGas(2000) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
@@ -883,21 +883,21 @@ public class DistilleryRecipes implements Runnable {
         addUniversalDistillationRecipe(
             Materials.Butadiene.getLightlyHydroCracked(1000),
             new FluidStack[] { Materials.Butene.getGas(667), Materials.Ethylene.getGas(667) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
             Materials.Butadiene.getModeratelyHydroCracked(1000),
             new FluidStack[] { Materials.Butane.getGas(223), Materials.Propene.getGas(223),
                 Materials.Ethane.getGas(400), Materials.Ethylene.getGas(445), Materials.Methane.getGas(223) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
             Materials.Butadiene.getSeverelyHydroCracked(1000),
             new FluidStack[] { Materials.Propane.getGas(260), Materials.Ethane.getGas(926),
                 Materials.Ethylene.getGas(389), Materials.Methane.getGas(2667) },
-            GT_Values.NI,
+            GTValues.NI,
             112,
             120);
         addUniversalDistillationRecipe(
@@ -926,20 +926,20 @@ public class DistilleryRecipes implements Runnable {
             Materials.Butene.getLightlyHydroCracked(1000),
             new FluidStack[] { Materials.Butane.getGas(334), Materials.Propene.getGas(334),
                 Materials.Ethane.getGas(334), Materials.Ethylene.getGas(334), Materials.Methane.getGas(334) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
             Materials.Butene.getModeratelyHydroCracked(1000),
             new FluidStack[] { Materials.Propane.getGas(389), Materials.Ethane.getGas(556),
                 Materials.Ethylene.getGas(334), Materials.Methane.getGas(1056) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
             Materials.Butene.getSeverelyHydroCracked(1000),
             new FluidStack[] { Materials.Ethane.getGas(1000), Materials.Methane.getGas(2000) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
@@ -968,19 +968,19 @@ public class DistilleryRecipes implements Runnable {
             Materials.Butane.getLightlyHydroCracked(1000),
             new FluidStack[] { Materials.Propane.getGas(667), Materials.Ethane.getGas(667),
                 Materials.Methane.getGas(667) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
             Materials.Butane.getModeratelyHydroCracked(1000),
             new FluidStack[] { Materials.Ethane.getGas(1000), Materials.Methane.getGas(2000) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
             Materials.Butane.getSeverelyHydroCracked(1000),
             new FluidStack[] { Materials.Methane.getGas(1000) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
@@ -1009,21 +1009,21 @@ public class DistilleryRecipes implements Runnable {
             Materials.Gas.getLightlyHydroCracked(1000),
             new FluidStack[] { Materials.Methane.getGas(1300), Materials.Hydrogen.getGas(1500),
                 Materials.Helium.getGas(100) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
             Materials.Gas.getModeratelyHydroCracked(1000),
             new FluidStack[] { Materials.Methane.getGas(1400), Materials.Hydrogen.getGas(3000),
                 Materials.Helium.getGas(150) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
             Materials.Gas.getSeverelyHydroCracked(1000),
             new FluidStack[] { Materials.Methane.getGas(1500), Materials.Hydrogen.getGas(4000),
                 Materials.Helium.getGas(200) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
@@ -1052,21 +1052,21 @@ public class DistilleryRecipes implements Runnable {
             Materials.Naphtha.getLightlyHydroCracked(1000),
             new FluidStack[] { Materials.Butane.getGas(800), Materials.Propane.getGas(300),
                 Materials.Ethane.getGas(250), Materials.Methane.getGas(250) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
             Materials.Naphtha.getModeratelyHydroCracked(1000),
             new FluidStack[] { Materials.Butane.getGas(200), Materials.Propane.getGas(1100),
                 Materials.Ethane.getGas(400), Materials.Methane.getGas(400) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
             Materials.Naphtha.getSeverelyHydroCracked(1000),
             new FluidStack[] { Materials.Butane.getGas(125), Materials.Propane.getGas(125),
                 Materials.Ethane.getGas(1500), Materials.Methane.getGas(1500) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
@@ -1102,7 +1102,7 @@ public class DistilleryRecipes implements Runnable {
             new FluidStack[] { Materials.Naphtha.getFluid(800), Materials.Octane.getFluid(100),
                 Materials.Butane.getGas(150), Materials.Propane.getGas(200), Materials.Ethane.getGas(125),
                 Materials.Methane.getGas(125) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
@@ -1110,7 +1110,7 @@ public class DistilleryRecipes implements Runnable {
             new FluidStack[] { Materials.Naphtha.getFluid(500), Materials.Octane.getFluid(50),
                 Materials.Butane.getGas(200), Materials.Propane.getGas(1100), Materials.Ethane.getGas(400),
                 Materials.Methane.getGas(400) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
@@ -1118,7 +1118,7 @@ public class DistilleryRecipes implements Runnable {
             new FluidStack[] { Materials.Naphtha.getFluid(200), Materials.Octane.getFluid(20),
                 Materials.Butane.getGas(125), Materials.Propane.getGas(125), Materials.Ethane.getGas(1500),
                 Materials.Methane.getGas(1500) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
@@ -1154,7 +1154,7 @@ public class DistilleryRecipes implements Runnable {
             new FluidStack[] { Materials.LightFuel.getFluid(600), Materials.Naphtha.getFluid(100),
                 Materials.Butane.getGas(100), Materials.Propane.getGas(100), Materials.Ethane.getGas(75),
                 Materials.Methane.getGas(75) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
@@ -1162,7 +1162,7 @@ public class DistilleryRecipes implements Runnable {
             new FluidStack[] { Materials.LightFuel.getFluid(400), Materials.Naphtha.getFluid(400),
                 Materials.Butane.getGas(150), Materials.Propane.getGas(150), Materials.Ethane.getGas(100),
                 Materials.Methane.getGas(100) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
@@ -1170,7 +1170,7 @@ public class DistilleryRecipes implements Runnable {
             new FluidStack[] { Materials.LightFuel.getFluid(200), Materials.Naphtha.getFluid(250),
                 Materials.Butane.getGas(300), Materials.Propane.getGas(300), Materials.Ethane.getGas(175),
                 Materials.Methane.getGas(175) },
-            GT_Values.NI,
+            GTValues.NI,
             120,
             120);
         addUniversalDistillationRecipe(
@@ -1205,9 +1205,9 @@ public class DistilleryRecipes implements Runnable {
     public void addUniversalDistillationRecipewithCircuit(FluidStack aInput, ItemStack[] aCircuit,
         FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, int aEUt) {
         for (int i = 0; i < Math.min(aOutputs.length, 11); i++) {
-            GT_RecipeBuilder buildDistillation = GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(i + 1));
-            if (aOutput2 != GT_Values.NI) {
+            GTRecipeBuilder buildDistillation = GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(i + 1));
+            if (aOutput2 != GTValues.NI) {
                 buildDistillation.itemOutputs(aOutput2);
             }
             buildDistillation.fluidInputs(aInput)
@@ -1216,9 +1216,9 @@ public class DistilleryRecipes implements Runnable {
                 .eut(aEUt / 4)
                 .addTo(distilleryRecipes);
         }
-        GT_RecipeBuilder buildDT = GT_Values.RA.stdBuilder()
+        GTRecipeBuilder buildDT = GTValues.RA.stdBuilder()
             .itemInputs(aCircuit);
-        if (aOutput2 != GT_Values.NI) {
+        if (aOutput2 != GTValues.NI) {
             buildDT.itemOutputs(aOutput2);
         }
         buildDT.fluidInputs(aInput)
@@ -1231,9 +1231,9 @@ public class DistilleryRecipes implements Runnable {
     public void addUniversalDistillationRecipe(FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2,
         int aDuration, int aEUt) {
         for (int i = 0; i < Math.min(aOutputs.length, 11); i++) {
-            GT_RecipeBuilder buildDistillation = GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(i + 1));
-            if (aOutput2 != GT_Values.NI) {
+            GTRecipeBuilder buildDistillation = GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(i + 1));
+            if (aOutput2 != GTValues.NI) {
                 buildDistillation.itemOutputs(aOutput2);
             }
             buildDistillation.fluidInputs(aInput)
@@ -1242,8 +1242,8 @@ public class DistilleryRecipes implements Runnable {
                 .eut(aEUt / 4)
                 .addTo(distilleryRecipes);
         }
-        GT_RecipeBuilder buildDT = GT_Values.RA.stdBuilder();
-        if (aOutput2 != GT_Values.NI) {
+        GTRecipeBuilder buildDT = GTValues.RA.stdBuilder();
+        if (aOutput2 != GTValues.NI) {
             buildDT.itemOutputs(aOutput2);
         }
         buildDT.fluidInputs(aInput)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java
index 363f279de5..6ac7f2051c 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java
@@ -1,22 +1,22 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-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.enums.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class ElectrolyzerRecipes implements Runnable {
 
@@ -24,119 +24,119 @@ public class ElectrolyzerRecipes implements Runnable {
     public void run() {
         // H2O = 2H + O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1), ItemList.Cell_Empty.get(1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1), ItemList.Cell_Empty.get(1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L))
             .fluidInputs(Materials.Water.getFluid(1000L))
             .fluidOutputs(Materials.Hydrogen.getGas(2000L))
             .duration(1 * MINUTES + 40 * SECONDS)
             .eut(30)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2), ItemList.Cell_Empty.get(1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L))
-            .fluidInputs(GT_ModHandler.getDistilledWater(1000L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2), ItemList.Cell_Empty.get(1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L))
+            .fluidInputs(GTModHandler.getDistilledWater(1000L))
             .fluidOutputs(Materials.Hydrogen.getGas(2000L))
             .duration(1 * MINUTES + 40 * SECONDS)
             .eut(30)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(3), ItemList.Cell_Empty.get(2L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(3), ItemList.Cell_Empty.get(2L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L))
             .fluidInputs(Materials.Water.getFluid(1000L))
             .fluidOutputs(Materials.Oxygen.getGas(1000L))
             .duration(1 * MINUTES + 40 * SECONDS)
             .eut(30)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(4), ItemList.Cell_Empty.get(2L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L))
-            .fluidInputs(GT_ModHandler.getDistilledWater(1000L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(4), ItemList.Cell_Empty.get(2L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L))
+            .fluidInputs(GTModHandler.getDistilledWater(1000L))
             .fluidOutputs(Materials.Oxygen.getGas(1000L))
             .duration(1 * MINUTES + 40 * SECONDS)
             .eut(30)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("electrolyzedWaterCell", 1L), ItemList.Cell_Empty.get(2L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("electrolyzedWaterCell", 1L), ItemList.Cell_Empty.get(2L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L))
             .duration(1 * SECONDS + 10 * TICKS)
             .eut(30)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("electrolyzedWaterCell", 1L), GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("electrolyzedWaterCell", 1L), GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L))
             .fluidOutputs(Materials.Hydrogen.getGas(2000L))
             .duration(1 * SECONDS + 10 * TICKS)
             .eut(30)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L))
-            .itemOutputs(GT_ModHandler.getIC2Item("electrolyzedWaterCell", 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L))
+            .itemOutputs(GTModHandler.getIC2Item("electrolyzedWaterCell", 1L))
             .duration(1 * MINUTES + 13 * SECONDS + 10 * TICKS)
             .eut(30)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Dye_Bonemeal.get(3L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L))
             .duration(4 * SECONDS + 18 * TICKS)
             .eut(26)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.sand, 8, 0))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L))
             .duration(25 * SECONDS)
             .eut(25)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.sand, 8, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L))
             .duration(25 * SECONDS)
             .eut(25)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 4))
             .duration(5 * SECONDS)
             .eut(64)
             .addTo(electrolyzerRecipes);
         // ZnS = Zn + S + 1 Ga(9.17%)
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sphalerite, 2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sphalerite, 2))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1))
             .outputChances(10000, 10000, 917)
             .duration(10 * SECONDS)
             .eut(30)
             .addTo(electrolyzerRecipes);
         // IC2 Fertilizer = H2O + CaCO3 + C
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.IC2_Fertilizer.get(1L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L))
             .fluidOutputs(Materials.Water.getFluid(1000L))
             .duration(5 * SECONDS)
             .eut(30)
             .addTo(electrolyzerRecipes);
         // NaOH = Na + O + H
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumHydroxide.getDust(3), Materials.Empty.getCells(1))
             .itemOutputs(Materials.Sodium.getDust(1), Materials.Hydrogen.getCells(1))
             .outputChances(10000, 10000)
@@ -146,8 +146,8 @@ public class ElectrolyzerRecipes implements Runnable {
             .addTo(electrolyzerRecipes);
         // CO2 = C + 2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Carbon.getDust(1))
             .fluidInputs(Materials.CarbonDioxide.getGas(1000))
             .fluidOutputs(Materials.Oxygen.getGas(2000))
@@ -155,8 +155,8 @@ public class ElectrolyzerRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(11), Materials.Empty.getCells(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(11), Materials.Empty.getCells(2))
             .itemOutputs(Materials.Carbon.getDust(1), Materials.Oxygen.getCells(2))
             .fluidInputs(Materials.CarbonDioxide.getGas(1000))
             .duration(45 * SECONDS)
@@ -164,8 +164,8 @@ public class ElectrolyzerRecipes implements Runnable {
             .addTo(electrolyzerRecipes);
         // CO = C + O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Carbon.getDust(1))
             .fluidInputs(Materials.CarbonMonoxide.getGas(1000))
             .fluidOutputs(Materials.Oxygen.getGas(1000))
@@ -173,15 +173,15 @@ public class ElectrolyzerRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(11), Materials.Empty.getCells(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(11), Materials.Empty.getCells(1))
             .itemOutputs(Materials.Carbon.getDust(1), Materials.Oxygen.getCells(1))
             .fluidInputs(Materials.CarbonMonoxide.getGas(1000))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.CarbonMonoxide.getCells(1))
             .itemOutputs(Materials.Carbon.getDust(1), Materials.Oxygen.getCells(1))
             .duration(15 * SECONDS)
@@ -190,7 +190,7 @@ public class ElectrolyzerRecipes implements Runnable {
 
         // H2S = S + 2H
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemOutputs(Materials.Sulfur.getDust(1))
             .fluidInputs(Materials.HydricSulfide.getGas(1000))
             .fluidOutputs(Materials.Hydrogen.getGas(2000))
@@ -198,7 +198,7 @@ public class ElectrolyzerRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemOutputs(Materials.Sulfur.getDust(1), Materials.Hydrogen.getCells(2))
             .itemInputs(Materials.HydricSulfide.getCells(1), Materials.Empty.getCells(1))
             .duration(3 * SECONDS + 12 * TICKS)
@@ -207,8 +207,8 @@ public class ElectrolyzerRecipes implements Runnable {
 
         // SO2 = S + 2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Sulfur.getDust(1))
             .fluidInputs(Materials.SulfurDioxide.getGas(1000))
             .fluidOutputs(Materials.Oxygen.getGas(2000))
@@ -216,8 +216,8 @@ public class ElectrolyzerRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(11), Materials.Empty.getCells(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(11), Materials.Empty.getCells(2))
             .itemOutputs(Materials.Sulfur.getDust(1), Materials.Oxygen.getCells(2))
             .fluidInputs(Materials.SulfurDioxide.getGas(1000))
             .duration(15 * SECONDS)
@@ -225,7 +225,7 @@ public class ElectrolyzerRecipes implements Runnable {
             .addTo(electrolyzerRecipes);
         // NaCl = Na +Cl
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Salt.getDust(2))
             .itemOutputs(Materials.Sodium.getDust(1))
             .fluidOutputs(Materials.Chlorine.getGas(1000))
@@ -234,8 +234,8 @@ public class ElectrolyzerRecipes implements Runnable {
             .addTo(electrolyzerRecipes);
         // (NaCl·H2O)= NaOH + H
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Empty.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.SodiumHydroxide.getDust(3), Materials.Hydrogen.getCells(1))
             .fluidInputs(Materials.SaltWater.getFluid(1000))
             .fluidOutputs(Materials.Chlorine.getGas(1000))
@@ -243,8 +243,8 @@ public class ElectrolyzerRecipes implements Runnable {
             .eut(30)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Empty.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.SodiumHydroxide.getDust(3), Materials.Chlorine.getCells(1))
             .fluidInputs(Materials.SaltWater.getFluid(1000))
             .fluidOutputs(Materials.Hydrogen.getGas(1000))
@@ -253,8 +253,8 @@ public class ElectrolyzerRecipes implements Runnable {
             .addTo(electrolyzerRecipes);
         // HCl = H + Cl
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Empty.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Hydrogen.getCells(1))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
             .fluidOutputs(Materials.Chlorine.getGas(1000))
@@ -262,8 +262,8 @@ public class ElectrolyzerRecipes implements Runnable {
             .eut(30)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Empty.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Chlorine.getCells(1))
             .fluidInputs(Materials.HydrochloricAcid.getFluid(1000))
             .fluidOutputs(Materials.Hydrogen.getGas(1000))
@@ -271,16 +271,16 @@ public class ElectrolyzerRecipes implements Runnable {
             .eut(30)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HydrochloricAcid.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Hydrogen.getCells(1))
             .fluidOutputs(Materials.Chlorine.getGas(1000))
             .duration(36 * SECONDS)
             .eut(30)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.HydrochloricAcid.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.Chlorine.getCells(1))
             .fluidOutputs(Materials.Hydrogen.getGas(1000))
             .duration(36 * SECONDS)
@@ -288,7 +288,7 @@ public class ElectrolyzerRecipes implements Runnable {
             .addTo(electrolyzerRecipes);
         // 2NaHSO4 = 2H + Na2S2O8
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.SodiumBisulfate.getDust(14), Materials.Empty.getCells(2))
             .itemOutputs(Materials.Hydrogen.getCells(2))
             .fluidOutputs(Materials.SodiumPersulfate.getFluid(1000))
@@ -296,59 +296,59 @@ public class ElectrolyzerRecipes implements Runnable {
             .eut(30)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lead, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 4))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lead, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 4))
             .fluidInputs(new FluidStack(ItemList.sLeadZincSolution, 8000))
             .fluidOutputs(Materials.Water.getFluid(2000))
             .duration(15 * SECONDS)
             .eut(192)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Cell_Empty.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1))
             .fluidInputs(new FluidStack(ItemList.sBlueVitriol, 2000))
             .fluidOutputs(Materials.SulfuricAcid.getFluid(1000))
             .duration(45 * SECONDS)
             .eut(30)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Cell_Empty.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1))
             .fluidInputs(new FluidStack(ItemList.sNickelSulfate, 2000))
             .fluidOutputs(Materials.SulfuricAcid.getFluid(1000))
             .duration(45 * SECONDS)
             .eut(30)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Cell_Empty.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1))
             .fluidInputs(new FluidStack(ItemList.sGreenVitriol, 2000))
             .fluidOutputs(Materials.SulfuricAcid.getFluid(1000))
             .duration(45 * SECONDS)
             .eut(30)
             .addTo(electrolyzerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.PhosphoricAcid, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.PhosphoricAcid, 1L),
                 ItemList.Cell_Empty.get(6L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 4L))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 4L))
             .duration(27 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(electrolyzerRecipes);
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java
index d9031ac64f..fa8097c6fd 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java
@@ -1,9 +1,9 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.electroMagneticSeparatorRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsOreAlum;
 import gregtech.api.enums.TierEU;
@@ -12,7 +12,7 @@ public class ElectromagneticSeparatorRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(MaterialsOreAlum.SluiceSand.getDust(1))
             .itemOutputs(Materials.Iron.getDust(1), Materials.Neodymium.getDust(1), Materials.Chrome.getDust(1))
             .outputChances(4000, 2000, 2000)
@@ -20,7 +20,7 @@ public class ElectromagneticSeparatorRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV / 2)
             .addTo(electroMagneticSeparatorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.TengamRaw.getDust(1))
             .itemOutputs(
                 Materials.TengamPurified.getDust(1),
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java
index 06ad1fa994..d51e6761fb 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java
@@ -1,19 +1,19 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.extractorRecipes;
-import static gregtech.api.util.GT_ModHandler.getIC2Item;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.WILDCARD;
+import static gregtech.api.util.GTModHandler.getIC2Item;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.WILDCARD;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-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.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class ExtractorRecipes implements Runnable {
 
@@ -22,16 +22,16 @@ public class ExtractorRecipes implements Runnable {
         addExtractionRecipe(new ItemStack(Blocks.bookshelf, 1, WILDCARD), new ItemStack(Items.book, 3, 0));
         addExtractionRecipe(
             new ItemStack(Items.slime_ball, 1),
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 2L));
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 2L));
         addExtractionRecipe(
             ItemList.IC2_Resin.get(1L),
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3L));
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3L));
         addExtractionRecipe(
             getIC2Item("rubberSapling", 1L),
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L));
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L));
         addExtractionRecipe(
             getIC2Item("rubberLeaves", 16L),
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L));
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L));
 
         addExtractionRecipe(ItemList.Cell_Air.get(1L), ItemList.Cell_Empty.get(1L));
         addExtractionRecipe(getIC2Item("filledTinCan", 1), getIC2Item("tinCan", 1));
@@ -40,152 +40,152 @@ public class ExtractorRecipes implements Runnable {
         addExtractionRecipe(new ItemStack(Blocks.nether_brick, 1), new ItemStack(Items.netherbrick, 4));
         addExtractionRecipe(new ItemStack(Blocks.snow, 1), new ItemStack(Items.snowball, 4));
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_SU_LV_SulfuricAcid.get(1L))
             .itemOutputs(ItemList.Battery_Hull_LV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_SU_LV_Mercury.get(1L))
             .itemOutputs(ItemList.Battery_Hull_LV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_SU_MV_SulfuricAcid.get(1L))
             .itemOutputs(ItemList.Battery_Hull_MV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_SU_MV_Mercury.get(1L))
             .itemOutputs(ItemList.Battery_Hull_MV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_SU_HV_SulfuricAcid.get(1L))
             .itemOutputs(ItemList.Battery_Hull_HV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_SU_HV_Mercury.get(1L))
             .itemOutputs(ItemList.Battery_Hull_HV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_RE_LV_Cadmium.get(1L))
             .itemOutputs(ItemList.Battery_Hull_LV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_RE_LV_Lithium.get(1L))
             .itemOutputs(ItemList.Battery_Hull_LV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_RE_LV_Sodium.get(1L))
             .itemOutputs(ItemList.Battery_Hull_LV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_RE_MV_Cadmium.get(1L))
             .itemOutputs(ItemList.Battery_Hull_MV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_RE_MV_Lithium.get(1L))
             .itemOutputs(ItemList.Battery_Hull_MV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_RE_MV_Sodium.get(1L))
             .itemOutputs(ItemList.Battery_Hull_MV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_RE_HV_Cadmium.get(1L))
             .itemOutputs(ItemList.Battery_Hull_HV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_RE_HV_Lithium.get(1L))
             .itemOutputs(ItemList.Battery_Hull_HV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_RE_HV_Sodium.get(1L))
             .itemOutputs(ItemList.Battery_Hull_HV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.BatteryHull_EV_Full.get(1L))
             .itemOutputs(ItemList.BatteryHull_EV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.BatteryHull_IV_Full.get(1L))
             .itemOutputs(ItemList.BatteryHull_IV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.BatteryHull_LuV_Full.get(1L))
             .itemOutputs(ItemList.BatteryHull_LuV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.BatteryHull_ZPM_Full.get(1L))
             .itemOutputs(ItemList.BatteryHull_ZPM.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.BatteryHull_UV_Full.get(1L))
             .itemOutputs(ItemList.BatteryHull_UV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.BatteryHull_UHV_Full.get(1L))
             .itemOutputs(ItemList.BatteryHull_UHV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.BatteryHull_UEV_Full.get(1L))
             .itemOutputs(ItemList.BatteryHull_UEV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.BatteryHull_UIV_Full.get(1L))
             .itemOutputs(ItemList.BatteryHull_UIV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.BatteryHull_UMV_Full.get(1L))
             .itemOutputs(ItemList.BatteryHull_UMV.get(1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.BatteryHull_UxV_Full.get(1L))
             .itemOutputs(ItemList.BatteryHull_UxV.get(1L))
             .duration(15 * SECONDS)
@@ -194,8 +194,8 @@ public class ExtractorRecipes implements Runnable {
     }
 
     public void addExtractionRecipe(ItemStack input, ItemStack output) {
-        output = GT_OreDictUnificator.get(true, output);
-        GT_Values.RA.stdBuilder()
+        output = GTOreDictUnificator.get(true, output);
+        GTValues.RA.stdBuilder()
             .itemInputs(input)
             .itemOutputs(output)
             .duration(15 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java
index e52ad3d4fb..59cbefc3c8 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java
@@ -1,10 +1,10 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.extruderRecipes;
-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 gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 
 public class ExtruderRecipes implements Runnable {
@@ -12,14 +12,14 @@ public class ExtruderRecipes implements Runnable {
     @Override
     public void run() {
         // wax capsule
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.FR_Wax.get(1L), ItemList.Shape_Extruder_Cell.get(0L))
             .itemOutputs(ItemList.FR_WaxCapsule.get(1L))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(16)
             .addTo(extruderRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.FR_RefractoryWax.get(1L), ItemList.Shape_Extruder_Cell.get(0L))
             .itemOutputs(ItemList.FR_RefractoryCapsule.get(1L))
             .duration(6 * SECONDS + 8 * TICKS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java
index c0954fda18..74b1e0e78e 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java
@@ -1,15 +1,15 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.fermentingRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 import static net.minecraftforge.fluids.FluidRegistry.getFluidStack;
 
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 
 public class FermenterRecipes implements Runnable {
@@ -17,273 +17,273 @@ public class FermenterRecipes implements Runnable {
     @Override
     public void run() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Biomass.getFluid(100))
             .fluidOutputs(Materials.FermentedBiomass.getFluid(100))
             .duration(7 * SECONDS + 10 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 100))
             .fluidOutputs(Materials.FermentedBiomass.getFluid(100))
             .duration(7 * SECONDS + 10 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("milk", 50))
             .fluidOutputs(getFluidStack("potion.mundane", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.lemonjuice", 50))
             .fluidOutputs(getFluidStack("potion.limoncello", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.applejuice", 50))
             .fluidOutputs(getFluidStack("potion.cider", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.goldenapplejuice", 50))
             .fluidOutputs(getFluidStack("potion.goldencider", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.idunsapplejuice", 50))
             .fluidOutputs(getFluidStack("potion.notchesbrew", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.reedwater", 50))
             .fluidOutputs(getFluidStack("potion.rum", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.rum", 50))
             .fluidOutputs(getFluidStack("potion.piratebrew", 10))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.grapejuice", 50))
             .fluidOutputs(getFluidStack("potion.wine", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.wine", 50))
             .fluidOutputs(getFluidStack("potion.vinegar", 10))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.scotch", 50))
             .fluidOutputs(getFluidStack("potion.glenmckenner", 10))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.wheatyhopsjuice", 50))
             .fluidOutputs(getFluidStack("potion.beer", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.hopsjuice", 50))
             .fluidOutputs(getFluidStack("potion.darkbeer", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.darkbeer", 50))
             .fluidOutputs(getFluidStack("potion.dragonblood", 10))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.beer", 75))
             .fluidOutputs(getFluidStack("potion.vinegar", 50))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.cider", 75))
             .fluidOutputs(getFluidStack("potion.vinegar", 50))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.goldencider", 75))
             .fluidOutputs(getFluidStack("potion.vinegar", 50))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.rum", 75))
             .fluidOutputs(getFluidStack("potion.vinegar", 50))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.wine", 75))
             .fluidOutputs(getFluidStack("potion.vinegar", 50))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.awkward", 50))
             .fluidOutputs(getFluidStack("potion.weakness", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.mundane", 50))
             .fluidOutputs(getFluidStack("potion.weakness", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.thick", 50))
             .fluidOutputs(getFluidStack("potion.weakness", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.poison", 50))
             .fluidOutputs(getFluidStack("potion.damage", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.health", 50))
             .fluidOutputs(getFluidStack("potion.damage", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.waterbreathing", 50))
             .fluidOutputs(getFluidStack("potion.damage", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.nightvision", 50))
             .fluidOutputs(getFluidStack("potion.invisibility", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.fireresistance", 50))
             .fluidOutputs(getFluidStack("potion.slowness", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.speed", 50))
             .fluidOutputs(getFluidStack("potion.slowness", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.strength", 50))
             .fluidOutputs(getFluidStack("potion.weakness", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.regen", 50))
             .fluidOutputs(getFluidStack("potion.poison", 25))
             .duration(51 * SECONDS + 4 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.poison.strong", 50))
             .fluidOutputs(getFluidStack("potion.damage.strong", 10))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.health.strong", 50))
             .fluidOutputs(getFluidStack("potion.damage.strong", 10))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.nightvision.long", 50))
             .fluidOutputs(getFluidStack("potion.invisibility.long", 10))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.regen.strong", 50))
             .fluidOutputs(getFluidStack("potion.poison.strong", 10))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.fireresistance.long", 50))
             .fluidOutputs(getFluidStack("potion.slowness.long", 10))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.speed.long", 50))
             .fluidOutputs(getFluidStack("potion.slowness.long", 10))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.strength.long", 50))
             .fluidOutputs(getFluidStack("potion.weakness.long", 10))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
             .eut(2)
             .addTo(fermentingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.regen.long", 50))
             .fluidOutputs(getFluidStack("potion.poison.long", 10))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java
index ea2b87996f..89bda51506 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java
@@ -2,7 +2,7 @@ package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 
@@ -10,7 +10,7 @@ public class FluidCannerRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_Hull_LV.get(1))
             .itemOutputs(ItemList.IC2_ReBattery.get(1))
             .fluidInputs(Materials.Redstone.getMolten(288))
@@ -18,7 +18,7 @@ public class FluidCannerRecipes implements Runnable {
             .eut(1)
             .addTo(fluidCannerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_Hull_LV.get(1))
             .itemOutputs(ItemList.Battery_SU_LV_Mercury.getWithCharge(1, Integer.MAX_VALUE))
             .fluidInputs(Materials.Mercury.getFluid(1000))
@@ -26,7 +26,7 @@ public class FluidCannerRecipes implements Runnable {
             .eut(1)
             .addTo(fluidCannerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_Hull_MV.get(1))
             .itemOutputs(ItemList.Battery_SU_MV_Mercury.getWithCharge(1, Integer.MAX_VALUE))
             .fluidInputs(Materials.Mercury.getFluid(4000))
@@ -34,7 +34,7 @@ public class FluidCannerRecipes implements Runnable {
             .eut(1)
             .addTo(fluidCannerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_Hull_HV.get(1))
             .itemOutputs(ItemList.Battery_SU_HV_Mercury.getWithCharge(1, Integer.MAX_VALUE))
             .fluidInputs(Materials.Mercury.getFluid(16000))
@@ -42,7 +42,7 @@ public class FluidCannerRecipes implements Runnable {
             .eut(1)
             .addTo(fluidCannerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_Hull_LV.get(1))
             .itemOutputs(ItemList.Battery_SU_LV_SulfuricAcid.getWithCharge(1, Integer.MAX_VALUE))
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000))
@@ -50,7 +50,7 @@ public class FluidCannerRecipes implements Runnable {
             .eut(1)
             .addTo(fluidCannerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_Hull_MV.get(1))
             .itemOutputs(ItemList.Battery_SU_MV_SulfuricAcid.getWithCharge(1, Integer.MAX_VALUE))
             .fluidInputs(Materials.SulfuricAcid.getFluid(4000))
@@ -58,7 +58,7 @@ public class FluidCannerRecipes implements Runnable {
             .eut(1)
             .addTo(fluidCannerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Battery_Hull_HV.get(1))
             .itemOutputs(ItemList.Battery_SU_HV_SulfuricAcid.getWithCharge(1, Integer.MAX_VALUE))
             .fluidInputs(Materials.SulfuricAcid.getFluid(16000))
@@ -66,7 +66,7 @@ public class FluidCannerRecipes implements Runnable {
             .eut(1)
             .addTo(fluidCannerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.TF_Vial_FieryTears.get(1))
             .itemOutputs(ItemList.Bottle_Empty.get(1))
             .fluidOutputs(Materials.FierySteel.getFluid(250))
@@ -74,7 +74,7 @@ public class FluidCannerRecipes implements Runnable {
             .eut(1)
             .addTo(fluidCannerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Spray_Color_Remover_Empty.get(1))
             .fluidInputs(Materials.Acetone.getFluid(4000))
             .itemOutputs(ItemList.Spray_Color_Remover.get(1))
@@ -82,7 +82,7 @@ public class FluidCannerRecipes implements Runnable {
             .eut(1)
             .addTo(fluidCannerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Spray_Color_Remover.get(1))
             .itemOutputs(ItemList.Spray_Color_Remover_Empty.get(1))
             .fluidOutputs(Materials.Acetone.getFluid(4000))
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java
index d27e85ab2d..d4b3d3b668 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java
@@ -6,120 +6,120 @@ import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.enums.Mods.Railcraft;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.loaders.misc.GT_Bees.combs;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.loaders.misc.GTBees.combs;
 import static net.minecraftforge.fluids.FluidRegistry.getFluidStack;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-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.enums.TierEU;
 import gregtech.api.recipe.RecipeCategories;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class FluidExtractorRecipes implements Runnable {
 
     @Override
     public void run() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Dye_SquidInk.get(1L))
             .fluidOutputs(getFluidStack("squidink", 144))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Dye_Indigo.get(1L))
             .fluidOutputs(getFluidStack("indigo", 144))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Crop_Drop_Indigo.get(1L))
             .fluidOutputs(getFluidStack("indigo", 144))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.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))
             .outputChances(1000)
-            .fluidOutputs(GT_ModHandler.getMilk(150L))
+            .fluidOutputs(GTModHandler.getMilk(150L))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Crop_Drop_OilBerry.get(1L))
             .fluidOutputs(Materials.Oil.getFluid(100L))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Crop_Drop_UUMBerry.get(1L))
             .fluidOutputs(Materials.UUMatter.getFluid(4L))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Crop_Drop_UUABerry.get(1L))
             .fluidOutputs(Materials.UUAmplifier.getFluid(4L))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.fish, 1, 0))
             .fluidOutputs(Materials.FishOil.getFluid(40L))
             .duration(16 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.fish, 1, 1))
             .fluidOutputs(Materials.FishOil.getFluid(60L))
             .duration(16 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.fish, 1, 2))
             .fluidOutputs(Materials.FishOil.getFluid(70L))
             .duration(16 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.fish, 1, 3))
             .fluidOutputs(Materials.FishOil.getFluid(30L))
             .duration(16 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.coal, 1, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1L))
             .outputChances(1000)
             .fluidOutputs(Materials.WoodTar.getFluid(100L))
             .duration(1 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
             .itemOutputs(ItemList.IC2_Plantball.get(1L))
             .outputChances(100)
             .fluidOutputs(Materials.Creosote.getFluid(5L))
@@ -127,58 +127,58 @@ public class FluidExtractorRecipes implements Runnable {
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HydratedCoal, 1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.HydratedCoal, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L))
             .outputChances(10000)
             .fluidOutputs(Materials.Water.getFluid(100L))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Thaumcraft.ID, "ItemResource", 1, 3))
             .fluidOutputs(Materials.Mercury.getFluid(1000L))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Mercury, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Mercury, 1L))
             .fluidOutputs(Materials.Mercury.getFluid(1000L))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Monazite, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Monazite, 1L))
             .fluidOutputs(Materials.Helium.getGas(200L))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(64)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(IndustrialCraft2.ID, "blockAlloyGlass", 1L, 0))
             .fluidOutputs(Materials.ReinforceGlass.getMolten(144))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(NewHorizonsCoreMod.ID, "item.ReinforcedGlassPlate", 1L, 0))
             .fluidOutputs(Materials.ReinforceGlass.getMolten(72))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_EV)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(NewHorizonsCoreMod.ID, "item.ReinforcedGlassLense", 1L, 0))
             .fluidOutputs(Materials.ReinforceGlass.getMolten(54))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_EV)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Long_Distance_Pipeline_Fluid.get(1L))
             .fluidOutputs(Materials.Steel.getMolten(19 * 144))
             .duration(20 * SECONDS)
@@ -186,9 +186,9 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Long_Distance_Pipeline_Item.get(1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 7L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 7L))
             .outputChances(10000)
             .fluidOutputs(Materials.Tin.getMolten(12 * 144))
             .duration(20 * SECONDS)
@@ -196,7 +196,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(4L))
             .fluidOutputs(Materials.Steel.getMolten(189))
             .duration(2 * SECONDS)
@@ -204,9 +204,9 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Long_Distance_Pipeline_Item_Pipe.get(16L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 3L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 3L))
             .outputChances(10000)
             .fluidOutputs(Materials.Steel.getMolten(324))
             .duration(20 * SECONDS)
@@ -214,23 +214,23 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("TritiumCell", 1))
-            .itemOutputs(GT_ModHandler.getIC2Item("fuelRod", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("TritiumCell", 1))
+            .itemOutputs(GTModHandler.getIC2Item("fuelRod", 1))
             .outputChances(10000)
             .fluidOutputs(Materials.Tritium.getGas(32))
             .duration(16 * TICKS)
             .eut(64)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 1L))
             .fluidOutputs(Materials.Glass.getMolten(72))
             .duration(30 * SECONDS)
             .eut(28)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 0))
             .fluidOutputs(Materials.Iron.getMolten(288))
             .duration(15 * SECONDS)
@@ -238,7 +238,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 1))
             .fluidOutputs(Materials.Iron.getMolten(144))
             .duration(15 * SECONDS)
@@ -246,9 +246,9 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 2))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6))
             .outputChances(10000)
             .fluidOutputs(Materials.Bronze.getMolten(1728))
             .duration(15 * SECONDS)
@@ -256,7 +256,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 13))
             .fluidOutputs(Materials.Steel.getMolten(288))
             .duration(20 * SECONDS)
@@ -264,7 +264,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 14))
             .fluidOutputs(Materials.Steel.getMolten(144))
             .duration(20 * SECONDS)
@@ -272,7 +272,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 15))
             .fluidOutputs(Materials.Steel.getMolten(1836))
             .duration(20 * SECONDS)
@@ -280,7 +280,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 0))
             .fluidOutputs(Materials.Aluminium.getMolten(288))
             .duration(25 * SECONDS)
@@ -288,7 +288,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 1))
             .fluidOutputs(Materials.Aluminium.getMolten(144))
             .duration(25 * SECONDS)
@@ -296,9 +296,9 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 2))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12L))
             .outputChances(10000)
             .fluidOutputs(Materials.Aluminium.getMolten(108L))
             .duration(25 * SECONDS)
@@ -306,7 +306,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 3))
             .fluidOutputs(Materials.StainlessSteel.getMolten(288))
             .duration(30 * SECONDS)
@@ -314,7 +314,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 4))
             .fluidOutputs(Materials.StainlessSteel.getMolten(144))
             .duration(30 * SECONDS)
@@ -322,7 +322,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 5))
             .fluidOutputs(Materials.StainlessSteel.getMolten(1836))
             .duration(30 * SECONDS)
@@ -330,7 +330,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 6))
             .fluidOutputs(Materials.Titanium.getMolten(288))
             .duration(35 * SECONDS)
@@ -338,7 +338,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 7))
             .fluidOutputs(Materials.Titanium.getMolten(144))
             .duration(35 * SECONDS)
@@ -346,7 +346,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 8))
             .fluidOutputs(Materials.Titanium.getMolten(1836))
             .duration(35 * SECONDS)
@@ -354,7 +354,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 9))
             .fluidOutputs(Materials.TungstenSteel.getMolten(288))
             .duration(40 * SECONDS)
@@ -362,7 +362,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 10))
             .fluidOutputs(Materials.TungstenSteel.getMolten(144))
             .duration(40 * SECONDS)
@@ -370,7 +370,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 11))
             .fluidOutputs(Materials.TungstenSteel.getMolten(1836))
             .duration(40 * SECONDS)
@@ -378,7 +378,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 12))
             .fluidOutputs(Materials.Palladium.getMolten(288))
             .duration(45 * SECONDS)
@@ -386,7 +386,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 13))
             .fluidOutputs(Materials.Palladium.getMolten(144))
             .duration(45 * SECONDS)
@@ -394,9 +394,9 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 14))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L))
             .outputChances(10000)
             .fluidOutputs(Materials.NiobiumTitanium.getMolten(1728))
             .duration(45 * SECONDS)
@@ -404,7 +404,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 0))
             .fluidOutputs(Materials.Iridium.getMolten(288))
             .duration(50 * SECONDS)
@@ -412,7 +412,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 1))
             .fluidOutputs(Materials.Iridium.getMolten(144))
             .duration(50 * SECONDS)
@@ -420,9 +420,9 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 2))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L))
             .outputChances(10000)
             .fluidOutputs(Materials.Enderium.getMolten(1728))
             .duration(50 * SECONDS)
@@ -430,7 +430,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 3))
             .fluidOutputs(Materials.Osmium.getMolten(288))
             .duration(55 * SECONDS)
@@ -438,7 +438,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 4))
             .fluidOutputs(Materials.Osmium.getMolten(144))
             .duration(55 * SECONDS)
@@ -446,9 +446,9 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 5))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L))
             .outputChances(10000)
             .fluidOutputs(Materials.Naquadah.getMolten(1728))
             .duration(55 * SECONDS)
@@ -456,7 +456,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 6))
             .fluidOutputs(Materials.Neutronium.getMolten(288))
             .duration(60 * SECONDS)
@@ -464,7 +464,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 7))
             .fluidOutputs(Materials.Neutronium.getMolten(144))
             .duration(60 * SECONDS)
@@ -472,7 +472,7 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 8))
             .fluidOutputs(Materials.Neutronium.getMolten(1836))
             .duration(60 * SECONDS)
@@ -480,58 +480,58 @@ public class FluidExtractorRecipes implements Runnable {
             .recipeCategory(RecipeCategories.fluidExtractorRecycling)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.wheat_seeds, 1, 32767))
             .fluidOutputs(Materials.SeedOil.getFluid(10))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(2)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.melon_seeds, 1, 32767))
             .fluidOutputs(Materials.SeedOil.getFluid(10))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(2)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.pumpkin_seeds, 1, 32767))
             .fluidOutputs(Materials.SeedOil.getFluid(10))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(2)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Crop_Drop_Rape.get(1))
             .fluidOutputs(Materials.SeedOil.getFluid(125))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(2)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.snowball, 1, 0))
             .fluidOutputs(Materials.Water.getFluid(250L))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.snow, 1, 0))
             .fluidOutputs(Materials.Water.getFluid(1000L))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L))
             .fluidOutputs(Materials.Ice.getSolid(1000L))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(fluidExtractionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Forestry.ID, "phosphor", 1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L))
             .outputChances(1000)
             .fluidOutputs(Materials.Lava.getFluid(800L))
             .duration(12 * SECONDS + 16 * TICKS)
@@ -540,7 +540,7 @@ public class FluidExtractorRecipes implements Runnable {
 
         // Beecombs fluid extractor recipes
         // xenon
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(combs, 1, 134))
             .fluidOutputs(getFluidStack("xenon", 250))
             .duration(2 * SECONDS + 10 * TICKS)
@@ -548,7 +548,7 @@ public class FluidExtractorRecipes implements Runnable {
             .addTo(fluidExtractionRecipes);
 
         // neon
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(combs, 1, 135))
             .fluidOutputs(getFluidStack("neon", 250))
             .duration(15 * TICKS)
@@ -556,7 +556,7 @@ public class FluidExtractorRecipes implements Runnable {
             .addTo(fluidExtractionRecipes);
 
         // krpton
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(combs, 1, 136))
             .fluidOutputs(getFluidStack("krypton", 250))
             .duration(1 * SECONDS + 5 * TICKS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java
index b9cdfc4aa3..8168282653 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java
@@ -1,62 +1,62 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.fluidHeaterRecipes;
-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 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_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 
 public class FluidHeaterRecipes implements Runnable {
 
     @Override
     public void run() {
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.GrowthMediumRaw.getFluid(1000))
             .fluidOutputs(Materials.GrowthMediumSterilized.getFluid(1000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(fluidHeaterRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.BioMediumRaw.getFluid(1000))
             .fluidOutputs(Materials.BioMediumSterilized.getFluid(1000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(fluidHeaterRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Water.getFluid(6))
             .fluidOutputs(Materials.Water.getGas(960))
             .duration(1 * SECONDS + 10 * TICKS)
             .eut(30)
             .addTo(fluidHeaterRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
-            .fluidInputs(GT_ModHandler.getDistilledWater(6))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
+            .fluidInputs(GTModHandler.getDistilledWater(6))
             .fluidOutputs(Materials.Water.getGas(960))
             .duration(1 * SECONDS + 10 * TICKS)
             .eut(30)
             .addTo(fluidHeaterRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.SeedOil.getFluid(16))
             .fluidOutputs(Materials.FryingOilHot.getFluid(16))
             .duration(16 * TICKS)
             .eut(30)
             .addTo(fluidHeaterRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.FishOil.getFluid(16))
             .fluidOutputs(Materials.FryingOilHot.getFluid(16))
             .duration(16 * TICKS)
@@ -64,8 +64,8 @@ public class FluidHeaterRecipes implements Runnable {
             .addTo(fluidHeaterRecipes);
         // Ca(CH3COO)2 = CH3COCH3 + CaO + CO2
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.CalciumAcetateSolution.getFluid(1000))
             .fluidOutputs(Materials.Acetone.getFluid(1000))
             .duration(4 * SECONDS)
@@ -73,7 +73,7 @@ public class FluidHeaterRecipes implements Runnable {
             .addTo(fluidHeaterRecipes);
         // Fluid Sodium
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Sodium.getDust(1))
             .fluidInputs(
 
@@ -83,8 +83,8 @@ public class FluidHeaterRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(fluidHeaterRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Acetone.getFluid(1000))
             .fluidOutputs(Materials.Ethenone.getGas(1000))
             .duration(8 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java
index 2d52f9eb69..d3197b6f30 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java
@@ -5,10 +5,10 @@ import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.enums.Mods.Railcraft;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.INGOTS;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.INGOTS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 import static net.minecraftforge.fluids.FluidRegistry.getFluidStack;
 
 import net.minecraft.init.Blocks;
@@ -18,17 +18,17 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsKevlar;
 import gregtech.api.enums.MaterialsUEVplus;
 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.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class FluidSolidifierRecipes implements Runnable {
 
@@ -49,7 +49,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 continue;
             }
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Mold_Casing.get(0L))
                 .itemOutputs(materialCasing[i])
                 .fluidInputs(materialArray[i].getMolten(72L))
@@ -63,7 +63,7 @@ public class FluidSolidifierRecipes implements Runnable {
             NBTTagCompound nbtFlask = new NBTTagCompound();
             nbtFlask.setInteger("Capacity", 1000);
             flask.setTagCompound(nbtFlask);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Mold_Ball.get(0))
                 .itemOutputs(flask)
                 .fluidInputs(new FluidStack(FluidRegistry.getFluid("molten.borosilicateglass"), 144))
@@ -72,7 +72,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .addTo(fluidSolidifierRecipes);
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Ball.get(0L))
             .itemOutputs(getModItem(Thaumcraft.ID, "ItemResource", 1, 3))
             .fluidInputs(Materials.Mercury.getFluid(1000L))
@@ -80,15 +80,15 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(4)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Ball.get(0L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Mercury, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Mercury, 1L))
             .fluidInputs(Materials.Mercury.getFluid(1000L))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Ball.get(0L))
             .itemOutputs(new ItemStack(Items.snowball, 1, 0))
             .fluidInputs(Materials.Water.getFluid(250L))
@@ -96,15 +96,15 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(4)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Ball.get(0L))
             .itemOutputs(new ItemStack(Items.snowball, 1, 0))
-            .fluidInputs(GT_ModHandler.getDistilledWater(250L))
+            .fluidInputs(GTModHandler.getDistilledWater(250L))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Block.get(0L))
             .itemOutputs(new ItemStack(Blocks.snow, 1, 0))
             .fluidInputs(Materials.Water.getFluid(1000L))
@@ -112,15 +112,15 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(4)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Block.get(0L))
             .itemOutputs(new ItemStack(Blocks.snow, 1, 0))
-            .fluidInputs(GT_ModHandler.getDistilledWater(1000L))
+            .fluidInputs(GTModHandler.getDistilledWater(1000L))
             .duration(25 * SECONDS + 12 * TICKS)
             .eut(4)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Block.get(0L))
             .itemOutputs(new ItemStack(Blocks.obsidian, 1, 0))
             .fluidInputs(Materials.Lava.getFluid(1000L))
@@ -128,15 +128,15 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(16)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Block.get(0L))
-            .itemOutputs(new ItemStack(GregTech_API.sBlockConcretes, 1, 8))
+            .itemOutputs(new ItemStack(GregTechAPI.sBlockConcretes, 1, 8))
             .fluidInputs(Materials.Concrete.getMolten(144L))
             .duration(12 * TICKS)
             .eut(4)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Block.get(0L))
             .itemOutputs(new ItemStack(Blocks.glowstone, 1, 0))
             .fluidInputs(Materials.Glowstone.getMolten(576L))
@@ -144,7 +144,7 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(4)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Block.get(0L))
             .itemOutputs(new ItemStack(Blocks.glass, 1, 0))
             .fluidInputs(Materials.Glass.getMolten(144L))
@@ -152,15 +152,15 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(4)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Plate.get(0L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Glass, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Glass, 1L))
             .fluidInputs(Materials.Glass.getMolten(144L))
             .duration(12 * TICKS)
             .eut(4)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Bottle.get(0L))
             .itemOutputs(ItemList.Bottle_Empty.get(1L))
             .fluidInputs(Materials.Glass.getMolten(144L))
@@ -168,7 +168,7 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(4)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Cylinder.get(0L))
             .itemOutputs(ItemList.Food_Cheese.get(1L))
             .fluidInputs(Materials.Milk.getFluid(250L))
@@ -176,7 +176,7 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(4)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Cylinder.get(0L))
             .itemOutputs(ItemList.Food_Cheese.get(1L))
             .fluidInputs(Materials.Cheese.getMolten(144L))
@@ -184,7 +184,7 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(8)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Anvil.get(0L))
             .itemOutputs(new ItemStack(Blocks.anvil, 1, 0))
             .fluidInputs(Materials.Iron.getMolten(4464L))
@@ -192,7 +192,7 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(16)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Anvil.get(0L))
             .itemOutputs(new ItemStack(Blocks.anvil, 1, 0))
             .fluidInputs(Materials.WroughtIron.getMolten(4464L))
@@ -200,15 +200,15 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(16)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Boron.getDust(1))
             .fluidInputs(Materials.Boron.getMolten(144L))
             .duration(1 * SECONDS + 10 * TICKS)
             .eut(30)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Cylinder.get(0))
             .itemOutputs(ItemList.Circuit_Parts_PetriDish.get(1))
             .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(36))
@@ -216,7 +216,7 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(16)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Cylinder.get(0))
             .itemOutputs(ItemList.Circuit_Parts_PetriDish.get(1))
             .fluidInputs(Materials.Polystyrene.getMolten(36))
@@ -224,7 +224,7 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(16)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Cylinder.get(0))
             .itemOutputs(ItemList.Circuit_Parts_PetriDish.get(1))
             .fluidInputs(Materials.BorosilicateGlass.getMolten(72))
@@ -232,7 +232,7 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(16)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Plate.get(0L))
             .itemOutputs(getModItem(NewHorizonsCoreMod.ID, "item.ReinforcedGlassPlate", 1L, 0))
             .fluidInputs(Materials.ReinforceGlass.getMolten(72))
@@ -240,7 +240,7 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Block.get(0L))
             .itemOutputs(getModItem(IndustrialCraft2.ID, "blockAlloyGlass", 1L))
             .fluidInputs(Materials.ReinforceGlass.getMolten(144))
@@ -248,7 +248,7 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Ball.get(0L))
             .itemOutputs(ItemList.Circuit_Parts_Glass_Tube.get(1))
             .fluidInputs(Materials.Glass.getMolten(144))
@@ -256,7 +256,7 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(24)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Ball.get(0L))
             .itemOutputs(ItemList.Circuit_Parts_Reinforced_Glass_Tube.get(1))
             .fluidInputs(Materials.ReinforceGlass.getMolten(288))
@@ -264,7 +264,7 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Ball.get(0L))
             .itemOutputs(ItemList.Circuit_Parts_Glass_Tube.get(1))
             .fluidInputs(getFluidStack("glass.molten", 1000))
@@ -272,7 +272,7 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(24)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Ball.get(0L))
             .itemOutputs(ItemList.GelledToluene.get(1))
             .fluidInputs(new FluidStack(ItemList.sToluene, 100))
@@ -280,55 +280,55 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(16)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Nugget.get(0L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Copper, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Copper, 1L))
             .fluidInputs(Materials.AnnealedCopper.getMolten(16))
             .duration(16 * TICKS)
             .eut(4)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Ingot.get(0L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L))
             .fluidInputs(Materials.AnnealedCopper.getMolten(144))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(8)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Block.get(0L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Copper, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, Materials.Copper, 1L))
             .fluidInputs(Materials.AnnealedCopper.getMolten(1296))
             .duration(14 * SECONDS + 8 * TICKS)
             .eut(8)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Nugget.get(0L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1L))
             .fluidInputs(Materials.WroughtIron.getMolten(16))
             .duration(16 * TICKS)
             .eut(4)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Ingot.get(0L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L))
             .fluidInputs(Materials.WroughtIron.getMolten(144))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(8)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Block.get(0L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L))
             .fluidInputs(Materials.WroughtIron.getMolten(1296))
             .duration(14 * SECONDS + 8 * TICKS)
             .eut(8)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Spinneret.get(0L))
             .itemOutputs(ItemList.KevlarFiber.get(8L))
             .fluidInputs(MaterialsKevlar.LiquidCrystalKevlar.getFluid(144L))
@@ -336,7 +336,7 @@ public class FluidSolidifierRecipes implements Runnable {
             .eut(TierEU.RECIPE_EV)
             .addTo(fluidSolidifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Anvil.get(0L))
             .itemOutputs(getModItem(Railcraft.ID, "anvil", 1L, 0))
             .fluidInputs(Materials.Steel.getMolten(4464L))
@@ -348,7 +348,7 @@ public class FluidSolidifierRecipes implements Runnable {
         final int fluidPerShapeSolidifierRecipe = 4 * INGOTS;
         {
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Bottle.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Bottle.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -356,7 +356,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Plate.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Plate.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -364,7 +364,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Cell.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Cell.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -372,7 +372,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Ring.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Ring.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -380,7 +380,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Rod.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Rod.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -388,7 +388,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Bolt.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Bolt.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -396,7 +396,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Ingot.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Ingot.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -404,7 +404,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Wire.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Wire.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -412,7 +412,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Casing.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Casing.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -420,7 +420,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Pipe_Tiny.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Tiny.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -428,7 +428,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Pipe_Small.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Small.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -436,7 +436,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Pipe_Medium.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Medium.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -444,7 +444,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Pipe_Large.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Large.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -452,7 +452,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Pipe_Huge.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Huge.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -460,7 +460,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Block.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Block.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -468,7 +468,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Sword.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Sword.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -476,7 +476,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Pickaxe.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pickaxe.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -484,7 +484,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Shovel.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Shovel.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -492,7 +492,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Axe.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Axe.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -500,7 +500,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Hoe.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Hoe.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -508,7 +508,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Hammer.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Hammer.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -516,7 +516,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_File.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_File.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -524,7 +524,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Saw.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Saw.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -532,7 +532,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Gear.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Gear.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -540,7 +540,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Rotor.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Rotor.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -548,7 +548,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Turbine_Blade.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Turbine_Blade.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -556,7 +556,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_Small_Gear.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Small_Gear.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
@@ -564,7 +564,7 @@ public class FluidSolidifierRecipes implements Runnable {
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(fluidSolidifierRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Extruder_ToolHeadDrill.get(1))
                 .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_ToolHeadDrill.get(1))
                 .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java
index 4ebb4b8da6..b8220acb0e 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java
@@ -2,21 +2,21 @@ package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.Mods.HardcoreEnderExpansion;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-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.TierEU;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
 public class ForgeHammerRecipes implements Runnable {
@@ -24,119 +24,119 @@ public class ForgeHammerRecipes implements Runnable {
     @Override
     public void run() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.stonebrick, 1, 0))
             .itemOutputs(new ItemStack(Blocks.stonebrick, 1, 2))
             .duration(10 * TICKS)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.stone, 1, 0))
             .itemOutputs(new ItemStack(Blocks.cobblestone, 1, 0))
             .duration(10 * TICKS)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.cobblestone, 1, 0))
             .itemOutputs(new ItemStack(Blocks.gravel, 1, 0))
             .duration(10 * TICKS)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.gravel, 1, 0))
             .itemOutputs(new ItemStack(Blocks.sand, 1, 0))
             .duration(10 * TICKS)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.sandstone, 1, 32767))
             .itemOutputs(new ItemStack(Blocks.sand, 1, 0))
             .duration(10 * TICKS)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.ice, 1, 0))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1))
             .duration(10 * TICKS)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.packed_ice, 1, 0))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 2))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 2))
             .duration(10 * TICKS)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.brick_block, 1, 0))
             .itemOutputs(new ItemStack(Items.brick, 3, 0))
             .duration(10 * TICKS)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.nether_brick, 1, 0))
             .itemOutputs(new ItemStack(Items.netherbrick, 3, 0))
             .duration(10 * TICKS)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.stained_glass, 1, 32767))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1))
             .duration(10 * TICKS)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.glass, 1, 32767))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1))
             .duration(10 * TICKS)
             .eut(10)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.stained_glass_pane, 1, 32767))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
             .duration(10 * TICKS)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.glass_pane, 1, 32767))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
             .duration(10 * TICKS)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Brick.getIngots(1))
             .itemOutputs(Materials.Brick.getDustSmall(1))
             .duration(10 * TICKS)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Firebrick.get(1))
             .itemOutputs(Materials.Fireclay.getDust(1))
             .duration(10 * TICKS)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Firebricks.get(1))
             .itemOutputs(ItemList.Firebrick.get(3))
             .duration(10 * TICKS)
             .eut(16)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Tesseract.get(1L), GregtechItemList.Laser_Lens_Special.get(1))
             .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(2880L))
             .fluidOutputs(MaterialsUEVplus.Space.getMolten(1440L), MaterialsUEVplus.Time.getMolten(1440L))
@@ -145,9 +145,9 @@ public class ForgeHammerRecipes implements Runnable {
             .addTo(hammerRecipes);
 
         if (HardcoreEnderExpansion.isModLoaded()) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(HardcoreEnderExpansion.ID, "endium_ore", 1))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.HeeEndium, 1))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushed, Materials.HeeEndium, 1))
                 .duration(16)
                 .eut(10)
                 .addTo(hammerRecipes);
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java
index 9780a0a7ba..1b5d29f1df 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java
@@ -3,80 +3,80 @@ package gregtech.loaders.postload.recipes;
 import static gregtech.api.enums.Mods.AppliedEnergistics2;
 import static gregtech.api.enums.Mods.BuildCraftSilicon;
 import static gregtech.api.recipe.RecipeMaps.formingPressRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-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.enums.TierEU;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class FormingPressRecipes implements Runnable {
 
     @Override
     public void run() {
         if (BuildCraftSilicon.isModLoaded()) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
                     getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0))
                 .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 1))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(formingPressRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L),
                     getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0))
                 .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 1))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(formingPressRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L),
                     getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0))
                 .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 2))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(formingPressRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
                     getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0))
                 .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 3))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(formingPressRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1L),
                     getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0))
                 .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 2L, 4))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(formingPressRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L),
                     getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0))
                 .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 5))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(formingPressRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     new ItemStack(Items.comparator, 1, 32767),
                     getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0))
@@ -87,7 +87,7 @@ public class FormingPressRecipes implements Runnable {
         }
 
         if (AppliedEnergistics2.isModLoaded()) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10),
                     getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 0L, 13))
@@ -96,36 +96,36 @@ public class FormingPressRecipes implements Runnable {
                 .eut(16)
                 .addTo(formingPressRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CertusQuartz, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.CertusQuartz, 1L),
                     getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 0L, 13))
                 .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 16))
                 .duration(10 * SECONDS)
                 .eut(16)
                 .addTo(formingPressRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
                     getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 0L, 14))
                 .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 17))
                 .duration(10 * SECONDS)
                 .eut(16)
                 .addTo(formingPressRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L),
                     getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 0L, 15))
                 .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 18))
                 .duration(10 * SECONDS)
                 .eut(16)
                 .addTo(formingPressRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SiliconSG, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.SiliconSG, 1L),
                     getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 0L, 19))
                 .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 20))
                 .duration(10 * SECONDS)
@@ -133,52 +133,52 @@ public class FormingPressRecipes implements Runnable {
                 .addTo(formingPressRecipes);
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Food_Dough_Sugar.get(4L), ItemList.Shape_Mold_Cylinder.get(0L))
             .itemOutputs(ItemList.Food_Raw_Cake.get(1L))
             .duration(19 * SECONDS + 4 * TICKS)
             .eut(4)
             .addTo(formingPressRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Cupronickel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Cupronickel, 1L),
                 ItemList.Shape_Mold_Credit.get(0L))
             .itemOutputs(ItemList.Credit_Greg_Cupronickel.get(4L))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(formingPressRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Brass, 1L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Brass, 1L),
                 ItemList.Shape_Mold_Credit.get(0L))
             .itemOutputs(ItemList.Coin_Doge.get(4L))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(formingPressRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
                 ItemList.Shape_Mold_Credit.get(0L))
             .itemOutputs(ItemList.Credit_Iron.get(4L))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(formingPressRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L),
                 ItemList.Shape_Mold_Credit.get(0L))
             .itemOutputs(ItemList.Credit_Iron.get(4L))
             .duration(5 * SECONDS)
             .eut(16)
             .addTo(formingPressRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brick, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Brick, 1L),
                 ItemList.Shape_Mold_Ingot.get(0L))
             .itemOutputs(new ItemStack(Items.brick, 1, 0))
             .duration(5 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java
index 2c3c979b11..96a6331867 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java
@@ -4,124 +4,124 @@ import static gregtech.api.enums.Mods.ForbiddenMagic;
 import static gregtech.api.enums.Mods.TaintedMagic;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.enums.Mods.ThaumicTinkerer;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE;
+import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_RecipeConstants;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTRecipeConstants;
 
 public class FuelRecipes implements Runnable {
 
     // todo: add an enum for the fuel type, int values are mysterious
     @Override
     public void run() {
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("biogasCell", 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("biogasCell", 1L))
             .metadata(FUEL_VALUE, 40)
             .metadata(FUEL_TYPE, 1)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.golden_apple, 1, 1))
             .itemOutputs(new ItemStack(Items.apple, 1))
             .metadata(FUEL_VALUE, 6400)
             .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Thaumcraft.ID, "ItemShard", 1L, 6))
             .metadata(FUEL_VALUE, 720)
             .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(ForbiddenMagic.ID, "GluttonyShard", 1L))
             .metadata(FUEL_VALUE, 720)
             .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(ForbiddenMagic.ID, "FMResource", 1L, 3))
             .metadata(FUEL_VALUE, 720)
             .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L))
             .metadata(FUEL_VALUE, 720)
             .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 1))
             .metadata(FUEL_VALUE, 720)
             .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 2))
             .metadata(FUEL_VALUE, 720)
             .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 3))
             .metadata(FUEL_VALUE, 720)
             .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 4))
             .metadata(FUEL_VALUE, 720)
             .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 5))
             .metadata(FUEL_VALUE, 720)
             .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 6))
             .metadata(FUEL_VALUE, 720)
             .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(TaintedMagic.ID, "ItemMaterial", 1L, 3))
             .metadata(FUEL_VALUE, 720)
             .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(TaintedMagic.ID, "ItemMaterial", 1L, 4))
             .metadata(FUEL_VALUE, 720)
             .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(TaintedMagic.ID, "ItemMaterial", 1L, 5))
             .metadata(FUEL_VALUE, 720)
             .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 6))
             .metadata(FUEL_VALUE, 720)
             .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 7))
             .metadata(FUEL_VALUE, 720)
             .metadata(FUEL_TYPE, 5)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
     }
 }
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java
index 3d53de7d2a..74cabd4196 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java
@@ -1,14 +1,14 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.fusionRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.FUSION_THRESHOLD;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.FUSION_THRESHOLD;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TierEU;
-import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MaterialsElements;
 
 public class FusionReactorRecipes implements Runnable {
 
@@ -21,7 +21,7 @@ public class FusionReactorRecipes implements Runnable {
         // F FT2, FT3 - fusion tier required, + - requires different startup recipe (startup cost bigger than
         // available on the tier)
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Lithium.getMolten(16), Materials.Tungsten.getMolten(16))
             .fluidOutputs(Materials.Iridium.getMolten(16))
             .duration(3 * SECONDS + 4 * TICKS)
@@ -29,7 +29,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 300000000)
             .addTo(fusionRecipes); // FT1+ - utility
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Deuterium.getGas(125), Materials.Tritium.getGas(125))
             .fluidOutputs(Materials.Helium.getPlasma(125))
             .duration(16 * TICKS)
@@ -37,7 +37,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 40000000)
             .addTo(fusionRecipes); // FT1 Cheap - farmable
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Deuterium.getGas(125), Materials.Helium_3.getGas(125))
             .fluidOutputs(Materials.Helium.getPlasma(125))
             .duration(16 * TICKS)
@@ -45,7 +45,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 60000000)
             .addTo(fusionRecipes); // FT1 Expensive //
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Aluminium.getMolten(16), Materials.Lithium.getMolten(16))
             .fluidOutputs(Materials.Sulfur.getPlasma(144))
             .duration(1 * SECONDS + 12 * TICKS)
@@ -53,7 +53,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 240000000)
             .addTo(fusionRecipes); // FT1+ Cheap
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Beryllium.getMolten(16), Materials.Deuterium.getGas(375))
             .fluidOutputs(Materials.Nitrogen.getPlasma(125))
             .duration(16 * TICKS)
@@ -61,7 +61,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 180000000)
             .addTo(fusionRecipes); // FT1+ Expensive //
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Silicon.getMolten(16), Materials.Magnesium.getMolten(16))
             .fluidOutputs(Materials.Iron.getPlasma(144))
             .duration(1 * SECONDS + 12 * TICKS)
@@ -69,7 +69,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 360000000)
             .addTo(fusionRecipes); // FT1++ Cheap //
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Potassium.getMolten(16), Materials.Fluorine.getGas(144))
             .fluidOutputs(Materials.Nickel.getPlasma(144))
             .duration(16 * TICKS)
@@ -77,7 +77,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 480000000)
             .addTo(fusionRecipes); // FT1++ Expensive //
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Beryllium.getMolten(16), Materials.Tungsten.getMolten(16))
             .fluidOutputs(Materials.Platinum.getMolten(16))
             .duration(1 * SECONDS + 12 * TICKS)
@@ -85,7 +85,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 150000000)
             .addTo(fusionRecipes); // FT1 - utility
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Neodymium.getMolten(16), Materials.Hydrogen.getGas(48))
             .fluidOutputs(Materials.Europium.getMolten(16))
             .duration(1 * SECONDS + 12 * TICKS)
@@ -93,7 +93,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 150000000)
             .addTo(fusionRecipes); // FT1 - utility
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Lutetium.getMolten(16), Materials.Chrome.getMolten(16))
             .fluidOutputs(Materials.Americium.getMolten(16))
             .duration(4 * SECONDS + 16 * TICKS)
@@ -101,7 +101,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 200000000)
             .addTo(fusionRecipes); // FT2 - utility
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Plutonium.getMolten(16), Materials.Thorium.getMolten(16))
             .fluidOutputs(Materials.Naquadah.getMolten(16))
             .duration(3 * SECONDS + 4 * TICKS)
@@ -109,7 +109,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 300000000)
             .addTo(fusionRecipes); // FT1+ - utility
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Americium.getMolten(144), Materials.Naquadria.getMolten(144))
             .fluidOutputs(Materials.Neutronium.getMolten(144))
             .duration(12 * SECONDS)
@@ -117,7 +117,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 640000000)
             .addTo(fusionRecipes); // FT3 - utility
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Glowstone.getMolten(16), Materials.Helium.getPlasma(4))
             .fluidOutputs(Materials.Sunnarium.getMolten(16))
             .duration(1 * SECONDS + 12 * TICKS)
@@ -126,7 +126,7 @@ public class FusionReactorRecipes implements Runnable {
             .addTo(fusionRecipes); // Mark 1 Expensive
                                    // //
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Tungsten.getMolten(16), Materials.Helium.getGas(16))
             .fluidOutputs(Materials.Osmium.getMolten(16))
             .duration(12 * SECONDS + 16 * TICKS)
@@ -134,7 +134,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 150000000)
             .addTo(fusionRecipes); // FT1 - utility
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Manganese.getMolten(16), Materials.Hydrogen.getGas(16))
             .fluidOutputs(Materials.Iron.getMolten(16))
             .duration(3 * SECONDS + 4 * TICKS)
@@ -142,7 +142,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 120000000)
             .addTo(fusionRecipes); // FT1 - utility
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Magnesium.getMolten(128), Materials.Oxygen.getGas(128))
             .fluidOutputs(Materials.Calcium.getPlasma(16))
             .duration(6 * SECONDS + 8 * TICKS)
@@ -150,7 +150,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 120000000)
             .addTo(fusionRecipes); //
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Mercury.getFluid(16), Materials.Magnesium.getMolten(16))
             .fluidOutputs(Materials.Uranium.getMolten(16))
             .duration(3 * SECONDS + 4 * TICKS)
@@ -158,7 +158,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 240000000)
             .addTo(fusionRecipes); // FT2 - utility
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Gold.getMolten(16), Materials.Aluminium.getMolten(16))
             .fluidOutputs(Materials.Uranium.getMolten(16))
             .duration(3 * SECONDS + 4 * TICKS)
@@ -166,7 +166,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 240000000)
             .addTo(fusionRecipes); // FT2 - utility
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Uranium.getMolten(16), Materials.Helium.getGas(16))
             .fluidOutputs(Materials.Plutonium.getMolten(16))
             .duration(6 * SECONDS + 8 * TICKS)
@@ -174,7 +174,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 480000000)
             .addTo(fusionRecipes); // FT2+ - utility
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Vanadium.getMolten(16), Materials.Hydrogen.getGas(125))
             .fluidOutputs(Materials.Chrome.getMolten(16))
             .duration(3 * SECONDS + 4 * TICKS)
@@ -182,7 +182,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 140000000)
             .addTo(fusionRecipes); // FT1 - utility
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Gallium.getMolten(16), Materials.Radon.getGas(125))
             .fluidOutputs(Materials.Duranium.getMolten(16))
             .duration(3 * SECONDS + 4 * TICKS)
@@ -190,7 +190,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 140000000)
             .addTo(fusionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Titanium.getMolten(48), Materials.Duranium.getMolten(32))
             .fluidOutputs(Materials.Tritanium.getMolten(16))
             .duration(3 * SECONDS + 4 * TICKS)
@@ -198,7 +198,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 200000000)
             .addTo(fusionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Tantalum.getMolten(16), Materials.Tritium.getGas(16))
             .fluidOutputs(Materials.Tungsten.getMolten(16))
             .duration(16 * TICKS)
@@ -206,7 +206,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 200000000)
             .addTo(fusionRecipes); //
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Silver.getMolten(16), Materials.Lithium.getMolten(16))
             .fluidOutputs(Materials.Indium.getMolten(16))
             .duration(1 * SECONDS + 12 * TICKS)
@@ -214,7 +214,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 380000000)
             .addTo(fusionRecipes); //
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Copper.getMolten(72), Materials.Tritium.getGas(250))
             .fluidOutputs(Materials.Zinc.getPlasma(72))
             .duration(16 * TICKS)
@@ -222,7 +222,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 180000000)
             .addTo(fusionRecipes); // FT2 - farmable
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Cobalt.getMolten(144), Materials.Silicon.getMolten(144))
             .fluidOutputs(Materials.Niobium.getPlasma(144))
             .duration(16 * TICKS)
@@ -230,7 +230,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 200000000)
             .addTo(fusionRecipes); // FT2 - utility
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Gold.getMolten(144), Materials.Arsenic.getMolten(144))
             .fluidOutputs(Materials.Silver.getPlasma(144))
             .duration(16 * TICKS)
@@ -238,7 +238,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 350000000)
             .addTo(fusionRecipes); // FT2+
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Silver.getMolten(144), Materials.Helium_3.getGas(375))
             .fluidOutputs(Materials.Tin.getPlasma(288))
             .duration(16 * TICKS)
@@ -246,7 +246,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 280000000)
             .addTo(fusionRecipes); // FT2
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Tantalum.getMolten(144), Materials.Zinc.getPlasma(72))
             .fluidOutputs(Materials.Bismuth.getPlasma(144))
             .duration(16 * TICKS)
@@ -254,7 +254,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 350000000)
             .addTo(fusionRecipes); // FT3 - farmable
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Iridium.getMolten(144), Materials.Fluorine.getGas(500))
             .fluidOutputs(Materials.Radon.getPlasma(144))
             .duration(1 * SECONDS + 12 * TICKS)
@@ -262,7 +262,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 450000000)
             .addTo(fusionRecipes); // FT3 - utility
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Plutonium241.getMolten(144), Materials.Hydrogen.getGas(2000))
             .fluidOutputs(Materials.Americium.getPlasma(144))
             .duration(3 * SECONDS + 4 * TICKS)
@@ -270,15 +270,15 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 500000000)
             .addTo(fusionRecipes); // FT3
 
-        GT_Values.RA.stdBuilder()
-            .fluidInputs(Materials.Cobalt.getMolten(144), ELEMENT.getInstance().NEON.getFluidStack(144))
+        GTValues.RA.stdBuilder()
+            .fluidInputs(Materials.Cobalt.getMolten(144), MaterialsElements.getInstance().NEON.getFluidStack(144))
             .fluidOutputs(Materials.Rubidium.getMolten(144))
             .duration(1 * SECONDS + 4 * TICKS)
             .eut(98304)
             .metadata(FUSION_THRESHOLD, 500000000)
             .addTo(fusionRecipes); // FT3
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Lutetium.getMolten(288), Materials.Vanadium.getMolten(288))
             .fluidOutputs(Materials.Plutonium241.getPlasma(288))
             .duration(4 * TICKS)
@@ -286,7 +286,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 1_000_000_000)
             .addTo(fusionRecipes); // FT5 because of UEV voltage
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Tellurium.getMolten(288), Materials.Zinc.getMolten(288))
             .fluidOutputs(Materials.Lead.getPlasma(288))
             .duration(4 * TICKS)
@@ -294,7 +294,7 @@ public class FusionReactorRecipes implements Runnable {
             .metadata(FUSION_THRESHOLD, 1_000_000_000)
             .addTo(fusionRecipes); // FT5 because of UEV voltage
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(Materials.Osmium.getMolten(288), Materials.Silicon.getMolten(288))
             .fluidOutputs(Materials.Thorium.getPlasma(288))
             .duration(4 * TICKS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java
index a671fd6977..80a35f1da0 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java
@@ -3,69 +3,69 @@ package gregtech.loaders.postload.recipes;
 import static gregtech.api.enums.Mods.GalacticraftCore;
 import static gregtech.api.enums.Mods.GalacticraftMars;
 import static gregtech.api.recipe.RecipeMaps.implosionRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
-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.enums.TierEU;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeConstants;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeConstants;
 
 public class ImplosionCompressorRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.IC2_Compressed_Coal_Chunk.get(1L))
             .itemOutputs(
                 ItemList.IC2_Industrial_Diamond.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 4L))
-            .metadata(GT_RecipeConstants.ADDITIVE_AMOUNT, 8)
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 4L))
+            .metadata(GTRecipeConstants.ADDITIVE_AMOUNT, 8)
             .duration(1 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(implosionRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Ingot_IridiumAlloy.get(1L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 4L))
-            .metadata(GT_RecipeConstants.ADDITIVE_AMOUNT, 8)
+                GTOreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 4L))
+            .metadata(GTRecipeConstants.ADDITIVE_AMOUNT, 8)
             .duration(1 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(implosionRecipes);
 
         if (GalacticraftMars.isModLoaded()) {
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Ingot_Heavy1.get(1L))
                 .itemOutputs(
                     getModItem(GalacticraftCore.ID, "item.heavyPlating", 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.StainlessSteel, 1L))
-                .metadata(GT_RecipeConstants.ADDITIVE_AMOUNT, 8)
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.StainlessSteel, 1L))
+                .metadata(GTRecipeConstants.ADDITIVE_AMOUNT, 8)
                 .duration(1 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(implosionRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Ingot_Heavy2.get(1L))
                 .itemOutputs(
                     getModItem(GalacticraftMars.ID, "item.null", 1L, 3),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.TungstenSteel, 2L))
-                .metadata(GT_RecipeConstants.ADDITIVE_AMOUNT, 16)
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.TungstenSteel, 2L))
+                .metadata(GTRecipeConstants.ADDITIVE_AMOUNT, 16)
                 .duration(1 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(implosionRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Ingot_Heavy3.get(1L))
                 .itemOutputs(
                     getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Platinum, 3L))
-                .metadata(GT_RecipeConstants.ADDITIVE_AMOUNT, 24)
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Platinum, 3L))
+                .metadata(GTRecipeConstants.ADDITIVE_AMOUNT, 24)
                 .duration(1 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(implosionRecipes);
diff --git a/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java
index be21c84d66..58285ee204 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java
@@ -1,10 +1,10 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.MaterialsUEVplus;
 import gregtech.api.enums.TierEU;
 
@@ -13,7 +13,7 @@ public class LaserEngraverRecipes implements Runnable {
     @Override
     public void run() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentCrudeCatalyst.getFluid(1000))
             .fluidOutputs(MaterialsUEVplus.ExcitedDTCC.getFluid(1000))
             .requiresCleanRoom()
@@ -22,7 +22,7 @@ public class LaserEngraverRecipes implements Runnable {
             .noOptimize()
             .addTo(laserEngraverRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentProsaicCatalyst.getFluid(1000))
             .fluidOutputs(MaterialsUEVplus.ExcitedDTPC.getFluid(1000))
             .requiresCleanRoom()
@@ -31,7 +31,7 @@ public class LaserEngraverRecipes implements Runnable {
             .noOptimize()
             .addTo(laserEngraverRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentResplendentCatalyst.getFluid(1000))
             .fluidOutputs(MaterialsUEVplus.ExcitedDTRC.getFluid(1000))
             .requiresCleanRoom()
@@ -40,7 +40,7 @@ public class LaserEngraverRecipes implements Runnable {
             .noOptimize()
             .addTo(laserEngraverRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentExoticCatalyst.getFluid(1000))
             .fluidOutputs(MaterialsUEVplus.ExcitedDTEC.getFluid(1000))
             .requiresCleanRoom()
@@ -49,7 +49,7 @@ public class LaserEngraverRecipes implements Runnable {
             .noOptimize()
             .addTo(laserEngraverRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentStellarCatalyst.getFluid(1000))
             .fluidOutputs(MaterialsUEVplus.ExcitedDTSC.getFluid(1000))
             .requiresCleanRoom()
diff --git a/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java
index 4413f61200..db2c79322f 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java
@@ -2,37 +2,37 @@ package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.recipe.RecipeMaps.latheRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class LatheRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Blocks.wooden_slab, 1, GT_Values.W))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.wooden_slab, 1, GTValues.W))
             .itemOutputs(
                 new ItemStack(Items.bowl, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1))
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(8)
             .addTo(latheRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(getModItem(Forestry.ID, "slabs", 1L, GT_Values.W))
+        GTValues.RA.stdBuilder()
+            .itemInputs(getModItem(Forestry.ID, "slabs", 1L, GTValues.W))
             .itemOutputs(
                 new ItemStack(Items.bowl, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1))
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(8)
             .addTo(latheRecipes);
diff --git a/src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java
index 863f0ae440..5896b94f1a 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java
@@ -1,9 +1,9 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.amplifierRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
-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.TierEU;
@@ -12,14 +12,14 @@ public class MatterAmplifierRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.IC2_Scrap.get(9L))
             .fluidOutputs(Materials.UUAmplifier.getFluid(1))
             .duration(9 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(amplifierRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.IC2_Scrapbox.get(1L))
             .fluidOutputs(Materials.UUAmplifier.getFluid(1))
             .duration(9 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java
index 1b8cbb4dcd..4562435816 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java
@@ -8,10 +8,10 @@ import static gregtech.api.enums.Mods.PamsHarvestCraft;
 import static gregtech.api.enums.Mods.Railcraft;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 import static net.minecraftforge.fluids.FluidRegistry.getFluidStack;
 
 import net.minecraft.init.Blocks;
@@ -20,8 +20,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import goodgenerator.items.MyMaterial;
-import gregtech.api.enums.GT_Values;
+import goodgenerator.items.GGMaterial;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsKevlar;
@@ -29,9 +29,9 @@ import gregtech.api.enums.MaterialsOreAlum;
 import gregtech.api.enums.MaterialsUEVplus;
 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.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import mods.railcraft.common.blocks.aesthetics.cube.EnumCube;
 
 public class MixerRecipes implements Runnable {
@@ -41,408 +41,408 @@ public class MixerRecipes implements Runnable {
 
         registerSingleBlockAndMulti();
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.EnderPearl, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.EnderEye, OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.EnderPearl, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.EnderEye, OrePrefixes.dust.mMaterialAmount))
             .duration(5 * SECONDS)
             .eut(48)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.Electrum, 2L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.Electrum, 2L * OrePrefixes.dust.mMaterialAmount))
             .duration(10 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.Invar, 3L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.Invar, 3L * OrePrefixes.dust.mMaterialAmount))
             .duration(15 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Invar, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Manganese, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.StainlessSteel, 9L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Invar, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Manganese, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.StainlessSteel, 9L * OrePrefixes.dust.mMaterialAmount))
             .duration(45 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.Kanthal, 3L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.Kanthal, 3L * OrePrefixes.dust.mMaterialAmount))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.Brass, 4L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.Brass, 4L * OrePrefixes.dust.mMaterialAmount))
             .duration(2 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.Bronze, 4L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.Bronze, 4L * OrePrefixes.dust.mMaterialAmount))
             .duration(2 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1),
-                GT_Utility.getIntegratedCircuit(3))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.Cupronickel, 2L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1),
+                GTUtility.getIntegratedCircuit(3))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.Cupronickel, 2L * OrePrefixes.dust.mMaterialAmount))
             .duration(10 * SECONDS)
             .eut(24)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 4),
-                GT_Utility.getIntegratedCircuit(4))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.SterlingSilver, 5L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 4),
+                GTUtility.getIntegratedCircuit(4))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.SterlingSilver, 5L * OrePrefixes.dust.mMaterialAmount))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Electrum, 2),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.BlackBronze, 5L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Electrum, 2),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.BlackBronze, 5L * OrePrefixes.dust.mMaterialAmount))
             .duration(25 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 4),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.BismuthBronze, 5L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 4),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.BismuthBronze, 5L * OrePrefixes.dust.mMaterialAmount))
             .duration(25 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackBronze, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 3),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.BlackSteel, 5L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.BlackBronze, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 3),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.BlackSteel, 5L * OrePrefixes.dust.mMaterialAmount))
             .duration(25 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SterlingSilver, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BismuthBronze, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 4),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.RedSteel, 8L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SterlingSilver, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.BismuthBronze, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 4),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.RedSteel, 8L * OrePrefixes.dust.mMaterialAmount))
             .duration(40 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RoseGold, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 4),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.BlueSteel, 8L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.RoseGold, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 4),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.BlueSteel, 8L * OrePrefixes.dust.mMaterialAmount))
             .duration(40 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 5),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 15),
-                GT_Utility.getIntegratedCircuit(14))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.BlackSteel, 25L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 5),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 15),
+                GTUtility.getIntegratedCircuit(14))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.BlackSteel, 25L * OrePrefixes.dust.mMaterialAmount))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 4),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 4),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 20),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 10),
-                GT_Utility.getIntegratedCircuit(15))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.RedSteel, 40L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 4),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 4),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 20),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 10),
+                GTUtility.getIntegratedCircuit(15))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.RedSteel, 40L * OrePrefixes.dust.mMaterialAmount))
             .duration(60 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 19),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 16),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 5),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 64),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 16),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 40),
-                GT_Utility.getIntegratedCircuit(16))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 19),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 16),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 5),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 64),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 16),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 40),
+                GTUtility.getIntegratedCircuit(16))
             .itemOutputs(
-                GT_OreDictUnificator.getDust(Materials.BlueSteel, 64L * OrePrefixes.dust.mMaterialAmount),
-                GT_OreDictUnificator.getDust(Materials.BlueSteel, 64L * OrePrefixes.dust.mMaterialAmount),
-                GT_OreDictUnificator.getDust(Materials.BlueSteel, 32L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.getDust(Materials.BlueSteel, 64L * OrePrefixes.dust.mMaterialAmount),
+                GTOreDictUnificator.getDust(Materials.BlueSteel, 64L * OrePrefixes.dust.mMaterialAmount),
+                GTOreDictUnificator.getDust(Materials.BlueSteel, 32L * OrePrefixes.dust.mMaterialAmount))
             .duration(3 * MINUTES)
             .eut(TierEU.RECIPE_HV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 5),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Molybdenum, 1),
-                GT_Utility.getIntegratedCircuit(2))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.Ultimet, 9L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 5),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Molybdenum, 1),
+                GTUtility.getIntegratedCircuit(2))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.Ultimet, 9L * OrePrefixes.dust.mMaterialAmount))
             .duration(45 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 7),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.CobaltBrass, 9L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 7),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.CobaltBrass, 9L * OrePrefixes.dust.mMaterialAmount))
             .duration(45 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 3),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.Gunpowder, 6L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 3),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.Gunpowder, 6L * OrePrefixes.dust.mMaterialAmount))
             .duration(30 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Charcoal, 3),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.Gunpowder, 6L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Charcoal, 3),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.Gunpowder, 6L * OrePrefixes.dust.mMaterialAmount))
             .duration(30 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 3),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.Gunpowder, 6L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 3),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.Gunpowder, 6L * OrePrefixes.dust.mMaterialAmount))
             .duration(30 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(
-                GT_OreDictUnificator.getDust(Materials.IndiumGalliumPhosphide, 3L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.getDust(Materials.IndiumGalliumPhosphide, 3L * OrePrefixes.dust.mMaterialAmount))
             .duration(10 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brick, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.Fireclay, 2L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Brick, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.Fireclay, 2L * OrePrefixes.dust.mMaterialAmount))
             .duration(10 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.Nichrome, 5L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.Nichrome, 5L * OrePrefixes.dust.mMaterialAmount))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 3),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.Osmiridium, 4L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 3),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.Osmiridium, 4L * OrePrefixes.dust.mMaterialAmount))
             .duration(2 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Niobium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.NiobiumTitanium, 2L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Niobium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.NiobiumTitanium, 2L * OrePrefixes.dust.mMaterialAmount))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.VanadiumGallium, 4L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.VanadiumGallium, 4L * OrePrefixes.dust.mMaterialAmount))
             .duration(2 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.TungstenCarbide, 2L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.TungstenCarbide, 2L * OrePrefixes.dust.mMaterialAmount))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.TungstenSteel, 2L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.TungstenSteel, 2L * OrePrefixes.dust.mMaterialAmount))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_EV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.TPV, 7L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.TPV, 7L * OrePrefixes.dust.mMaterialAmount))
             .duration(8 * SECONDS + 15 * TICKS)
             .eut(TierEU.RECIPE_EV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 5),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Molybdenum, 2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.HSSG, 9L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 5),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Molybdenum, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.HSSG, 9L * OrePrefixes.dust.mMaterialAmount))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 6),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Manganese, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.HSSE, 9L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 6),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Manganese, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.HSSE, 9L * OrePrefixes.dust.mMaterialAmount))
             .duration(35 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 6),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1),
-                GT_Utility.getIntegratedCircuit(2))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.HSSS, 9L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 6),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 2),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1),
+                GTUtility.getIntegratedCircuit(2))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.HSSS, 9L * OrePrefixes.dust.mMaterialAmount))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4),
-                GT_Utility.getIntegratedCircuit(3))
-            .itemOutputs(GT_OreDictUnificator.getDust(Materials.FerriteMixture, 6L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4),
+                GTUtility.getIntegratedCircuit(3))
+            .itemOutputs(GTOreDictUnificator.getDust(Materials.FerriteMixture, 6L * OrePrefixes.dust.mMaterialAmount))
             .duration(10 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 7))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 7))
             .itemOutputs(
-                GT_OreDictUnificator.getDust(Materials.BorosilicateGlass, 8L * OrePrefixes.dust.mMaterialAmount))
+                GTOreDictUnificator.getDust(Materials.BorosilicateGlass, 8L * OrePrefixes.dust.mMaterialAmount))
             .duration(10 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Items.rotten_flesh, 1, 0),
                 new ItemStack(Items.fermented_spider_eye, 1, 0),
                 ItemList.IC2_Scrap.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1))
             .itemOutputs(ItemList.Food_Chum.get(4))
             .fluidInputs(getFluidStack("potion.purpledrink", 750))
             .fluidOutputs(getFluidStack("sludge", 1000))
@@ -450,44 +450,42 @@ public class MixerRecipes implements Runnable {
             .eut(24)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1))
             .itemOutputs(ItemList.Food_Dough.get(2))
             .fluidInputs(Materials.Water.getFluid(1000))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1),
-                ItemList.Food_PotatoChips.get(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1), ItemList.Food_PotatoChips.get(1))
             .itemOutputs(ItemList.Food_ChiliChips.get(1))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Redstone, 5),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ruby, 4))
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Redstone, 5),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ruby, 4))
             .itemOutputs(ItemList.IC2_Energium_Dust.get(1))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 5),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ruby, 4))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 5),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ruby, 4))
             .itemOutputs(ItemList.IC2_Energium_Dust.get(9))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1),
                 new ItemStack(Blocks.brown_mushroom, 1),
                 new ItemStack(Items.spider_eye, 1))
             .itemOutputs(new ItemStack(Items.fermented_spider_eye, 1))
@@ -495,138 +493,138 @@ public class MixerRecipes implements Runnable {
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.LiveRoot, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IronWood, 2))
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.LiveRoot, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.IronWood, 2))
             .duration(5 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 9),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.LiveRoot, 9))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IronWood, 18))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 9),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.LiveRoot, 9))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.IronWood, 18))
             .duration(45 * SECONDS)
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1),
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Fluix, 2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Fluix, 2))
             .fluidInputs(Materials.Water.getFluid(500))
             .duration(20 * TICKS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1),
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Fluix, 2))
-            .fluidInputs(GT_ModHandler.getDistilledWater(500))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Fluix, 2))
+            .fluidInputs(GTModHandler.getDistilledWater(500))
             .duration(20 * TICKS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.IC2_Fertilizer.get(1),
                 new ItemStack(Blocks.dirt, 8, 32767),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(getModItem(Forestry.ID, "soil", 8L, 0))
             .fluidInputs(Materials.Water.getFluid(1000))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.FR_Fertilizer.get(1),
                 new ItemStack(Blocks.dirt, 8, 32767),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(getModItem(Forestry.ID, "soil", 8L, 0))
             .fluidInputs(Materials.Water.getFluid(1000))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.FR_Compost.get(1),
                 new ItemStack(Blocks.dirt, 8, 32767),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(getModItem(Forestry.ID, "soil", 8L, 0))
             .fluidInputs(Materials.Water.getFluid(1000))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.FR_Mulch.get(8),
                 new ItemStack(Blocks.dirt, 8, 32767),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(getModItem(Forestry.ID, "soil", 8L, 0))
             .fluidInputs(Materials.Water.getFluid(1000))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.sand, 1, 32767),
                 new ItemStack(Blocks.dirt, 1, 32767),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(getModItem(Forestry.ID, "soil", 2L, 1))
             .fluidInputs(Materials.Water.getFluid(250))
             .duration(16 * TICKS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 5),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 6))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 5),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 6))
             .duration(16 * TICKS)
             .eut(TierEU.RECIPE_MV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 5),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 5),
                 Materials.Empty.getCells(1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 6))
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 6))
             .fluidInputs(Materials.HeavyFuel.getFluid(1000))
             .duration(16 * TICKS)
             .eut(TierEU.RECIPE_MV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1),
                 Materials.Empty.getCells(5),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 6))
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 6))
             .fluidInputs(Materials.LightFuel.getFluid(5000))
             .duration(16 * TICKS)
             .eut(TierEU.RECIPE_MV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 5),
-                GT_Utility.getIntegratedCircuit(5))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 5),
+                GTUtility.getIntegratedCircuit(5))
             .itemOutputs(Materials.Empty.getCells(5))
             .fluidInputs(Materials.HeavyFuel.getFluid(1000))
             .fluidOutputs(Materials.Fuel.getFluid(6000))
@@ -634,10 +632,10 @@ public class MixerRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1),
-                GT_Utility.getIntegratedCircuit(6))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1),
+                GTUtility.getIntegratedCircuit(6))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.LightFuel.getFluid(5000))
             .fluidOutputs(Materials.Fuel.getFluid(6000))
@@ -645,10 +643,10 @@ public class MixerRecipes implements Runnable {
             .eut(TierEU.RECIPE_MV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 5),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Water, 5),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
             .itemOutputs(Materials.Empty.getCells(5))
             .fluidInputs(Materials.Lubricant.getFluid(20))
             .fluidOutputs(new FluidStack(ItemList.sDrillingFluid, 5000))
@@ -656,56 +654,56 @@ public class MixerRecipes implements Runnable {
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 1),
-                GT_Utility.getIntegratedCircuit(4))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 1),
+                GTUtility.getIntegratedCircuit(4))
             .fluidInputs(Materials.Water.getFluid(125))
             .fluidOutputs(getFluidStack("ic2coolant", 125))
             .duration(12 * SECONDS + 16 * TICKS)
             .eut(48)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 1),
-                GT_Utility.getIntegratedCircuit(4))
-            .fluidInputs(GT_ModHandler.getDistilledWater(1000))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 1),
+                GTUtility.getIntegratedCircuit(4))
+            .fluidInputs(GTModHandler.getDistilledWater(1000))
             .fluidOutputs(getFluidStack("ic2coolant", 1000))
             .duration(12 * SECONDS + 16 * TICKS)
             .eut(48)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.SFMixture.get(4))
             .fluidInputs(Materials.AdvancedGlue.getFluid(200))
             .duration(40 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.SFMixture.get(8))
             .fluidInputs(Materials.AdvancedGlue.getFluid(200))
             .duration(40 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Caesium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Caesium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.SFMixture.get(12))
             .fluidInputs(Materials.AdvancedGlue.getFluid(200))
             .duration(40 * SECONDS)
@@ -714,124 +712,124 @@ public class MixerRecipes implements Runnable {
 
         // McGuffium239 is non-renewable and only obtainable though world gen.
         // It's a meme, don't think too deep about it.
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.SFMixture.get(64))
             .fluidInputs(Materials.McGuffium239.getFluid(12))
             .duration(20 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.SFMixture.get(64))
             .fluidInputs(Materials.McGuffium239.getFluid(8))
             .duration(20 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Caesium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Caesium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.SFMixture.get(64))
             .fluidInputs(Materials.McGuffium239.getFluid(4))
             .duration(20 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.SFMixture.get(2), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.EnderEye, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.SFMixture.get(2), GTOreDictUnificator.get(OrePrefixes.dust, Materials.EnderEye, 1))
             .itemOutputs(ItemList.MSFMixture.get(4))
             .fluidInputs(Materials.Mercury.getFluid(1000))
             .duration(15 * SECONDS)
             .eut(64)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemList.SFMixture.get(1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemList.SFMixture.get(1), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1))
             .itemOutputs(ItemList.MSFMixture.get(1))
             .fluidInputs(Materials.Mercury.getFluid(500))
             .duration(15 * SECONDS)
             .eut(64)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 4),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 4),
                 ItemList.MSFMixture.get(24),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Block_MSSFUEL.get(4))
             .fluidInputs(Materials.NitroFuel.getFluid(4000))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 4),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 4),
                 ItemList.MSFMixture.get(16),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Block_MSSFUEL.get(4))
             .fluidInputs(Materials.NitroFuel.getFluid(3000))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 4),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Coal, 4),
                 ItemList.MSFMixture.get(8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Block_MSSFUEL.get(4))
             .fluidInputs(Materials.NitroFuel.getFluid(2000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 4),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 4),
                 ItemList.MSFMixture.get(24),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Block_MSSFUEL.get(4))
             .fluidInputs(Materials.GasolinePremium.getFluid(1600))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 4),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 4),
                 ItemList.MSFMixture.get(16),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Block_MSSFUEL.get(4))
             .fluidInputs(Materials.GasolinePremium.getFluid(1200))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 4),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Coal, 4),
                 ItemList.MSFMixture.get(8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Block_MSSFUEL.get(4))
             .fluidInputs(Materials.GasolinePremium.getFluid(800))
             .duration(10 * SECONDS)
@@ -839,66 +837,66 @@ public class MixerRecipes implements Runnable {
             .addTo(mixerRecipes);
 
         if (Thaumcraft.isModLoaded()) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.SFMixture.get(20),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedAir, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.InfusedAir, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.MSFMixture.get(20))
                 .fluidInputs(Materials.FierySteel.getFluid(50))
                 .duration(10 * SECONDS)
                 .eut(64)
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.SFMixture.get(20),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedEarth, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.InfusedEarth, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.MSFMixture.get(20))
                 .fluidInputs(Materials.FierySteel.getFluid(50))
                 .duration(10 * SECONDS)
                 .eut(64)
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.SFMixture.get(20),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedEntropy, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.InfusedEntropy, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.MSFMixture.get(20))
                 .fluidInputs(Materials.FierySteel.getFluid(50))
                 .duration(10 * SECONDS)
                 .eut(64)
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.SFMixture.get(20),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedFire, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.InfusedFire, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.MSFMixture.get(20))
                 .fluidInputs(Materials.FierySteel.getFluid(50))
                 .duration(10 * SECONDS)
                 .eut(64)
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.SFMixture.get(20),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedOrder, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.InfusedOrder, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.MSFMixture.get(20))
                 .fluidInputs(Materials.FierySteel.getFluid(50))
                 .duration(10 * SECONDS)
                 .eut(64)
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.SFMixture.get(20),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedWater, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.InfusedWater, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.MSFMixture.get(20))
                 .fluidInputs(Materials.FierySteel.getFluid(50))
                 .duration(10 * SECONDS)
@@ -907,138 +905,138 @@ public class MixerRecipes implements Runnable {
 
             FluidStack tFD = getFluidStack("fluiddeath", 30);
             if (tFD != null && tFD.getFluid() != null && tFD.amount > 0) {
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
                         ItemList.SFMixture.get(30),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedAir, 1),
-                        GT_Utility.getIntegratedCircuit(1))
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.InfusedAir, 1),
+                        GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.MSFMixture.get(30))
                     .fluidInputs(tFD)
                     .duration(10 * SECONDS)
                     .eut(64)
                     .addTo(mixerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
                         ItemList.SFMixture.get(30),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedEarth, 1),
-                        GT_Utility.getIntegratedCircuit(1))
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.InfusedEarth, 1),
+                        GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.MSFMixture.get(30))
                     .fluidInputs(tFD)
                     .duration(10 * SECONDS)
                     .eut(64)
                     .addTo(mixerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
                         ItemList.SFMixture.get(30),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedEntropy, 1),
-                        GT_Utility.getIntegratedCircuit(1))
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.InfusedEntropy, 1),
+                        GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.MSFMixture.get(30))
                     .fluidInputs(tFD)
                     .duration(10 * SECONDS)
                     .eut(64)
                     .addTo(mixerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
                         ItemList.SFMixture.get(30),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedFire, 1),
-                        GT_Utility.getIntegratedCircuit(1))
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.InfusedFire, 1),
+                        GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.MSFMixture.get(30))
                     .fluidInputs(tFD)
                     .duration(10 * SECONDS)
                     .eut(64)
                     .addTo(mixerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
                         ItemList.SFMixture.get(30),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedOrder, 1),
-                        GT_Utility.getIntegratedCircuit(1))
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.InfusedOrder, 1),
+                        GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.MSFMixture.get(30))
                     .fluidInputs(tFD)
                     .duration(10 * SECONDS)
                     .eut(64)
                     .addTo(mixerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
                         ItemList.SFMixture.get(30),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedWater, 1),
-                        GT_Utility.getIntegratedCircuit(1))
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.InfusedWater, 1),
+                        GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.MSFMixture.get(30))
                     .fluidInputs(tFD)
                     .duration(10 * SECONDS)
                     .eut(64)
                     .addTo(mixerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1),
+                        GTOreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1),
                         ItemList.MSFMixture.get(6),
                         getModItem(Thaumcraft.ID, "ItemResource", 4),
-                        GT_Utility.getIntegratedCircuit(1))
+                        GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.Block_MSSFUEL.get(1))
                     .fluidInputs(Materials.NitroFuel.getFluid(1000))
                     .duration(7 * SECONDS)
                     .eut(TierEU.RECIPE_HV)
                     .addTo(mixerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1),
+                        GTOreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1),
                         ItemList.MSFMixture.get(4),
                         getModItem(Thaumcraft.ID, "ItemResource", 4),
-                        GT_Utility.getIntegratedCircuit(1))
+                        GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.Block_MSSFUEL.get(1))
                     .fluidInputs(Materials.NitroFuel.getFluid(750))
                     .duration(6 * SECONDS)
                     .eut(TierEU.RECIPE_HV)
                     .addTo(mixerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1),
+                        GTOreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1),
                         ItemList.MSFMixture.get(2),
                         getModItem(Thaumcraft.ID, "ItemResource", 4),
-                        GT_Utility.getIntegratedCircuit(1))
+                        GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.Block_MSSFUEL.get(1))
                     .fluidInputs(Materials.NitroFuel.getFluid(500))
                     .duration(5 * SECONDS)
                     .eut(TierEU.RECIPE_HV)
                     .addTo(mixerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1),
+                        GTOreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1),
                         ItemList.MSFMixture.get(6),
                         getModItem(Thaumcraft.ID, "ItemResource", 4),
-                        GT_Utility.getIntegratedCircuit(1))
+                        GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.Block_MSSFUEL.get(1))
                     .fluidInputs(Materials.GasolinePremium.getFluid(400))
                     .duration(7 * SECONDS)
                     .eut(TierEU.RECIPE_HV)
                     .addTo(mixerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1),
+                        GTOreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1),
                         ItemList.MSFMixture.get(4),
                         getModItem(Thaumcraft.ID, "ItemResource", 4),
-                        GT_Utility.getIntegratedCircuit(1))
+                        GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.Block_MSSFUEL.get(1))
                     .fluidInputs(Materials.GasolinePremium.getFluid(300))
                     .duration(6 * SECONDS)
                     .eut(TierEU.RECIPE_HV)
                     .addTo(mixerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1),
+                        GTOreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1),
                         ItemList.MSFMixture.get(2),
                         getModItem(Thaumcraft.ID, "ItemResource", 4),
-                        GT_Utility.getIntegratedCircuit(1))
+                        GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(ItemList.Block_MSSFUEL.get(1))
                     .fluidInputs(Materials.GasolinePremium.getFluid(200))
                     .duration(5 * SECONDS)
@@ -1047,76 +1045,76 @@ public class MixerRecipes implements Runnable {
             }
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1),
                 ItemList.SFMixture.get(6),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Block_SSFUEL.get(1))
             .fluidInputs(Materials.NitroFuel.getFluid(1000))
             .duration(7 * SECONDS)
             .eut(250)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1),
                 ItemList.SFMixture.get(4),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Block_SSFUEL.get(1))
             .fluidInputs(Materials.NitroFuel.getFluid(750))
             .duration(6 * SECONDS)
             .eut(250)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1),
                 ItemList.SFMixture.get(2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Block_SSFUEL.get(1))
             .fluidInputs(Materials.NitroFuel.getFluid(500))
             .duration(5 * SECONDS)
             .eut(250)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1),
                 ItemList.SFMixture.get(6),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Block_SSFUEL.get(1))
             .fluidInputs(Materials.GasolinePremium.getFluid(400))
             .duration(7 * SECONDS)
             .eut(250)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1),
                 ItemList.SFMixture.get(4),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Block_SSFUEL.get(1))
             .fluidInputs(Materials.GasolinePremium.getFluid(300))
             .duration(6 * SECONDS)
             .eut(250)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1),
+                GTOreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1),
                 ItemList.SFMixture.get(2),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Block_SSFUEL.get(1))
             .fluidInputs(Materials.GasolinePremium.getFluid(200))
             .duration(5 * SECONDS)
             .eut(250)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Cell_Empty.get(1))
             .fluidInputs(Materials.NitricAcid.getFluid(1000))
             .fluidOutputs(new FluidStack(ItemList.sNitrationMixture, 2000))
@@ -1124,164 +1122,164 @@ public class MixerRecipes implements Runnable {
             .eut(2)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitricAcid, 1),
-                GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitrationMixture, 2))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.NitricAcid, 1),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.NitrationMixture, 2))
             .duration(24 * SECONDS)
             .eut(2)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dirt, 1, 32767),
                 new ItemStack(Items.wheat, 4, 32767),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0))
             .fluidInputs(Materials.Water.getFluid(100))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dirt, 1, 2),
                 new ItemStack(Items.wheat, 4, 32767),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0))
             .fluidInputs(Materials.Water.getFluid(100))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dirt, 1, 32767),
                 getModItem(BiomesOPlenty.ID, "plants", 4, 6),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0))
             .fluidInputs(Materials.Water.getFluid(100))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dirt, 1, 2),
                 getModItem(BiomesOPlenty.ID, "plants", 4, 6),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0))
             .fluidInputs(Materials.Water.getFluid(100))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dirt, 1, 32767),
                 getModItem(PamsHarvestCraft.ID, "oatsItem", 4),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0))
             .fluidInputs(Materials.Water.getFluid(100))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dirt, 1, 2),
                 getModItem(PamsHarvestCraft.ID, "oatsItem", 4),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0))
             .fluidInputs(Materials.Water.getFluid(100))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dirt, 1, 32767),
                 getModItem(PamsHarvestCraft.ID, "ryeItem", 4),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0))
             .fluidInputs(Materials.Water.getFluid(100))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dirt, 1, 2),
                 getModItem(PamsHarvestCraft.ID, "ryeItem", 4),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0))
             .fluidInputs(Materials.Water.getFluid(100))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dirt, 1, 32767),
                 getModItem(PamsHarvestCraft.ID, "barleyItem", 4),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0))
             .fluidInputs(Materials.Water.getFluid(100))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dirt, 1, 2),
                 getModItem(PamsHarvestCraft.ID, "barleyItem", 4, 6),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0))
             .fluidInputs(Materials.Water.getFluid(100))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dirt, 1, 32767),
                 getModItem(Natura.ID, "barleyFood", 4),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0))
             .fluidInputs(Materials.Water.getFluid(100))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dirt, 1, 2),
                 getModItem(Natura.ID, "barleyFood", 4),
-                GT_Utility.getIntegratedCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0))
             .fluidInputs(Materials.Water.getFluid(100))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dirt, 1, 32767),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0))
             .fluidInputs(Materials.Water.getFluid(100))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dirt, 1, 2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4),
-                GT_Utility.getIntegratedCircuit(3))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4),
+                GTUtility.getIntegratedCircuit(3))
             .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0))
             .fluidInputs(Materials.Water.getFluid(100))
             .duration(10 * SECONDS)
@@ -1290,15 +1288,15 @@ public class MixerRecipes implements Runnable {
 
         // radiation manufacturing
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("fuelRod", 1), new ItemStack(Items.glowstone_dust, 9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("fuelRod", 1), new ItemStack(Items.glowstone_dust, 9))
             .itemOutputs(ItemList.GlowstoneCell.get(1))
             .fluidInputs(Materials.Helium.getGas(250))
             .duration(1 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(MaterialsOreAlum.SluiceSand.getDust(1))
             .fluidInputs(Materials.Water.getFluid(500))
             .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(1000))
@@ -1308,8 +1306,8 @@ public class MixerRecipes implements Runnable {
 
         // NaCl + H2O = (NaCl·H2O)
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Salt.getDust(2), GT_Utility.getIntegratedCircuit(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Salt.getDust(2), GTUtility.getIntegratedCircuit(3))
             .fluidInputs(Materials.Water.getFluid(1000))
             .fluidOutputs(Materials.SaltWater.getFluid(1000))
             .duration(5 * SECONDS)
@@ -1318,8 +1316,8 @@ public class MixerRecipes implements Runnable {
 
         // CaCO3 + 2 CH3COOH = Ca(CH3COO)2 + H2O + CO2
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Calcite.getDust(5), Materials.Empty.getCells(2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Calcite.getDust(5), Materials.Empty.getCells(2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Water.getCells(1), Materials.CarbonDioxide.getCells(1))
             .fluidInputs(Materials.AceticAcid.getFluid(2000))
             .fluidOutputs(Materials.CalciumAcetateSolution.getFluid(1000))
@@ -1327,8 +1325,8 @@ public class MixerRecipes implements Runnable {
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Calcite.getDust(5), Materials.Empty.getCells(2), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Calcite.getDust(5), Materials.Empty.getCells(2), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.CalciumAcetateSolution.getCells(1), Materials.CarbonDioxide.getCells(1))
             .fluidInputs(Materials.AceticAcid.getFluid(2000))
             .fluidOutputs(Materials.Water.getFluid(1000))
@@ -1336,8 +1334,8 @@ public class MixerRecipes implements Runnable {
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Calcite.getDust(5), Materials.Empty.getCells(2), GT_Utility.getIntegratedCircuit(21))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Calcite.getDust(5), Materials.Empty.getCells(2), GTUtility.getIntegratedCircuit(21))
             .itemOutputs(Materials.Water.getCells(1), Materials.CalciumAcetateSolution.getCells(1))
             .fluidInputs(Materials.AceticAcid.getFluid(2000))
             .fluidOutputs(Materials.CarbonDioxide.getGas(1000))
@@ -1345,8 +1343,8 @@ public class MixerRecipes implements Runnable {
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Calcite.getDust(5), Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Calcite.getDust(5), Materials.Empty.getCells(1), GTUtility.getIntegratedCircuit(4))
             .itemOutputs(Materials.CarbonDioxide.getCells(1))
             .fluidInputs(Materials.AceticAcid.getFluid(2000))
             .fluidOutputs(Materials.CalciumAcetateSolution.getFluid(1000))
@@ -1354,8 +1352,8 @@ public class MixerRecipes implements Runnable {
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Calcite.getDust(5), Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(14))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Calcite.getDust(5), Materials.Empty.getCells(1), GTUtility.getIntegratedCircuit(14))
             .itemOutputs(Materials.CalciumAcetateSolution.getCells(1))
             .fluidInputs(Materials.AceticAcid.getFluid(2000))
             .fluidOutputs(Materials.CarbonDioxide.getGas(1000))
@@ -1365,8 +1363,8 @@ public class MixerRecipes implements Runnable {
 
         // Ca + 2 CH3COOH = Ca(CH3COO)2 + 2H
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Calcium.getDust(1), Materials.Empty.getCells(2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Calcium.getDust(1), Materials.Empty.getCells(2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Hydrogen.getCells(2))
             .fluidInputs(Materials.AceticAcid.getFluid(2000))
             .fluidOutputs(Materials.CalciumAcetateSolution.getFluid(1000))
@@ -1374,8 +1372,8 @@ public class MixerRecipes implements Runnable {
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Calcium.getDust(1), Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Calcium.getDust(1), Materials.Empty.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.CalciumAcetateSolution.getCells(1))
             .fluidInputs(Materials.AceticAcid.getFluid(2000))
             .fluidOutputs(Materials.Hydrogen.getGas(2000))
@@ -1385,8 +1383,8 @@ public class MixerRecipes implements Runnable {
 
         // CaO + 2 CH3COOH = Ca(CH3COO)2 + H2O
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Quicklime.getDust(2), Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Quicklime.getDust(2), Materials.Empty.getCells(1), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Water.getCells(1))
             .fluidInputs(Materials.AceticAcid.getFluid(2000))
             .fluidOutputs(Materials.CalciumAcetateSolution.getFluid(1000))
@@ -1394,11 +1392,8 @@ public class MixerRecipes implements Runnable {
             .eut(16)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                Materials.Quicklime.getDust(2),
-                Materials.Empty.getCells(1),
-                GT_Utility.getIntegratedCircuit(11))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Quicklime.getDust(2), Materials.Empty.getCells(1), GTUtility.getIntegratedCircuit(11))
             .itemOutputs(Materials.CalciumAcetateSolution.getCells(1))
             .fluidInputs(Materials.AceticAcid.getFluid(2000))
             .fluidOutputs(Materials.Water.getFluid(1000))
@@ -1408,7 +1403,7 @@ public class MixerRecipes implements Runnable {
 
         // 2CH3COOCH3 + 3CH3COCH3/(C4H6O2)n = 5Glue
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Acetone.getCells(3))
             .itemOutputs(Materials.Empty.getCells(3))
             .fluidInputs(Materials.PolyvinylAcetate.getFluid(2000))
@@ -1417,7 +1412,7 @@ public class MixerRecipes implements Runnable {
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.PolyvinylAcetate.getCells(2))
             .itemOutputs(Materials.Empty.getCells(2))
             .fluidInputs(Materials.Acetone.getFluid(3000))
@@ -1426,7 +1421,7 @@ public class MixerRecipes implements Runnable {
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.MethylAcetate.getCells(3))
             .itemOutputs(Materials.Empty.getCells(3))
             .fluidInputs(Materials.PolyvinylAcetate.getFluid(2000))
@@ -1435,7 +1430,7 @@ public class MixerRecipes implements Runnable {
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.PolyvinylAcetate.getCells(2))
             .itemOutputs(Materials.Empty.getCells(2))
             .fluidInputs(Materials.MethylAcetate.getFluid(3000))
@@ -1444,7 +1439,7 @@ public class MixerRecipes implements Runnable {
             .eut(8)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Sugar.getDust(4))
             .itemOutputs(Materials.Charcoal.getGems(1))
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000))
@@ -1453,7 +1448,7 @@ public class MixerRecipes implements Runnable {
             .eut(2)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Wood.getDust(4))
             .itemOutputs(Materials.Charcoal.getGems(1))
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000))
@@ -1462,7 +1457,7 @@ public class MixerRecipes implements Runnable {
             .eut(2)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Fuel.getCells(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Tetranitromethane.getFluid(20))
@@ -1471,7 +1466,7 @@ public class MixerRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.BioDiesel.getCells(1))
             .itemOutputs(Materials.Empty.getCells(1))
             .fluidInputs(Materials.Tetranitromethane.getFluid(40))
@@ -1482,21 +1477,21 @@ public class MixerRecipes implements Runnable {
 
         // CH4O + C4H8 = C5H12O
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Methanol.getCells(1), Materials.Butene.getCells(1))
             .itemOutputs(Materials.MTBEMixture.getCells(1), Materials.Empty.getCells(1))
             .duration(20 * TICKS)
             .eut(TierEU.RECIPE_HV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Methanol.getCells(1), Materials.Butane.getCells(1))
             .itemOutputs(Materials.MTBEMixtureAlt.getCells(1), Materials.Empty.getCells(1))
             .duration(20 * TICKS)
             .eut(TierEU.RECIPE_HV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 Materials.Naphtha.getCells(16),
                 Materials.Gas.getCells(2),
@@ -1507,7 +1502,7 @@ public class MixerRecipes implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 Materials.GasolineRegular.getCells(20),
                 Materials.Octane.getCells(2),
@@ -1521,46 +1516,40 @@ public class MixerRecipes implements Runnable {
             .addTo(mixerRecipes);
 
         if (Railcraft.isModLoaded()) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    EnumCube.COKE_BLOCK.getItem(),
-                    ItemList.SFMixture.get(2),
-                    GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(EnumCube.COKE_BLOCK.getItem(), ItemList.SFMixture.get(2), GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Block_SSFUEL.get(1))
                 .fluidInputs(Materials.NitroFuel.getFluid(300))
                 .duration(5 * SECONDS)
                 .eut(250)
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     EnumCube.COKE_BLOCK.getItem(4),
                     ItemList.SFMixture.get(8),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Block_SSFUEL.get(4))
                 .fluidInputs(Materials.GasolinePremium.getFluid(480))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     EnumCube.COKE_BLOCK.getItem(4),
                     ItemList.SFMixture.get(8),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Block_SSFUEL.get(4))
                 .fluidInputs(Materials.NitroFuel.getFluid(1200))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    EnumCube.COKE_BLOCK.getItem(),
-                    ItemList.SFMixture.get(2),
-                    GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(EnumCube.COKE_BLOCK.getItem(), ItemList.SFMixture.get(2), GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Block_SSFUEL.get(1))
                 .fluidInputs(Materials.GasolinePremium.getFluid(120))
                 .duration(5 * SECONDS)
@@ -1569,24 +1558,24 @@ public class MixerRecipes implements Runnable {
         }
 
         if (Thaumcraft.isModLoaded() && Railcraft.isModLoaded()) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     EnumCube.COKE_BLOCK.getItem(),
                     ItemList.MSFMixture.get(2),
                     getModItem(Thaumcraft.ID, "ItemResource", 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Block_MSSFUEL.get(1))
                 .fluidInputs(Materials.NitroFuel.getFluid(300))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     EnumCube.COKE_BLOCK.getItem(),
                     ItemList.MSFMixture.get(2),
                     getModItem(Thaumcraft.ID, "ItemResource", 4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Block_MSSFUEL.get(1))
                 .fluidInputs(Materials.GasolinePremium.getFluid(120))
                 .duration(5 * SECONDS)
@@ -1604,24 +1593,24 @@ public class MixerRecipes implements Runnable {
         boolean splashLong = !(FluidRegistry.getFluid("potion." + aName + ".long") == null
             || FluidRegistry.getFluid("potion." + aName + ".long.splash") == null);
 
-        if (splash) GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1))
+        if (splash) GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion." + aName), 750))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion." + aName + ".splash"), 750))
             .duration(10 * SECONDS)
             .eut(24)
             .addTo(mixerRecipes);
 
-        if (splashStrong) GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1))
+        if (splashStrong) GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion." + aName + ".strong"), 750))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion." + aName + ".strong.splash"), 750))
             .duration(10 * SECONDS)
             .eut(24)
             .addTo(mixerRecipes);
 
-        if (splashLong) GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1))
+        if (splashLong) GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion." + aName + ".long"), 750))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion." + aName + ".long.splash"), 750))
             .duration(10 * SECONDS)
@@ -1630,11 +1619,11 @@ public class MixerRecipes implements Runnable {
     }
 
     public void registerSingleBlockAndMulti() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 Materials.NaquadahEnriched.getDust(8),
                 Materials.Holmium.getDust(2),
-                GT_Utility.getIntegratedCircuit(4))
+                GTUtility.getIntegratedCircuit(4))
             .itemOutputs(Materials.EnrichedHolmium.getDust(10))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_ZPM)
@@ -1642,8 +1631,8 @@ public class MixerRecipes implements Runnable {
 
         // Catalysts for Plasma Forge.
         {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(9))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(9))
                 .fluidInputs(
                     Materials.Helium.getPlasma(1000L),
                     Materials.Iron.getPlasma(1000L),
@@ -1655,8 +1644,8 @@ public class MixerRecipes implements Runnable {
                 .noOptimize()
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(10))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(10))
                 .fluidInputs(
                     MaterialsUEVplus.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L),
                     Materials.Radon.getPlasma(1000L),
@@ -1669,8 +1658,8 @@ public class MixerRecipes implements Runnable {
                 .noOptimize()
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(11))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(11))
                 .fluidInputs(
                     MaterialsUEVplus.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L),
                     Materials.Nitrogen.getPlasma(1000L),
@@ -1683,8 +1672,8 @@ public class MixerRecipes implements Runnable {
                 .noOptimize()
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(12))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(12))
                 .fluidInputs(
                     MaterialsUEVplus.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L),
                     Materials.Americium.getPlasma(1000L),
@@ -1697,8 +1686,8 @@ public class MixerRecipes implements Runnable {
                 .noOptimize()
                 .addTo(mixerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(13))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(13))
                 .fluidInputs(
                     MaterialsUEVplus.DimensionallyTranscendentExoticCatalyst.getFluid(1000L),
                     Materials.Lead.getPlasma(1000),
@@ -1712,7 +1701,7 @@ public class MixerRecipes implements Runnable {
                 .addTo(mixerRecipes);
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.IC2_Spray_WeedEx.get(1))
             .fluidInputs(MaterialsKevlar.NaphthenicAcid.getFluid(10))
             .fluidOutputs(Materials.WeedEX9000.getFluid(750))
@@ -1720,15 +1709,15 @@ public class MixerRecipes implements Runnable {
             .eut(100)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 Materials.Tritanium.getDust(11),
-                MyMaterial.orundum.get(OrePrefixes.dust, 8),
+                GGMaterial.orundum.get(OrePrefixes.dust, 8),
                 Materials.Rubidium.getDust(11),
                 Materials.FierySteel.getDust(7),
                 Materials.Firestone.getDust(13),
-                MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 13),
-                GT_Utility.getIntegratedCircuit(6))
+                GGMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 13),
+                GTUtility.getIntegratedCircuit(6))
             .itemOutputs(MaterialsUEVplus.Mellion.getDust(63))
             .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(5000))
             .duration(15 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java b/src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java
index dad2388ae6..27c3004d7b 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java
@@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack;
 
 import codechicken.nei.api.API;
 import gregtech.api.enums.ItemList;
-import gregtech.common.items.GT_MetaGenerated_Item_03;
+import gregtech.common.items.MetaGeneratedItem03;
 
 public class NEIHiding implements Runnable {
 
@@ -18,7 +18,7 @@ public class NEIHiding implements Runnable {
         }
 
         for (int i = 0; i < 16; i++) {
-            API.hideItem(new ItemStack(GT_MetaGenerated_Item_03.INSTANCE, 1, i));
+            API.hideItem(new ItemStack(MetaGeneratedItem03.INSTANCE, 1, i));
         }
 
         if (Forestry.isModLoaded()) {
diff --git a/src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java b/src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java
index f8c816dc5c..4f6ab13116 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java
@@ -1,18 +1,18 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.Mods.HardcoreEnderExpansion;
-import static gregtech.api.util.GT_ModHandler.getModItem;
+import static gregtech.api.util.GTModHandler.getModItem;
 
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class OreDictUnification implements Runnable {
 
     @Override
     public void run() {
         if (HardcoreEnderExpansion.isModLoaded()) {
-            GT_OreDictUnificator.set(
+            GTOreDictUnificator.set(
                 OrePrefixes.ingot,
                 Materials.HeeEndium,
                 getModItem(HardcoreEnderExpansion.ID, "endium_ingot", 1),
diff --git a/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java
index 4ff99582c2..a86266029b 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java
@@ -1,64 +1,64 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.packagerRecipes;
-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 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.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class PackagerRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Tool_Matches.get(16L),
-                GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L))
+                GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L))
             .itemOutputs(ItemList.Tool_MatchBox_Full.get(1L))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(16)
             .addTo(packagerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Tool_MatchBox_Full.get(1L))
             .itemOutputs(ItemList.Tool_Matches.get(16L))
             .duration(1 * SECONDS + 12 * TICKS)
             .eut(16)
             .addTo(packagerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.IC2_Scrap.get(9), ItemList.Schematic_3by3.get(0))
             .itemOutputs(ItemList.IC2_Scrapbox.get(1))
             .duration(16 * TICKS)
             .eut(1)
             .addTo(packagerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Food_Fries.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1))
+                GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1))
             .itemOutputs(ItemList.Food_Packaged_Fries.get(1))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(16)
             .addTo(packagerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Food_PotatoChips.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1))
+                GTOreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1))
             .itemOutputs(ItemList.Food_Packaged_PotatoChips.get(1))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(16)
             .addTo(packagerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Food_ChiliChips.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1))
+                GTOreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1))
             .itemOutputs(ItemList.Food_Packaged_ChiliChips.get(1))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(16)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java
index e648205b7a..ea3c5ff7d1 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java
@@ -4,19 +4,19 @@ import static goodgenerator.loader.Loaders.huiCircuit;
 import static gregtech.api.enums.Mods.Avaritia;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.recipe.RecipeMaps.plasmaForgeRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
 
 import net.minecraft.item.ItemStack;
 
-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.TierEU;
 import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MaterialsElements;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
 public class PlasmaForgeRecipes implements Runnable {
@@ -24,7 +24,7 @@ public class PlasmaForgeRecipes implements Runnable {
     @Override
     public void run() {
         // Giga chad trophy.
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Field_Generator_UEV.get(64),
                 ItemList.Field_Generator_UIV.get(64),
@@ -39,7 +39,7 @@ public class PlasmaForgeRecipes implements Runnable {
             .addTo(plasmaForgeRecipes);
 
         // Quantum anomaly recipe bypass for UEV+. Avoids RNG.
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(ModItems.itemStandarParticleBase, 1, 24),
                 getModItem(NewHorizonsCoreMod.ID, "item.ChromaticLens", 0),
@@ -54,14 +54,14 @@ public class PlasmaForgeRecipes implements Runnable {
 
         if (Avaritia.isModLoaded()) {
             // Six-Phased Copper
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Avaritia.ID, "Singularity", 8, 5))
                 .fluidInputs(
-                    ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getFluidStack(72 * 144),
-                    ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(4 * 72 * 144),
-                    ELEMENT.STANDALONE.HYPOGEN.getFluidStack(36 * 144),
-                    ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getFluidStack(8 * 72 * 144),
-                    ELEMENT.STANDALONE.RHUGNOR.getFluidStack(18 * 144),
+                    MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getFluidStack(72 * 144),
+                    MaterialsElements.STANDALONE.ASTRAL_TITANIUM.getFluidStack(4 * 72 * 144),
+                    MaterialsElements.STANDALONE.HYPOGEN.getFluidStack(36 * 144),
+                    MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getFluidStack(8 * 72 * 144),
+                    MaterialsElements.STANDALONE.RHUGNOR.getFluidStack(18 * 144),
                     MaterialsUEVplus.Mellion.getMolten(72 * 144))
                 .fluidOutputs(MaterialsUEVplus.SixPhasedCopper.getMolten(72 * 144L))
                 .duration(60 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java
index e700ee0730..ddf37cd242 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java
@@ -1,32 +1,32 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.printerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 import static net.minecraftforge.fluids.FluidRegistry.getFluidStack;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-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.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
 public class PrinterRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L))
             .itemOutputs(ItemList.Paper_Punch_Card_Empty.get(1L))
             .fluidInputs(getFluidStack("squidink", 36))
             .duration(5 * SECONDS)
             .eut(2)
             .addTo(printerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Paper_Punch_Card_Empty.get(1L))
             .special(ItemList.Tool_DataStick.getWithName(0L, "With Punch Card Data"))
             .itemOutputs(ItemList.Paper_Punch_Card_Encoded.get(1L))
@@ -35,8 +35,8 @@ public class PrinterRecipes implements Runnable {
             .eut(2)
             .addTo(printerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3L))
             .special(ItemList.Tool_DataStick.getWithName(0L, "With Scanned Book Data"))
             .itemOutputs(ItemList.Paper_Printed_Pages.get(1L))
             .fluidInputs(getFluidStack("squidink", 144))
@@ -44,7 +44,7 @@ public class PrinterRecipes implements Runnable {
             .eut(2)
             .addTo(printerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.map, 1, 32767))
             .special(ItemList.Tool_DataStick.getWithName(0L, "With Scanned Map Data"))
             .itemOutputs(new ItemStack(Items.filled_map, 1, 0))
@@ -53,9 +53,9 @@ public class PrinterRecipes implements Runnable {
             .eut(2)
             .addTo(printerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.book, 1, 32767))
-            .itemOutputs(GT_Utility.getWrittenBook("Manual_Printer", ItemList.Book_Written_01.get(1L)))
+            .itemOutputs(GTUtility.getWrittenBook("Manual_Printer", ItemList.Book_Written_01.get(1L)))
             .fluidInputs(getFluidStack("squidink", 144))
             .duration(20 * SECONDS)
             .eut(2)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java
index 75a81448e0..1a9f82cb67 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java
@@ -5,22 +5,22 @@ import static gregtech.api.enums.Mods.HardcoreEnderExpansion;
 import static gregtech.api.enums.Mods.Railcraft;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
-import static gregtech.api.util.GT_ModHandler.getIC2Item;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTModHandler.getIC2Item;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-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.enums.TierEU;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class Pulverizer implements Runnable {
 
@@ -28,167 +28,167 @@ public class Pulverizer implements Runnable {
     public void run() {
         // recycling Long Distance Pipes
         {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Long_Distance_Pipeline_Fluid.get(1))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 19))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 19))
                 .duration(15 * SECONDS)
                 .eut(4)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Long_Distance_Pipeline_Item.get(1))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 12),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 7))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 12),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 7))
                 .duration(15 * SECONDS)
                 .eut(4)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(1))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Steel, 2))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Steel, 2))
                 .duration(10 * TICKS)
                 .eut(4)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Long_Distance_Pipeline_Item_Pipe.get(1))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Steel, 1))
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Steel, 1))
                 .duration(10 * TICKS)
                 .eut(4)
                 .addTo(maceratorRecipes);
         }
 
         // marbe dust( stone dust
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Marble, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Marble, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.block, Materials.Marble, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Marble, 1))
             .duration(8 * SECONDS)
             .eut(4)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getModItem(Thaumcraft.ID, "ItemResource", 1, 18))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1))
             .duration(1 * SECONDS + 1 * TICKS)
             .eut(4)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.reeds, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(2)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_Cupronickel.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cupronickel, 8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 2))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cupronickel, 8),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 2))
             .duration(1 * MINUTES + 15 * SECONDS)
             .eut(80)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_Kanthal.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Kanthal, 8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cupronickel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 3))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Kanthal, 8),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cupronickel, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 3))
             .duration(1 * MINUTES + 15 * SECONDS)
             .eut(80)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_Nichrome.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nichrome, 8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Kanthal, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 4))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nichrome, 8),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Kanthal, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 4))
             .duration(1 * MINUTES + 15 * SECONDS)
             .eut(80)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_TungstenSteel.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TPV, 8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nichrome, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 5))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.TPV, 8),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nichrome, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 5))
             .duration(1 * MINUTES + 15 * SECONDS)
             .eut(80)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_HSSG.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TPV, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 6))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 8),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.TPV, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 6))
             .duration(1 * MINUTES + 15 * SECONDS)
             .eut(80)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_HSSS.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSS, 8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 7))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.HSSS, 8),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 7))
             .duration(1 * MINUTES + 15 * SECONDS)
             .eut(80)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_Naquadah.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSS, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 8))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 8),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.HSSS, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 8))
             .duration(1 * MINUTES + 15 * SECONDS)
             .eut(80)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_NaquadahAlloy.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahAlloy, 8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 9))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahAlloy, 8),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 9))
             .duration(1 * MINUTES + 15 * SECONDS)
             .eut(80)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_Trinium.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahAlloy, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 10))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 8),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahAlloy, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 10))
             .duration(1 * MINUTES + 15 * SECONDS)
             .eut(80)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_ElectrumFlux.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 11))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 8),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 11))
             .duration(1 * MINUTES + 15 * SECONDS)
             .eut(80)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Casing_Coil_AwakenedDraconium.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 12))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 8),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 12))
             .duration(1 * MINUTES + 15 * SECONDS)
             .eut(80)
             .addTo(maceratorRecipes);
@@ -197,284 +197,284 @@ public class Pulverizer implements Runnable {
             // recycling RC Tanks
             // Iron
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 0))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2))
                 .duration(15 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 1))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
                 .duration(15 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 2))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 12),
-                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 12),
+                    GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 3))
                 .duration(15 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
 
             // Steel
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 13))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2))
                 .duration(15 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 14))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
                 .duration(15 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 15))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 12),
-                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Steel, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 12),
+                    GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Steel, 3))
                 .duration(15 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
 
             // Aluminium
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 0))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 2))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 2))
                 .duration(22 * SECONDS + 10 * TICKS)
                 .eut(8)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 1))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
                 .duration(22 * SECONDS + 10 * TICKS)
                 .eut(8)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 2))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 12),
-                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Aluminium, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 12),
+                    GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Aluminium, 3))
                 .duration(22 * SECONDS + 10 * TICKS)
                 .eut(8)
                 .addTo(maceratorRecipes);
 
             // Stainless Steel
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 3))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 2))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 2))
                 .duration(30 * SECONDS)
                 .eut(16)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 4))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
                 .duration(30 * SECONDS)
                 .eut(16)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 5))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 12),
-                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.StainlessSteel, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 12),
+                    GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.StainlessSteel, 3))
                 .duration(30 * SECONDS)
                 .eut(16)
                 .addTo(maceratorRecipes);
 
             // Titanium
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 6))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 2))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 2))
                 .duration(30 * SECONDS)
                 .eut(30)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 7))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
                 .duration(30 * SECONDS)
                 .eut(30)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 8))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 12),
-                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 12),
+                    GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 3))
                 .duration(30 * SECONDS)
                 .eut(30)
                 .addTo(maceratorRecipes);
 
             // Tungesten Steel
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 9))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 2))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 2))
                 .duration(30 * SECONDS)
                 .eut(30)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 10))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
                 .duration(30 * SECONDS)
                 .eut(30)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 11))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 12),
-                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.TungstenSteel, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 12),
+                    GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.TungstenSteel, 3))
                 .duration(30 * SECONDS)
                 .eut(30)
                 .addTo(maceratorRecipes);
 
             // Palladium
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 12))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 2))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 2))
                 .duration(37 * SECONDS + 10 * TICKS)
                 .eut(64)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 13))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
                 .duration(37 * SECONDS + 10 * TICKS)
                 .eut(64)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 14))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NiobiumTitanium, 12),
-                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Chrome, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.NiobiumTitanium, 12),
+                    GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Chrome, 3))
                 .duration(37 * SECONDS + 10 * TICKS)
                 .eut(64)
                 .addTo(maceratorRecipes);
 
             // Iridium
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 0))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 2))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 2))
                 .duration(45 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 1))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
                 .duration(45 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 2))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Enderium, 12),
-                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iridium, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Enderium, 12),
+                    GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iridium, 3))
                 .duration(45 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(maceratorRecipes);
 
             // Osmium
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 3))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 2))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 2))
                 .duration(52 * SECONDS + 10 * TICKS)
                 .eut(256)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 4))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
                 .duration(52 * SECONDS + 10 * TICKS)
                 .eut(256)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 5))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 12),
-                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Osmium, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 12),
+                    GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Osmium, 3))
                 .duration(52 * SECONDS + 10 * TICKS)
                 .eut(256)
                 .addTo(maceratorRecipes);
 
             // Neutronium
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 6))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 2))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 2))
                 .duration(60 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 7))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 1),
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3))
                 .duration(60 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 8))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 12),
-                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neutronium, 3))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 12),
+                    GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neutronium, 3))
                 .duration(60 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(maceratorRecipes);
         }
 
         if (AppliedEnergistics2.isModLoaded()) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(AppliedEnergistics2.ID, "tile.BlockSkyStone", 1L, 32767))
                 .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 45))
                 .duration(20 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(AppliedEnergistics2.ID, "tile.BlockSkyChest", 1L, 32767))
                 .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 45))
                 .duration(20 * SECONDS)
@@ -482,7 +482,7 @@ public class Pulverizer implements Runnable {
                 .addTo(maceratorRecipes);
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.blaze_rod, 1))
             .itemOutputs(new ItemStack(Items.blaze_powder, 3), new ItemStack(Items.blaze_powder, 1))
             .outputChances(10000, 5000)
@@ -490,7 +490,7 @@ public class Pulverizer implements Runnable {
             .eut(2)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.web, 1, 0))
             .itemOutputs(new ItemStack(Items.string, 1), new ItemStack(Items.string, 1))
             .outputChances(10000, 5000)
@@ -498,90 +498,90 @@ public class Pulverizer implements Runnable {
             .eut(2)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.red_mushroom, 1, 32767))
             .itemOutputs(ItemList.IC2_Grin_Powder.get(1L))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.poisonous_potato, 1))
             .itemOutputs(ItemList.IC2_Grin_Powder.get(1L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.spider_eye, 1))
             .itemOutputs(ItemList.IC2_Grin_Powder.get(1L))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.bone, 1))
             .itemOutputs(new ItemStack(Items.dye, 4, 15))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.IC2_EnergyCrystal.get(1))
             .itemOutputs(getIC2Item("energiumDust", 9))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getIC2Item("biochaff", 1))
             .itemOutputs(new ItemStack(Blocks.dirt, 1))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.quartz_stairs, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 6))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 6))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.item_frame, 1, 32767))
             .itemOutputs(
                 new ItemStack(Items.leather, 1),
-                GT_OreDictUnificator.getDust(Materials.Wood, OrePrefixes.stick.mMaterialAmount * 4L))
+                GTOreDictUnificator.getDust(Materials.Wood, OrePrefixes.stick.mMaterialAmount * 4L))
             .outputChances(10000, 9500)
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.bow, 1, 0))
             .itemOutputs(
                 new ItemStack(Items.string, 3),
-                GT_OreDictUnificator.getDust(Materials.Wood, OrePrefixes.stick.mMaterialAmount * 3))
+                GTOreDictUnificator.getDust(Materials.Wood, OrePrefixes.stick.mMaterialAmount * 3))
             .outputChances(10000, 9500)
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Brick.getIngots(1))
             .itemOutputs(Materials.Brick.getDustSmall(1))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.brick_stairs, 1, 0))
             .itemOutputs(Materials.Brick.getDustSmall(6))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Machine_Bricked_BlastFurnace.get(1))
             .itemOutputs(Materials.Brick.getDust(8), Materials.Iron.getDust(1))
             .duration(20 * SECONDS)
@@ -589,11 +589,11 @@ public class Pulverizer implements Runnable {
             .addTo(maceratorRecipes);
 
         if (HardcoreEnderExpansion.isModLoaded()) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(getModItem(HardcoreEnderExpansion.ID, "endium_ore", 1))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.HeeEndium, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1))
+                    GTOreDictUnificator.get(OrePrefixes.crushed, Materials.HeeEndium, 2),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1))
                 .outputChances(10000, 5000)
                 .duration(20 * SECONDS)
                 .eut(2)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java
index 51017358b4..6f9f8f234d 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java
@@ -3,19 +3,19 @@ package gregtech.loaders.postload.recipes;
 import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Mods.Railcraft;
 import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import mods.railcraft.common.blocks.aesthetics.cube.EnumCube;
 import mods.railcraft.common.items.RailcraftToolItems;
 
@@ -24,20 +24,20 @@ public class PyrolyseRecipes implements Runnable {
     @Override
     public void run() {
         if (Railcraft.isModLoaded()) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(RailcraftToolItems.getCoalCoke(16))
                 .fluidOutputs(Materials.Creosote.getFluid(8000))
                 .duration(32 * SECONDS)
                 .eut(64)
                 .addTo(pyrolyseRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTOreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16),
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(RailcraftToolItems.getCoalCoke(16))
                 .fluidInputs(Materials.Nitrogen.getGas(1000))
                 .fluidOutputs(Materials.Creosote.getFluid(8000))
@@ -45,20 +45,20 @@ public class PyrolyseRecipes implements Runnable {
                 .eut(96)
                 .addTo(pyrolyseRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 8),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.block, Materials.Coal, 8),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(EnumCube.COKE_BLOCK.getItem(8))
                 .fluidOutputs(Materials.Creosote.getFluid(32000))
                 .duration(2 * MINUTES + 8 * SECONDS)
                 .eut(64)
                 .addTo(pyrolyseRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 8),
-                    GT_Utility.getIntegratedCircuit(2))
+                    GTOreDictUnificator.get(OrePrefixes.block, Materials.Coal, 8),
+                    GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(EnumCube.COKE_BLOCK.getItem(8))
                 .fluidInputs(Materials.Nitrogen.getGas(1000))
                 .fluidOutputs(Materials.Creosote.getFluid(32000))
@@ -68,16 +68,16 @@ public class PyrolyseRecipes implements Runnable {
         }
 
         if (Forestry.isModLoaded()) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(getModItem(Forestry.ID, "fertilizerBio", 4), GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(getModItem(Forestry.ID, "fertilizerBio", 4), GTUtility.getIntegratedCircuit(1))
                 .fluidInputs(Materials.Water.getFluid(4000))
                 .fluidOutputs(Materials.Biomass.getFluid(5000))
                 .duration(45 * SECONDS)
                 .eut(10)
                 .addTo(pyrolyseRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(getModItem(Forestry.ID, "mulch", 32), GT_Utility.getIntegratedCircuit(1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(getModItem(Forestry.ID, "mulch", 32), GTUtility.getIntegratedCircuit(1))
                 .fluidInputs(Materials.Water.getFluid(4000))
                 .fluidOutputs(Materials.Biomass.getFluid(5000))
                 .duration(45 * SECONDS)
@@ -85,48 +85,48 @@ public class PyrolyseRecipes implements Runnable {
                 .addTo(pyrolyseRecipes);
         }
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("biochaff", 4), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("biochaff", 4), GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Water.getFluid(4000))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 5000))
             .duration(45 * SECONDS)
             .eut(10)
             .addTo(pyrolyseRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("biochaff", 1), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("biochaff", 1), GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.Water.getFluid(1500))
             .fluidOutputs(Materials.FermentedBiomass.getFluid(1500))
             .duration(10 * SECONDS)
             .eut(10)
             .addTo(pyrolyseRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 1000))
             .fluidOutputs(Materials.FermentedBiomass.getFluid(1000))
             .duration(5 * SECONDS)
             .eut(10)
             .addTo(pyrolyseRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(Materials.Biomass.getFluid(1000))
             .fluidOutputs(Materials.FermentedBiomass.getFluid(1000))
             .duration(5 * SECONDS)
             .eut(10)
             .addTo(pyrolyseRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Sugar.getDust(23), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Sugar.getDust(23), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(Materials.Charcoal.getDust(12))
             .fluidOutputs(Materials.Water.getFluid(1500))
             .duration(16 * SECONDS)
             .eut(64)
             .addTo(pyrolyseRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(Materials.Sugar.getDust(23), GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(Materials.Sugar.getDust(23), GTUtility.getIntegratedCircuit(2))
             .itemOutputs(Materials.Charcoal.getDust(12))
             .fluidInputs(Materials.Nitrogen.getGas(500))
             .fluidOutputs(Materials.Water.getFluid(1500))
diff --git a/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java b/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java
index 10132ece09..96976d2b9a 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java
@@ -2,7 +2,7 @@ package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.Mods.ExtraTrees;
 import static gregtech.api.enums.Mods.IndustrialCraft2;
-import static gregtech.api.util.GT_ModHandler.getModItem;
+import static gregtech.api.util.GTModHandler.getModItem;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -11,13 +11,13 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-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.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import ic2.api.recipe.ILiquidHeatExchangerManager;
 import ic2.api.recipe.Recipes;
 
@@ -25,93 +25,93 @@ public class RecipeRemover implements Runnable {
 
     @Override
     public void run() {
-        GT_ModHandler.removeRecipeByOutput(ItemList.IC2_Fertilizer.get(1L));
+        GTModHandler.removeRecipeByOutput(ItemList.IC2_Fertilizer.get(1L));
         removeCrafting();
         removeSmelting();
         removeIC2Recipes();
     }
 
     public void removeCrafting() {
-        GT_ModHandler.removeRecipe(new ItemStack(Items.lava_bucket), ItemList.Cell_Empty.get(1L));
-        GT_ModHandler.removeRecipe(new ItemStack(Items.water_bucket), ItemList.Cell_Empty.get(1L));
+        GTModHandler.removeRecipe(new ItemStack(Items.lava_bucket), ItemList.Cell_Empty.get(1L));
+        GTModHandler.removeRecipe(new ItemStack(Items.water_bucket), ItemList.Cell_Empty.get(1L));
     }
 
     public void removeIC2Recipes() {
 
         try {
-            GT_Utility.removeSimpleIC2MachineRecipe(
-                GT_Values.NI,
+            GTUtility.removeSimpleIC2MachineRecipe(
+                GTValues.NI,
                 Recipes.metalformerExtruding.getRecipes(),
                 ItemList.Cell_Empty.get(3L));
-            GT_Utility.removeSimpleIC2MachineRecipe(
+            GTUtility.removeSimpleIC2MachineRecipe(
                 ItemList.IC2_Energium_Dust.get(1L),
                 Recipes.compressor.getRecipes(),
-                GT_Values.NI);
-            GT_Utility.removeSimpleIC2MachineRecipe(
+                GTValues.NI);
+            GTUtility.removeSimpleIC2MachineRecipe(
                 new ItemStack(Items.gunpowder),
                 Recipes.extractor.getRecipes(),
-                GT_Values.NI);
-            GT_Utility.removeSimpleIC2MachineRecipe(
+                GTValues.NI);
+            GTUtility.removeSimpleIC2MachineRecipe(
                 new ItemStack(Blocks.wool, 1, 32767),
                 Recipes.extractor.getRecipes(),
-                GT_Values.NI);
-            GT_Utility.removeSimpleIC2MachineRecipe(
+                GTValues.NI);
+            GTUtility.removeSimpleIC2MachineRecipe(
                 new ItemStack(Blocks.gravel),
                 Recipes.oreWashing.getRecipes(),
-                GT_Values.NI);
+                GTValues.NI);
         } catch (Throwable ignored) {}
-        GT_Utility.removeIC2BottleRecipe(
-            GT_ModHandler.getIC2Item("fuelRod", 1),
-            GT_ModHandler.getIC2Item("UranFuel", 1),
+        GTUtility.removeIC2BottleRecipe(
+            GTModHandler.getIC2Item("fuelRod", 1),
+            GTModHandler.getIC2Item("UranFuel", 1),
             Recipes.cannerBottle.getRecipes(),
-            GT_ModHandler.getIC2Item("reactorUraniumSimple", 1, 1));
-        GT_Utility.removeIC2BottleRecipe(
-            GT_ModHandler.getIC2Item("fuelRod", 1),
-            GT_ModHandler.getIC2Item("MOXFuel", 1),
+            GTModHandler.getIC2Item("reactorUraniumSimple", 1, 1));
+        GTUtility.removeIC2BottleRecipe(
+            GTModHandler.getIC2Item("fuelRod", 1),
+            GTModHandler.getIC2Item("MOXFuel", 1),
             Recipes.cannerBottle.getRecipes(),
-            GT_ModHandler.getIC2Item("reactorMOXSimple", 1, 1));
+            GTModHandler.getIC2Item("reactorMOXSimple", 1, 1));
 
-        GT_Utility.removeSimpleIC2MachineRecipe(
+        GTUtility.removeSimpleIC2MachineRecipe(
             new ItemStack(Blocks.cobblestone),
-            GT_ModHandler.getMaceratorRecipeList(),
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L));
-        GT_Utility.removeSimpleIC2MachineRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lapis, 1L),
-            GT_ModHandler.getMaceratorRecipeList(),
+            GTModHandler.getMaceratorRecipeList(),
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L));
+        GTUtility.removeSimpleIC2MachineRecipe(
+            GTOreDictUnificator.get(OrePrefixes.gem, Materials.Lapis, 1L),
+            GTModHandler.getMaceratorRecipeList(),
             ItemList.IC2_Plantball.get(1L));
-        GT_Utility.removeSimpleIC2MachineRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
-            GT_ModHandler.getMaceratorRecipeList(),
+        GTUtility.removeSimpleIC2MachineRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
+            GTModHandler.getMaceratorRecipeList(),
             ItemList.IC2_Plantball.get(1L));
-        GT_Utility.removeSimpleIC2MachineRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L),
-            GT_ModHandler.getMaceratorRecipeList(),
+        GTUtility.removeSimpleIC2MachineRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L),
+            GTModHandler.getMaceratorRecipeList(),
             ItemList.IC2_Plantball.get(1L));
-        GT_Utility.removeSimpleIC2MachineRecipe(
-            GT_Values.NI,
-            GT_ModHandler.getMaceratorRecipeList(),
+        GTUtility.removeSimpleIC2MachineRecipe(
+            GTValues.NI,
+            GTModHandler.getMaceratorRecipeList(),
             getModItem(IndustrialCraft2.ID, "itemBiochaff", 1L));
 
-        GT_Utility.removeSimpleIC2MachineRecipe(
+        GTUtility.removeSimpleIC2MachineRecipe(
             new ItemStack(Blocks.cactus, 8, 0),
-            GT_ModHandler.getCompressorRecipeList(),
+            GTModHandler.getCompressorRecipeList(),
             getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1L));
-        GT_Utility.removeSimpleIC2MachineRecipe(
+        GTUtility.removeSimpleIC2MachineRecipe(
             getModItem(ExtraTrees.ID, "food", 8L, 24),
-            GT_ModHandler.getCompressorRecipeList(),
+            GTModHandler.getCompressorRecipeList(),
             getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1L));
 
-        GT_Utility.removeSimpleIC2MachineRecipe(
+        GTUtility.removeSimpleIC2MachineRecipe(
             ItemList.Crop_Drop_BobsYerUncleRanks.get(1L),
-            GT_ModHandler.getExtractorRecipeList(),
+            GTModHandler.getExtractorRecipeList(),
             null);
-        GT_Utility.removeSimpleIC2MachineRecipe(
+        GTUtility.removeSimpleIC2MachineRecipe(
             ItemList.Crop_Drop_Ferru.get(1L),
-            GT_ModHandler.getExtractorRecipeList(),
+            GTModHandler.getExtractorRecipeList(),
             null);
-        GT_Utility.removeSimpleIC2MachineRecipe(
+        GTUtility.removeSimpleIC2MachineRecipe(
             ItemList.Crop_Drop_Aurelia.get(1L),
-            GT_ModHandler.getExtractorRecipeList(),
+            GTModHandler.getExtractorRecipeList(),
             null);
 
         try {
@@ -153,14 +153,12 @@ public class RecipeRemover implements Runnable {
     }
 
     public void removeSmelting() {
-        GT_ModHandler.removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Graphite, 1L));
-        GT_ModHandler
-            .removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Graphite, 1L));
-        GT_ModHandler.removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Graphite, 1L));
-        GT_ModHandler
-            .removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Graphite, 1L));
-        GT_ModHandler
-            .removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Graphite, 1L));
-        GT_ModHandler.removeFurnaceSmelting(ItemList.IC2_Resin.get(1L));
+        GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.ore, Materials.Graphite, 1L));
+        GTModHandler
+            .removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Graphite, 1L));
+        GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Graphite, 1L));
+        GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Graphite, 1L));
+        GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Graphite, 1L));
+        GTModHandler.removeFurnaceSmelting(ItemList.IC2_Resin.get(1L));
     }
 }
diff --git a/src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java
index 3a34cc3536..876164efb0 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java
@@ -3,24 +3,24 @@ package gregtech.loaders.postload.recipes;
 import static gregtech.api.enums.Mods.EnderIO;
 import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.recipe.RecipeMaps.sifterRecipes;
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-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.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class SifterRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.gravel, 1, 0))
             .itemOutputs(
                 new ItemStack(Items.flint, 1, 0),
@@ -34,20 +34,20 @@ public class SifterRecipes implements Runnable {
             .eut(16)
             .addTo(sifterRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Coal, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Coal, 1L))
             .itemOutputs(
                 new ItemStack(Items.coal, 1, 0),
                 new ItemStack(Items.coal, 1, 0),
                 new ItemStack(Items.coal, 1, 0),
                 new ItemStack(Items.coal, 1, 0),
                 new ItemStack(Items.coal, 1, 0),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L))
             .outputChances(10000, 9000, 8000, 7000, 6000, 5000)
             .duration(30 * SECONDS)
             .eut(16)
             .addTo(sifterRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.ElectronicsLump.get(1))
             .itemOutputs(
                 ItemList.Electric_Motor_LV.get(1),
diff --git a/src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java
index 73d251014e..08c81a8ecb 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java
@@ -1,38 +1,38 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.slicerRecipes;
-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 gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 
 public class SlicerRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Food_Dough_Chocolate.get(1), ItemList.Shape_Slicer_Flat.get(0))
             .itemOutputs(ItemList.Food_Raw_Cookie.get(4))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(slicerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Food_Baked_Bun.get(1), ItemList.Shape_Slicer_Flat.get(0))
             .itemOutputs(ItemList.Food_Sliced_Bun.get(2))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(slicerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Food_Baked_Bread.get(1), ItemList.Shape_Slicer_Flat.get(0))
             .itemOutputs(ItemList.Food_Sliced_Bread.get(2))
             .duration(6 * SECONDS + 8 * TICKS)
             .eut(4)
             .addTo(slicerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Food_Baked_Baguette.get(1), ItemList.Shape_Slicer_Flat.get(0))
             .itemOutputs(ItemList.Food_Sliced_Baguette.get(2))
             .duration(6 * SECONDS + 8 * TICKS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/SmelterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/SmelterRecipes.java
index e56cc613e7..57e932b2cc 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/SmelterRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/SmelterRecipes.java
@@ -7,63 +7,63 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class SmelterRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_PotatoChips.get(1L), ItemList.Food_PotatoChips.get(1L));
+        GTModHandler.addSmeltingRecipe(ItemList.Food_Raw_PotatoChips.get(1L), ItemList.Food_PotatoChips.get(1L));
 
-        GT_ModHandler
+        GTModHandler
             .addSmeltingRecipe(ItemList.Food_Potato_On_Stick.get(1L), ItemList.Food_Potato_On_Stick_Roasted.get(1L));
 
-        GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_Bun.get(1L), ItemList.Food_Baked_Bun.get(1L));
+        GTModHandler.addSmeltingRecipe(ItemList.Food_Raw_Bun.get(1L), ItemList.Food_Baked_Bun.get(1L));
 
-        GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_Bread.get(1L), ItemList.Food_Baked_Bread.get(1L));
+        GTModHandler.addSmeltingRecipe(ItemList.Food_Raw_Bread.get(1L), ItemList.Food_Baked_Bread.get(1L));
 
-        GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_Baguette.get(1L), ItemList.Food_Baked_Baguette.get(1L));
+        GTModHandler.addSmeltingRecipe(ItemList.Food_Raw_Baguette.get(1L), ItemList.Food_Baked_Baguette.get(1L));
 
-        GT_ModHandler
+        GTModHandler
             .addSmeltingRecipe(ItemList.Food_Raw_Pizza_Veggie.get(1L), ItemList.Food_Baked_Pizza_Veggie.get(1L));
 
-        GT_ModHandler
+        GTModHandler
             .addSmeltingRecipe(ItemList.Food_Raw_Pizza_Cheese.get(1L), ItemList.Food_Baked_Pizza_Cheese.get(1L));
 
-        GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_Pizza_Meat.get(1L), ItemList.Food_Baked_Pizza_Meat.get(1L));
+        GTModHandler.addSmeltingRecipe(ItemList.Food_Raw_Pizza_Meat.get(1L), ItemList.Food_Baked_Pizza_Meat.get(1L));
 
-        GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_Baguette.get(1L), ItemList.Food_Baked_Baguette.get(1L));
+        GTModHandler.addSmeltingRecipe(ItemList.Food_Raw_Baguette.get(1L), ItemList.Food_Baked_Baguette.get(1L));
 
-        GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_Cake.get(1L), ItemList.Food_Baked_Cake.get(1L));
+        GTModHandler.addSmeltingRecipe(ItemList.Food_Raw_Cake.get(1L), ItemList.Food_Baked_Cake.get(1L));
 
-        GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_Cookie.get(1L), new ItemStack(Items.cookie, 1));
+        GTModHandler.addSmeltingRecipe(ItemList.Food_Raw_Cookie.get(1L), new ItemStack(Items.cookie, 1));
 
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(Items.slime_ball, 1), ItemList.IC2_Resin.get(1L));
+        GTModHandler.addSmeltingRecipe(new ItemStack(Items.slime_ball, 1), ItemList.IC2_Resin.get(1L));
 
-        GT_ModHandler.addSmeltingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Graphite, 1L),
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L));
+        GTModHandler.addSmeltingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.ore, Materials.Graphite, 1L),
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L));
 
-        GT_ModHandler.addSmeltingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Graphite, 1L),
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L));
+        GTModHandler.addSmeltingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Graphite, 1L),
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L));
 
-        GT_ModHandler.addSmeltingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Graphite, 1L),
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L));
+        GTModHandler.addSmeltingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Graphite, 1L),
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L));
 
-        GT_ModHandler.addSmeltingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Graphite, 1L),
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L));
+        GTModHandler.addSmeltingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Graphite, 1L),
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L));
 
-        GT_ModHandler.addSmeltingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1L),
-            GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.WroughtIron, 1L));
+        GTModHandler.addSmeltingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1L),
+            GTOreDictUnificator.get(OrePrefixes.nugget, Materials.WroughtIron, 1L));
 
-        GT_ModHandler.addSmeltingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Graphite, 1L),
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L));
+        GTModHandler.addSmeltingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Graphite, 1L),
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L));
 
         GameRegistry.addSmelting(ItemList.CompressedFireclay.get(1), ItemList.Firebrick.get(1), 0);
     }
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java
index 441da5a116..b08e6ed56e 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java
@@ -2,7 +2,7 @@ package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.Mods.AppliedEnergistics2;
 import static gregtech.api.enums.Mods.Thaumcraft;
-import static gregtech.api.util.GT_ModHandler.getModItem;
+import static gregtech.api.util.GTModHandler.getModItem;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -10,551 +10,551 @@ import java.util.Collections;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enchants.Enchantment_Hazmat;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enchants.EnchantmentHazmat;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.TC_Aspects;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.loaders.postload.GT_MachineRecipeLoader;
+import gregtech.api.enums.TCAspects;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.loaders.postload.MachineRecipeLoader;
 
 public class ThaumcraftRecipes implements Runnable {
 
     @Override
     public void run() {
-        if ((!Thaumcraft.isModLoaded()) || GregTech_API.sThaumcraftCompat == null) {
+        if ((!Thaumcraft.isModLoaded()) || GregTechAPI.sThaumcraftCompat == null) {
             return;
         }
 
         // Add Recipe for TC Crucible: Salis Mundus to Balanced Shards
         String tKey = "GT_BALANCE_SHARD_RECIPE";
-        GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+        GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
             "TB.SM",
             getModItem(Thaumcraft.ID, "ItemResource", 1L, 14),
             getModItem(Thaumcraft.ID, "ItemShard", 1L, 6),
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 1L)));
 
         tKey = "GT_WOOD_TO_CHARCOAL";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "You have discovered a way of making charcoal magically instead of using regular ovens for this purpose.<BR><BR>To create charcoal from wood you first need an air-free environment, some vacuus essentia is needed for that, then you need to incinerate the wood using ignis essentia and wait until all the water inside the wood is burned away.<BR><BR>This method however doesn't create creosote oil as byproduct.");
 
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Charcoal Transmutation",
             "Turning wood into charcoal",
             new String[] { "ALUMENTUM" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 1L),
+            GTOreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 1L),
             2,
             0,
             13,
             5,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 10L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 8L)),
+                new TCAspects.TC_AspectStack(TCAspects.ARBOR, 10L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 8L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.log.get(Materials.Wood),
-                    GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 1L),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.VACUOS, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L))) });
 
         tKey = "GT_FILL_WATER_BUCKET";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "You have discovered a way of filling a bucket with aqua essentia in order to simply get water.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Water Transmutation",
             "Filling buckets with water",
             null,
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Water, 1L),
+            GTOreDictUnificator.get(OrePrefixes.bucket, Materials.Water, 1L),
             2,
             0,
             16,
             5,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L)),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 4L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
-                    GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Water, 1L),
-                    Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L))),
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.bucket, Materials.Water, 1L),
+                    Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 4L))),
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
-                    GT_OreDictUnificator.get(OrePrefixes.bucketClay, Materials.Empty, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.bucketClay, Materials.Water, 1L),
-                    Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L))),
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.bucketClay, Materials.Empty, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.bucketClay, Materials.Water, 1L),
+                    Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 4L))),
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
-                    GT_OreDictUnificator.get(OrePrefixes.capsule, Materials.Empty, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.capsule, Materials.Water, 1L),
-                    Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L))),
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.capsule, Materials.Empty, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.capsule, Materials.Water, 1L),
+                    Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 4L))),
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
-                    GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L),
-                    Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L))) });
+                    GTOreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L),
+                    Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 4L))) });
 
         tKey = "GT_TRANSZINC";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "You have discovered a way to multiply zinc by steeping zinc nuggets in metallum harvested from other metals.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Zinc Transmutation",
             "Transformation of metals into zinc",
             new String[] { "TRANSTIN" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Zinc, 1L),
+            GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Zinc, 1L),
             2,
             1,
             9,
             13,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.SANO, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.nugget.get(Materials.Zinc),
-                    GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Zinc, 3L),
+                    GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Zinc, 3L),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.SANO, 1L))) });
 
         tKey = "GT_TRANSANTIMONY";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "You have discovered a way to multiply antimony by steeping antimony nuggets in metallum harvested from other metals.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Antimony Transmutation",
             "Transformation of metals into antimony",
             new String[] { "GT_TRANSZINC", "TRANSLEAD" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Antimony, 1L),
+            GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Antimony, 1L),
             2,
             1,
             9,
             14,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.nugget.get(Materials.Antimony),
-                    GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Antimony, 3L),
+                    GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Antimony, 3L),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L))) });
 
         tKey = "GT_TRANSNICKEL";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "You have discovered a way to multiply nickel by steeping nickel nuggets in metallum harvested from other metals.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Nickel Transmutation",
             "Transformation of metals into nickel",
             new String[] { "TRANSLEAD" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Nickel, 1L),
+            GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Nickel, 1L),
             2,
             1,
             9,
             15,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.nugget.get(Materials.Nickel),
-                    GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Nickel, 3L),
+                    GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Nickel, 3L),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L))) });
 
         tKey = "GT_TRANSCOBALT";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "You have discovered a way to multiply cobalt by steeping cobalt nuggets in metallum harvested from other metals.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Cobalt Transmutation",
             "Transformation of metals into cobalt",
             new String[] { "GT_TRANSNICKEL" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Cobalt, 1L),
+            GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Cobalt, 1L),
             2,
             1,
             9,
             16,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.nugget.get(Materials.Cobalt),
-                    GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Cobalt, 3L),
+                    GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Cobalt, 3L),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 1L))) });
 
         tKey = "GT_TRANSBISMUTH";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "You have discovered a way to multiply bismuth by steeping bismuth nuggets in metallum harvested from other metals.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Bismuth Transmutation",
             "Transformation of metals into bismuth",
             new String[] { "GT_TRANSCOBALT" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Bismuth, 1L),
+            GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Bismuth, 1L),
             2,
             1,
             11,
             17,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.nugget.get(Materials.Bismuth),
-                    GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Bismuth, 3L),
+                    GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Bismuth, 3L),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 1L))) });
 
         tKey = "GT_IRON_TO_STEEL";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "You have discovered a way of making Iron harder by just re-ordering its components.<BR><BR>This Method can be used to create a Material called Steel, which is used in many non-Thaumaturgic applications.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Steel Transmutation",
             "Transforming iron to steel",
             new String[] { "TRANSIRON", "GT_WOOD_TO_CHARCOAL" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L),
+            GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L),
             3,
             0,
             13,
             8,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.nugget.get(Materials.Iron),
-                    GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L),
-                    Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L))) });
+                    GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L),
+                    Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ORDO, 1L))) });
 
         tKey = "GT_TRANSBRONZE";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "You have discovered a way of creating Alloys using the already known transmutations of Copper and Tin.<BR><BR>This Method can be used to create a Bronze directly without having to go through an alloying process.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Bronze Transmutation",
             "Transformation of metals into bronze",
             new String[] { "TRANSTIN", "TRANSCOPPER" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Bronze, 1L),
+            GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Bronze, 1L),
             2,
             0,
             13,
             11,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.nugget.get(Materials.Bronze),
-                    GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Bronze, 3L),
+                    GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Bronze, 3L),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 1L))) });
 
         tKey = "GT_TRANSELECTRUM";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "Your discovery of Bronze Transmutation has lead you to the conclusion it works with other Alloys such as Electrum as well.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Electrum Transmutation",
             "Transformation of metals into electrum",
             new String[] { "GT_TRANSBRONZE", "TRANSGOLD", "TRANSSILVER" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Electrum, 1L),
+            GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Electrum, 1L),
             2,
             1,
             11,
             11,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.nugget.get(Materials.Electrum),
-                    GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Electrum, 3L),
+                    GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Electrum, 3L),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 1L))) });
 
         tKey = "GT_TRANSBRASS";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "Your discovery of Bronze Transmutation has lead you to the conclusion it works with other Alloys such as Brass as well.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Brass Transmutation",
             "Transformation of metals into brass",
             new String[] { "GT_TRANSBRONZE", "GT_TRANSZINC" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Brass, 1L),
+            GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Brass, 1L),
             2,
             1,
             11,
             12,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.nugget.get(Materials.Brass),
-                    GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Brass, 3L),
+                    GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Brass, 3L),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 1L))) });
 
         tKey = "GT_TRANSINVAR";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "Your discovery of Bronze Transmutation has lead you to the conclusion it works with other Alloys such as Invar as well.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Invar Transmutation",
             "Transformation of metals into invar",
             new String[] { "GT_TRANSBRONZE", "GT_TRANSNICKEL" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Invar, 1L),
+            GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Invar, 1L),
             2,
             1,
             11,
             15,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.GELUM, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.nugget.get(Materials.Invar),
-                    GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Invar, 3L),
+                    GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Invar, 3L),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L))) });
 
         tKey = "GT_TRANSCUPRONICKEL";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "Your discovery of Bronze Transmutation has lead you to the conclusion it works with other Alloys such as Cupronickel as well.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Cupronickel Transmutation",
             "Transformation of metals into cupronickel",
             new String[] { "GT_TRANSBRONZE", "GT_TRANSNICKEL" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Cupronickel, 1L),
+            GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Cupronickel, 1L),
             2,
             1,
             11,
             16,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.nugget.get(Materials.Cupronickel),
-                    GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Cupronickel, 3L),
+                    GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Cupronickel, 3L),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 1L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 1L),
+                        new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L))) });
 
         tKey = "GT_TRANSBATTERYALLOY";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "Your discovery of Bronze Transmutation has lead you to the conclusion it works with other Alloys such as Battery Alloy as well.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Battery Alloy Transmutation",
             "Transformation of metals into battery alloy",
             new String[] { "GT_TRANSBRONZE", "GT_TRANSANTIMONY" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.BatteryAlloy, 1L),
+            GTOreDictUnificator.get(OrePrefixes.nugget, Materials.BatteryAlloy, 1L),
             2,
             1,
             11,
             13,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.nugget.get(Materials.BatteryAlloy),
-                    GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.BatteryAlloy, 3L),
+                    GTOreDictUnificator.get(OrePrefixes.nugget, Materials.BatteryAlloy, 3L),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                        new TCAspects.TC_AspectStack(TCAspects.ORDO, 1L))) });
 
         tKey = "GT_TRANSSOLDERINGALLOY";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "Your discovery of Bronze Transmutation has lead you to the conclusion it works with other Alloys such as Soldering Alloy as well.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Soldering Alloy Transmutation",
             "Transformation of metals into soldering alloy",
             new String[] { "GT_TRANSBRONZE", "GT_TRANSANTIMONY" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.SolderingAlloy, 1L),
+            GTOreDictUnificator.get(OrePrefixes.nugget, Materials.SolderingAlloy, 1L),
             2,
             1,
             11,
             14,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.nugget.get(Materials.SolderingAlloy),
-                    GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.SolderingAlloy, 3L),
+                    GTOreDictUnificator.get(OrePrefixes.nugget, Materials.SolderingAlloy, 3L),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                        new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L))) });
 
         tKey = "GT_ADVANCEDMETALLURGY";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "Now that you have discovered all the basic metals, you can finally move on to the next Level of magic metallurgy and create more advanced metals");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Advanced Metallurgic Transmutation",
             "Mastering the basic metals",
             new String[] { "GT_TRANSBISMUTH", "GT_IRON_TO_STEEL", "GT_TRANSSOLDERINGALLOY", "GT_TRANSBATTERYALLOY",
                 "GT_TRANSBRASS", "GT_TRANSELECTRUM", "GT_TRANSCUPRONICKEL", "GT_TRANSINVAR" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L),
             3,
             0,
             16,
             14,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 50L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 20L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 20L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 20L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 20L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 20L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 50L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 20L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 20L),
+                new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 20L),
+                new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 20L),
+                new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 20L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey });
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey });
 
         tKey = "GT_TRANSALUMINIUM";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "You have discovered a way to multiply aluminium by steeping aluminium nuggets in metallum harvested from other metals.<BR><BR>This transmutation is slightly harder to achieve, because aluminium has special properties, which require more order to achieve the desired result.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Aluminium Transmutation",
             "Transformation of metals into aluminium",
             new String[] { "GT_ADVANCEDMETALLURGY" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 1L),
+            GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 1L),
             4,
             0,
             19,
             14,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.VOLATUS, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.nugget.get(Materials.Aluminium),
-                    GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 3L),
+                    GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 3L),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 1L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.VOLATUS, 1L),
+                        new TCAspects.TC_AspectStack(TCAspects.ORDO, 1L),
+                        new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L))) });
 
         tKey = "GT_TRANSSKYSTONE";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "You have discovered a way to convert obsidian to skystone.<BR><BR>Not sure why you'd want to do this, unless skystone is somehow unavailable in your world.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Skystone Transmutation",
             "Transformation of obsidian into skystone",
@@ -566,128 +566,128 @@ public class ThaumcraftRecipes implements Runnable {
             19,
             15,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.VOLATUS, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.TERRA, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     new ItemStack(Blocks.obsidian),
                     getModItem(AppliedEnergistics2.ID, "tile.BlockSkyStone", 1),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 1L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 1L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.VOLATUS, 1L),
+                        new TCAspects.TC_AspectStack(TCAspects.TERRA, 1L),
+                        new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 1L))) });
 
         tKey = "GT_TRANSMINERAL";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "You have discovered a way to convert basaltic mineral sand to granitic mineral sand and vice versa.<BR><BR>Handy for people living in the sky who can't access it normally, or if you really want one or the other.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Basaltic Mineral Transmutation",
             "Transformation of mineral sands",
             new String[] { "GT_ADVANCEDMETALLURGY" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GraniticMineralSand, 1L),
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.GraniticMineralSand, 1L),
             4,
             0,
             19,
             16,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.VOLATUS, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.TERRA, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BasalticMineralSand, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GraniticMineralSand, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.BasalticMineralSand, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.GraniticMineralSand, 1L),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 1L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 1L))),
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
-                    tKey,
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GraniticMineralSand, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BasalticMineralSand, 1L),
+                        new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 1L),
+                        new TCAspects.TC_AspectStack(TCAspects.ORDO, 1L),
+                        new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1L))),
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
+                    tKey,
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.GraniticMineralSand, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.BasalticMineralSand, 1L),
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 1L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 1L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                        new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 1L),
+                        new TCAspects.TC_AspectStack(TCAspects.ORDO, 1L),
+                        new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1L))) });
 
         tKey = "GT_CRYSTALLISATION";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "Sometimes when processing your Crystal Shards they become a pile of Dust instead of the mostly required Shard.<BR><BR>You have finally found a way to reverse this Process by using Vitreus Essentia for recrystallising the Shards.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Shard Recrystallisation",
             "Fixing your precious crystals",
             new String[] { "ALCHEMICALMANUFACTURE" },
             "ALCHEMY",
-            GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedOrder, 1L),
+            GTOreDictUnificator.get(OrePrefixes.gem, Materials.InfusedOrder, 1L),
             3,
             0,
             -11,
             -3,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3L)),
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 3L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.dust.get(Materials.Amber),
-                    GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Amber, 1L),
-                    Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))),
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.gem, Materials.Amber, 1L),
+                    Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 4L))),
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.dust.get(Materials.InfusedOrder),
-                    GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedOrder, 1L),
-                    Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))),
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.gem, Materials.InfusedOrder, 1L),
+                    Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 4L))),
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.dust.get(Materials.InfusedEntropy),
-                    GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1L),
-                    Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))),
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1L),
+                    Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 4L))),
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.dust.get(Materials.InfusedAir),
-                    GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedAir, 1L),
-                    Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))),
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.gem, Materials.InfusedAir, 1L),
+                    Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 4L))),
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.dust.get(Materials.InfusedEarth),
-                    GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEarth, 1L),
-                    Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))),
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEarth, 1L),
+                    Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 4L))),
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.dust.get(Materials.InfusedFire),
-                    GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedFire, 1L),
-                    Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))),
-                GregTech_API.sThaumcraftCompat.addCrucibleRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.gem, Materials.InfusedFire, 1L),
+                    Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 4L))),
+                GregTechAPI.sThaumcraftCompat.addCrucibleRecipe(
                     tKey,
                     OrePrefixes.dust.get(Materials.InfusedWater),
-                    GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedWater, 1L),
-                    Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L))) });
+                    GTOreDictUnificator.get(OrePrefixes.gem, Materials.InfusedWater, 1L),
+                    Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 4L))) });
 
         tKey = "GT_MAGICENERGY";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "While trying to find new ways to integrate magic into your industrial factories, you have discovered a way to convert magical energy into electrical power.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Magic Energy Conversion",
             "Magic to Power",
@@ -699,33 +699,31 @@ public class ThaumcraftRecipes implements Runnable {
             -3,
             10,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 10L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 10L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 20L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 10L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 10L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 20L),
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 10L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addInfusionRecipe(
-                    tKey,
-                    ItemList.Hull_LV.get(1L),
-                    new ItemStack[] { new ItemStack(Blocks.beacon),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
-                        ItemList.Sensor_MV.get(2L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L),
-                        ItemList.Sensor_MV.get(2L) },
-                    ItemList.MagicEnergyConverter_LV.get(1L),
-                    5,
-                    Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 32L))) });
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey, GregTechAPI.sThaumcraftCompat.addInfusionRecipe(
+                tKey,
+                ItemList.Hull_LV.get(1L),
+                new ItemStack[] { new ItemStack(Blocks.beacon),
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), ItemList.Sensor_MV.get(2L),
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), ItemList.Sensor_MV.get(2L) },
+                ItemList.MagicEnergyConverter_LV.get(1L),
+                5,
+                Arrays.asList(
+                    new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 32L),
+                    new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                    new TCAspects.TC_AspectStack(TCAspects.MACHINA, 32L))) });
 
         tKey = "GT_MAGICENERGY2";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "Attempts to increase the output of your Magic Energy generators have resulted in significant improvements.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Adept Magic Energy Conversion",
             "Magic to Power",
@@ -737,33 +735,33 @@ public class ThaumcraftRecipes implements Runnable {
             -4,
             12,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 10L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 10L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 20L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 10L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 10L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 20L),
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 10L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addInfusionRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addInfusionRecipe(
                     tKey,
                     ItemList.Hull_MV.get(1L),
                     new ItemStack[] { new ItemStack(Blocks.beacon),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Thaumium, 1L),
-                        ItemList.Sensor_HV.get(2L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.StainlessSteel, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Thaumium, 1L),
+                        ItemList.Sensor_HV.get(2L), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.StainlessSteel, 1L),
                         ItemList.Sensor_HV.get(2L) },
                     ItemList.MagicEnergyConverter_MV.get(1L),
                     6,
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 64L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 64L),
+                        new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 32L),
+                        new TCAspects.TC_AspectStack(TCAspects.MACHINA, 64L))) });
 
         tKey = "GT_MAGICENERGY3";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "Attempts to further increase the output of your Magic Energy generators have resulted in great improvements.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Master Magic Energy Conversion",
             "Magic to Power",
@@ -775,34 +773,32 @@ public class ThaumcraftRecipes implements Runnable {
             -4,
             14,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 20L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 20L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 40L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 20L)),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 20L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 20L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 40L),
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 20L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addInfusionRecipe(
-                    tKey,
-                    ItemList.Hull_HV.get(1L),
-                    new ItemStack[] { new ItemStack(Blocks.beacon),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1L),
-                        ItemList.Field_Generator_MV.get(1L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 1L),
-                        ItemList.Field_Generator_MV.get(1L) },
-                    ItemList.MagicEnergyConverter_HV.get(1L),
-                    8,
-                    Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 128L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128L))) });
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey, GregTechAPI.sThaumcraftCompat.addInfusionRecipe(
+                tKey,
+                ItemList.Hull_HV.get(1L),
+                new ItemStack[] { new ItemStack(Blocks.beacon),
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1L),
+                    ItemList.Field_Generator_MV.get(1L), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 1L),
+                    ItemList.Field_Generator_MV.get(1L) },
+                ItemList.MagicEnergyConverter_HV.get(1L),
+                8,
+                Arrays.asList(
+                    new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 128L),
+                    new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                    new TCAspects.TC_AspectStack(TCAspects.MACHINA, 128L))) });
 
         tKey = "GT_MAGICABSORB";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "Research into magical energy conversion methods has identified a way to convert surrounding energies into electrical power.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Magic Energy Absorption",
             "Harvesting Magic",
@@ -814,33 +810,31 @@ public class ThaumcraftRecipes implements Runnable {
             -2,
             12,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 10L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 10L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 20L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 10L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 10L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 20L),
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 10L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addInfusionRecipe(
-                    tKey,
-                    ItemList.Hull_LV.get(1L),
-                    new ItemStack[] { ItemList.MagicEnergyConverter_LV.get(1L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L),
-                        ItemList.Sensor_MV.get(2L) },
-                    ItemList.MagicEnergyAbsorber_LV.get(1L),
-                    6,
-                    Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L),
-                        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.VACUOS, 16L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 32L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 4L))) });
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey, GregTechAPI.sThaumcraftCompat.addInfusionRecipe(
+                tKey,
+                ItemList.Hull_LV.get(1L),
+                new ItemStack[] { ItemList.MagicEnergyConverter_LV.get(1L),
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), ItemList.Sensor_MV.get(2L) },
+                ItemList.MagicEnergyAbsorber_LV.get(1L),
+                6,
+                Arrays.asList(
+                    new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 32L),
+                    new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                    new TCAspects.TC_AspectStack(TCAspects.MACHINA, 32L),
+                    new TCAspects.TC_AspectStack(TCAspects.VACUOS, 16L),
+                    new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 32L),
+                    new TCAspects.TC_AspectStack(TCAspects.STRONTIO, 4L))) });
 
         tKey = "GT_MAGICABSORB2";
-        GT_LanguageManager
-            .addStringLocalization(GT_MachineRecipeLoader.aTextTCGTPage + tKey, "Moar output! Drain all the Magic!");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GTLanguageManager
+            .addStringLocalization(MachineRecipeLoader.aTextTCGTPage + tKey, "Moar output! Drain all the Magic!");
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Improved Magic Energy Absorption",
             "Harvesting Magic",
@@ -852,109 +846,109 @@ public class ThaumcraftRecipes implements Runnable {
             -2,
             14,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 10L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 10L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 20L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 10L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 10L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 20L),
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 10L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addInfusionRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addInfusionRecipe(
                     tKey,
                     ItemList.Hull_MV.get(1L),
                     new ItemStack[] { ItemList.MagicEnergyConverter_MV.get(1L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), ItemList.Sensor_HV.get(2L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L) },
+                        GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), ItemList.Sensor_HV.get(2L),
+                        GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L) },
                     ItemList.MagicEnergyAbsorber_MV.get(1L),
                     6,
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L),
-                        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.VACUOS, 32L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 64L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 8L))),
-                GregTech_API.sThaumcraftCompat.addInfusionRecipe(
+                        new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 64L),
+                        new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 32L),
+                        new TCAspects.TC_AspectStack(TCAspects.MACHINA, 64L),
+                        new TCAspects.TC_AspectStack(TCAspects.VACUOS, 32L),
+                        new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 64L),
+                        new TCAspects.TC_AspectStack(TCAspects.STRONTIO, 8L))),
+                GregTechAPI.sThaumcraftCompat.addInfusionRecipe(
                     tKey,
                     ItemList.Hull_HV.get(1L),
                     new ItemStack[] { ItemList.MagicEnergyConverter_MV.get(1L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1),
+                        GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1),
                         ItemList.Field_Generator_MV.get(1L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1), },
+                        GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1), },
                     ItemList.MagicEnergyAbsorber_HV.get(1L),
                     8,
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 128L),
-                        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.VACUOS, 64L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 128L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 16L))),
-                GregTech_API.sThaumcraftCompat.addInfusionRecipe(
+                        new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 128L),
+                        new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                        new TCAspects.TC_AspectStack(TCAspects.MACHINA, 128L),
+                        new TCAspects.TC_AspectStack(TCAspects.VACUOS, 64L),
+                        new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 128L),
+                        new TCAspects.TC_AspectStack(TCAspects.STRONTIO, 16L))),
+                GregTechAPI.sThaumcraftCompat.addInfusionRecipe(
                     tKey,
                     ItemList.Hull_EV.get(1L),
                     new ItemStack[] { ItemList.MagicEnergyConverter_HV.get(1L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 1),
+                        GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1),
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 1),
                         ItemList.Field_Generator_HV.get(1L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 1), },
+                        GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1),
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 1), },
                     ItemList.MagicEnergyAbsorber_EV.get(1L),
                     10,
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256L),
-                        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.VACUOS, 128L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 256L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 64L))) });
+                        new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 256L),
+                        new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 128L),
+                        new TCAspects.TC_AspectStack(TCAspects.MACHINA, 256L),
+                        new TCAspects.TC_AspectStack(TCAspects.VACUOS, 128L),
+                        new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 256L),
+                        new TCAspects.TC_AspectStack(TCAspects.STRONTIO, 64L))) });
 
         tKey = "GT_HAZMATENCH";
-        GT_LanguageManager.addStringLocalization(
-            GT_MachineRecipeLoader.aTextTCGTPage + tKey,
+        GTLanguageManager.addStringLocalization(
+            MachineRecipeLoader.aTextTCGTPage + tKey,
             "You have discovered a way to magically enchant a mundane piece of armor with the protective properties of a Hazmat suite.");
-        GregTech_API.sThaumcraftCompat.addResearch(
+        GregTechAPI.sThaumcraftCompat.addResearch(
             tKey,
             "Hazmat Protection",
             "Magical protection from physical hazards",
             new String[] { "INFUSIONENCHANTMENT" },
             "ARTIFICE",
-            GT_ModHandler.getIC2Item("hazmatChestplate", 1),
+            GTModHandler.getIC2Item("hazmatChestplate", 1),
             4,
             0,
             -7,
             13,
             Arrays.asList(
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITIUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)),
+                new TCAspects.TC_AspectStack(TCAspects.VITIUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.RADIO, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1L)),
             null,
-            new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey,
-                GregTech_API.sThaumcraftCompat.addInfusionEnchantmentRecipe(
+            new Object[] { MachineRecipeLoader.aTextTCGTPage + tKey,
+                GregTechAPI.sThaumcraftCompat.addInfusionEnchantmentRecipe(
                     tKey,
-                    Enchantment_Hazmat.INSTANCE,
+                    EnchantmentHazmat.INSTANCE,
                     5,
                     Arrays.asList(
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.VITIUM, 8L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 16L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 16L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 32L),
-                        new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 16L)),
+                        new TCAspects.TC_AspectStack(TCAspects.VITIUM, 8L),
+                        new TCAspects.TC_AspectStack(TCAspects.GELUM, 16L),
+                        new TCAspects.TC_AspectStack(TCAspects.RADIO, 16L),
+                        new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 32L),
+                        new TCAspects.TC_AspectStack(TCAspects.VENENUM, 16L)),
                     new ItemStack[] { getModItem(Thaumcraft.ID, "ItemResource", 1L, 14),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 1),
-                        GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1),
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1),
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 1),
+                        GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1),
                         getModItem(Thaumcraft.ID, "ItemResource", 1L, 14),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 1),
-                        GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1) }) });
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1),
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 1),
+                        GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1) }) });
 
     }
 }
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java
index 8e06eec1e0..41aa5341d1 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java
@@ -1,119 +1,119 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes;
-import static gregtech.api.util.GT_ModHandler.getIC2Item;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTModHandler.getIC2Item;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-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.enums.TierEU;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class ThermalCentrifugeRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.SunnariumCell.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 1),
                 new ItemStack(Items.glowstone_dust, 2),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(thermalCentrifugeRecipes);
 
         // Recipes from the old ic2 recipe maps
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getIC2Item("reactorDepletedMOXSimple", 1))
             .itemOutputs(
                 getIC2Item("smallPlutonium", 1),
                 getIC2Item("Plutonium", 3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(thermalCentrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getIC2Item("reactorDepletedMOXDual", 1))
             .itemOutputs(
                 getIC2Item("smallPlutonium", 2),
                 getIC2Item("Plutonium", 6),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(thermalCentrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getIC2Item("reactorDepletedMOXQuad", 1))
             .itemOutputs(
                 getIC2Item("smallPlutonium", 4),
                 getIC2Item("Plutonium", 12),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(thermalCentrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getIC2Item("reactorDepletedUraniumSimple", 1))
             .itemOutputs(
                 getIC2Item("smallPlutonium", 1),
                 getIC2Item("Uran238", 4),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(thermalCentrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getIC2Item("reactorDepletedUraniumDual", 1))
             .itemOutputs(
                 getIC2Item("smallPlutonium", 2),
                 getIC2Item("Uran238", 8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(thermalCentrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getIC2Item("reactorDepletedUraniumQuad", 1))
             .itemOutputs(
                 getIC2Item("smallPlutonium", 4),
                 getIC2Item("Uran238", 16),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(thermalCentrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getIC2Item("RTGPellets", 1))
-            .itemOutputs(getIC2Item("Plutonium", 3), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 54))
+            .itemOutputs(getIC2Item("Plutonium", 3), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 54))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(thermalCentrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 2))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 2))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 1))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(thermalCentrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 4))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 4))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(thermalCentrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.cobblestone, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(thermalCentrifugeRecipes);
diff --git a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java
index b1cd1b76f3..07e6f0c4b1 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java
@@ -4,12 +4,12 @@ import static gregtech.api.recipe.RecipeMaps.transcendentPlasmaMixerRecipes;
 
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsUEVplus;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.material.ELEMENT;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.material.MaterialsElements;
 
 public class TranscendentPlasmaMixerRecipes implements Runnable {
 
@@ -24,8 +24,8 @@ public class TranscendentPlasmaMixerRecipes implements Runnable {
     @Override
     public void run() {
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(
                 Materials.Helium.getPlasma(1000),
                 Materials.Iron.getPlasma(1000),
@@ -37,8 +37,8 @@ public class TranscendentPlasmaMixerRecipes implements Runnable {
             .noOptimize()
             .addTo(transcendentPlasmaMixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(
                 Materials.Helium.getPlasma(1000),
                 Materials.Iron.getPlasma(1000),
@@ -54,8 +54,8 @@ public class TranscendentPlasmaMixerRecipes implements Runnable {
             .noOptimize()
             .addTo(transcendentPlasmaMixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(3))
             .fluidInputs(
                 Materials.Helium.getPlasma(1000),
                 Materials.Iron.getPlasma(1000),
@@ -75,8 +75,8 @@ public class TranscendentPlasmaMixerRecipes implements Runnable {
             .noOptimize()
             .addTo(transcendentPlasmaMixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(4))
             .fluidInputs(
                 Materials.Helium.getPlasma(1000),
                 Materials.Iron.getPlasma(1000),
@@ -100,8 +100,8 @@ public class TranscendentPlasmaMixerRecipes implements Runnable {
             .noOptimize()
             .addTo(transcendentPlasmaMixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(5))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(5))
             .fluidInputs(
                 Materials.Helium.getPlasma(1000),
                 Materials.Iron.getPlasma(1000),
@@ -129,8 +129,8 @@ public class TranscendentPlasmaMixerRecipes implements Runnable {
             .noOptimize()
             .addTo(transcendentPlasmaMixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(
                 MaterialsUEVplus.RawStarMatter.getFluid(1000L),
                 MaterialsUEVplus.SpaceTime.getMolten(1000L),
@@ -142,12 +142,12 @@ public class TranscendentPlasmaMixerRecipes implements Runnable {
             .noOptimize()
             .addTo(transcendentPlasmaMixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .fluidInputs(
-                new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 1000),
+                new FluidStack(MaterialsElements.getInstance().FERMIUM.getPlasma(), 1000),
                 Materials.Thorium.getPlasma(1000L),
-                new FluidStack(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 1000),
+                new FluidStack(MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 1000),
                 Materials.Calcium.getPlasma(1000L),
                 MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000L))
             .fluidOutputs(MaterialsUEVplus.Creon.getPlasma(5000L))
diff --git a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java
index a5150948ce..89e213c31b 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java
@@ -1,22 +1,22 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.HOURS;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.HOURS;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-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.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 VacuumFreezerRecipes implements Runnable {
 
@@ -26,30 +26,30 @@ public class VacuumFreezerRecipes implements Runnable {
         {
             // reactor heat switch
             {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_ModHandler.getIC2Item("reactorHeatSwitch", 1L, 32767))
-                    .itemOutputs(GT_ModHandler.getIC2Item("reactorHeatSwitch", 1L, 1))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTModHandler.getIC2Item("reactorHeatSwitch", 1L, 32767))
+                    .itemOutputs(GTModHandler.getIC2Item("reactorHeatSwitch", 1L, 1))
                     .duration(5 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_ModHandler.getIC2Item("reactorHeatSwitchCore", 1L, 32767))
-                    .itemOutputs(GT_ModHandler.getIC2Item("reactorHeatSwitchCore", 1L, 1))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTModHandler.getIC2Item("reactorHeatSwitchCore", 1L, 32767))
+                    .itemOutputs(GTModHandler.getIC2Item("reactorHeatSwitchCore", 1L, 1))
                     .duration(5 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_ModHandler.getIC2Item("reactorHeatSwitchSpread", 1L, 32767))
-                    .itemOutputs(GT_ModHandler.getIC2Item("reactorHeatSwitchSpread", 1L, 1))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTModHandler.getIC2Item("reactorHeatSwitchSpread", 1L, 32767))
+                    .itemOutputs(GTModHandler.getIC2Item("reactorHeatSwitchSpread", 1L, 1))
                     .duration(5 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_ModHandler.getIC2Item("reactorHeatSwitchDiamond", 1L, 32767))
-                    .itemOutputs(GT_ModHandler.getIC2Item("reactorHeatSwitchDiamond", 1L, 1))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTModHandler.getIC2Item("reactorHeatSwitchDiamond", 1L, 32767))
+                    .itemOutputs(GTModHandler.getIC2Item("reactorHeatSwitchDiamond", 1L, 1))
                     .duration(5 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
@@ -57,39 +57,39 @@ public class VacuumFreezerRecipes implements Runnable {
 
             // reactor vent
             {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_ModHandler.getIC2Item("reactorVent", 1L, 32767))
-                    .itemOutputs(GT_ModHandler.getIC2Item("reactorVent", 1L, 1))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTModHandler.getIC2Item("reactorVent", 1L, 32767))
+                    .itemOutputs(GTModHandler.getIC2Item("reactorVent", 1L, 1))
                     .duration(5 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_ModHandler.getIC2Item("reactorVentCore", 1L, 32767))
-                    .itemOutputs(GT_ModHandler.getIC2Item("reactorVentCore", 1L, 1))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTModHandler.getIC2Item("reactorVentCore", 1L, 32767))
+                    .itemOutputs(GTModHandler.getIC2Item("reactorVentCore", 1L, 1))
                     .duration(5 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_ModHandler.getIC2Item("reactorVentGold", 1L, 32767))
-                    .itemOutputs(GT_ModHandler.getIC2Item("reactorVentGold", 1L, 1))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTModHandler.getIC2Item("reactorVentGold", 1L, 32767))
+                    .itemOutputs(GTModHandler.getIC2Item("reactorVentGold", 1L, 1))
                     .duration(5 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_ModHandler.getIC2Item("reactorVentDiamond", 1L, 32767))
-                    .itemOutputs(GT_ModHandler.getIC2Item("reactorVentDiamond", 1L, 1))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTModHandler.getIC2Item("reactorVentDiamond", 1L, 32767))
+                    .itemOutputs(GTModHandler.getIC2Item("reactorVentDiamond", 1L, 1))
                     .duration(5 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
             }
 
             // reactor vent spread
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_ModHandler.getIC2Item("reactorVentSpread", 1L, 32767))
-                .itemOutputs(GT_ModHandler.getIC2Item("reactorVentSpread", 1L, 0))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTModHandler.getIC2Item("reactorVentSpread", 1L, 32767))
+                .itemOutputs(GTModHandler.getIC2Item("reactorVentSpread", 1L, 0))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(vacuumFreezerRecipes);
@@ -97,98 +97,98 @@ public class VacuumFreezerRecipes implements Runnable {
             // reactor coolant
             {
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_ModHandler.getIC2Item("reactorCoolantSimple", 1L, 32767))
-                    .itemOutputs(GT_ModHandler.getIC2Item("reactorCoolantSimple", 1L, 1))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTModHandler.getIC2Item("reactorCoolantSimple", 1L, 32767))
+                    .itemOutputs(GTModHandler.getIC2Item("reactorCoolantSimple", 1L, 1))
                     .duration(10 * TICKS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_ModHandler.getIC2Item("reactorCoolantTriple", 1L, 32767))
-                    .itemOutputs(GT_ModHandler.getIC2Item("reactorCoolantTriple", 1L, 1))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTModHandler.getIC2Item("reactorCoolantTriple", 1L, 32767))
+                    .itemOutputs(GTModHandler.getIC2Item("reactorCoolantTriple", 1L, 1))
                     .duration(1 * SECONDS + 10 * TICKS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_ModHandler.getIC2Item("reactorCoolantSix", 1L, 32767))
-                    .itemOutputs(GT_ModHandler.getIC2Item("reactorCoolantSix", 1L, 1))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTModHandler.getIC2Item("reactorCoolantSix", 1L, 32767))
+                    .itemOutputs(GTModHandler.getIC2Item("reactorCoolantSix", 1L, 1))
                     .duration(3 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(ItemList.Reactor_Coolant_He_1.getWildcard(1L))
                     .itemOutputs(ItemList.Reactor_Coolant_He_1.get(1L))
                     .duration(3 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(ItemList.Reactor_Coolant_He_3.getWildcard(1L))
                     .itemOutputs(ItemList.Reactor_Coolant_He_3.get(1L))
                     .duration(9 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(ItemList.Reactor_Coolant_He_6.getWildcard(1L))
                     .itemOutputs(ItemList.Reactor_Coolant_He_6.get(1L))
                     .duration(18 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(ItemList.Reactor_Coolant_NaK_1.getWildcard(1L))
                     .itemOutputs(ItemList.Reactor_Coolant_NaK_1.get(1L))
                     .duration(3 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(ItemList.Reactor_Coolant_NaK_3.getWildcard(1L))
                     .itemOutputs(ItemList.Reactor_Coolant_NaK_3.get(1L))
                     .duration(9 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(ItemList.Reactor_Coolant_NaK_6.getWildcard(1L))
                     .itemOutputs(ItemList.Reactor_Coolant_NaK_6.get(1L))
                     .duration(18 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(ItemList.neutroniumHeatCapacitor.getWildcard(1L))
                     .itemOutputs(ItemList.neutroniumHeatCapacitor.get(1L))
                     .duration(13 * HOURS + 53 * MINUTES + 20 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(ItemList.Reactor_Coolant_Sp_1.getWildcard(1L))
                     .itemOutputs(ItemList.Reactor_Coolant_Sp_1.get(1L))
                     .duration(9 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(ItemList.Reactor_Coolant_Sp_2.getWildcard(1L))
                     .itemOutputs(ItemList.Reactor_Coolant_Sp_2.get(1L))
                     .duration(18 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(ItemList.Reactor_Coolant_Sp_3.getWildcard(1L))
                     .itemOutputs(ItemList.Reactor_Coolant_Sp_3.get(1L))
                     .duration(27 * SECONDS)
                     .eut(TierEU.RECIPE_MV)
                     .addTo(vacuumFreezerRecipes);
 
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(ItemList.Reactor_Coolant_Sp_6.getWildcard(1L))
                     .itemOutputs(ItemList.Reactor_Coolant_Sp_6.get(1L))
                     .duration(54 * SECONDS)
@@ -200,56 +200,56 @@ public class VacuumFreezerRecipes implements Runnable {
 
         // fluid vacuum
         {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ice, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Ice, 1L))
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidOxygen, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.LiquidOxygen, 1L))
                 .duration(1 * MINUTES)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidNitrogen, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.LiquidNitrogen, 1L))
                 .duration(1 * MINUTES)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_ModHandler.getIC2Item("airCell", 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTModHandler.getIC2Item("airCell", 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L))
                 .duration(1 * SECONDS + 8 * TICKS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Reactor_Coolant_Sp_1.getWildcard(1L))
                 .itemOutputs(ItemList.Reactor_Coolant_Sp_1.get(1L))
                 .duration(1 * MINUTES + 30 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Reactor_Coolant_Sp_2.getWildcard(1L))
                 .itemOutputs(ItemList.Reactor_Coolant_Sp_2.get(1L))
                 .duration(3 * MINUTES)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Reactor_Coolant_Sp_3.getWildcard(1L))
                 .itemOutputs(ItemList.Reactor_Coolant_Sp_3.get(1L))
                 .duration(4 * MINUTES + 30 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Reactor_Coolant_Sp_6.getWildcard(1L))
                 .itemOutputs(ItemList.Reactor_Coolant_Sp_6.get(1L))
                 .duration(9 * MINUTES)
@@ -259,44 +259,44 @@ public class VacuumFreezerRecipes implements Runnable {
 
         // Freeze superconductors.
         {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Pentacadmiummagnesiumhexaoxid, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Pentacadmiummagnesiumhexaoxid, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.Pentacadmiummagnesiumhexaoxid, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Pentacadmiummagnesiumhexaoxid, 1L))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Titaniumonabariumdecacoppereikosaoxid, 1L))
+                    GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.Titaniumonabariumdecacoppereikosaoxid, 1L))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titaniumonabariumdecacoppereikosaoxid, 1L))
+                    GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Titaniumonabariumdecacoppereikosaoxid, 1L))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Uraniumtriplatinid, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Uraniumtriplatinid, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.Uraniumtriplatinid, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Uraniumtriplatinid, 1L))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_EV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Vanadiumtriindinid, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Vanadiumtriindinid, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.Vanadiumtriindinid, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Vanadiumtriindinid, 1L))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_IV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(
+                    GTOreDictUnificator.get(
                         OrePrefixes.ingotHot,
                         Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid,
                         1L))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(
+                    GTOreDictUnificator.get(
                         OrePrefixes.ingot,
                         Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid,
                         1L))
@@ -304,51 +304,51 @@ public class VacuumFreezerRecipes implements Runnable {
                 .eut(TierEU.RECIPE_LuV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(OrePrefixes.ingotHot, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 1L))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 1L))
+                    GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 1L))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_ZPM)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Longasssuperconductornameforuvwire, 1L))
+                    GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.Longasssuperconductornameforuvwire, 1L))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Longasssuperconductornameforuvwire, 1L))
+                    GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Longasssuperconductornameforuvwire, 1L))
                 .duration(40 * SECONDS)
                 .eut(TierEU.RECIPE_UV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Longasssuperconductornameforuhvwire, 1L))
+                    GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.Longasssuperconductornameforuhvwire, 1L))
                 .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Longasssuperconductornameforuhvwire, 1L))
+                    GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Longasssuperconductornameforuhvwire, 1L))
                 .duration(1 * MINUTES + 20 * SECONDS)
                 .eut(TierEU.RECIPE_UHV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUEVBase, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUEVBase, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUEVBase, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUEVBase, 1L))
                 .duration(2 * MINUTES + 40 * SECONDS)
                 .eut(TierEU.RECIPE_UEV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUIVBase, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUIVBase, 1L))
                 .duration(2 * MINUTES + 40 * SECONDS)
                 .eut(TierEU.RECIPE_UIV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUMVBase, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUMVBase, 1L))
                 .duration(2 * MINUTES + 40 * SECONDS)
                 .eut(TierEU.RECIPE_UMV)
                 .addTo(vacuumFreezerRecipes);
@@ -356,42 +356,42 @@ public class VacuumFreezerRecipes implements Runnable {
 
         // Plasma Freezing
         {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Americium, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Americium, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Americium, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cellMolten, Materials.Americium, 1L))
                 .duration(1 * SECONDS)
                 .eut(TierEU.RECIPE_LuV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Helium, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Helium, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L))
                 .duration(5 * TICKS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Nitrogen, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Nitrogen, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L))
                 .duration(1 * SECONDS + 8 * TICKS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Oxygen, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Oxygen, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L))
                 .duration(1 * SECONDS + 12 * TICKS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Radon, 1L))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTOreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Radon, 1L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L))
                 .duration(5 * SECONDS + 10 * TICKS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(vacuumFreezerRecipes);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .fluidInputs(Materials.Boron.getPlasma(144L))
                 .fluidOutputs(Materials.Boron.getMolten(144L))
                 .duration(1 * SECONDS)
@@ -400,9 +400,9 @@ public class VacuumFreezerRecipes implements Runnable {
         }
 
         // hot transcendent metal ingot cooling
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.TranscendentMetal, 1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, MaterialsUEVplus.TranscendentMetal, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.TranscendentMetal, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, MaterialsUEVplus.TranscendentMetal, 1L))
             .fluidInputs(
                 new FluidStack(FluidRegistry.getFluid("molten.titansteel"), 144),
                 Materials.SuperCoolant.getFluid(1000))
@@ -410,10 +410,10 @@ public class VacuumFreezerRecipes implements Runnable {
             .eut(TierEU.RECIPE_UIV)
             .addTo(vacuumFreezerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.Mellion, 9L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.Mellion, 9L))
             .fluidInputs(MaterialsUEVplus.Creon.getPlasma(1296L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, MaterialsUEVplus.Mellion, 9L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, MaterialsUEVplus.Mellion, 9L))
             .fluidOutputs(MaterialsUEVplus.Creon.getMolten(1296L))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_UMV)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java
index b91163619b..76fea74bdc 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java
@@ -1,19 +1,19 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.wiremillRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeRegistrator.registerWiremillRecipes;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeRegistrator.registerWiremillRecipes;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsUEVplus;
 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 WiremillRecipes implements Runnable {
 
@@ -24,16 +24,16 @@ public class WiremillRecipes implements Runnable {
 
         registerWiremillRecipes(MaterialsUEVplus.SpaceTime, 20 * SECONDS, (int) TierEU.RECIPE_LuV);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Polycaprolactam, 1L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Polycaprolactam, 1L))
             .itemOutputs(new ItemStack(Items.string, 32))
             .duration(4 * SECONDS)
             .eut(48)
             .addTo(wiremillRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Steel, 1))
-            .itemOutputs(GT_ModHandler.getIC2Item("miningPipe", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Steel, 1))
+            .itemOutputs(GTModHandler.getIC2Item("miningPipe", 1))
             .duration(10 * SECONDS)
             .eut(16)
             .addTo(wiremillRecipes);
diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GTPreLoad.java
index a2e6137cff..f0eb4c6d8c 100644
--- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java
+++ b/src/main/java/gregtech/loaders/preload/GTPreLoad.java
@@ -1,6 +1,6 @@
 package gregtech.loaders.preload;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 import static gregtech.api.enums.Mods.CraftTweaker;
 import static gregtech.api.enums.Mods.GalacticraftCore;
 import static gregtech.api.enums.Mods.GregTech;
@@ -31,22 +31,22 @@ import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.discovery.ASMDataTable;
 import cpw.mods.fml.common.discovery.ModDiscoverer;
-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.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.recipe.RecipeCategory;
 import gregtech.api.recipe.RecipeCategoryHolder;
 import gregtech.api.recipe.RecipeCategorySetting;
-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_RecipeBuilder;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Proxy;
+import gregtech.api.util.GTConfig;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTUtility;
+import gregtech.common.GTProxy;
 import gregtech.common.config.client.ConfigColorModulation;
 import gregtech.common.config.client.ConfigInterface;
 import gregtech.common.config.client.ConfigRender;
@@ -57,15 +57,15 @@ import gregtech.common.config.gregtech.ConfigGeneral;
 import gregtech.common.config.gregtech.ConfigMachines;
 import gregtech.common.config.gregtech.ConfigOreDropBehavior;
 import gregtech.common.config.gregtech.ConfigPollution;
-import gregtech.common.tileentities.machines.long_distance.GT_MetaTileEntity_LongDistancePipelineBase;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Cleanroom;
+import gregtech.common.tileentities.machines.long_distance.MTELongDistancePipelineBase;
+import gregtech.common.tileentities.machines.multi.MTECleanroom;
 
-public class GT_PreLoad {
+public class GTPreLoad {
 
     public static void sortToTheEnd() {
         try {
-            GT_FML_LOGGER.info("GT_Mod: Sorting GregTech to the end of the Mod List for further processing.");
-            LoadController tLoadController = (LoadController) GT_Utility
+            GT_FML_LOGGER.info("GTMod: Sorting GregTech to the end of the Mod List for further processing.");
+            LoadController tLoadController = (LoadController) GTUtility
                 .getFieldContent(Loader.instance(), "modController", true, true);
             assert tLoadController != null;
             List<ModContainer> tModList = tLoadController.getActiveModList();
@@ -84,15 +84,15 @@ public class GT_PreLoad {
             if (tGregTech != null) {
                 tNewModsList.add(tGregTech);
             }
-            Objects.requireNonNull(GT_Utility.getField(tLoadController, "activeModList", true, true))
+            Objects.requireNonNull(GTUtility.getField(tLoadController, "activeModList", true, true))
                 .set(tLoadController, tNewModsList);
         } catch (Throwable e) {
-            GT_Mod.logStackTrace(e);
+            GTMod.logStackTrace(e);
         }
     }
 
     public static void initLocalization(File languageDir) {
-        GT_FML_LOGGER.info("GT_Mod: Generating Lang-File");
+        GT_FML_LOGGER.info("GTMod: Generating Lang-File");
 
         if (FMLCommonHandler.instance()
             .getEffectiveSide()
@@ -104,107 +104,107 @@ public class GT_PreLoad {
             GT_FML_LOGGER.info("User lang is " + userLang);
             if (userLang.equals("en_US")) {
                 GT_FML_LOGGER.info("Loading GregTech.lang");
-                GT_LanguageManager.isEN_US = true;
-                GT_LanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang"));
+                GTLanguageManager.isEN_US = true;
+                GTLanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang"));
             } else {
                 String l10nFileName = "GregTech_" + userLang + ".lang";
                 File l10nFile = new File(languageDir, l10nFileName);
                 if (l10nFile.isFile()) {
                     GT_FML_LOGGER.info("Loading l10n file: " + l10nFileName);
-                    GT_LanguageManager.sEnglishFile = new Configuration(l10nFile);
+                    GTLanguageManager.sEnglishFile = new Configuration(l10nFile);
                 } else {
                     GT_FML_LOGGER.info("Cannot find l10n file " + l10nFileName + ", fallback to GregTech.lang");
-                    GT_LanguageManager.isEN_US = true;
-                    GT_LanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang"));
+                    GTLanguageManager.isEN_US = true;
+                    GTLanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang"));
                 }
             }
         } else {
-            GT_LanguageManager.isEN_US = true;
-            GT_LanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang"));
+            GTLanguageManager.isEN_US = true;
+            GTLanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang"));
         }
-        GT_LanguageManager.sEnglishFile.load();
+        GTLanguageManager.sEnglishFile.load();
 
         Materials.getMaterialsMap()
             .values()
             .parallelStream()
             .filter(Objects::nonNull)
             .forEach(
-                aMaterial -> aMaterial.mLocalizedName = GT_LanguageManager
+                aMaterial -> aMaterial.mLocalizedName = GTLanguageManager
                     .addStringLocalization("Material." + aMaterial.mName.toLowerCase(), aMaterial.mDefaultLocalName));
     }
 
     public static void getConfiguration(File configDir) {
         File tFile = new File(new File(configDir, "GregTech"), "IDs.cfg");
-        GT_Config.sConfigFileIDs = new Configuration(tFile);
-        GT_Config.sConfigFileIDs.load();
-        GT_Config.sConfigFileIDs.save();
+        GTConfig.sConfigFileIDs = new Configuration(tFile);
+        GTConfig.sConfigFileIDs.load();
+        GTConfig.sConfigFileIDs.save();
 
         tFile = new File(new File(configDir, "GregTech"), "Cleanroom.cfg");
-        GT_Config.cleanroomFile = new Configuration(tFile);
-        GT_Config.cleanroomFile.load();
-        GT_Config.cleanroomFile.save();
+        GTConfig.cleanroomFile = new Configuration(tFile);
+        GTConfig.cleanroomFile.load();
+        GTConfig.cleanroomFile.save();
 
         tFile = new File(new File(configDir, "GregTech"), "UndergroundFluids.cfg");
-        GT_Config.undergroundFluidsFile = new Configuration(tFile);
-        GT_Config.undergroundFluidsFile.load();
-        GT_Config.undergroundFluidsFile.save();
+        GTConfig.undergroundFluidsFile = new Configuration(tFile);
+        GTConfig.undergroundFluidsFile.load();
+        GTConfig.undergroundFluidsFile.save();
 
-        GregTech_API.NEIClientFIle = new GT_Config(
+        GregTechAPI.NEIClientFIle = new GTConfig(
             new Configuration(new File(new File(configDir, "GregTech"), "NEIClient.cfg")));
 
     }
 
     public static void createLogFiles(File parentFile) {
-        GT_Log.mLogFile = new File(parentFile, "logs/GregTech.log");
-        if (!GT_Log.mLogFile.exists()) {
+        GTLog.mLogFile = new File(parentFile, "logs/GregTech.log");
+        if (!GTLog.mLogFile.exists()) {
             try {
-                GT_Log.mLogFile.createNewFile();
+                GTLog.mLogFile.createNewFile();
             } catch (Throwable ignored) {}
         }
         try {
-            GT_Log.out = GT_Log.err = new PrintStream(GT_Log.mLogFile);
+            GTLog.out = GTLog.err = new PrintStream(GTLog.mLogFile);
         } catch (FileNotFoundException ignored) {}
 
         if (ConfigGeneral.loggingOreDict) {
-            GT_Log.mOreDictLogFile = new File(parentFile, "logs/OreDict.log");
-            if (!GT_Log.mOreDictLogFile.exists()) {
+            GTLog.mOreDictLogFile = new File(parentFile, "logs/OreDict.log");
+            if (!GTLog.mOreDictLogFile.exists()) {
                 try {
-                    GT_Log.mOreDictLogFile.createNewFile();
+                    GTLog.mOreDictLogFile.createNewFile();
                 } catch (Throwable ignored) {}
             }
-            List<String> tList = ((GT_Log.LogBuffer) GT_Log.ore).mBufferedOreDictLog;
+            List<String> tList = ((GTLog.LogBuffer) GTLog.ore).mBufferedOreDictLog;
             try {
-                GT_Log.ore = new PrintStream(GT_Log.mOreDictLogFile);
+                GTLog.ore = new PrintStream(GTLog.mOreDictLogFile);
             } catch (Throwable ignored) {}
-            GT_Log.ore.println("******************************************************************************");
-            GT_Log.ore.println("* This is the complete log of the GT5-Unofficial OreDictionary Handler. It   *");
-            GT_Log.ore.println("* processes all OreDictionary entries and can sometimes cause errors. All    *");
-            GT_Log.ore.println("* entries and errors are being logged. If you see an error please raise an   *");
-            GT_Log.ore.println("* issue at https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues.  *");
-            GT_Log.ore.println("******************************************************************************");
-            tList.forEach(GT_Log.ore::println);
+            GTLog.ore.println("******************************************************************************");
+            GTLog.ore.println("* This is the complete log of the GT5-Unofficial OreDictionary Handler. It   *");
+            GTLog.ore.println("* processes all OreDictionary entries and can sometimes cause errors. All    *");
+            GTLog.ore.println("* entries and errors are being logged. If you see an error please raise an   *");
+            GTLog.ore.println("* issue at https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues.  *");
+            GTLog.ore.println("******************************************************************************");
+            tList.forEach(GTLog.ore::println);
         }
         if (ConfigGeneral.loggingExplosions) {
-            GT_Log.mExplosionLog = new File(parentFile, "logs/Explosion.log");
-            if (!GT_Log.mExplosionLog.exists()) {
+            GTLog.mExplosionLog = new File(parentFile, "logs/Explosion.log");
+            if (!GTLog.mExplosionLog.exists()) {
                 try {
-                    GT_Log.mExplosionLog.createNewFile();
+                    GTLog.mExplosionLog.createNewFile();
                 } catch (Throwable ignored) {}
             }
             try {
-                GT_Log.exp = new PrintStream(GT_Log.mExplosionLog);
+                GTLog.exp = new PrintStream(GTLog.mExplosionLog);
             } catch (Throwable ignored) {}
         }
 
         if (ConfigGeneral.loggingPlayerActicity) {
-            GT_Log.mPlayerActivityLogFile = new File(parentFile, "logs/PlayerActivity.log");
-            if (!GT_Log.mPlayerActivityLogFile.exists()) {
+            GTLog.mPlayerActivityLogFile = new File(parentFile, "logs/PlayerActivity.log");
+            if (!GTLog.mPlayerActivityLogFile.exists()) {
                 try {
-                    GT_Log.mPlayerActivityLogFile.createNewFile();
+                    GTLog.mPlayerActivityLogFile.createNewFile();
                 } catch (Throwable ignored) {}
             }
             try {
-                GT_Log.pal = new PrintStream(GT_Log.mPlayerActivityLogFile);
+                GTLog.pal = new PrintStream(GTLog.mPlayerActivityLogFile);
             } catch (Throwable ignored) {}
         }
     }
@@ -272,8 +272,8 @@ public class GT_PreLoad {
                                     "gemFlawed", "gemFlawless", "gemExquisite", "gearGt" };
                                 if (mIt == 3) tags = new String[] { "itemCasing", "nanite" };
                                 if (tags.length > prefix) tag = tags[prefix];
-                                if (GregTech_API.sGeneratedMaterials[material] != null) {
-                                    tag += GregTech_API.sGeneratedMaterials[material].mName;
+                                if (GregTechAPI.sGeneratedMaterials[material] != null) {
+                                    tag += GregTechAPI.sGeneratedMaterials[material].mName;
                                     if (!oreTags.contains(tag)) oreTags.add(tag);
                                 } else if (material > 0) {
                                     GT_FML_LOGGER.info("MaterialDisabled: " + material + " " + m.group(1));
@@ -301,7 +301,7 @@ public class GT_PreLoad {
             .filter(test -> StringUtils.startsWithAny(test, preS))
             .forEach(test -> {
                 mMTTags.add(test);
-                if (GT_Values.D1) GT_FML_LOGGER.info("oretag: " + test);
+                if (GTValues.D1) GT_FML_LOGGER.info("oretag: " + test);
             });
 
         GT_FML_LOGGER.info("reenableMetaItems");
@@ -351,196 +351,196 @@ public class GT_PreLoad {
     }
 
     public static void adjustScrap() {
-        GT_FML_LOGGER.info("GT_Mod: Removing all original Scrapbox Drops.");
+        GT_FML_LOGGER.info("GTMod: Removing all original Scrapbox Drops.");
         try {
-            Objects.requireNonNull(GT_Utility.getField("ic2.core.item.ItemScrapbox$Drop", "topChance", true, true))
+            Objects.requireNonNull(GTUtility.getField("ic2.core.item.ItemScrapbox$Drop", "topChance", true, true))
                 .set(null, 0);
             ((List<?>) Objects.requireNonNull(
-                GT_Utility.getFieldContent(
-                    GT_Utility.getFieldContent("ic2.api.recipe.Recipes", "scrapboxDrops", true, true),
+                GTUtility.getFieldContent(
+                    GTUtility.getFieldContent("ic2.api.recipe.Recipes", "scrapboxDrops", true, true),
                     "drops",
                     true,
                     true))).clear();
         } catch (Throwable e) {
-            if (GT_Values.D1) {
-                e.printStackTrace(GT_Log.err);
+            if (GTValues.D1) {
+                e.printStackTrace(GTLog.err);
             }
         }
-        GT_Log.out.println("GT_Mod: Adding Scrap with a Weight of 200.0F to the Scrapbox Drops.");
-        GT_ModHandler.addScrapboxDrop(200.0F, GT_ModHandler.getIC2Item("scrap", 1L));
+        GTLog.out.println("GTMod: Adding Scrap with a Weight of 200.0F to the Scrapbox Drops.");
+        GTModHandler.addScrapboxDrop(200.0F, GTModHandler.getIC2Item("scrap", 1L));
     }
 
     public static void loadConfig() {
         // general
-        GT_Values.D1 = ConfigDebug.D1;
-        GT_Values.D2 = ConfigDebug.D2;
-        GT_Values.allow_broken_recipemap = ConfigDebug.allowBrokenRecipeMap;
-        GT_Values.debugCleanroom = ConfigDebug.debugCleanroom;
-        GT_Values.debugDriller = ConfigDebug.debugDriller;
-        GT_Values.debugWorldGen = ConfigDebug.debugWorldgen;
-        GT_Values.debugOrevein = ConfigDebug.debugOrevein;
-        GT_Values.debugSmallOres = ConfigDebug.debugSmallOres;
-        GT_Values.debugStones = ConfigDebug.debugStones;
-        GT_Values.debugBlockMiner = ConfigDebug.debugBlockMiner;
-        GT_Values.debugBlockPump = ConfigDebug.debugBlockPump;
-        GT_Values.debugEntityCramming = ConfigDebug.debugEntityCramming;
-        GT_Values.debugWorldData = ConfigDebug.debugWorldData;
-        GT_Values.oreveinPercentage = ConfigGeneral.oreveinPercentage;
-        GT_Values.oreveinAttempts = ConfigGeneral.oreveinAttempts;
-        GT_Values.oreveinMaxPlacementAttempts = ConfigGeneral.oreveinMaxPlacementAttempts;
-        GT_Values.oreveinPlacerOres = ConfigGeneral.oreveinPlacerOres;
-        GT_Values.oreveinPlacerOresMultiplier = ConfigGeneral.oreveinPlacerOresMultiplier;
-        GregTech_API.TICKS_FOR_LAG_AVERAGING = ConfigGeneral.ticksForLagAveraging;
-        GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = ConfigGeneral.millisecondThesholdUntilLagWarning;
-        GregTech_API.sTimber = ConfigGeneral.timber;
-        GregTech_API.sDrinksAlwaysDrinkable = ConfigGeneral.drinksAlwaysDrinkable;
-        GregTech_API.sDoShowAllItemsInCreative = ConfigGeneral.doShowAllItemsInCreative;
-        GregTech_API.sMultiThreadedSounds = ConfigGeneral.multiThreadedSounds;
-        GT_Mod.gregtechproxy.mMaxEqualEntitiesAtOneSpot = ConfigGeneral.maxEqualEntitiesAtOneSpot;
-        GT_Mod.gregtechproxy.mFlintChance = ConfigGeneral.flintChance;
-        GT_Mod.gregtechproxy.mItemDespawnTime = ConfigGeneral.itemDespawnTime;
-        GT_Mod.gregtechproxy.mAllowSmallBoilerAutomation = ConfigGeneral.allowSmallBoilerAutomation;
-        GT_Mod.gregtechproxy.mDisableVanillaOres = gregtech.common.config.worldgen.ConfigGeneral.disableVanillaOres;
-        GT_Mod.gregtechproxy.mIncreaseDungeonLoot = ConfigGeneral.increaseDungeonLoot;
-        GT_Mod.gregtechproxy.mAxeWhenAdventure = ConfigGeneral.axeWhenAdventure;
-        GT_Mod.gregtechproxy.mSurvivalIntoAdventure = ConfigGeneral.survivalIntoAdventure;
-        GT_Mod.gregtechproxy.mHungerEffect = ConfigGeneral.hungerEffect;
-        GT_Mod.gregtechproxy.mInventoryUnification = ConfigGeneral.inventoryUnification;
-        GT_Mod.gregtechproxy.mGTBees = ConfigGeneral.GTBees;
-        GT_Mod.gregtechproxy.mCraftingUnification = ConfigGeneral.craftingUnification;
-        GT_Mod.gregtechproxy.mNerfedWoodPlank = ConfigGeneral.nerfedWoodPlank;
-        GT_Mod.gregtechproxy.mNerfedVanillaTools = ConfigGeneral.nerfedVanillaTools;
-        GT_Mod.gregtechproxy.mAchievements = ConfigGeneral.achievements;
-        GT_Mod.gregtechproxy.mHideUnusedOres = ConfigGeneral.hideUnusedOres;
-        GT_Mod.gregtechproxy.mEnableAllMaterials = ConfigGeneral.enableAllMaterials;
-        GT_Mod.gregtechproxy.mExplosionItemDrop = ConfigGeneral.explosionItemDrop;
-        GT_Mod.gregtechproxy.mEnableCleanroom = ConfigGeneral.enableCleanroom;
-        GT_Mod.gregtechproxy.mLowGravProcessing = GalacticraftCore.isModLoaded() && ConfigGeneral.lowGravProcessing;
-        GT_Mod.gregtechproxy.mCropNeedBlock = ConfigGeneral.cropNeedBlock;
-        GT_Mod.gregtechproxy.mAMHInteraction = ConfigGeneral.autoMaintenaceHatchesInteraction;
-        GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre = ConfigGeneral.mixedOreOnlyYieldsTwoThirdsOfPureOre;
-        GT_Mod.gregtechproxy.mRichOreYieldMultiplier = ConfigGeneral.richOreYieldMultiplier;
-        GT_Mod.gregtechproxy.mNetherOreYieldMultiplier = ConfigGeneral.netherOreYieldMultiplier;
-        GT_Mod.gregtechproxy.mEndOreYieldMultiplier = ConfigGeneral.endOreYieldMultiplier;
-        GT_Mod.gregtechproxy.gt6Pipe = ConfigGeneral.gt6Pipe;
-        GT_Mod.gregtechproxy.gt6Cable = ConfigGeneral.gt6Cable;
-        GT_Mod.gregtechproxy.ic2EnergySourceCompat = ConfigGeneral.ic2EnergySourceCompat;
-        GT_Mod.gregtechproxy.costlyCableConnection = ConfigGeneral.costlyCableConnection;
-        GT_Mod.gregtechproxy.crashOnNullRecipeInput = ConfigGeneral.crashOnNullRecipeInput;
+        GTValues.D1 = ConfigDebug.D1;
+        GTValues.D2 = ConfigDebug.D2;
+        GTValues.allow_broken_recipemap = ConfigDebug.allowBrokenRecipeMap;
+        GTValues.debugCleanroom = ConfigDebug.debugCleanroom;
+        GTValues.debugDriller = ConfigDebug.debugDriller;
+        GTValues.debugWorldGen = ConfigDebug.debugWorldgen;
+        GTValues.debugOrevein = ConfigDebug.debugOrevein;
+        GTValues.debugSmallOres = ConfigDebug.debugSmallOres;
+        GTValues.debugStones = ConfigDebug.debugStones;
+        GTValues.debugBlockMiner = ConfigDebug.debugBlockMiner;
+        GTValues.debugBlockPump = ConfigDebug.debugBlockPump;
+        GTValues.debugEntityCramming = ConfigDebug.debugEntityCramming;
+        GTValues.debugWorldData = ConfigDebug.debugWorldData;
+        GTValues.oreveinPercentage = ConfigGeneral.oreveinPercentage;
+        GTValues.oreveinAttempts = ConfigGeneral.oreveinAttempts;
+        GTValues.oreveinMaxPlacementAttempts = ConfigGeneral.oreveinMaxPlacementAttempts;
+        GTValues.oreveinPlacerOres = ConfigGeneral.oreveinPlacerOres;
+        GTValues.oreveinPlacerOresMultiplier = ConfigGeneral.oreveinPlacerOresMultiplier;
+        GregTechAPI.TICKS_FOR_LAG_AVERAGING = ConfigGeneral.ticksForLagAveraging;
+        GregTechAPI.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = ConfigGeneral.millisecondThesholdUntilLagWarning;
+        GregTechAPI.sTimber = ConfigGeneral.timber;
+        GregTechAPI.sDrinksAlwaysDrinkable = ConfigGeneral.drinksAlwaysDrinkable;
+        GregTechAPI.sDoShowAllItemsInCreative = ConfigGeneral.doShowAllItemsInCreative;
+        GregTechAPI.sMultiThreadedSounds = ConfigGeneral.multiThreadedSounds;
+        GTMod.gregtechproxy.mMaxEqualEntitiesAtOneSpot = ConfigGeneral.maxEqualEntitiesAtOneSpot;
+        GTMod.gregtechproxy.mFlintChance = ConfigGeneral.flintChance;
+        GTMod.gregtechproxy.mItemDespawnTime = ConfigGeneral.itemDespawnTime;
+        GTMod.gregtechproxy.mAllowSmallBoilerAutomation = ConfigGeneral.allowSmallBoilerAutomation;
+        GTMod.gregtechproxy.mDisableVanillaOres = gregtech.common.config.worldgen.ConfigGeneral.disableVanillaOres;
+        GTMod.gregtechproxy.mIncreaseDungeonLoot = ConfigGeneral.increaseDungeonLoot;
+        GTMod.gregtechproxy.mAxeWhenAdventure = ConfigGeneral.axeWhenAdventure;
+        GTMod.gregtechproxy.mSurvivalIntoAdventure = ConfigGeneral.survivalIntoAdventure;
+        GTMod.gregtechproxy.mHungerEffect = ConfigGeneral.hungerEffect;
+        GTMod.gregtechproxy.mInventoryUnification = ConfigGeneral.inventoryUnification;
+        GTMod.gregtechproxy.mGTBees = ConfigGeneral.GTBees;
+        GTMod.gregtechproxy.mCraftingUnification = ConfigGeneral.craftingUnification;
+        GTMod.gregtechproxy.mNerfedWoodPlank = ConfigGeneral.nerfedWoodPlank;
+        GTMod.gregtechproxy.mNerfedVanillaTools = ConfigGeneral.nerfedVanillaTools;
+        GTMod.gregtechproxy.mAchievements = ConfigGeneral.achievements;
+        GTMod.gregtechproxy.mHideUnusedOres = ConfigGeneral.hideUnusedOres;
+        GTMod.gregtechproxy.mEnableAllMaterials = ConfigGeneral.enableAllMaterials;
+        GTMod.gregtechproxy.mExplosionItemDrop = ConfigGeneral.explosionItemDrop;
+        GTMod.gregtechproxy.mEnableCleanroom = ConfigGeneral.enableCleanroom;
+        GTMod.gregtechproxy.mLowGravProcessing = GalacticraftCore.isModLoaded() && ConfigGeneral.lowGravProcessing;
+        GTMod.gregtechproxy.mCropNeedBlock = ConfigGeneral.cropNeedBlock;
+        GTMod.gregtechproxy.mAMHInteraction = ConfigGeneral.autoMaintenaceHatchesInteraction;
+        GTMod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre = ConfigGeneral.mixedOreOnlyYieldsTwoThirdsOfPureOre;
+        GTMod.gregtechproxy.mRichOreYieldMultiplier = ConfigGeneral.richOreYieldMultiplier;
+        GTMod.gregtechproxy.mNetherOreYieldMultiplier = ConfigGeneral.netherOreYieldMultiplier;
+        GTMod.gregtechproxy.mEndOreYieldMultiplier = ConfigGeneral.endOreYieldMultiplier;
+        GTMod.gregtechproxy.gt6Pipe = ConfigGeneral.gt6Pipe;
+        GTMod.gregtechproxy.gt6Cable = ConfigGeneral.gt6Cable;
+        GTMod.gregtechproxy.ic2EnergySourceCompat = ConfigGeneral.ic2EnergySourceCompat;
+        GTMod.gregtechproxy.costlyCableConnection = ConfigGeneral.costlyCableConnection;
+        GTMod.gregtechproxy.crashOnNullRecipeInput = ConfigGeneral.crashOnNullRecipeInput;
         if ((boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment")) {
-            GT_Mod.gregtechproxy.crashOnNullRecipeInput = false; // Use flags in GT_RecipeBuilder instead!
+            GTMod.gregtechproxy.crashOnNullRecipeInput = false; // Use flags in GTRecipeBuilder instead!
         }
-        GT_LanguageManager.i18nPlaceholder = ConfigGeneral.i18nPlaceholder;
-        GT_MetaTileEntity_LongDistancePipelineBase.minimalDistancePoints = ConfigGeneral.minimalDistancePoints;
-        GT_Values.mCTMEnabledBlock.addAll(Arrays.asList(ConfigGeneral.CTMWhitelist));
-        GT_Values.mCTMDisabledBlock.addAll(Arrays.asList(ConfigGeneral.CTMBlacklist));
+        GTLanguageManager.i18nPlaceholder = ConfigGeneral.i18nPlaceholder;
+        MTELongDistancePipelineBase.minimalDistancePoints = ConfigGeneral.minimalDistancePoints;
+        GTValues.mCTMEnabledBlock.addAll(Arrays.asList(ConfigGeneral.CTMWhitelist));
+        GTValues.mCTMDisabledBlock.addAll(Arrays.asList(ConfigGeneral.CTMBlacklist));
         if (ConfigGeneral.harderMobSpawner) {
             Blocks.mob_spawner.setHardness(500.0F)
                 .setResistance(6000000.0F);
         }
 
         // machines
-        GT_Values.ticksBetweenSounds = ConfigMachines.ticksBetweenSounds;
-        GT_Values.blacklistedTileEntiyClassNamesForWA = ConfigMachines.blacklistedTileEntiyClassNamesForWA;
-        GT_Values.cleanroomGlass = ConfigMachines.cleanroomGlass;
-        GT_Values.enableChunkloaders = ConfigMachines.enableChunkloaders;
-        GT_Values.alwaysReloadChunkloaders = ConfigMachines.alwaysReloadChunkloaders;
-        GT_Values.debugChunkloaders = ConfigDebug.debugChunkloaders;
-        GT_Values.disableDigitalChestsExternalAccess = ConfigMachines.disableDigitalChestsExternalAccess;
-        GT_Values.enableMultiTileEntities = ConfigMachines.enableMultiTileEntities
+        GTValues.ticksBetweenSounds = ConfigMachines.ticksBetweenSounds;
+        GTValues.blacklistedTileEntiyClassNamesForWA = ConfigMachines.blacklistedTileEntiyClassNamesForWA;
+        GTValues.cleanroomGlass = ConfigMachines.cleanroomGlass;
+        GTValues.enableChunkloaders = ConfigMachines.enableChunkloaders;
+        GTValues.alwaysReloadChunkloaders = ConfigMachines.alwaysReloadChunkloaders;
+        GTValues.debugChunkloaders = ConfigDebug.debugChunkloaders;
+        GTValues.disableDigitalChestsExternalAccess = ConfigMachines.disableDigitalChestsExternalAccess;
+        GTValues.enableMultiTileEntities = ConfigMachines.enableMultiTileEntities
             || (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
-        GregTech_API.sMachineExplosions = ConfigMachines.machineExplosions;
-        GregTech_API.sMachineFlammable = ConfigMachines.machineFlammable;
-        GregTech_API.sMachineNonWrenchExplosions = ConfigMachines.machineNonWrenchExplosions;
-        GregTech_API.sMachineWireFire = ConfigMachines.machineWireFire;
-        GregTech_API.sMachineFireExplosions = ConfigMachines.machineFireExplosions;
-        GregTech_API.sMachineRainExplosions = ConfigMachines.machineRainExplosions;
-        GregTech_API.sMachineThunderExplosions = ConfigMachines.machineThunderExplosions;
-        GregTech_API.sColoredGUI = ConfigMachines.coloredGUI;
-        GregTech_API.sMachineMetalGUI = ConfigMachines.machineMetalGUI;
+        GregTechAPI.sMachineExplosions = ConfigMachines.machineExplosions;
+        GregTechAPI.sMachineFlammable = ConfigMachines.machineFlammable;
+        GregTechAPI.sMachineNonWrenchExplosions = ConfigMachines.machineNonWrenchExplosions;
+        GregTechAPI.sMachineWireFire = ConfigMachines.machineWireFire;
+        GregTechAPI.sMachineFireExplosions = ConfigMachines.machineFireExplosions;
+        GregTechAPI.sMachineRainExplosions = ConfigMachines.machineRainExplosions;
+        GregTechAPI.sMachineThunderExplosions = ConfigMachines.machineThunderExplosions;
+        GregTechAPI.sColoredGUI = ConfigMachines.coloredGUI;
+        GregTechAPI.sMachineMetalGUI = ConfigMachines.machineMetalGUI;
         // Implementation for this is actually handled in NewHorizonsCoreMod in MainRegistry.java!
-        GregTech_API.sUseMachineMetal = ConfigMachines.useMachineMetal;
+        GregTechAPI.sUseMachineMetal = ConfigMachines.useMachineMetal;
 
         // client
         loadClientConfig();
 
         // Pollution
-        GT_Mod.gregtechproxy.mPollution = ConfigPollution.pollution;
-        GT_Mod.gregtechproxy.mPollutionSmogLimit = ConfigPollution.pollutionSmogLimit;
-        GT_Mod.gregtechproxy.mPollutionPoisonLimit = ConfigPollution.pollutionPoisonLimit;
-        GT_Mod.gregtechproxy.mPollutionVegetationLimit = ConfigPollution.pollutionVegetationLimit;
-        GT_Mod.gregtechproxy.mPollutionSourRainLimit = ConfigPollution.pollutionSourRainLimit;
-        GT_Mod.gregtechproxy.mPollutionOnExplosion = ConfigPollution.pollutionOnExplosion;
-        GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond = ConfigPollution.pollutionPrimitveBlastFurnacePerSecond;
-        GT_Mod.gregtechproxy.mPollutionCharcoalPitPerSecond = ConfigPollution.pollutionCharcoalPitPerSecond;
-        GT_Mod.gregtechproxy.mPollutionEBFPerSecond = ConfigPollution.pollutionEBFPerSecond;
-        GT_Mod.gregtechproxy.mPollutionLargeCombustionEnginePerSecond = ConfigPollution.pollutionLargeCombustionEnginePerSecond;
-        GT_Mod.gregtechproxy.mPollutionExtremeCombustionEnginePerSecond = ConfigPollution.pollutionExtremeCombustionEnginePerSecond;
-        GT_Mod.gregtechproxy.mPollutionImplosionCompressorPerSecond = ConfigPollution.pollutionImplosionCompressorPerSecond;
-        GT_Mod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond = ConfigPollution.pollutionLargeBronzeBoilerPerSecond;
-        GT_Mod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond = ConfigPollution.pollutionLargeSteelBoilerPerSecond;
-        GT_Mod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond = ConfigPollution.pollutionLargeTitaniumBoilerPerSecond;
-        GT_Mod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond = ConfigPollution.pollutionLargeTungstenSteelBoilerPerSecond;
-        GT_Mod.gregtechproxy.mPollutionReleasedByThrottle = ConfigPollution.pollutionReleasedByThrottle;
-        GT_Mod.gregtechproxy.mPollutionLargeGasTurbinePerSecond = ConfigPollution.pollutionLargeGasTurbinePerSecond;
-        GT_Mod.gregtechproxy.mPollutionMultiSmelterPerSecond = ConfigPollution.pollutionMultiSmelterPerSecond;
-        GT_Mod.gregtechproxy.mPollutionPyrolyseOvenPerSecond = ConfigPollution.pollutionPyrolyseOvenPerSecond;
-        GT_Mod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond = ConfigPollution.pollutionSmallCoalBoilerPerSecond;
-        GT_Mod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond = ConfigPollution.pollutionHighPressureLavaBoilerPerSecond;
-        GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond = ConfigPollution.pollutionHighPressureCoalBoilerPerSecond;
-        GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond = ConfigPollution.pollutionBaseDieselGeneratorPerSecond;
+        GTMod.gregtechproxy.mPollution = ConfigPollution.pollution;
+        GTMod.gregtechproxy.mPollutionSmogLimit = ConfigPollution.pollutionSmogLimit;
+        GTMod.gregtechproxy.mPollutionPoisonLimit = ConfigPollution.pollutionPoisonLimit;
+        GTMod.gregtechproxy.mPollutionVegetationLimit = ConfigPollution.pollutionVegetationLimit;
+        GTMod.gregtechproxy.mPollutionSourRainLimit = ConfigPollution.pollutionSourRainLimit;
+        GTMod.gregtechproxy.mPollutionOnExplosion = ConfigPollution.pollutionOnExplosion;
+        GTMod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond = ConfigPollution.pollutionPrimitveBlastFurnacePerSecond;
+        GTMod.gregtechproxy.mPollutionCharcoalPitPerSecond = ConfigPollution.pollutionCharcoalPitPerSecond;
+        GTMod.gregtechproxy.mPollutionEBFPerSecond = ConfigPollution.pollutionEBFPerSecond;
+        GTMod.gregtechproxy.mPollutionLargeCombustionEnginePerSecond = ConfigPollution.pollutionLargeCombustionEnginePerSecond;
+        GTMod.gregtechproxy.mPollutionExtremeCombustionEnginePerSecond = ConfigPollution.pollutionExtremeCombustionEnginePerSecond;
+        GTMod.gregtechproxy.mPollutionImplosionCompressorPerSecond = ConfigPollution.pollutionImplosionCompressorPerSecond;
+        GTMod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond = ConfigPollution.pollutionLargeBronzeBoilerPerSecond;
+        GTMod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond = ConfigPollution.pollutionLargeSteelBoilerPerSecond;
+        GTMod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond = ConfigPollution.pollutionLargeTitaniumBoilerPerSecond;
+        GTMod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond = ConfigPollution.pollutionLargeTungstenSteelBoilerPerSecond;
+        GTMod.gregtechproxy.mPollutionReleasedByThrottle = ConfigPollution.pollutionReleasedByThrottle;
+        GTMod.gregtechproxy.mPollutionLargeGasTurbinePerSecond = ConfigPollution.pollutionLargeGasTurbinePerSecond;
+        GTMod.gregtechproxy.mPollutionMultiSmelterPerSecond = ConfigPollution.pollutionMultiSmelterPerSecond;
+        GTMod.gregtechproxy.mPollutionPyrolyseOvenPerSecond = ConfigPollution.pollutionPyrolyseOvenPerSecond;
+        GTMod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond = ConfigPollution.pollutionSmallCoalBoilerPerSecond;
+        GTMod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond = ConfigPollution.pollutionHighPressureLavaBoilerPerSecond;
+        GTMod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond = ConfigPollution.pollutionHighPressureCoalBoilerPerSecond;
+        GTMod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond = ConfigPollution.pollutionBaseDieselGeneratorPerSecond;
         double[] mPollutionDieselGeneratorReleasedByTier = ConfigPollution.pollutionDieselGeneratorReleasedByTier;
         if (mPollutionDieselGeneratorReleasedByTier.length
-            == GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier.length) {
-            GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier = mPollutionDieselGeneratorReleasedByTier;
+            == GTMod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier.length) {
+            GTMod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier = mPollutionDieselGeneratorReleasedByTier;
         } else {
             GT_FML_LOGGER
                 .error("The Length of the Diesel Turbine Pollution Array Config must be the same as the Default");
         }
-        GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond = ConfigPollution.pollutionBaseGasTurbinePerSecond;
+        GTMod.gregtechproxy.mPollutionBaseGasTurbinePerSecond = ConfigPollution.pollutionBaseGasTurbinePerSecond;
         double[] mPollutionGasTurbineReleasedByTier = ConfigPollution.pollutionGasTurbineReleasedByTier;
         if (mPollutionGasTurbineReleasedByTier.length
-            == GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier.length) {
-            GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier = mPollutionGasTurbineReleasedByTier;
+            == GTMod.gregtechproxy.mPollutionGasTurbineReleasedByTier.length) {
+            GTMod.gregtechproxy.mPollutionGasTurbineReleasedByTier = mPollutionGasTurbineReleasedByTier;
         } else {
             GT_FML_LOGGER.error("The Length of the Gas Turbine Pollution Array Config must be the same as the Default");
         }
 
         // cleanroom file
-        if (GT_Mod.gregtechproxy.mEnableCleanroom) GT_MetaTileEntity_Cleanroom.loadConfig(GT_Config.cleanroomFile);
+        if (GTMod.gregtechproxy.mEnableCleanroom) MTECleanroom.loadConfig(GTConfig.cleanroomFile);
 
         // underground fluids file
-        GT_Mod.gregtechproxy.mUndergroundOil.getConfig(GT_Config.undergroundFluidsFile, "undergroundfluid");
+        GTMod.gregtechproxy.mUndergroundOil.getConfig(GTConfig.undergroundFluidsFile, "undergroundfluid");
 
         // Worldgeneration.cfg
-        GT_Mod.gregtechproxy.enableUndergroundGravelGen = gregtech.common.config.worldgen.ConfigGeneral.generateUndergroundGravelGen;
-        GT_Mod.gregtechproxy.enableUndergroundDirtGen = gregtech.common.config.worldgen.ConfigGeneral.generateUndergroundDirtGen;
-        GT_Mod.gregtechproxy.enableBlackGraniteOres = gregtech.common.config.worldgen.ConfigGeneral.generateBlackGraniteOres;
-        GT_Mod.gregtechproxy.enableRedGraniteOres = gregtech.common.config.worldgen.ConfigGeneral.generateBlackGraniteOres;
-        GT_Mod.gregtechproxy.enableMarbleOres = gregtech.common.config.worldgen.ConfigGeneral.generateMarbleOres;
-        GT_Mod.gregtechproxy.enableBasaltOres = gregtech.common.config.worldgen.ConfigGeneral.generateBasaltOres;
+        GTMod.gregtechproxy.enableUndergroundGravelGen = gregtech.common.config.worldgen.ConfigGeneral.generateUndergroundGravelGen;
+        GTMod.gregtechproxy.enableUndergroundDirtGen = gregtech.common.config.worldgen.ConfigGeneral.generateUndergroundDirtGen;
+        GTMod.gregtechproxy.enableBlackGraniteOres = gregtech.common.config.worldgen.ConfigGeneral.generateBlackGraniteOres;
+        GTMod.gregtechproxy.enableRedGraniteOres = gregtech.common.config.worldgen.ConfigGeneral.generateBlackGraniteOres;
+        GTMod.gregtechproxy.enableMarbleOres = gregtech.common.config.worldgen.ConfigGeneral.generateMarbleOres;
+        GTMod.gregtechproxy.enableBasaltOres = gregtech.common.config.worldgen.ConfigGeneral.generateBasaltOres;
 
         // OverpoweredStuff.cfg
-        GregTech_API.mOutputRF = gregtech.common.config.opstuff.ConfigGeneral.outputRF;
-        GregTech_API.mInputRF = gregtech.common.config.opstuff.ConfigGeneral.inputRF;
-        GregTech_API.mEUtoRF = gregtech.common.config.opstuff.ConfigGeneral.howMuchRFWith100EUInInput;
-        GregTech_API.mRFtoEU = gregtech.common.config.opstuff.ConfigGeneral.howMuchEUWith100RFInInput;
-        GregTech_API.mRFExplosions = gregtech.common.config.opstuff.ConfigGeneral.RFExplosions;
+        GregTechAPI.mOutputRF = gregtech.common.config.opstuff.ConfigGeneral.outputRF;
+        GregTechAPI.mInputRF = gregtech.common.config.opstuff.ConfigGeneral.inputRF;
+        GregTechAPI.mEUtoRF = gregtech.common.config.opstuff.ConfigGeneral.howMuchRFWith100EUInInput;
+        GregTechAPI.mRFtoEU = gregtech.common.config.opstuff.ConfigGeneral.howMuchEUWith100RFInInput;
+        GregTechAPI.mRFExplosions = gregtech.common.config.opstuff.ConfigGeneral.RFExplosions;
 
         // MachineStats.cfg
-        GT_Mod.gregtechproxy.mForceFreeFace = gregtech.common.config.machinestats.ConfigMachines.forceFreeFace;
+        GTMod.gregtechproxy.mForceFreeFace = gregtech.common.config.machinestats.ConfigMachines.forceFreeFace;
 
         // ore_drop_behavior
         try {
-            GT_Log.out.println("Trying to set it to: " + ConfigOreDropBehavior.setting);
-            GT_Mod.gregtechproxy.oreDropSystem = GT_Proxy.OreDropSystem.valueOf(ConfigOreDropBehavior.setting);;
+            GTLog.out.println("Trying to set it to: " + ConfigOreDropBehavior.setting);
+            GTMod.gregtechproxy.oreDropSystem = GTProxy.OreDropSystem.valueOf(ConfigOreDropBehavior.setting);;
         } catch (IllegalArgumentException e) {
-            GT_Log.err.println(e);
-            GT_Mod.gregtechproxy.oreDropSystem = GT_Proxy.OreDropSystem.FortuneItem;
+            GTLog.err.println(e);
+            GTMod.gregtechproxy.oreDropSystem = GTProxy.OreDropSystem.FortuneItem;
         }
 
         // features
-        GT_Mod.gregtechproxy.mUpgradeCount = Math.min(64, Math.max(1, ConfigFeatures.upgradeStackSize));
+        GTMod.gregtechproxy.mUpgradeCount = Math.min(64, Math.max(1, ConfigFeatures.upgradeStackSize));
         for (OrePrefixes tPrefix : OrePrefixes.values()) {
             if (tPrefix.mIsUsedForOreProcessing) {
                 tPrefix.mDefaultStackSize = ((byte) Math.min(64, Math.max(1, ConfigFeatures.maxOreStackSize)));
@@ -556,7 +556,7 @@ public class GT_PreLoad {
                 }
         }
 
-        GT_RecipeBuilder.onConfigLoad();
+        GTRecipeBuilder.onConfigLoad();
     }
 
     public static void parseHex(Dyes dye, String hexString) {
@@ -581,44 +581,44 @@ public class GT_PreLoad {
                     }
                 }
             });
-        GT_Mod.gregtechproxy.mRenderTileAmbientOcclusion = ConfigRender.renderTileAmbientOcclusion;
-        GT_Mod.gregtechproxy.mRenderGlowTextures = ConfigRender.renderGlowTextures;
-        GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped = ConfigRender.renderFlippedMachinesFlipped;
-        GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch = ConfigRender.renderIndicatorsOnHatch;
-        GT_Mod.gregtechproxy.mRenderDirtParticles = ConfigRender.renderDirtParticles;
-        GT_Mod.gregtechproxy.mRenderPollutionFog = ConfigRender.renderPollutionFog;
-        GT_Mod.gregtechproxy.mRenderItemDurabilityBar = ConfigRender.renderItemDurabilityBar;
-        GT_Mod.gregtechproxy.mRenderItemChargeBar = ConfigRender.renderItemChargeBar;
-        GT_Mod.gregtechproxy.mUseBlockUpdateHandler = ConfigRender.useBlockUpdateHandler;
-
-        GT_Mod.gregtechproxy.mCoverTabsVisible = ConfigInterface.coverTabsVisible;
-        GT_Mod.gregtechproxy.mCoverTabsFlipped = ConfigInterface.coverTabsFlipped;
-        GT_Mod.gregtechproxy.mTooltipVerbosity = ConfigInterface.tooltipVerbosity;
-        GT_Mod.gregtechproxy.mTooltipShiftVerbosity = ConfigInterface.tooltipShiftVerbosity;
-        GT_Mod.gregtechproxy.mTitleTabStyle = ConfigInterface.titleTabStyle;
-
-        GT_Mod.gregtechproxy.mNEIRecipeSecondMode = GregTech_API.NEIClientFIle.get("nei", "RecipeSecondMode", true);
-        GT_Mod.gregtechproxy.mNEIRecipeOwner = GregTech_API.NEIClientFIle.get("nei", "RecipeOwner", false);
-        GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace = GregTech_API.NEIClientFIle
+        GTMod.gregtechproxy.mRenderTileAmbientOcclusion = ConfigRender.renderTileAmbientOcclusion;
+        GTMod.gregtechproxy.mRenderGlowTextures = ConfigRender.renderGlowTextures;
+        GTMod.gregtechproxy.mRenderFlippedMachinesFlipped = ConfigRender.renderFlippedMachinesFlipped;
+        GTMod.gregtechproxy.mRenderIndicatorsOnHatch = ConfigRender.renderIndicatorsOnHatch;
+        GTMod.gregtechproxy.mRenderDirtParticles = ConfigRender.renderDirtParticles;
+        GTMod.gregtechproxy.mRenderPollutionFog = ConfigRender.renderPollutionFog;
+        GTMod.gregtechproxy.mRenderItemDurabilityBar = ConfigRender.renderItemDurabilityBar;
+        GTMod.gregtechproxy.mRenderItemChargeBar = ConfigRender.renderItemChargeBar;
+        GTMod.gregtechproxy.mUseBlockUpdateHandler = ConfigRender.useBlockUpdateHandler;
+
+        GTMod.gregtechproxy.mCoverTabsVisible = ConfigInterface.coverTabsVisible;
+        GTMod.gregtechproxy.mCoverTabsFlipped = ConfigInterface.coverTabsFlipped;
+        GTMod.gregtechproxy.mTooltipVerbosity = ConfigInterface.tooltipVerbosity;
+        GTMod.gregtechproxy.mTooltipShiftVerbosity = ConfigInterface.tooltipShiftVerbosity;
+        GTMod.gregtechproxy.mTitleTabStyle = ConfigInterface.titleTabStyle;
+
+        GTMod.gregtechproxy.mNEIRecipeSecondMode = GregTechAPI.NEIClientFIle.get("nei", "RecipeSecondMode", true);
+        GTMod.gregtechproxy.mNEIRecipeOwner = GregTechAPI.NEIClientFIle.get("nei", "RecipeOwner", false);
+        GTMod.gregtechproxy.mNEIRecipeOwnerStackTrace = GregTechAPI.NEIClientFIle
             .get("nei", "RecipeOwnerStackTrace", false);
-        GT_Mod.gregtechproxy.mNEIOriginalVoltage = GregTech_API.NEIClientFIle.get("nei", "OriginalVoltage", false);
+        GTMod.gregtechproxy.mNEIOriginalVoltage = GregTechAPI.NEIClientFIle.get("nei", "OriginalVoltage", false);
 
-        GT_Mod.gregtechproxy.recipeCategorySettings.clear();
+        GTMod.gregtechproxy.recipeCategorySettings.clear();
         for (RecipeCategory recipeCategory : findRecipeCategories()) {
             RecipeCategorySetting setting = RecipeCategorySetting.find(
-                GregTech_API.NEIClientFIle.getWithValidValues(
+                GregTechAPI.NEIClientFIle.getWithValidValues(
                     "nei.recipe_categories",
                     recipeCategory.unlocalizedName,
                     RecipeCategorySetting.NAMES,
                     RecipeCategorySetting.getDefault()
                         .toName()));
-            GT_Mod.gregtechproxy.recipeCategorySettings.put(recipeCategory, setting);
+            GTMod.gregtechproxy.recipeCategorySettings.put(recipeCategory, setting);
         }
 
-        GT_Mod.gregtechproxy.mWailaTransformerVoltageTier = ConfigWaila.wailaTransformerVoltageTier;
-        GT_Mod.gregtechproxy.wailaAverageNS = ConfigWaila.wailaAverageNS;
+        GTMod.gregtechproxy.mWailaTransformerVoltageTier = ConfigWaila.wailaTransformerVoltageTier;
+        GTMod.gregtechproxy.wailaAverageNS = ConfigWaila.wailaAverageNS;
 
-        GT_Mod.gregtechproxy.reloadNEICache();
+        GTMod.gregtechproxy.reloadNEICache();
     }
 
     private static List<RecipeCategory> findRecipeCategories() {
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_CircuitBehaviors.java b/src/main/java/gregtech/loaders/preload/GT_Loader_CircuitBehaviors.java
deleted file mode 100644
index fd66127e36..0000000000
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_CircuitBehaviors.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package gregtech.loaders.preload;
-
-import gregtech.api.util.GT_Log;
-import gregtech.common.redstonecircuits.GT_Circuit_BasicLogic;
-import gregtech.common.redstonecircuits.GT_Circuit_BitAnd;
-import gregtech.common.redstonecircuits.GT_Circuit_CombinationLock;
-import gregtech.common.redstonecircuits.GT_Circuit_Equals;
-import gregtech.common.redstonecircuits.GT_Circuit_Pulser;
-import gregtech.common.redstonecircuits.GT_Circuit_Randomizer;
-import gregtech.common.redstonecircuits.GT_Circuit_RedstoneMeter;
-import gregtech.common.redstonecircuits.GT_Circuit_Repeater;
-import gregtech.common.redstonecircuits.GT_Circuit_Timer;
-
-public class GT_Loader_CircuitBehaviors implements Runnable {
-
-    @Override
-    public void run() {
-        GT_Log.out.println("GT_Mod: Register Redstone Circuit behaviours.");
-        new GT_Circuit_Timer(0);
-        new GT_Circuit_BasicLogic(1);
-        new GT_Circuit_Repeater(2);
-        new GT_Circuit_Pulser(3);
-        new GT_Circuit_RedstoneMeter(4);
-
-        new GT_Circuit_Randomizer(8);
-
-        new GT_Circuit_CombinationLock(16);
-        new GT_Circuit_BitAnd(17);
-        new GT_Circuit_Equals(18);
-    }
-}
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java
index c0946a7334..9b89ce9176 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java
@@ -1,6 +1,6 @@
 package gregtech.loaders.preload;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 import static gregtech.api.multitileentity.enums.GT_MultiTileCasing.*;
 import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.*;
 import static gregtech.api.multitileentity.enums.GT_MultiTileUpgradeCasing.*;
@@ -85,7 +85,7 @@ public class GT_Loader_MultiTileEntities implements Runnable {
 
     @Override
     public void run() {
-        GT_FML_LOGGER.info("GT_Mod: Registering MultiTileEntities");
+        GT_FML_LOGGER.info("GTMod: Registering MultiTileEntities");
         registerMachines();
         registerCasings();
         registerComponentCasings();
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java
deleted file mode 100644
index 1b4d2bdf91..0000000000
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java
+++ /dev/null
@@ -1,458 +0,0 @@
-package gregtech.loaders.preload;
-
-import static gregtech.api.enums.Mods.AppliedEnergistics2;
-import static gregtech.api.enums.Mods.Botania;
-import static gregtech.api.enums.Mods.IndustrialCraft2;
-import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
-import static gregtech.api.enums.Mods.Railcraft;
-import static gregtech.api.enums.Mods.Thaumcraft;
-import static gregtech.api.enums.Mods.TwilightForest;
-
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.MaterialsBotania;
-import gregtech.api.enums.OreDictNames;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-
-public class GT_Loader_OreDictionary implements Runnable {
-
-    @Override
-    public void run() {
-        GT_Log.out.println("GT_Mod: Register OreDict Entries of Non-GT-Items.");
-        GT_OreDictUnificator.set(OrePrefixes.cell, Materials.Empty, ItemList.Cell_Empty.get(1L));
-        GT_OreDictUnificator.set(OrePrefixes.cell, Materials.Lava, ItemList.Cell_Lava.get(1L));
-        GT_OreDictUnificator.set(OrePrefixes.cell, Materials.Lava, GT_ModHandler.getIC2Item("lavaCell", 1L));
-        GT_OreDictUnificator.set(OrePrefixes.cell, Materials.Water, ItemList.Cell_Water.get(1L));
-        GT_OreDictUnificator.set(OrePrefixes.cell, Materials.Water, GT_ModHandler.getIC2Item("waterCell", 1L));
-        GT_OreDictUnificator.set(
-            OrePrefixes.cell,
-            Materials.Creosote,
-            GT_ModHandler.getModItem(Railcraft.ID, "fluid.creosote.cell", 1L));
-
-        GT_OreDictUnificator.set(OrePrefixes.cell, Materials.UUMatter, GT_ModHandler.getIC2Item("uuMatterCell", 1L));
-        GT_OreDictUnificator.set(OrePrefixes.cell, Materials.ConstructionFoam, GT_ModHandler.getIC2Item("CFCell", 1L));
-
-        GT_OreDictUnificator.set(OrePrefixes.bucket, Materials.Empty, new ItemStack(Items.bucket, 1, 0));
-        GT_OreDictUnificator.set(OrePrefixes.bucket, Materials.Water, new ItemStack(Items.water_bucket, 1, 0));
-        GT_OreDictUnificator.set(OrePrefixes.bucket, Materials.Lava, new ItemStack(Items.lava_bucket, 1, 0));
-        GT_OreDictUnificator.set(OrePrefixes.bucket, Materials.Milk, new ItemStack(Items.milk_bucket, 1, 0));
-        // Clay buckets handled in gregtech.common.GT_Proxy.onLoad() as they aren't registered until Iguana Tweaks
-        // pre-init.
-
-        GT_OreDictUnificator.set(OrePrefixes.bottle, Materials.Empty, new ItemStack(Items.glass_bottle, 1, 0));
-        GT_OreDictUnificator.set(OrePrefixes.bottle, Materials.Water, new ItemStack(Items.potionitem, 1, 0));
-
-        GT_OreDictUnificator
-            .set(OrePrefixes.plateAlloy, Materials.Iridium, GT_ModHandler.getIC2Item("iridiumPlate", 1L));
-        GT_OreDictUnificator
-            .set(OrePrefixes.plateAlloy, Materials.Advanced, GT_ModHandler.getIC2Item("advancedAlloy", 1L));
-        GT_OreDictUnificator.set(OrePrefixes.plateAlloy, Materials.Carbon, GT_ModHandler.getIC2Item("carbonPlate", 1L));
-
-        GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Coal, new ItemStack(Blocks.coal_ore, 1));
-        GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Iron, new ItemStack(Blocks.iron_ore, 1));
-        GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Lapis, new ItemStack(Blocks.lapis_ore, 1));
-        GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Redstone, new ItemStack(Blocks.redstone_ore, 1));
-        GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Redstone, new ItemStack(Blocks.lit_redstone_ore, 1));
-        GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Gold, new ItemStack(Blocks.gold_ore, 1));
-        GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Diamond, new ItemStack(Blocks.diamond_ore, 1));
-        GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Emerald, new ItemStack(Blocks.emerald_ore, 1));
-        GT_OreDictUnificator.set(OrePrefixes.ore, Materials.NetherQuartz, new ItemStack(Blocks.quartz_ore, 1));
-        GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Copper, GT_ModHandler.getIC2Item("copperIngot", 1L));
-        GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Tin, GT_ModHandler.getIC2Item("tinIngot", 1L));
-        GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Lead, GT_ModHandler.getIC2Item("leadIngot", 1L));
-        GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Bronze, GT_ModHandler.getIC2Item("bronzeIngot", 1L));
-        GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Silver, GT_ModHandler.getIC2Item("silverIngot", 1L));
-        GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Iridium, GT_ModHandler.getIC2Item("iridiumOre", 1L));
-        GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Lapis, new ItemStack(Items.dye, 1, 4));
-        GT_OreDictUnificator.set(OrePrefixes.gem, Materials.EnderEye, new ItemStack(Items.ender_eye, 1));
-        GT_OreDictUnificator.set(OrePrefixes.gem, Materials.EnderPearl, new ItemStack(Items.ender_pearl, 1));
-        GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Diamond, new ItemStack(Items.diamond, 1));
-        GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Emerald, new ItemStack(Items.emerald, 1));
-        GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Coal, new ItemStack(Items.coal, 1, 0));
-        GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Charcoal, new ItemStack(Items.coal, 1, 1));
-        GT_OreDictUnificator.set(OrePrefixes.gem, Materials.NetherQuartz, new ItemStack(Items.quartz, 1));
-        GT_OreDictUnificator.set(OrePrefixes.gem, Materials.NetherStar, new ItemStack(Items.nether_star, 1));
-        GT_OreDictUnificator.set(OrePrefixes.nugget, Materials.Gold, new ItemStack(Items.gold_nugget, 1));
-        GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Gold, new ItemStack(Items.gold_ingot, 1));
-        GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Iron, new ItemStack(Items.iron_ingot, 1));
-        GT_OreDictUnificator.set(OrePrefixes.plate, Materials.Paper, new ItemStack(Items.paper, 1));
-        GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Sugar, new ItemStack(Items.sugar, 1));
-        GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Bone, ItemList.Dye_Bonemeal.get(1L));
-        GT_OreDictUnificator.set(OrePrefixes.stick, Materials.Wood, new ItemStack(Items.stick, 1));
-        GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Redstone, new ItemStack(Items.redstone, 1));
-        GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Gunpowder, new ItemStack(Items.gunpowder, 1));
-        GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Glowstone, new ItemStack(Items.glowstone_dust, 1));
-        GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Blaze, new ItemStack(Items.blaze_powder, 1));
-        GT_OreDictUnificator.set(OrePrefixes.stick, Materials.Blaze, new ItemStack(Items.blaze_rod, 1));
-        GT_OreDictUnificator.set(OrePrefixes.block, Materials.Iron, new ItemStack(Blocks.iron_block, 1, 0));
-        GT_OreDictUnificator.set(OrePrefixes.block, Materials.Gold, new ItemStack(Blocks.gold_block, 1, 0));
-        GT_OreDictUnificator.set(OrePrefixes.block, Materials.Diamond, new ItemStack(Blocks.diamond_block, 1, 0));
-        GT_OreDictUnificator.set(OrePrefixes.block, Materials.Emerald, new ItemStack(Blocks.emerald_block, 1, 0));
-        GT_OreDictUnificator.set(OrePrefixes.block, Materials.Lapis, new ItemStack(Blocks.lapis_block, 1, 0));
-        GT_OreDictUnificator.set(OrePrefixes.block, Materials.Coal, new ItemStack(Blocks.coal_block, 1, 0));
-        GT_OreDictUnificator.set(OrePrefixes.block, Materials.Redstone, new ItemStack(Blocks.redstone_block, 1, 0));
-        GT_OreDictUnificator.set(OrePrefixes.block, Materials.NetherQuartz, new ItemStack(Blocks.quartz_block, 1, 0));
-        GT_OreDictUnificator.set(OrePrefixes.block, Materials.Clay, new ItemStack(Blocks.clay, 1, 0));
-        if (Blocks.ender_chest != null) {
-            GT_OreDictUnificator.registerOre(OreDictNames.enderChest, new ItemStack(Blocks.ender_chest, 1));
-        }
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingAnvil, new ItemStack(Blocks.anvil, 1));
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingAnvil, GT_ModHandler.getModItem(Railcraft.ID, "anvil", 1L, 0));
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingIndustrialDiamond, ItemList.IC2_Industrial_Diamond.get(1L));
-        GT_OreDictUnificator
-            .registerOre(OrePrefixes.glass, Materials.Reinforced, GT_ModHandler.getIC2Item("reinforcedGlass", 1L));
-
-        GT_OreDictUnificator
-            .registerOre(OrePrefixes.stone, Materials.Basalt, GT_ModHandler.getModItem(Railcraft.ID, "cube", 1L, 6));
-        GT_OreDictUnificator
-            .registerOre(OrePrefixes.stone, Materials.Marble, GT_ModHandler.getModItem(Railcraft.ID, "cube", 1L, 7));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.stone,
-            Materials.Basalt,
-            GT_ModHandler.getModItem(Railcraft.ID, "brick.abyssal", 1L, 32767));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.stone,
-            Materials.Marble,
-            GT_ModHandler.getModItem(Railcraft.ID, "brick.quarried", 1L, 32767));
-        GT_OreDictUnificator
-            .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(Blocks.obsidian, 1, 32767));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Stone, new ItemStack(Blocks.stone, 1, 32767));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stoneMossy, new ItemStack(Blocks.mossy_cobblestone, 1, 32767));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stoneCobble, new ItemStack(Blocks.mossy_cobblestone, 1, 32767));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stoneCobble, new ItemStack(Blocks.cobblestone, 1, 32767));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stoneSmooth, new ItemStack(Blocks.stone, 1, 32767));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stoneBricks, new ItemStack(Blocks.stonebrick, 1, 32767));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stoneMossy, new ItemStack(Blocks.stonebrick, 1, 1));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stoneCracked, new ItemStack(Blocks.stonebrick, 1, 2));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stoneChiseled, new ItemStack(Blocks.stonebrick, 1, 3));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Sand, new ItemStack(Blocks.sandstone, 1, 32767));
-        GT_OreDictUnificator
-            .registerOre(OrePrefixes.stone, Materials.Netherrack, new ItemStack(Blocks.netherrack, 1, 32767));
-        GT_OreDictUnificator
-            .registerOre(OrePrefixes.stone, Materials.NetherBrick, new ItemStack(Blocks.nether_brick, 1, 32767));
-        GT_OreDictUnificator
-            .registerOre(OrePrefixes.stone, Materials.Endstone, new ItemStack(Blocks.end_stone, 1, 32767));
-        GT_OreDictUnificator
-            .registerOre(OrePrefixes.stone, Materials.Glowstone, new ItemStack(Blocks.glowstone, 1, 32767));
-
-        GT_OreDictUnificator
-            .registerOre("paperResearchFragment", GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 9));
-        GT_OreDictUnificator.registerOre(
-            "itemCertusQuartz",
-            GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1));
-        GT_OreDictUnificator.registerOre(
-            "itemCertusQuartz",
-            GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10));
-        GT_OreDictUnificator.registerOre(
-            "itemNetherQuartz",
-            GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11));
-        GT_OreDictUnificator.registerOre(
-            OreDictNames.craftingQuartz,
-            GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1));
-        GT_OreDictUnificator.registerOre(
-            OreDictNames.craftingQuartz,
-            GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10));
-        GT_OreDictUnificator.registerOre(
-            OreDictNames.craftingQuartz,
-            GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11));
-        GT_OreDictUnificator.registerOre("cropLemon", ItemList.FR_Lemon.get(1L));
-        GT_OreDictUnificator.registerOre("cropCoffee", ItemList.IC2_CoffeeBeans.get(1L));
-        GT_OreDictUnificator.registerOre("cropPotato", ItemList.Food_Raw_Potato.get(1L));
-        GT_OreDictUnificator.registerOre(OrePrefixes.battery, Materials.LV, GT_ModHandler.getIC2Item("reBattery", 1L));
-        GT_OreDictUnificator
-            .registerOre(OrePrefixes.battery, Materials.LV, GT_ModHandler.getIC2Item("chargedReBattery", 1L, 32767));
-        GT_OreDictUnificator
-            .registerOre(OrePrefixes.battery, Materials.MV, GT_ModHandler.getIC2Item("advBattery", 1L, 32767));
-        GT_OreDictUnificator
-            .registerOre(OrePrefixes.battery, Materials.HV, GT_ModHandler.getIC2Item("energyCrystal", 1L, 32767));
-        GT_OreDictUnificator
-            .registerOre(OrePrefixes.battery, Materials.EV, GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 32767));
-
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingWireCopper, GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L));
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingWireGold, GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L));
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingWireIron, GT_ModHandler.getIC2Item("insulatedIronCableItem", 1L));
-        GT_OreDictUnificator.registerOre(
-            OreDictNames.craftingWireTin,
-            GT_ModHandler
-                .getIC2Item("insulatedTinCableItem", 1L, GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L)));
-
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingRedstoneTorch, new ItemStack(Blocks.redstone_torch, 1, 32767));
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingRedstoneTorch, new ItemStack(Blocks.unlit_redstone_torch, 1, 32767));
-
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingWorkBench, new ItemStack(Blocks.crafting_table, 1));
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingWorkBench, new ItemStack(GregTech_API.sBlockMachines, 1, 16));
-
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingPiston, new ItemStack(Blocks.piston, 1, 32767));
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingPiston, new ItemStack(Blocks.sticky_piston, 1, 32767));
-
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingSafe, new ItemStack(GregTech_API.sBlockMachines, 1, 45));
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingSafe, GT_ModHandler.getIC2Item("personalSafe", 1L));
-
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingChest, new ItemStack(Blocks.chest, 1, 32767));
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingChest, new ItemStack(Blocks.trapped_chest, 1, 32767));
-
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingFurnace, new ItemStack(Blocks.furnace, 1, 32767));
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingFurnace, new ItemStack(Blocks.lit_furnace, 1, 32767));
-
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingPump, GT_ModHandler.getIC2Item("pump", 1L));
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingElectromagnet, GT_ModHandler.getIC2Item("magnetizer", 1L));
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingTeleporter, GT_ModHandler.getIC2Item("teleporter", 1L));
-
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingMacerator, GT_ModHandler.getIC2Item("macerator", 1L));
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingMacerator, new ItemStack(GregTech_API.sBlockMachines, 1, 50));
-
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingExtractor, GT_ModHandler.getIC2Item("extractor", 1L));
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingExtractor, new ItemStack(GregTech_API.sBlockMachines, 1, 51));
-
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingCompressor, GT_ModHandler.getIC2Item("compressor", 1L));
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingCompressor, new ItemStack(GregTech_API.sBlockMachines, 1, 52));
-
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingRecycler, GT_ModHandler.getIC2Item("recycler", 1L));
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingRecycler, new ItemStack(GregTech_API.sBlockMachines, 1, 53));
-
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingIronFurnace, GT_ModHandler.getIC2Item("ironFurnace", 1L));
-
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingCentrifuge, new ItemStack(GregTech_API.sBlockMachines, 1, 62));
-
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingInductionFurnace, GT_ModHandler.getIC2Item("inductionFurnace", 1L));
-
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingElectricFurnace, GT_ModHandler.getIC2Item("electroFurnace", 1L));
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingElectricFurnace, new ItemStack(GregTech_API.sBlockMachines, 1, 54));
-
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingGenerator, GT_ModHandler.getIC2Item("generator", 1L));
-
-        GT_OreDictUnificator
-            .registerOre(OreDictNames.craftingGeothermalGenerator, GT_ModHandler.getIC2Item("geothermalGenerator", 1L));
-
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingFeather, new ItemStack(Items.feather, 1, 32767));
-        GT_OreDictUnificator.registerOre(
-            OreDictNames.craftingFeather,
-            GT_ModHandler.getModItem(TwilightForest.ID, "item.tfFeather", 1L, 32767));
-
-        GT_OreDictUnificator.registerOre("itemWheat", new ItemStack(Items.wheat, 1, 32767));
-        GT_OreDictUnificator.registerOre("paperEmpty", new ItemStack(Items.paper, 1, 32767));
-        GT_OreDictUnificator.registerOre("paperMap", new ItemStack(Items.map, 1, 32767));
-        GT_OreDictUnificator.registerOre("paperMap", new ItemStack(Items.filled_map, 1, 32767));
-        GT_OreDictUnificator.registerOre("bookEmpty", new ItemStack(Items.book, 1, 32767));
-        GT_OreDictUnificator.registerOre("bookWritable", new ItemStack(Items.writable_book, 1, 32767));
-        GT_OreDictUnificator.registerOre("bookWritten", new ItemStack(Items.written_book, 1, 32767));
-        GT_OreDictUnificator.registerOre("bookEnchanted", new ItemStack(Items.enchanted_book, 1, 32767));
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.book, 1, 32767));
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.writable_book, 1, 32767));
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.written_book, 1, 32767));
-        GT_OreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.enchanted_book, 1, 32767));
-
-        GT_OreDictUnificator.addToBlacklist(GT_ModHandler.getIC2Item("electronicCircuit", 1L));
-        GT_OreDictUnificator.addToBlacklist(GT_ModHandler.getIC2Item("advancedCircuit", 1L));
-        GT_OreDictUnificator
-            .registerOre(OrePrefixes.circuit, Materials.LV, GT_ModHandler.getIC2Item("electronicCircuit", 1L));
-        GT_OreDictUnificator
-            .registerOre(OrePrefixes.circuit, Materials.HV, GT_ModHandler.getIC2Item("advancedCircuit", 1L));
-
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.itemCasing,
-            Materials.Copper,
-            GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 0));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.itemCasing,
-            Materials.Tin,
-            GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 1));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.itemCasing,
-            Materials.Bronze,
-            GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 2));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.itemCasing,
-            Materials.Gold,
-            GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 3));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.itemCasing,
-            Materials.Iron,
-            GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 4));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.itemCasing,
-            Materials.Steel,
-            GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 5));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.itemCasing,
-            Materials.Lead,
-            GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 6));
-
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.itemCasing,
-            Materials.Osmium,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OsmiumItemCasing", 1L, 0));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.itemCasing,
-            Materials.Aluminium,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.AluminiumItemCasing", 1L, 0));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.itemCasing,
-            Materials.StainlessSteel,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.StainlessSteelItemCasing", 1L, 0));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.itemCasing,
-            Materials.Tungsten,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TungstenItemCasing", 1L, 0));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.itemCasing,
-            Materials.Neutronium,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NeutroniumItemCasing", 1L, 0));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.itemCasing,
-            Materials.TungstenSteel,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TungstenSteelItemCasing", 1L, 0));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.itemCasing,
-            Materials.Iridium,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IridiumItemCasing", 1L, 0));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.itemCasing,
-            Materials.Titanium,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitaniumItemCasing", 1L, 0));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.itemCasing,
-            Materials.Chrome,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ChromeItemCasing", 1L, 0));
-
-        // Fake Circuits
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.circuit,
-            Materials.ULV,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitULV", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.circuit,
-            Materials.LV,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitLV", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.circuit,
-            Materials.MV,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMV", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.circuit,
-            Materials.HV,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitHV", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.circuit,
-            Materials.EV,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitEV", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.circuit,
-            Materials.IV,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitIV", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.circuit,
-            Materials.LuV,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitLuV", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.circuit,
-            Materials.ZPM,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitZPM", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.circuit,
-            Materials.UV,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUV", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.circuit,
-            Materials.UHV,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUHV", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.circuit,
-            Materials.UEV,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUEV", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.circuit,
-            Materials.UIV,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUIV", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.circuit,
-            Materials.UMV,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUMV", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.circuit,
-            Materials.UXV,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUXV", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.circuit,
-            Materials.MAX,
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMAX", 1L));
-
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.block,
-            MaterialsBotania.Manasteel,
-            GT_ModHandler.getModItem(Botania.ID, "storage", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.block,
-            MaterialsBotania.Terrasteel,
-            GT_ModHandler.getModItem(Botania.ID, "storage", 1L, 1));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.ingot,
-            MaterialsBotania.ElvenElementium,
-            GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 7));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.nugget,
-            MaterialsBotania.ElvenElementium,
-            GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 19));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.block,
-            MaterialsBotania.ElvenElementium,
-            GT_ModHandler.getModItem(Botania.ID, "storage", 1L, 2));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.block,
-            MaterialsBotania.Livingrock,
-            GT_ModHandler.getModItem(Botania.ID, "livingrock", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.ingot,
-            MaterialsBotania.GaiaSpirit,
-            GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 14));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.block,
-            MaterialsBotania.Livingwood,
-            GT_ModHandler.getModItem(Botania.ID, "livingwood", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.block,
-            MaterialsBotania.Dreamwood,
-            GT_ModHandler.getModItem(Botania.ID, "dreamwood", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.gem,
-            MaterialsBotania.ManaDiamond,
-            GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 2));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.block,
-            MaterialsBotania.ManaDiamond,
-            GT_ModHandler.getModItem(Botania.ID, "storage", 1L, 3));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.gem,
-            MaterialsBotania.BotaniaDragonstone,
-            GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 9));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.block,
-            MaterialsBotania.BotaniaDragonstone,
-            GT_ModHandler.getModItem(Botania.ID, "storage", 1L, 4));
-    }
-}
diff --git a/src/main/java/gregtech/loaders/preload/LoaderCircuitBehaviors.java b/src/main/java/gregtech/loaders/preload/LoaderCircuitBehaviors.java
new file mode 100644
index 0000000000..8bb2300000
--- /dev/null
+++ b/src/main/java/gregtech/loaders/preload/LoaderCircuitBehaviors.java
@@ -0,0 +1,31 @@
+package gregtech.loaders.preload;
+
+import gregtech.api.util.GTLog;
+import gregtech.common.redstonecircuits.CircuitBasicLogic;
+import gregtech.common.redstonecircuits.CircuitBitAnd;
+import gregtech.common.redstonecircuits.CircuitCombinationLock;
+import gregtech.common.redstonecircuits.CircuitEquals;
+import gregtech.common.redstonecircuits.CircuitPulser;
+import gregtech.common.redstonecircuits.CircuitRandomizer;
+import gregtech.common.redstonecircuits.CircuitRedstoneMeter;
+import gregtech.common.redstonecircuits.CircuitRepeater;
+import gregtech.common.redstonecircuits.CircuitTimer;
+
+public class LoaderCircuitBehaviors implements Runnable {
+
+    @Override
+    public void run() {
+        GTLog.out.println("GTMod: Register Redstone Circuit behaviours.");
+        new CircuitTimer(0);
+        new CircuitBasicLogic(1);
+        new CircuitRepeater(2);
+        new CircuitPulser(3);
+        new CircuitRedstoneMeter(4);
+
+        new CircuitRandomizer(8);
+
+        new CircuitCombinationLock(16);
+        new CircuitBitAnd(17);
+        new CircuitEquals(18);
+    }
+}
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java
index f4c682d848..7bf36c1e33 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
+++ b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java
@@ -13,9 +13,9 @@ import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
 import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeBuilder.WILDCARD;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.WILDCARD;
 
 import java.util.Locale;
 
@@ -29,10 +29,10 @@ import net.minecraftforge.fluids.FluidRegistry;
 import codechicken.nei.api.API;
 import cpw.mods.fml.common.event.FMLInterModComms;
 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.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsKevlar;
@@ -40,71 +40,71 @@ import gregtech.api.enums.MaterialsUEVplus;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
 import gregtech.api.enums.TierEU;
-import gregtech.api.fluid.GT_FluidFactory;
-import gregtech.api.items.GT_Block_LongDistancePipe;
-import gregtech.api.items.GT_BreederCell_Item;
-import gregtech.api.items.GT_Generic_Item;
-import gregtech.api.items.GT_RadioactiveCellIC_Item;
+import gregtech.api.fluid.GTFluidFactory;
+import gregtech.api.items.BlockLongDistancePipe;
+import gregtech.api.items.GTGenericItem;
+import gregtech.api.items.ItemBreederCell;
+import gregtech.api.items.ItemRadioactiveCellIC;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-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.blocks.GT_Block_Casings1;
-import gregtech.common.blocks.GT_Block_Casings10;
-import gregtech.common.blocks.GT_Block_Casings11;
-import gregtech.common.blocks.GT_Block_Casings2;
-import gregtech.common.blocks.GT_Block_Casings3;
-import gregtech.common.blocks.GT_Block_Casings4;
-import gregtech.common.blocks.GT_Block_Casings5;
-import gregtech.common.blocks.GT_Block_Casings6;
-import gregtech.common.blocks.GT_Block_Casings8;
-import gregtech.common.blocks.GT_Block_Casings9;
-import gregtech.common.blocks.GT_Block_Concretes;
-import gregtech.common.blocks.GT_Block_Drone;
-import gregtech.common.blocks.GT_Block_FrameBox;
-import gregtech.common.blocks.GT_Block_Glass1;
-import gregtech.common.blocks.GT_Block_Granites;
-import gregtech.common.blocks.GT_Block_Laser;
-import gregtech.common.blocks.GT_Block_Machines;
-import gregtech.common.blocks.GT_Block_Metal;
-import gregtech.common.blocks.GT_Block_Ores;
-import gregtech.common.blocks.GT_Block_Reinforced;
-import gregtech.common.blocks.GT_Block_Stones;
-import gregtech.common.blocks.GT_Block_TintedIndustrialGlass;
-import gregtech.common.blocks.GT_Cyclotron_Coils;
-import gregtech.common.blocks.GT_TileEntity_Ores;
-import gregtech.common.blocks.GT_WormholeRenderBlock;
-import gregtech.common.items.GT_DepletetCell_Item;
-import gregtech.common.items.GT_FluidDisplayItem;
-import gregtech.common.items.GT_IntegratedCircuit_Item;
-import gregtech.common.items.GT_MetaGenerated_Item_01;
-import gregtech.common.items.GT_MetaGenerated_Item_02;
-import gregtech.common.items.GT_MetaGenerated_Item_03;
-import gregtech.common.items.GT_MetaGenerated_Item_98;
-import gregtech.common.items.GT_MetaGenerated_Item_99;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.GT_NeutronReflector_Item;
-import gregtech.common.items.GT_TierDrone;
-import gregtech.common.items.GT_VolumetricFlask;
-import gregtech.common.items.GT_WirelessHeadphones;
-import gregtech.common.tileentities.render.TileDrone;
-import gregtech.common.tileentities.render.TileLaser;
-import gregtech.common.tileentities.render.TileWormhole;
-
-public class GT_Loader_Item_Block_And_Fluid implements Runnable {
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.blocks.BlockCasings1;
+import gregtech.common.blocks.BlockCasings10;
+import gregtech.common.blocks.BlockCasings11;
+import gregtech.common.blocks.BlockCasings2;
+import gregtech.common.blocks.BlockCasings3;
+import gregtech.common.blocks.BlockCasings4;
+import gregtech.common.blocks.BlockCasings5;
+import gregtech.common.blocks.BlockCasings6;
+import gregtech.common.blocks.BlockCasings8;
+import gregtech.common.blocks.BlockCasings9;
+import gregtech.common.blocks.BlockConcretes;
+import gregtech.common.blocks.BlockCyclotronCoils;
+import gregtech.common.blocks.BlockDrone;
+import gregtech.common.blocks.BlockFrameBox;
+import gregtech.common.blocks.BlockGlass1;
+import gregtech.common.blocks.BlockGranites;
+import gregtech.common.blocks.BlockLaser;
+import gregtech.common.blocks.BlockMachines;
+import gregtech.common.blocks.BlockMetal;
+import gregtech.common.blocks.BlockOres;
+import gregtech.common.blocks.BlockReinforced;
+import gregtech.common.blocks.BlockStones;
+import gregtech.common.blocks.BlockTintedIndustrialGlass;
+import gregtech.common.blocks.BlockWormholeRender;
+import gregtech.common.blocks.TileEntityOres;
+import gregtech.common.items.ItemDepletedCell;
+import gregtech.common.items.ItemFluidDisplay;
+import gregtech.common.items.ItemIntegratedCircuit;
+import gregtech.common.items.ItemNeutronReflector;
+import gregtech.common.items.ItemTierDrone;
+import gregtech.common.items.ItemVolumetricFlask;
+import gregtech.common.items.ItemWirelessHeadphones;
+import gregtech.common.items.MetaGeneratedItem01;
+import gregtech.common.items.MetaGeneratedItem02;
+import gregtech.common.items.MetaGeneratedItem03;
+import gregtech.common.items.MetaGeneratedItem98;
+import gregtech.common.items.MetaGeneratedItem99;
+import gregtech.common.items.MetaGeneratedTool01;
+import gregtech.common.tileentities.render.TileEntityDrone;
+import gregtech.common.tileentities.render.TileEntityLaser;
+import gregtech.common.tileentities.render.TileEntityWormhole;
+
+public class LoaderGTBlockFluid implements Runnable {
 
     @Override
     public void run() {
-        Materials.Water.mFluid = (Materials.Ice.mFluid = GT_ModHandler.getWater(1000L)
+        Materials.Water.mFluid = (Materials.Ice.mFluid = GTModHandler.getWater(1000L)
             .getFluid());
-        Materials.Lava.mFluid = GT_ModHandler.getLava(1000L)
+        Materials.Lava.mFluid = GTModHandler.getLava(1000L)
             .getFluid();
 
-        GT_Log.out.println("GT_Mod: Register Books.");
+        GTLog.out.println("GTMod: Register Books.");
 
-        GT_Utility.getWrittenBook(
+        GTUtility.getWrittenBook(
             "Manual_Printer",
             "Printer Manual V2.0",
             "Gregorius Techneticies",
@@ -117,7 +117,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             "3. Renaming Items: This Functionality is no longer Part of the Printer. There is now a Name Mold for the Forming Press to imprint a Name into an Item, just rename the Mold in an Anvil and use it in the Forming Press on any Item.",
             "4. Crafting of Books, Maps, Nametags etc etc etc: Those Recipes moved to other Machines, just look them up in NEI.");
 
-        GT_Utility.getWrittenBook(
+        GTUtility.getWrittenBook(
             "Manual_Punch_Cards",
             "Punch Card Manual V0.0",
             "Gregorius Techneticies",
@@ -135,7 +135,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             "A Punch Card Processor can run up to four Loops, each with the length of seven Punch Cards, parallel.",
             "Why does the Punch Card need Ink to be made, you ask? Because the empty one needs to have some lines on, and the for the punched one it prints the Code to execute in a human readable format on the Card.");
 
-        GT_Utility.getWrittenBook(
+        GTUtility.getWrittenBook(
             "Manual_Microwave",
             "Microwave Oven Manual",
             "Kitchen Industries",
@@ -148,81 +148,80 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             "Do not insert inflammable Objects. The Oven will catch on Fire.",
             "Do not insert Explosives such as Eggs. Just don't.");
 
-        GT_Log.out.println("GT_Mod: Register Items.");
+        GTLog.out.println("GTMod: Register Items.");
 
-        new GT_IntegratedCircuit_Item();
-        new GT_MetaGenerated_Item_01();
-        new GT_MetaGenerated_Item_02();
-        new GT_MetaGenerated_Item_03();
-        // GT_MetaGenerated_Item_98 is initialized in GT_Proxy.onPostLoad() because we need to wait for fluids to be
+        new ItemIntegratedCircuit();
+        new MetaGeneratedItem01();
+        new MetaGeneratedItem02();
+        new MetaGeneratedItem03();
+        // GT_MetaGenerated_Item_98 is initialized in GTProxy.onPostLoad() because we need to wait for fluids to be
         // registered.
         // Pre-initialization needs to happen before then, though, because the cell icons get deleted at some point
         // between load and post-load.
-        GT_MetaGenerated_Item_98.preInit();
-        new GT_MetaGenerated_Item_99();
-        new GT_MetaGenerated_Tool_01();
-        new GT_FluidDisplayItem();
-        new GT_WirelessHeadphones();
+        MetaGeneratedItem98.preInit();
+        new MetaGeneratedItem99();
+        new MetaGeneratedTool01();
+        new ItemFluidDisplay();
+        new ItemWirelessHeadphones();
 
-        // Tiered recipe materials actually appear to be set in GT_MetaTileEntity_BasicMachine_GT_Recipe, making these
+        // Tiered recipe materials actually appear to be set in MTEBasicMachineWithRecipe, making these
         // unused
-        ItemList.Rotor_LV.set(GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Tin, 1L));
-        ItemList.Rotor_MV.set(GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Bronze, 1L));
-        ItemList.Rotor_HV.set(GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Steel, 1L));
-        ItemList.Rotor_EV.set(GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1L));
-        ItemList.Rotor_IV.set(GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1L));
+        ItemList.Rotor_LV.set(GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Tin, 1L));
+        ItemList.Rotor_MV.set(GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Bronze, 1L));
+        ItemList.Rotor_HV.set(GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Steel, 1L));
+        ItemList.Rotor_EV.set(GTOreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1L));
+        ItemList.Rotor_IV.set(GTOreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1L));
 
-        ItemList.VOLUMETRIC_FLASK.set(new GT_VolumetricFlask("Volumetric_Flask", "Volumetric flask", 1000));
+        ItemList.VOLUMETRIC_FLASK.set(new ItemVolumetricFlask("Volumetric_Flask", "Volumetric flask", 1000));
 
-        Item tItem = (Item) GT_Utility.callConstructor(
+        Item tItem = (Item) GTUtility.callConstructor(
             "gregtech.common.items.GT_SensorCard_Item",
             0,
             null,
             false,
             new Object[] { "sensorcard", "GregTech Sensor Card" });
         ItemList.NC_SensorCard.set(
-            tItem == null ? new GT_Generic_Item("sensorcard", "GregTech Sensor Card", "Nuclear Control not installed")
+            tItem == null ? new GTGenericItem("sensorcard", "GregTech Sensor Card", "Nuclear Control not installed")
                 : tItem);
 
-        Item advSensorCard = (Item) GT_Utility
+        Item advSensorCard = (Item) GTUtility
             .callConstructor("gregtech.common.items.GT_AdvancedSensorCard_Item", 0, null, false);
         ItemList.NC_AdvancedSensorCard.set(
             advSensorCard == null
-                ? new GT_Generic_Item(
+                ? new GTGenericItem(
                     "advancedsensorcard",
                     "GregTech Advanced Sensor Card",
                     "Nuclear Control not installed")
                 : advSensorCard);
 
-        ItemList.Neutron_Reflector
-            .set(new GT_NeutronReflector_Item("neutronreflector", "Iridium Neutron Reflector", 0));
+        ItemList.Neutron_Reflector.set(new ItemNeutronReflector("neutronreflector", "Iridium Neutron Reflector", 0));
         ItemList.Reactor_Coolant_He_1
-            .set(GregTech_API.constructCoolantCellItem("60k_Helium_Coolantcell", "60k He Coolant Cell", 60000));
+            .set(GregTechAPI.constructCoolantCellItem("60k_Helium_Coolantcell", "60k He Coolant Cell", 60000));
         ItemList.Reactor_Coolant_He_3
-            .set(GregTech_API.constructCoolantCellItem("180k_Helium_Coolantcell", "180k He Coolant Cell", 180000));
+            .set(GregTechAPI.constructCoolantCellItem("180k_Helium_Coolantcell", "180k He Coolant Cell", 180000));
         ItemList.Reactor_Coolant_He_6
-            .set(GregTech_API.constructCoolantCellItem("360k_Helium_Coolantcell", "360k He Coolant Cell", 360000));
+            .set(GregTechAPI.constructCoolantCellItem("360k_Helium_Coolantcell", "360k He Coolant Cell", 360000));
         ItemList.Reactor_Coolant_NaK_1
-            .set(GregTech_API.constructCoolantCellItem("60k_NaK_Coolantcell", "60k NaK Coolantcell", 60000));
+            .set(GregTechAPI.constructCoolantCellItem("60k_NaK_Coolantcell", "60k NaK Coolantcell", 60000));
         ItemList.Reactor_Coolant_NaK_3
-            .set(GregTech_API.constructCoolantCellItem("180k_NaK_Coolantcell", "180k NaK Coolantcell", 180000));
+            .set(GregTechAPI.constructCoolantCellItem("180k_NaK_Coolantcell", "180k NaK Coolantcell", 180000));
         ItemList.Reactor_Coolant_NaK_6
-            .set(GregTech_API.constructCoolantCellItem("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000));
+            .set(GregTechAPI.constructCoolantCellItem("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000));
 
         ItemList.Reactor_Coolant_Sp_1
-            .set(GregTech_API.constructCoolantCellItem("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000));
+            .set(GregTechAPI.constructCoolantCellItem("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000));
 
         ItemList.Reactor_Coolant_Sp_2
-            .set(GregTech_API.constructCoolantCellItem("360k_Space_Coolantcell", "360k Sp Coolant Cell", 360000));
+            .set(GregTechAPI.constructCoolantCellItem("360k_Space_Coolantcell", "360k Sp Coolant Cell", 360000));
 
         ItemList.Reactor_Coolant_Sp_3
-            .set(GregTech_API.constructCoolantCellItem("540k_Space_Coolantcell", "540k Sp Coolant Cell", 540000));
+            .set(GregTechAPI.constructCoolantCellItem("540k_Space_Coolantcell", "540k Sp Coolant Cell", 540000));
 
         ItemList.Reactor_Coolant_Sp_6
-            .set(GregTech_API.constructCoolantCellItem("1080k_Space_Coolantcell", "1080k Sp Coolant Cell", 1080000));
+            .set(GregTechAPI.constructCoolantCellItem("1080k_Space_Coolantcell", "1080k Sp Coolant Cell", 1080000));
 
         ItemList.GlowstoneCell.set(
-            new GT_BreederCell_Item(
+            new ItemBreederCell(
                 "glowstoneCell",
                 "Glowstone Fuel Rod",
                 "Source of sunnarium",
@@ -230,23 +229,23 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 1,
                 10000,
                 () -> ItemList.SunnariumCell.get(1)));
-        ItemList.SunnariumCell.set(new GT_DepletetCell_Item("sunnariumCell", "Sunnarium Fuel Rod", 1));
+        ItemList.SunnariumCell.set(new ItemDepletedCell("sunnariumCell", "Sunnarium Fuel Rod", 1));
 
         ItemList.neutroniumHeatCapacitor.set(
-            GregTech_API
+            GregTechAPI
                 .constructCoolantCellItem("neutroniumHeatCapacitor", "1G Neutronium Heat Capacitor", 1000000000));
 
-        ItemList.Depleted_Thorium_1.set(new GT_DepletetCell_Item("ThoriumcellDep", "Fuel Rod (Depleted Thorium)", 1));
+        ItemList.Depleted_Thorium_1.set(new ItemDepletedCell("ThoriumcellDep", "Fuel Rod (Depleted Thorium)", 1));
         ItemList.Depleted_Thorium_2
-            .set(new GT_DepletetCell_Item("Double_ThoriumcellDep", "Dual Fuel Rod (Depleted Thorium)", 1)); // TODO
-                                                                                                            // CHECK
-                                                                                                            // num
+            .set(new ItemDepletedCell("Double_ThoriumcellDep", "Dual Fuel Rod (Depleted Thorium)", 1)); // TODO
+                                                                                                        // CHECK
+                                                                                                        // num
         ItemList.Depleted_Thorium_4
-            .set(new GT_DepletetCell_Item("Quad_ThoriumcellDep", "Quad Fuel Rod (Depleted Thorium)", 1)); // TODO
-                                                                                                          // CHECK
-                                                                                                          // num
+            .set(new ItemDepletedCell("Quad_ThoriumcellDep", "Quad Fuel Rod (Depleted Thorium)", 1)); // TODO
+                                                                                                      // CHECK
+                                                                                                      // num
         ItemList.ThoriumCell_1.set(
-            new GT_RadioactiveCellIC_Item(
+            new ItemRadioactiveCellIC(
                 "Thoriumcell",
                 "Fuel Rod (Thorium)",
                 1,
@@ -257,7 +256,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 ItemList.Depleted_Thorium_1.get(1),
                 false));
         ItemList.ThoriumCell_2.set(
-            new GT_RadioactiveCellIC_Item(
+            new ItemRadioactiveCellIC(
                 "Double_Thoriumcell",
                 "Dual Fuel Rod (Thorium)",
                 2,
@@ -268,7 +267,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 ItemList.Depleted_Thorium_2.get(1),
                 false));
         ItemList.ThoriumCell_4.set(
-            new GT_RadioactiveCellIC_Item(
+            new ItemRadioactiveCellIC(
                 "Quad_Thoriumcell",
                 "Quad Fuel Rod (Thorium)",
                 4,
@@ -279,44 +278,43 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 ItemList.Depleted_Thorium_4.get(1),
                 false));
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Depleted_Thorium_1.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lutetium, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L))
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lutetium, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L))
             .duration(25 * SECONDS)
             .eut(48)
             .addTo(thermalCentrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Depleted_Thorium_2.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3L))
             .duration(25 * SECONDS)
             .eut(48)
             .addTo(thermalCentrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Depleted_Thorium_4.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 4L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 4L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6L))
             .duration(25 * SECONDS)
             .eut(48)
             .addTo(thermalCentrifugeRecipes);
 
-        ItemList.Depleted_Naquadah_1
-            .set(new GT_DepletetCell_Item("NaquadahcellDep", "Fuel Rod (Depleted Naquadah)", 1));
+        ItemList.Depleted_Naquadah_1.set(new ItemDepletedCell("NaquadahcellDep", "Fuel Rod (Depleted Naquadah)", 1));
         ItemList.Depleted_Naquadah_2
-            .set(new GT_DepletetCell_Item("Double_NaquadahcellDep", "Dual Fuel Rod (Depleted Naquadah)", 1));
+            .set(new ItemDepletedCell("Double_NaquadahcellDep", "Dual Fuel Rod (Depleted Naquadah)", 1));
         ItemList.Depleted_Naquadah_4
-            .set(new GT_DepletetCell_Item("Quad_NaquadahcellDep", "Quad Fuel Rod (Depleted Naquadah)", 1));
+            .set(new ItemDepletedCell("Quad_NaquadahcellDep", "Quad Fuel Rod (Depleted Naquadah)", 1));
         ItemList.NaquadahCell_1.set(
-            new GT_RadioactiveCellIC_Item(
+            new ItemRadioactiveCellIC(
                 "Naquadahcell",
                 "Fuel Rod (Naquadah)",
                 1,
@@ -327,7 +325,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 ItemList.Depleted_Naquadah_1.get(1),
                 false));
         ItemList.NaquadahCell_2.set(
-            new GT_RadioactiveCellIC_Item(
+            new ItemRadioactiveCellIC(
                 "Double_Naquadahcell",
                 "Dual Fuel Rod (Naquadah)",
                 2,
@@ -338,7 +336,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 ItemList.Depleted_Naquadah_2.get(1),
                 false));
         ItemList.NaquadahCell_4.set(
-            new GT_RadioactiveCellIC_Item(
+            new ItemRadioactiveCellIC(
                 "Quad_Naquadahcell",
                 "Quad Fuel Rod (Naquadah)",
                 4,
@@ -349,53 +347,53 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 ItemList.Depleted_Naquadah_4.get(1),
                 false));
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Depleted_Naquadah_1.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Naquadria, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 8L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Naquadria, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 8L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1L))
             .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000)
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Depleted_Naquadah_2.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 4L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 18L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 2L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 4L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 18L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 2L))
             .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000)
             .duration(50 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Depleted_Naquadah_4.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 4L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 4L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 8L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 38L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 4L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 4L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 8L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 38L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L))
             .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000)
             .duration(100 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(centrifugeRecipes);
 
-        ItemList.Depleted_MNq_1.set(new GT_DepletetCell_Item("MNqCellDep", "Fuel Rod (Depleted Nq*)", 1));
-        ItemList.Depleted_MNq_2.set(new GT_DepletetCell_Item("Double_MNqCellDep", "Dual Fuel Rod (Depleted Nq*)", 1));
-        ItemList.Depleted_MNq_4.set(new GT_DepletetCell_Item("Quad_MNqCellDep", "Quad Fuel Rod (Depleted Nq*)", 1));
+        ItemList.Depleted_MNq_1.set(new ItemDepletedCell("MNqCellDep", "Fuel Rod (Depleted Nq*)", 1));
+        ItemList.Depleted_MNq_2.set(new ItemDepletedCell("Double_MNqCellDep", "Dual Fuel Rod (Depleted Nq*)", 1));
+        ItemList.Depleted_MNq_4.set(new ItemDepletedCell("Quad_MNqCellDep", "Quad Fuel Rod (Depleted Nq*)", 1));
         ItemList.MNqCell_1.set(
-            new GT_RadioactiveCellIC_Item(
+            new ItemRadioactiveCellIC(
                 "MNqCell",
                 "Fuel Rod (Nq* - MOX like behaviour)",
                 1,
@@ -406,7 +404,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 ItemList.Depleted_MNq_1.get(1),
                 true));
         ItemList.MNqCell_2.set(
-            new GT_RadioactiveCellIC_Item(
+            new ItemRadioactiveCellIC(
                 "Double_MNqCell",
                 "Dual Fuel Rod (Nq* - MOX like behaviour)",
                 2,
@@ -417,7 +415,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 ItemList.Depleted_MNq_2.get(1),
                 true));
         ItemList.MNqCell_4.set(
-            new GT_RadioactiveCellIC_Item(
+            new ItemRadioactiveCellIC(
                 "Quad_MNqCell",
                 "Quad Fuel Rod (Nq* - MOX like behaviour)",
                 4,
@@ -428,50 +426,50 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 ItemList.Depleted_MNq_4.get(1),
                 true));
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Depleted_MNq_1.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.NaquadahEnriched, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 8L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.NaquadahEnriched, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 8L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1L))
             .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000)
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Depleted_MNq_2.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 4L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 18L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 2L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 4L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 18L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 2L))
             .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000)
             .duration(50 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(centrifugeRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Depleted_MNq_4.get(1))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 4L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 4L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 8L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 38L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 4L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 4L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 8L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 38L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L))
             .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000)
             .duration(100 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(centrifugeRecipes);
 
         ItemList.Uraniumcell_1.set(
-            new GT_RadioactiveCellIC_Item(
+            new ItemRadioactiveCellIC(
                 "reactorUraniumSimple",
                 "Fuel Rod (Uranium)",
                 1,
@@ -479,10 +477,10 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 2F,
                 1,
                 1F,
-                GT_ModHandler.getIC2Item("reactorDepletedUraniumSimple", 1),
+                GTModHandler.getIC2Item("reactorDepletedUraniumSimple", 1),
                 false));
         ItemList.Uraniumcell_2.set(
-            new GT_RadioactiveCellIC_Item(
+            new ItemRadioactiveCellIC(
                 "reactorUraniumDual",
                 "Dual Fuel Rod (Uranium)",
                 2,
@@ -490,10 +488,10 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 2F,
                 1,
                 1F,
-                GT_ModHandler.getIC2Item("reactorDepletedUraniumDual", 1),
+                GTModHandler.getIC2Item("reactorDepletedUraniumDual", 1),
                 false));
         ItemList.Uraniumcell_4.set(
-            new GT_RadioactiveCellIC_Item(
+            new ItemRadioactiveCellIC(
                 "reactorUraniumQuad",
                 "Quad Fuel Rod (Uranium)",
                 4,
@@ -501,10 +499,10 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 2F,
                 1,
                 1F,
-                GT_ModHandler.getIC2Item("reactorDepletedUraniumQuad", 1),
+                GTModHandler.getIC2Item("reactorDepletedUraniumQuad", 1),
                 false));
         ItemList.Moxcell_1.set(
-            new GT_RadioactiveCellIC_Item(
+            new ItemRadioactiveCellIC(
                 "reactorMOXSimple",
                 "Fuel Rod (Mox)",
                 1,
@@ -512,10 +510,10 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 2F,
                 1,
                 1F,
-                GT_ModHandler.getIC2Item("reactorDepletedMOXSimple", 1),
+                GTModHandler.getIC2Item("reactorDepletedMOXSimple", 1),
                 true));
         ItemList.Moxcell_2.set(
-            new GT_RadioactiveCellIC_Item(
+            new ItemRadioactiveCellIC(
                 "reactorMOXDual",
                 "Dual Fuel Rod (Mox)",
                 2,
@@ -523,10 +521,10 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 2F,
                 1,
                 1F,
-                GT_ModHandler.getIC2Item("reactorDepletedMOXDual", 1),
+                GTModHandler.getIC2Item("reactorDepletedMOXDual", 1),
                 true));
         ItemList.Moxcell_4.set(
-            new GT_RadioactiveCellIC_Item(
+            new ItemRadioactiveCellIC(
                 "reactorMOXQuad",
                 "Quad Fuel Rod (Mox)",
                 4,
@@ -534,36 +532,36 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 2F,
                 1,
                 1F,
-                GT_ModHandler.getIC2Item("reactorDepletedMOXQuad", 1),
+                GTModHandler.getIC2Item("reactorDepletedMOXQuad", 1),
                 true));
 
-        GT_Log.out.println("GT_Mod: Adding Blocks.");
-        GregTech_API.sBlockMachines = new GT_Block_Machines();
-        GregTech_API.sBlockCasings1 = new GT_Block_Casings1();
-        GregTech_API.sBlockCasings2 = new GT_Block_Casings2();
-        GregTech_API.sBlockCasings3 = new GT_Block_Casings3();
-        GregTech_API.sBlockCasings4 = new GT_Block_Casings4();
-        GregTech_API.sBlockCasings5 = new GT_Block_Casings5();
-        GregTech_API.sBlockCasings6 = new GT_Block_Casings6();
-        GregTech_API.sBlockCasings8 = new GT_Block_Casings8();
-        GregTech_API.sBlockCasings9 = new GT_Block_Casings9();
-        GregTech_API.sBlockCasings10 = new GT_Block_Casings10();
-        GregTech_API.sBlockCasings11 = new GT_Block_Casings11();
-        GregTech_API.sBlockGranites = new GT_Block_Granites();
-        GregTech_API.sBlockLongDistancePipes = new GT_Block_LongDistancePipe();
-        GregTech_API.sBlockConcretes = new GT_Block_Concretes();
-        GregTech_API.sBlockStones = new GT_Block_Stones();
-        GregTech_API.sBlockOres1 = new GT_Block_Ores();
-        GregTech_API.sBlockFrames = new GT_Block_FrameBox();
-        GregTech_API.sDroneRender = new GT_Block_Drone();
-        GregTech_API.sBlockGlass1 = new GT_Block_Glass1();
-        GregTech_API.sBlockTintedGlass = new GT_Block_TintedIndustrialGlass();
-        GregTech_API.sLaserRender = new GT_Block_Laser();
-        GregTech_API.sWormholeRender = new GT_WormholeRenderBlock();
+        GTLog.out.println("GTMod: Adding Blocks.");
+        GregTechAPI.sBlockMachines = new BlockMachines();
+        GregTechAPI.sBlockCasings1 = new BlockCasings1();
+        GregTechAPI.sBlockCasings2 = new BlockCasings2();
+        GregTechAPI.sBlockCasings3 = new BlockCasings3();
+        GregTechAPI.sBlockCasings4 = new BlockCasings4();
+        GregTechAPI.sBlockCasings5 = new BlockCasings5();
+        GregTechAPI.sBlockCasings6 = new BlockCasings6();
+        GregTechAPI.sBlockCasings8 = new BlockCasings8();
+        GregTechAPI.sBlockCasings9 = new BlockCasings9();
+        GregTechAPI.sBlockCasings10 = new BlockCasings10();
+        GregTechAPI.sBlockCasings11 = new BlockCasings11();
+        GregTechAPI.sBlockGranites = new BlockGranites();
+        GregTechAPI.sBlockLongDistancePipes = new BlockLongDistancePipe();
+        GregTechAPI.sBlockConcretes = new BlockConcretes();
+        GregTechAPI.sBlockStones = new BlockStones();
+        GregTechAPI.sBlockOres1 = new BlockOres();
+        GregTechAPI.sBlockFrames = new BlockFrameBox();
+        GregTechAPI.sDroneRender = new BlockDrone();
+        GregTechAPI.sBlockGlass1 = new BlockGlass1();
+        GregTechAPI.sBlockTintedGlass = new BlockTintedIndustrialGlass();
+        GregTechAPI.sLaserRender = new BlockLaser();
+        GregTechAPI.sWormholeRender = new BlockWormholeRender();
 
         // meta ID order, DO NOT CHANGE ORDER
 
-        GregTech_API.sBlockMetal1 = new GT_Block_Metal(
+        GregTechAPI.sBlockMetal1 = new BlockMetal(
             "gt.blockmetal1",
             new Materials[] { Materials.Adamantium, Materials.Aluminium, Materials.Americium, Materials.AnnealedCopper,
                 Materials.Antimony, Materials.Arsenic, Materials.AstralSilver, Materials.BatteryAlloy,
@@ -572,7 +570,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             OrePrefixes.block,
             gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS1);
 
-        GregTech_API.sBlockMetal2 = new GT_Block_Metal(
+        GregTechAPI.sBlockMetal2 = new BlockMetal(
             "gt.blockmetal2",
             new Materials[] { Materials.Bronze, Materials.Caesium, Materials.Cerium, Materials.Chrome,
                 Materials.ChromiumDioxide, Materials.Cobalt, Materials.CobaltBrass, Materials.Copper,
@@ -581,7 +579,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             OrePrefixes.block,
             gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS2);
 
-        GregTech_API.sBlockMetal3 = new GT_Block_Metal(
+        GregTechAPI.sBlockMetal3 = new BlockMetal(
             "gt.blockmetal3",
             new Materials[] { Materials.ElectrumFlux, Materials.Enderium, Materials.Erbium, Materials.Europium,
                 Materials.FierySteel, Materials.Gadolinium, Materials.Gallium, Materials.Holmium, Materials.HSLA,
@@ -590,7 +588,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             OrePrefixes.block,
             gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS3);
 
-        GregTech_API.sBlockMetal4 = new GT_Block_Metal(
+        GregTechAPI.sBlockMetal4 = new BlockMetal(
             "gt.blockmetal4",
             new Materials[] { Materials.Knightmetal, Materials.Lanthanum, Materials.Lead, Materials.Lutetium,
                 Materials.Magnalium, Materials.Magnesium, Materials.Manganese, Materials.MeteoricIron,
@@ -599,7 +597,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             OrePrefixes.block,
             gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS4);
 
-        GregTech_API.sBlockMetal5 = new GT_Block_Metal(
+        GregTechAPI.sBlockMetal5 = new BlockMetal(
             "gt.blockmetal5",
             new Materials[] { Materials.Neodymium, Materials.NeodymiumMagnetic, Materials.Neutronium,
                 Materials.Nichrome, Materials.Nickel, Materials.Niobium, Materials.NiobiumNitride,
@@ -609,7 +607,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             OrePrefixes.block,
             gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS5);
 
-        GregTech_API.sBlockMetal6 = new GT_Block_Metal(
+        GregTechAPI.sBlockMetal6 = new BlockMetal(
             "gt.blockmetal6",
             new Materials[] { Materials.Promethium, Materials.RedAlloy, Materials.RedSteel, Materials.RoseGold,
                 Materials.Rubidium, Materials.Samarium, Materials.Scandium, Materials.ShadowIron, Materials.ShadowSteel,
@@ -618,7 +616,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             OrePrefixes.block,
             gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS6);
 
-        GregTech_API.sBlockMetal7 = new GT_Block_Metal(
+        GregTechAPI.sBlockMetal7 = new BlockMetal(
             "gt.blockmetal7",
             new Materials[] { Materials.Sunnarium, Materials.Tantalum, Materials.Tellurium, Materials.Terbium,
                 Materials.Thaumium, Materials.Thorium, Materials.Thulium, Materials.Tin, Materials.TinAlloy,
@@ -627,7 +625,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             OrePrefixes.block,
             gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS7);
 
-        GregTech_API.sBlockMetal8 = new GT_Block_Metal(
+        GregTechAPI.sBlockMetal8 = new BlockMetal(
             "gt.blockmetal8",
             new Materials[] { Materials.Vanadium, Materials.VanadiumGallium, Materials.WroughtIron, Materials.Ytterbium,
                 Materials.Yttrium, Materials.YttriumBariumCuprate, Materials.Zinc, Materials.TungstenCarbide,
@@ -636,7 +634,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             OrePrefixes.block,
             gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS8);
 
-        GregTech_API.sBlockGem1 = new GT_Block_Metal(
+        GregTechAPI.sBlockGem1 = new BlockMetal(
             "gt.blockgem1",
             new Materials[] { Materials.InfusedAir, Materials.Amber, Materials.Amethyst, Materials.InfusedWater,
                 Materials.BlueTopaz, Materials.CertusQuartz, Materials.Dilithium, Materials.EnderEye,
@@ -645,7 +643,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             OrePrefixes.block,
             gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS9);
 
-        GregTech_API.sBlockGem2 = new GT_Block_Metal(
+        GregTechAPI.sBlockGem2 = new BlockMetal(
             "gt.blockgem2",
             new Materials[] { Materials.Lazurite, Materials.Lignite, Materials.Monazite, Materials.Niter,
                 Materials.Olivine, Materials.Opal, Materials.InfusedOrder, Materials.InfusedEntropy,
@@ -654,14 +652,14 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             OrePrefixes.block,
             gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS10);
 
-        GregTech_API.sBlockGem3 = new GT_Block_Metal(
+        GregTechAPI.sBlockGem3 = new BlockMetal(
             "gt.blockgem3",
             new Materials[] { Materials.Topaz, Materials.Vinteum, Materials.GarnetYellow, Materials.NetherStar,
                 Materials.Charcoal, Materials.Blaze },
             OrePrefixes.block,
             gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS11);
 
-        GregTech_API.sBlockMetal9 = new GT_Block_Metal(
+        GregTechAPI.sBlockMetal9 = new BlockMetal(
             "gt.blockmetal9",
             new Materials[] { Materials.Cryolite, Materials.SiliconSG, MaterialsKevlar.NickelAluminide,
                 MaterialsUEVplus.SpaceTime, MaterialsUEVplus.TranscendentMetal, Materials.Oriharukon,
@@ -670,13 +668,13 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             OrePrefixes.block,
             gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS12);
 
-        GregTech_API.sBlockReinforced = new GT_Block_Reinforced("gt.blockreinforced");
+        GregTechAPI.sBlockReinforced = new BlockReinforced("gt.blockreinforced");
 
-        GT_Log.out.println("GT_Mod: Register TileEntities.");
+        GTLog.out.println("GTMod: Register TileEntities.");
 
-        BaseMetaTileEntity tBaseMetaTileEntity = GregTech_API.constructBaseMetaTileEntity();
+        BaseMetaTileEntity tBaseMetaTileEntity = GregTechAPI.constructBaseMetaTileEntity();
 
-        GT_Log.out.println("GT_Mod: Registering the BaseMetaTileEntity.");
+        GTLog.out.println("GTMod: Registering the BaseMetaTileEntity.");
         GameRegistry.registerTileEntity(tBaseMetaTileEntity.getClass(), "BaseMetaTileEntity");
         FMLInterModComms.sendMessage(
             AppliedEnergistics2.ID,
@@ -684,176 +682,175 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             tBaseMetaTileEntity.getClass()
                 .getName());
 
-        GT_Log.out.println("GT_Mod: Registering the DroneRender.");
-        GameRegistry.registerTileEntity(TileDrone.class, "DroneRender");
+        GTLog.out.println("GTMod: Registering the DroneRender.");
+        GameRegistry.registerTileEntity(TileEntityDrone.class, "DroneRender");
 
-        GT_Log.out.println("GT_Mod: Registering the LaserRender.");
-        GameRegistry.registerTileEntity(TileLaser.class, "LaserRenderer");
+        GTLog.out.println("GTMod: Registering the LaserRender.");
+        GameRegistry.registerTileEntity(TileEntityLaser.class, "LaserRenderer");
 
-        GT_Log.out.println("GT_Mod: Registering the WormholeRender.");
-        GameRegistry.registerTileEntity(TileWormhole.class, "WormholeRender");
+        GTLog.out.println("GTMod: Registering the WormholeRender.");
+        GameRegistry.registerTileEntity(TileEntityWormhole.class, "WormholeRender");
 
-        GT_Log.out.println("GT_Mod: Registering the BaseMetaPipeEntity.");
+        GTLog.out.println("GTMod: Registering the BaseMetaPipeEntity.");
         GameRegistry.registerTileEntity(BaseMetaPipeEntity.class, "BaseMetaPipeEntity");
         FMLInterModComms.sendMessage(AppliedEnergistics2.ID, "whitelist-spatial", BaseMetaPipeEntity.class.getName());
 
-        GT_Log.out.println("GT_Mod: Registering the Ore TileEntity.");
-        GameRegistry.registerTileEntity(GT_TileEntity_Ores.class, "GT_TileEntity_Ores");
-        FMLInterModComms.sendMessage(AppliedEnergistics2.ID, "whitelist-spatial", GT_TileEntity_Ores.class.getName());
+        GTLog.out.println("GTMod: Registering the Ore TileEntity.");
+        GameRegistry.registerTileEntity(TileEntityOres.class, "GT_TileEntity_Ores");
+        FMLInterModComms.sendMessage(AppliedEnergistics2.ID, "whitelist-spatial", TileEntityOres.class.getName());
 
-        GT_Log.out.println("GT_Mod: Registering Fluids.");
-        Materials.ConstructionFoam.mFluid = GT_Utility
-            .getFluidForFilledItem(GT_ModHandler.getIC2Item("CFCell", 1L), true)
+        GTLog.out.println("GTMod: Registering Fluids.");
+        Materials.ConstructionFoam.mFluid = GTUtility.getFluidForFilledItem(GTModHandler.getIC2Item("CFCell", 1L), true)
             .getFluid();
-        Materials.UUMatter.mFluid = GT_Utility.getFluidForFilledItem(GT_ModHandler.getIC2Item("uuMatterCell", 1L), true)
+        Materials.UUMatter.mFluid = GTUtility.getFluidForFilledItem(GTModHandler.getIC2Item("uuMatterCell", 1L), true)
             .getFluid();
 
-        GT_FluidFactory.builder("Air")
+        GTFluidFactory.builder("Air")
             .withLocalizedName("Air")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Air)
             .registerContainers(ItemList.Cell_Air.get(1L), ItemList.Cell_Empty.get(1L), 2000);
-        GT_FluidFactory.builder("LiquidOxygen")
+        GTFluidFactory.builder("LiquidOxygen")
             .withLocalizedName("Liquid Oxygen")
             .withStateAndTemperature(GAS, 60)
             .buildAndRegister()
             .configureMaterials(Materials.LiquidOxygen)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidOxygen, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.LiquidOxygen, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("LiquidNitrogen")
+        GTFluidFactory.builder("LiquidNitrogen")
             .withLocalizedName("Liquid Nitrogen")
             .withStateAndTemperature(GAS, 77)
             .buildAndRegister()
             .configureMaterials(Materials.LiquidNitrogen)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidNitrogen, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.LiquidNitrogen, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("LiquidAir")
+        GTFluidFactory.builder("LiquidAir")
             .withLocalizedName("Liquid Air")
             .withStateAndTemperature(LIQUID, 77)
             .buildAndRegister()
             .configureMaterials(Materials.LiquidAir)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("Oxygen")
+        GTFluidFactory.builder("Oxygen")
             .withLocalizedName("Oxygen")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Oxygen)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("Hydrogen")
+        GTFluidFactory.builder("Hydrogen")
             .withLocalizedName("Hydrogen")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Hydrogen)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("Deuterium")
+        GTFluidFactory.builder("Deuterium")
             .withLocalizedName("Deuterium")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Deuterium)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Deuterium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Deuterium, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("Tritium")
+        GTFluidFactory.builder("Tritium")
             .withLocalizedName("Tritium")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Tritium)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Tritium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Tritium, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("Helium")
+        GTFluidFactory.builder("Helium")
             .withLocalizedName("Helium")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Helium)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("Argon")
+        GTFluidFactory.builder("Argon")
             .withLocalizedName("Argon")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Argon)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("Radon")
+        GTFluidFactory.builder("Radon")
             .withLocalizedName("Radon")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Radon)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L),
                 ItemList.Cell_Empty.get(1L));
 
-        GT_FluidFactory.builder("Fluorine")
+        GTFluidFactory.builder("Fluorine")
             .withLocalizedName("Fluorine")
             .withStateAndTemperature(GAS, 53)
             .buildAndRegister()
             .configureMaterials(Materials.Fluorine)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("Titaniumtetrachloride")
+        GTFluidFactory.builder("Titaniumtetrachloride")
             .withLocalizedName("Titaniumtetrachloride")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Titaniumtetrachloride)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Titaniumtetrachloride, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Titaniumtetrachloride, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("Helium-3")
+        GTFluidFactory.builder("Helium-3")
             .withLocalizedName("Helium-3")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Helium_3)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium_3, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Helium_3, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("Methane")
+        GTFluidFactory.builder("Methane")
             .withLocalizedName("Methane")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Methane)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Methane, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Methane, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("Nitrogen")
+        GTFluidFactory.builder("Nitrogen")
             .withLocalizedName("Nitrogen")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Nitrogen)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("NitrogenDioxide")
+        GTFluidFactory.builder("NitrogenDioxide")
             .withLocalizedName("Nitrogen Dioxide")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.NitrogenDioxide)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitrogenDioxide, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.NitrogenDioxide, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("Steam")
+        GTFluidFactory.builder("Steam")
             .withLocalizedName("Steam")
             .withStateAndTemperature(GAS, 375)
             .buildAndRegister()
             .configureMaterials(Materials.Water)
-            .registerBContainers(GT_ModHandler.getIC2Item("steamCell", 1), Materials.Empty.getCells(1));
+            .registerBContainers(GTModHandler.getIC2Item("steamCell", 1), Materials.Empty.getCells(1));
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Empty.getCells(1))
-            .itemOutputs(GT_ModHandler.getIC2Item("steamCell", 1))
-            .fluidInputs(GT_ModHandler.getSteam(1000))
+            .itemOutputs(GTModHandler.getIC2Item("steamCell", 1))
+            .fluidInputs(GTModHandler.getSteam(1000))
             .duration(16 * TICKS)
             .eut(1)
             .addTo(fluidCannerRecipes);
@@ -862,23 +859,23 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
         Materials.Water.mGas.setTemperature(375)
             .setGaseous(true);
 
-        ItemList.sOilExtraHeavy = GT_FluidFactory.of("liquid_extra_heavy_oil", "Very Heavy Oil", LIQUID, 295);
-        ItemList.sEpichlorhydrin = GT_FluidFactory.builder("liquid_epichlorhydrin")
+        ItemList.sOilExtraHeavy = GTFluidFactory.of("liquid_extra_heavy_oil", "Very Heavy Oil", LIQUID, 295);
+        ItemList.sEpichlorhydrin = GTFluidFactory.builder("liquid_epichlorhydrin")
             .withLocalizedName("Epichlorohydrin")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Epichlorohydrin)
             .registerBContainers(Materials.Epichlorohydrin.getCells(1), Materials.Empty.getCells(1))
             .asFluid();
-        ItemList.sDrillingFluid = GT_FluidFactory.of("liquid_drillingfluid", "Drilling Fluid", LIQUID, 295);
-        ItemList.sToluene = GT_FluidFactory.builder("liquid_toluene")
+        ItemList.sDrillingFluid = GTFluidFactory.of("liquid_drillingfluid", "Drilling Fluid", LIQUID, 295);
+        ItemList.sToluene = GTFluidFactory.builder("liquid_toluene")
             .withLocalizedName("Toluene")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Toluene)
             .registerBContainers(Materials.Toluene.getCells(1), Materials.Empty.getCells(1))
             .asFluid();
-        ItemList.sNitrationMixture = GT_FluidFactory.builder("liquid_nitrationmixture")
+        ItemList.sNitrationMixture = GTFluidFactory.builder("liquid_nitrationmixture")
             .withLocalizedName("Nitration Mixture")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
@@ -886,120 +883,120 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             .registerBContainers(Materials.NitrationMixture.getCells(1), Materials.Empty.getCells(1))
             .asFluid();
 
-        GT_FluidFactory.builder("liquid_heavy_oil")
+        GTFluidFactory.builder("liquid_heavy_oil")
             .withLocalizedName("Heavy Oil")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.OilHeavy)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilHeavy, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.OilHeavy, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("liquid_medium_oil")
+        GTFluidFactory.builder("liquid_medium_oil")
             .withLocalizedName("Raw Oil")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.OilMedium)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilMedium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.OilMedium, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("liquid_light_oil")
+        GTFluidFactory.builder("liquid_light_oil")
             .withLocalizedName("Light Oil")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.OilLight)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilLight, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.OilLight, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("gas_natural_gas")
+        GTFluidFactory.builder("gas_natural_gas")
             .withLocalizedName("Natural Gas")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.NatruralGas)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NatruralGas, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.NatruralGas, 1L),
                 ItemList.Cell_Empty.get(1L));
-        ItemList.sHydricSulfur = GT_FluidFactory.builder("liquid_hydricsulfur")
+        ItemList.sHydricSulfur = GTFluidFactory.builder("liquid_hydricsulfur")
             .withLocalizedName("Hydrogen Sulfide")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.HydricSulfide)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L),
                 ItemList.Cell_Empty.get(1L))
             .asFluid();
-        GT_FluidFactory.builder("gas_sulfuricgas")
+        GTFluidFactory.builder("gas_sulfuricgas")
             .withLocalizedName("Sulfuric Gas")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.SulfuricGas)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricGas, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricGas, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("gas_gas")
+        GTFluidFactory.builder("gas_gas")
             .withLocalizedName("Refinery Gas")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Gas)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("liquid_sulfuricnaphtha")
+        GTFluidFactory.builder("liquid_sulfuricnaphtha")
             .withLocalizedName("Sulfuric Naphtha")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.SulfuricNaphtha)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricNaphtha, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricNaphtha, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("liquid_sufluriclight_fuel")
+        GTFluidFactory.builder("liquid_sufluriclight_fuel")
             .withLocalizedName("Sulfuric Light Fuel")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.SulfuricLightFuel)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricLightFuel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricLightFuel, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("liquid_sulfuricheavy_fuel")
+        GTFluidFactory.builder("liquid_sulfuricheavy_fuel")
             .withLocalizedName("Sulfuric Heavy Fuel")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.SulfuricHeavyFuel)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricHeavyFuel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricHeavyFuel, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("liquid_naphtha")
+        GTFluidFactory.builder("liquid_naphtha")
             .withLocalizedName("Naphtha")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Naphtha)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naphtha, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Naphtha, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("liquid_light_fuel")
+        GTFluidFactory.builder("liquid_light_fuel")
             .withLocalizedName("Light Fuel")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.LightFuel)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("liquid_heavy_fuel")
+        GTFluidFactory.builder("liquid_heavy_fuel")
             .withLocalizedName("Heavy Fuel")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.HeavyFuel)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("liquid_lpg")
+        GTFluidFactory.builder("liquid_lpg")
             .withLocalizedName("LPG")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.LPG)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LPG, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.LPG, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("charcoal_byproducts")
+        GTFluidFactory.builder("charcoal_byproducts")
             .withTextureName("molten.autogenerated")
             .withLocalizedName("Charcoal Byproducts")
             .withColorRGBA(Materials.CharcoalByproducts.mRGBa)
@@ -1007,9 +1004,9 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             .buildAndRegister()
             .configureMaterials(Materials.CharcoalByproducts)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.CharcoalByproducts, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.CharcoalByproducts, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("molten.bisphenol_a")
+        GTFluidFactory.builder("molten.bisphenol_a")
             .withTextureName("molten.autogenerated")
             .withLocalizedName("Molten Bisphenol A")
             .withColorRGBA(Materials.BisphenolA.mRGBa)
@@ -1017,299 +1014,299 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
             .buildAndRegister()
             .configureMaterials(Materials.BisphenolA)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.BisphenolA, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.BisphenolA, 1L),
                 ItemList.Cell_Empty.get(1L));
 
-        GT_FluidFactory.builder("UUAmplifier")
+        GTFluidFactory.builder("UUAmplifier")
             .withLocalizedName("UU Amplifier")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.UUAmplifier)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.UUAmplifier, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.UUAmplifier, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("Chlorine")
+        GTFluidFactory.builder("Chlorine")
             .withLocalizedName("Chlorine")
             .withStateAndTemperature(GAS, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Chlorine)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("Mercury")
+        GTFluidFactory.builder("Mercury")
             .withLocalizedName("Mercury")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Mercury)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Mercury, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Mercury, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("NitroFuel")
+        GTFluidFactory.builder("NitroFuel")
             .withLocalizedName("Cetane-Boosted Diesel")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.NitroFuel)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitroFuel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.NitroFuel, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("SodiumPersulfate")
+        GTFluidFactory.builder("SodiumPersulfate")
             .withLocalizedName("Sodium Persulfate")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.SodiumPersulfate)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SodiumPersulfate, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.SodiumPersulfate, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("Glyceryl")
+        GTFluidFactory.builder("Glyceryl")
             .withLocalizedName("Glyceryl Trinitrate")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Glyceryl)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glyceryl, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Glyceryl, 1L),
                 ItemList.Cell_Empty.get(1L));
 
-        GT_FluidFactory.builder("lubricant")
+        GTFluidFactory.builder("lubricant")
             .withLocalizedName("Lubricant")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Lubricant)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("creosote")
+        GTFluidFactory.builder("creosote")
             .withLocalizedName("Creosote Oil")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Creosote)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Creosote, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Creosote, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("seedoil")
+        GTFluidFactory.builder("seedoil")
             .withLocalizedName("Seed Oil")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.SeedOil)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SeedOil, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.SeedOil, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("fishoil")
+        GTFluidFactory.builder("fishoil")
             .withLocalizedName("Fish Oil")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.FishOil)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FishOil, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.FishOil, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("oil")
+        GTFluidFactory.builder("oil")
             .withLocalizedName("Oil")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Oil)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("fuel")
+        GTFluidFactory.builder("fuel")
             .withLocalizedName("Diesel")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Fuel)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("for.honey")
+        GTFluidFactory.builder("for.honey")
             .withLocalizedName("Honey")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Honey)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Honey, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Honey, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("biomass")
+        GTFluidFactory.builder("biomass")
             .withLocalizedName("Biomass")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Biomass)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Biomass, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Biomass, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("bioethanol")
+        GTFluidFactory.builder("bioethanol")
             .withLocalizedName("Bio Ethanol")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Ethanol)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ethanol, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Ethanol, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("sulfuricacid")
+        GTFluidFactory.builder("sulfuricacid")
             .withLocalizedName("Sulfuric Acid")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.SulfuricAcid)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("milk")
+        GTFluidFactory.builder("milk")
             .withLocalizedName("Milk")
             .withStateAndTemperature(LIQUID, 290)
             .buildAndRegister()
             .configureMaterials(Materials.Milk)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Milk, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Milk, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("mcguffium")
+        GTFluidFactory.builder("mcguffium")
             .withLocalizedName("Mc Guffium 239")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.McGuffium239)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.McGuffium239, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.McGuffium239, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("refinedGlue")
+        GTFluidFactory.builder("refinedGlue")
             .withLocalizedName("Refined Glue")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Glue)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("hotfryingoil")
+        GTFluidFactory.builder("hotfryingoil")
             .withLocalizedName("Hot Frying Oil")
             .withStateAndTemperature(LIQUID, 400)
             .buildAndRegister()
             .configureMaterials(Materials.FryingOilHot)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FryingOilHot, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.FryingOilHot, 1L),
                 ItemList.Cell_Empty.get(1L));
 
-        GT_FluidFactory.builder("DimensionallyTranscendentResidue")
+        GTFluidFactory.builder("DimensionallyTranscendentResidue")
             .withLocalizedName("Dimensionally Transcendent Residue")
             .withStateAndTemperature(LIQUID, 2000000000)
             .buildAndRegister()
             .configureMaterials(MaterialsUEVplus.DimensionallyTranscendentResidue)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.DimensionallyTranscendentResidue, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.DimensionallyTranscendentResidue, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("ExcitedDTCC")
+        GTFluidFactory.builder("ExcitedDTCC")
             .withLocalizedName("Excited Dimensionally Transcendent Crude Catalyst")
             .withStateAndTemperature(LIQUID, 500000000)
             .buildAndRegister()
             .configureMaterials(MaterialsUEVplus.ExcitedDTCC)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTCC, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTCC, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("ExcitedDTPC")
+        GTFluidFactory.builder("ExcitedDTPC")
             .withLocalizedName("Excited Dimensionally Transcendent Prosaic Catalyst")
             .withStateAndTemperature(LIQUID, 500000000)
             .buildAndRegister()
             .configureMaterials(MaterialsUEVplus.ExcitedDTPC)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTPC, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTPC, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("ExcitedDTRC")
+        GTFluidFactory.builder("ExcitedDTRC")
             .withLocalizedName("Excited Dimensionally Transcendent Resplendent Catalyst")
             .withStateAndTemperature(LIQUID, 500000000)
             .buildAndRegister()
             .configureMaterials(MaterialsUEVplus.ExcitedDTRC)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTRC, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTRC, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("ExcitedDTEC")
+        GTFluidFactory.builder("ExcitedDTEC")
             .withLocalizedName("Excited Dimensionally Transcendent Exotic Catalyst")
             .withStateAndTemperature(LIQUID, 500000000)
             .buildAndRegister()
             .configureMaterials(MaterialsUEVplus.ExcitedDTEC)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTEC, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTEC, 1L),
                 ItemList.Cell_Empty.get(1L));
-        GT_FluidFactory.builder("ExcitedDTSC")
+        GTFluidFactory.builder("ExcitedDTSC")
             .withLocalizedName("Excited Dimensionally Transcendent Stellar Catalyst")
             .withStateAndTemperature(LIQUID, 500000000)
             .buildAndRegister()
             .configureMaterials(MaterialsUEVplus.ExcitedDTSC)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTSC, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTSC, 1L),
                 ItemList.Cell_Empty.get(1L));
 
-        GT_FluidFactory.builder(MaterialsUEVplus.RawStarMatter.mName)
+        GTFluidFactory.builder(MaterialsUEVplus.RawStarMatter.mName)
             .withLocalizedName(MaterialsUEVplus.RawStarMatter.mLocalizedName)
             .withStateAndTemperature(LIQUID, 10_000_000)
             .buildAndRegister()
             .configureMaterials(MaterialsUEVplus.RawStarMatter)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.RawStarMatter, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.RawStarMatter, 1L),
                 ItemList.Cell_Empty.get(1L));
 
-        GT_FluidFactory.builder(MaterialsUEVplus.Space.mName)
+        GTFluidFactory.builder(MaterialsUEVplus.Space.mName)
             .withLocalizedName(MaterialsUEVplus.Space.mLocalizedName)
             .withStateAndTemperature(MOLTEN, 0)
             .buildAndRegister()
             .configureMaterials(MaterialsUEVplus.Space)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.Space, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.Space, 1L),
                 ItemList.Cell_Empty.get(1L));
 
-        GT_FluidFactory.builder(MaterialsUEVplus.Time.mName)
+        GTFluidFactory.builder(MaterialsUEVplus.Time.mName)
             .withLocalizedName(MaterialsUEVplus.Time.mLocalizedName)
             .withStateAndTemperature(MOLTEN, 0)
             .buildAndRegister()
             .configureMaterials(MaterialsUEVplus.Time)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.Time, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.Time, 1L),
                 ItemList.Cell_Empty.get(1L));
 
-        GT_FluidFactory.builder("PrimordialMatter")
+        GTFluidFactory.builder("PrimordialMatter")
             .withLocalizedName(MaterialsUEVplus.PrimordialMatter.mLocalizedName)
             .withStateAndTemperature(LIQUID, 2_000_000_000)
             .buildAndRegister()
             .configureMaterials(MaterialsUEVplus.PrimordialMatter)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.PrimordialMatter, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.PrimordialMatter, 1L),
                 ItemList.Cell_Empty.get(1L));
 
-        GT_FluidFactory.builder("QuarkGluonPlasma")
+        GTFluidFactory.builder("QuarkGluonPlasma")
             .withLocalizedName(MaterialsUEVplus.QuarkGluonPlasma.mLocalizedName)
             .withStateAndTemperature(LIQUID, 2_000_000_000)
             .buildAndRegister()
             .configureMaterials(MaterialsUEVplus.QuarkGluonPlasma)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.QuarkGluonPlasma, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.QuarkGluonPlasma, 1L),
                 ItemList.Cell_Empty.get(1L));
 
-        GT_FluidFactory.builder("PhononMedium")
+        GTFluidFactory.builder("PhononMedium")
             .withLocalizedName(MaterialsUEVplus.PhononMedium.mLocalizedName)
             .withStateAndTemperature(LIQUID, 500)
             .buildAndRegister()
             .configureMaterials(MaterialsUEVplus.PhononMedium)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.PhononMedium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.PhononMedium, 1L),
                 ItemList.Cell_Empty.get(1L));
 
-        GT_FluidFactory.builder("PhononCrystalSolution")
+        GTFluidFactory.builder("PhononCrystalSolution")
             .withLocalizedName(MaterialsUEVplus.PhononCrystalSolution.mLocalizedName)
             .withStateAndTemperature(LIQUID, 500)
             .buildAndRegister()
             .configureMaterials(MaterialsUEVplus.PhononCrystalSolution)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.PhononCrystalSolution, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.PhononCrystalSolution, 1L),
                 ItemList.Cell_Empty.get(1L));
 
-        GT_FluidFactory.builder("fieryblood")
+        GTFluidFactory.builder("fieryblood")
             .withLocalizedName("Fiery Blood")
             .withStateAndTemperature(LIQUID, 6400)
             .buildAndRegister()
             .configureMaterials(Materials.FierySteel)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FierySteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.FierySteel, 1L),
                 ItemList.Cell_Empty.get(1L));
 
-        GT_FluidFactory.builder("holywater")
+        GTFluidFactory.builder("holywater")
             .withLocalizedName("Holy Water")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.HolyWater)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HolyWater, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.HolyWater, 1L),
                 ItemList.Cell_Empty.get(1L));
         if (ItemList.TF_Vial_FieryBlood.get(1L) != null) {
             FluidContainerRegistry.registerFluidContainer(
@@ -1322,8 +1319,8 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
         FluidContainerRegistry.registerFluidContainer(
             new FluidContainerRegistry.FluidContainerData(
                 Materials.Milk.getFluid(1000L),
-                GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Milk, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L)));
+                GTOreDictUnificator.get(OrePrefixes.bucket, Materials.Milk, 1L),
+                GTOreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L)));
         FluidContainerRegistry.registerFluidContainer(
             new FluidContainerRegistry.FluidContainerData(
                 Materials.Milk.getFluid(250L),
@@ -1350,12 +1347,12 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 ItemList.Tool_Lighter_Platinum_Full.get(1L),
                 ItemList.Tool_Lighter_Platinum_Empty.get(1L)));
 
-        Dyes.dyeBlack.addFluidDye(GT_FluidFactory.of("squidink", "Squid Ink", LIQUID, 295));
-        Dyes.dyeBlue.addFluidDye(GT_FluidFactory.of("indigo", "Indigo Dye", LIQUID, 295));
+        Dyes.dyeBlack.addFluidDye(GTFluidFactory.of("squidink", "Squid Ink", LIQUID, 295));
+        Dyes.dyeBlue.addFluidDye(GTFluidFactory.of("indigo", "Indigo Dye", LIQUID, 295));
         for (byte i = 0; i < Dyes.VALUES.length; i = (byte) (i + 1)) {
             Dyes tDye = Dyes.VALUES[i];
             tDye.addFluidDye(
-                GT_FluidFactory.builder(
+                GTFluidFactory.builder(
                     "dye.watermixed." + tDye.name()
                         .toLowerCase(Locale.ENGLISH))
                     .withTextureName("dyes")
@@ -1365,7 +1362,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                     .buildAndRegister()
                     .asFluid());
             tDye.addFluidDye(
-                GT_FluidFactory.builder(
+                GTFluidFactory.builder(
                     "dye.chemical." + tDye.name()
                         .toLowerCase(Locale.ENGLISH))
                     .withTextureName("dyes")
@@ -1376,611 +1373,611 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                     .registerContainers(ItemList.SPRAY_CAN_DYES[i].get(1L), ItemList.Spray_Empty.get(1L), 2304)
                     .asFluid());
         }
-        GT_FluidFactory.builder("ice")
+        GTFluidFactory.builder("ice")
             .withLocalizedName("Crushed Ice")
             .withStateAndTemperature(SLURRY, 270)
             .buildAndRegister()
             .configureMaterials(Materials.Ice)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ice, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Ice, 1L),
                 ItemList.Cell_Empty.get(1L));
         Materials.Water.mSolid = Materials.Ice.mSolid;
 
-        GT_FluidFactory.builder("molten.glass")
+        GTFluidFactory.builder("molten.glass")
             .withLocalizedName("Molten Glass")
             .withStateAndTemperature(MOLTEN, 1500)
             .buildAndRegister()
             .configureMaterials(Materials.Glass)
             .registerContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Glass, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cellMolten, Materials.Glass, 1L),
                 ItemList.Cell_Empty.get(1L),
                 144);
-        GT_FluidFactory.builder("molten.redstone")
+        GTFluidFactory.builder("molten.redstone")
             .withLocalizedName("Molten Redstone")
             .withStateAndTemperature(MOLTEN, 500)
             .buildAndRegister()
             .configureMaterials(Materials.Redstone)
             .registerContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Redstone, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cellMolten, Materials.Redstone, 1L),
                 ItemList.Cell_Empty.get(1L),
                 144);
-        GT_FluidFactory.builder("molten.blaze")
+        GTFluidFactory.builder("molten.blaze")
             .withLocalizedName("Molten Blaze")
             .withStateAndTemperature(MOLTEN, 6400)
             .buildAndRegister()
             .configureMaterials(Materials.Blaze)
             .registerContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Blaze, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cellMolten, Materials.Blaze, 1L),
                 ItemList.Cell_Empty.get(1L),
                 144);
-        GT_FluidFactory.builder("wet.concrete")
+        GTFluidFactory.builder("wet.concrete")
             .withLocalizedName("Wet Concrete")
             .withStateAndTemperature(MOLTEN, 300)
             .buildAndRegister()
             .configureMaterials(Materials.Concrete)
             .registerContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Concrete, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cellMolten, Materials.Concrete, 1L),
                 ItemList.Cell_Empty.get(1L),
                 144);
 
         for (Materials tMaterial : Materials.values()) {
             if ((tMaterial.mStandardMoltenFluid == null) && (tMaterial.contains(SubTag.SMELTING_TO_FLUID))
                 && (!tMaterial.contains(SubTag.NO_SMELTING))) {
-                GT_Mod.gregtechproxy.addAutogeneratedMoltenFluid(tMaterial);
+                GTMod.gregtechproxy.addAutogeneratedMoltenFluid(tMaterial);
                 if ((tMaterial.mSmeltInto != tMaterial) && (tMaterial.mSmeltInto.mStandardMoltenFluid == null)) {
-                    GT_Mod.gregtechproxy.addAutogeneratedMoltenFluid(tMaterial.mSmeltInto);
+                    GTMod.gregtechproxy.addAutogeneratedMoltenFluid(tMaterial.mSmeltInto);
                 }
             }
             if (tMaterial.mElement != null) {
-                GT_Mod.gregtechproxy.addAutogeneratedPlasmaFluid(tMaterial);
+                GTMod.gregtechproxy.addAutogeneratedPlasmaFluid(tMaterial);
             }
             if (tMaterial.hasCorrespondingFluid()) {
-                GT_Mod.gregtechproxy.addAutoGeneratedCorrespondingFluid(tMaterial);
+                GTMod.gregtechproxy.addAutoGeneratedCorrespondingFluid(tMaterial);
             }
             if (tMaterial.hasCorrespondingGas()) {
-                GT_Mod.gregtechproxy.addAutoGeneratedCorrespondingGas(tMaterial);
+                GTMod.gregtechproxy.addAutoGeneratedCorrespondingGas(tMaterial);
             }
             if (tMaterial.canBeCracked()) {
-                GT_Mod.gregtechproxy.addAutoGeneratedHydroCrackedFluids(tMaterial);
-                GT_Mod.gregtechproxy.addAutoGeneratedSteamCrackedFluids(tMaterial);
+                GTMod.gregtechproxy.addAutoGeneratedHydroCrackedFluids(tMaterial);
+                GTMod.gregtechproxy.addAutoGeneratedSteamCrackedFluids(tMaterial);
             }
         }
 
-        GT_FluidFactory.builder("potion.awkward")
+        GTFluidFactory.builder("potion.awkward")
             .withLocalizedName("Awkward Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.thick")
+        GTFluidFactory.builder("potion.thick")
             .withLocalizedName("Thick Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 32), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.mundane")
+        GTFluidFactory.builder("potion.mundane")
             .withLocalizedName("Mundane Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 64), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.damage")
+        GTFluidFactory.builder("potion.damage")
             .withLocalizedName("Harming Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8204), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.damage.strong")
+        GTFluidFactory.builder("potion.damage.strong")
             .withLocalizedName("Strong Harming Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8236), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.damage.splash")
+        GTFluidFactory.builder("potion.damage.splash")
             .withLocalizedName("Splash Harming Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16396), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.damage.strong.splash")
+        GTFluidFactory.builder("potion.damage.strong.splash")
             .withLocalizedName("Strong Splash Harming Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16428), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.health")
+        GTFluidFactory.builder("potion.health")
             .withLocalizedName("Healing Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8197), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.health.strong")
+        GTFluidFactory.builder("potion.health.strong")
             .withLocalizedName("Strong Healing Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8229), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.health.splash")
+        GTFluidFactory.builder("potion.health.splash")
             .withLocalizedName("Splash Healing Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16389), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.health.strong.splash")
+        GTFluidFactory.builder("potion.health.strong.splash")
             .withLocalizedName("Strong Splash Healing Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16421), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.speed")
+        GTFluidFactory.builder("potion.speed")
             .withLocalizedName("Swiftness Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8194), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.speed.strong")
+        GTFluidFactory.builder("potion.speed.strong")
             .withLocalizedName("Strong Swiftness Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8226), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.speed.long")
+        GTFluidFactory.builder("potion.speed.long")
             .withLocalizedName("Stretched Swiftness Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8258), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.speed.splash")
+        GTFluidFactory.builder("potion.speed.splash")
             .withLocalizedName("Splash Swiftness Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16386), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.speed.strong.splash")
+        GTFluidFactory.builder("potion.speed.strong.splash")
             .withLocalizedName("Strong Splash Swiftness Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16418), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.speed.long.splash")
+        GTFluidFactory.builder("potion.speed.long.splash")
             .withLocalizedName("Stretched Splash Swiftness Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16450), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.strength")
+        GTFluidFactory.builder("potion.strength")
             .withLocalizedName("Strength Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8201), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.strength.strong")
+        GTFluidFactory.builder("potion.strength.strong")
             .withLocalizedName("Strong Strength Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8233), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.strength.long")
+        GTFluidFactory.builder("potion.strength.long")
             .withLocalizedName("Stretched Strength Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8265), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.strength.splash")
+        GTFluidFactory.builder("potion.strength.splash")
             .withLocalizedName("Splash Strength Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16393), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.strength.strong.splash")
+        GTFluidFactory.builder("potion.strength.strong.splash")
             .withLocalizedName("Strong Splash Strength Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16425), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.strength.long.splash")
+        GTFluidFactory.builder("potion.strength.long.splash")
             .withLocalizedName("Stretched Splash Strength Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16457), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.regen")
+        GTFluidFactory.builder("potion.regen")
             .withLocalizedName("Regenerating Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8193), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.regen.strong")
+        GTFluidFactory.builder("potion.regen.strong")
             .withLocalizedName("Strong Regenerating Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8225), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.regen.long")
+        GTFluidFactory.builder("potion.regen.long")
             .withLocalizedName("Stretched Regenerating Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8257), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.regen.splash")
+        GTFluidFactory.builder("potion.regen.splash")
             .withLocalizedName("Splash Regenerating Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16385), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.regen.strong.splash")
+        GTFluidFactory.builder("potion.regen.strong.splash")
             .withLocalizedName("Strong Splash Regenerating Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16417), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.regen.long.splash")
+        GTFluidFactory.builder("potion.regen.long.splash")
             .withLocalizedName("Stretched Splash Regenerating Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16449), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.poison")
+        GTFluidFactory.builder("potion.poison")
             .withLocalizedName("Poisonous Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8196), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.poison.strong")
+        GTFluidFactory.builder("potion.poison.strong")
             .withLocalizedName("Strong Poisonous Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8228), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.poison.long")
+        GTFluidFactory.builder("potion.poison.long")
             .withLocalizedName("Stretched Poisonous Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8260), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.poison.splash")
+        GTFluidFactory.builder("potion.poison.splash")
             .withLocalizedName("Splash Poisonous Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16388), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.poison.strong.splash")
+        GTFluidFactory.builder("potion.poison.strong.splash")
             .withLocalizedName("Strong Splash Poisonous Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16420), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.poison.long.splash")
+        GTFluidFactory.builder("potion.poison.long.splash")
             .withLocalizedName("Stretched Splash Poisonous Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16452), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.fireresistance")
+        GTFluidFactory.builder("potion.fireresistance")
             .withLocalizedName("Fire Resistant Brew")
             .withStateAndTemperature(LIQUID, 375)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8195), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.fireresistance.long")
+        GTFluidFactory.builder("potion.fireresistance.long")
             .withLocalizedName("Stretched Fire Resistant Brew")
             .withStateAndTemperature(LIQUID, 375)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8259), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.fireresistance.splash")
+        GTFluidFactory.builder("potion.fireresistance.splash")
             .withLocalizedName("Splash Fire Resistant Brew")
             .withStateAndTemperature(LIQUID, 375)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16387), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.fireresistance.long.splash")
+        GTFluidFactory.builder("potion.fireresistance.long.splash")
             .withLocalizedName("Stretched Splash Fire Resistant Brew")
             .withStateAndTemperature(LIQUID, 375)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16451), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.nightvision")
+        GTFluidFactory.builder("potion.nightvision")
             .withLocalizedName("Night Vision Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8198), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.nightvision.long")
+        GTFluidFactory.builder("potion.nightvision.long")
             .withLocalizedName("Stretched Night Vision Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8262), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.nightvision.splash")
+        GTFluidFactory.builder("potion.nightvision.splash")
             .withLocalizedName("Splash Night Vision Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16390), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.nightvision.long.splash")
+        GTFluidFactory.builder("potion.nightvision.long.splash")
             .withLocalizedName("Stretched Splash Night Vision Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16454), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.weakness")
+        GTFluidFactory.builder("potion.weakness")
             .withLocalizedName("Weakening Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8200), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.weakness.long")
+        GTFluidFactory.builder("potion.weakness.long")
             .withLocalizedName("Stretched Weakening Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8264), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.weakness.splash")
+        GTFluidFactory.builder("potion.weakness.splash")
             .withLocalizedName("Splash Weakening Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16392), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.weakness.long.splash")
+        GTFluidFactory.builder("potion.weakness.long.splash")
             .withLocalizedName("Stretched Splash Weakening Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16456), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.slowness")
+        GTFluidFactory.builder("potion.slowness")
             .withLocalizedName("Lame Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8202), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.slowness.long")
+        GTFluidFactory.builder("potion.slowness.long")
             .withLocalizedName("Stretched Lame Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8266), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.slowness.splash")
+        GTFluidFactory.builder("potion.slowness.splash")
             .withLocalizedName("Splash Lame Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16394), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.slowness.long.splash")
+        GTFluidFactory.builder("potion.slowness.long.splash")
             .withLocalizedName("Stretched Splash Lame Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16458), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.waterbreathing")
+        GTFluidFactory.builder("potion.waterbreathing")
             .withLocalizedName("Fishy Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8205), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.waterbreathing.long")
+        GTFluidFactory.builder("potion.waterbreathing.long")
             .withLocalizedName("Stretched Fishy Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8269), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.waterbreathing.splash")
+        GTFluidFactory.builder("potion.waterbreathing.splash")
             .withLocalizedName("Splash Fishy Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16397), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.waterbreathing.long.splash")
+        GTFluidFactory.builder("potion.waterbreathing.long.splash")
             .withLocalizedName("Stretched Splash Fishy Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16461), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.invisibility")
+        GTFluidFactory.builder("potion.invisibility")
             .withLocalizedName("Invisible Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8206), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.invisibility.long")
+        GTFluidFactory.builder("potion.invisibility.long")
             .withLocalizedName("Stretched Invisible Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 8270), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.invisibility.splash")
+        GTFluidFactory.builder("potion.invisibility.splash")
             .withLocalizedName("Splash Invisible Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16398), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.invisibility.long.splash")
+        GTFluidFactory.builder("potion.invisibility.long.splash")
             .withLocalizedName("Stretched Splash Invisible Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(new ItemStack(Items.potionitem, 1, 16462), ItemList.Bottle_Empty.get(1L));
 
-        GT_FluidFactory.builder("potion.purpledrink")
+        GTFluidFactory.builder("potion.purpledrink")
             .withLocalizedName("Purple Drink")
             .withStateAndTemperature(LIQUID, 275)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Purple_Drink.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.grapejuice")
+        GTFluidFactory.builder("potion.grapejuice")
             .withLocalizedName("Grape Juice")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Grape_Juice.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.wine")
+        GTFluidFactory.builder("potion.wine")
             .withLocalizedName("Wine")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Wine.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.vinegar")
+        GTFluidFactory.builder("potion.vinegar")
             .withLocalizedName("Vinegar")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .configureMaterials(Materials.Vinegar)
             .registerPContainers(ItemList.Bottle_Vinegar.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.potatojuice")
+        GTFluidFactory.builder("potion.potatojuice")
             .withLocalizedName("Potato Juice")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Potato_Juice.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.vodka")
+        GTFluidFactory.builder("potion.vodka")
             .withLocalizedName("Vodka")
             .withStateAndTemperature(LIQUID, 275)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Vodka.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.leninade")
+        GTFluidFactory.builder("potion.leninade")
             .withLocalizedName("Leninade")
             .withStateAndTemperature(LIQUID, 275)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Leninade.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.mineralwater")
+        GTFluidFactory.builder("potion.mineralwater")
             .withLocalizedName("Mineral Water")
             .withStateAndTemperature(LIQUID, 275)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Mineral_Water.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.saltywater")
+        GTFluidFactory.builder("potion.saltywater")
             .withLocalizedName("Salty Water")
             .withStateAndTemperature(LIQUID, 275)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Salty_Water.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.reedwater")
+        GTFluidFactory.builder("potion.reedwater")
             .withLocalizedName("Reed Water")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Reed_Water.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.rum")
+        GTFluidFactory.builder("potion.rum")
             .withLocalizedName("Rum")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Rum.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.piratebrew")
+        GTFluidFactory.builder("potion.piratebrew")
             .withLocalizedName("Pirate Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Pirate_Brew.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.hopsjuice")
+        GTFluidFactory.builder("potion.hopsjuice")
             .withLocalizedName("Hops Juice")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Hops_Juice.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.darkbeer")
+        GTFluidFactory.builder("potion.darkbeer")
             .withLocalizedName("Dark Beer")
             .withStateAndTemperature(LIQUID, 275)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Dark_Beer.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.dragonblood")
+        GTFluidFactory.builder("potion.dragonblood")
             .withLocalizedName("Dragon Blood")
             .withStateAndTemperature(LIQUID, 375)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Dragon_Blood.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.wheatyjuice")
+        GTFluidFactory.builder("potion.wheatyjuice")
             .withLocalizedName("Wheaty Juice")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Wheaty_Juice.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.scotch")
+        GTFluidFactory.builder("potion.scotch")
             .withLocalizedName("Scotch")
             .withStateAndTemperature(LIQUID, 275)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Scotch.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.glenmckenner")
+        GTFluidFactory.builder("potion.glenmckenner")
             .withLocalizedName("Glen McKenner")
             .withStateAndTemperature(LIQUID, 275)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Glen_McKenner.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.wheatyhopsjuice")
+        GTFluidFactory.builder("potion.wheatyhopsjuice")
             .withLocalizedName("Wheaty Hops Juice")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Wheaty_Hops_Juice.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.beer")
+        GTFluidFactory.builder("potion.beer")
             .withLocalizedName("Beer")
             .withStateAndTemperature(LIQUID, 275)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Beer.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.chillysauce")
+        GTFluidFactory.builder("potion.chillysauce")
             .withLocalizedName("Chilly Sauce")
             .withStateAndTemperature(LIQUID, 375)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Chilly_Sauce.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.hotsauce")
+        GTFluidFactory.builder("potion.hotsauce")
             .withLocalizedName("Hot Sauce")
             .withStateAndTemperature(LIQUID, 380)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Hot_Sauce.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.diabolosauce")
+        GTFluidFactory.builder("potion.diabolosauce")
             .withLocalizedName("Diabolo Sauce")
             .withStateAndTemperature(LIQUID, 385)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Diabolo_Sauce.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.diablosauce")
+        GTFluidFactory.builder("potion.diablosauce")
             .withLocalizedName("Diablo Sauce")
             .withStateAndTemperature(LIQUID, 390)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Diablo_Sauce.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.diablosauce.strong")
+        GTFluidFactory.builder("potion.diablosauce.strong")
             .withLocalizedName("Old Man Snitches glitched Diablo Sauce")
             .withStateAndTemperature(LIQUID, 999)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Snitches_Glitch_Sauce.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.applejuice")
+        GTFluidFactory.builder("potion.applejuice")
             .withLocalizedName("Apple Juice")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Apple_Juice.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.cider")
+        GTFluidFactory.builder("potion.cider")
             .withLocalizedName("Cider")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Cider.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.goldenapplejuice")
+        GTFluidFactory.builder("potion.goldenapplejuice")
             .withLocalizedName("Golden Apple Juice")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Golden_Apple_Juice.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.goldencider")
+        GTFluidFactory.builder("potion.goldencider")
             .withLocalizedName("Golden Cider")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Golden_Cider.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.idunsapplejuice")
+        GTFluidFactory.builder("potion.idunsapplejuice")
             .withLocalizedName("Idun's Apple Juice")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Iduns_Apple_Juice.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.notchesbrew")
+        GTFluidFactory.builder("potion.notchesbrew")
             .withLocalizedName("Notches Brew")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Notches_Brew.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.lemonjuice")
+        GTFluidFactory.builder("potion.lemonjuice")
             .withLocalizedName("Lemon Juice")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Lemon_Juice.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.limoncello")
+        GTFluidFactory.builder("potion.limoncello")
             .withLocalizedName("Limoncello")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Limoncello.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.lemonade")
+        GTFluidFactory.builder("potion.lemonade")
             .withLocalizedName("Lemonade")
             .withStateAndTemperature(LIQUID, 275)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Lemonade.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.alcopops")
+        GTFluidFactory.builder("potion.alcopops")
             .withLocalizedName("Alcopops")
             .withStateAndTemperature(LIQUID, 275)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Alcopops.get(1L), ItemList.Bottle_Empty.get(1L));
-        GT_FluidFactory.builder("potion.cavejohnsonsgrenadejuice")
+        GTFluidFactory.builder("potion.cavejohnsonsgrenadejuice")
             .withLocalizedName("Cave Johnsons Grenade Juice")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.Bottle_Cave_Johnsons_Grenade_Juice.get(1L), ItemList.Bottle_Empty.get(1L));
 
-        GT_FluidFactory.builder("potion.darkcoffee")
+        GTFluidFactory.builder("potion.darkcoffee")
             .withLocalizedName("Dark Coffee")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.ThermosCan_Dark_Coffee.get(1L), ItemList.ThermosCan_Empty.get(1L));
-        GT_FluidFactory.builder("potion.darkcafeaulait")
+        GTFluidFactory.builder("potion.darkcafeaulait")
             .withLocalizedName("Dark Cafe au lait")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.ThermosCan_Dark_Cafe_au_lait.get(1L), ItemList.ThermosCan_Empty.get(1L));
-        GT_FluidFactory.builder("potion.coffee")
+        GTFluidFactory.builder("potion.coffee")
             .withLocalizedName("Coffee")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.ThermosCan_Coffee.get(1L), ItemList.ThermosCan_Empty.get(1L));
-        GT_FluidFactory.builder("potion.cafeaulait")
+        GTFluidFactory.builder("potion.cafeaulait")
             .withLocalizedName("Cafe au lait")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.ThermosCan_Cafe_au_lait.get(1L), ItemList.ThermosCan_Empty.get(1L));
-        GT_FluidFactory.builder("potion.laitaucafe")
+        GTFluidFactory.builder("potion.laitaucafe")
             .withLocalizedName("Lait au cafe")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.ThermosCan_Lait_au_cafe.get(1L), ItemList.ThermosCan_Empty.get(1L));
-        GT_FluidFactory.builder("potion.darkchocolatemilk")
+        GTFluidFactory.builder("potion.darkchocolatemilk")
             .withLocalizedName("Bitter Chocolate Milk")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.ThermosCan_Dark_Chocolate_Milk.get(1L), ItemList.ThermosCan_Empty.get(1L));
-        GT_FluidFactory.builder("potion.chocolatemilk")
+        GTFluidFactory.builder("potion.chocolatemilk")
             .withLocalizedName("Chocolate Milk")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.ThermosCan_Chocolate_Milk.get(1L), ItemList.ThermosCan_Empty.get(1L));
-        GT_FluidFactory.builder("potion.tea")
+        GTFluidFactory.builder("potion.tea")
             .withLocalizedName("Tea")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.ThermosCan_Tea.get(1L), ItemList.ThermosCan_Empty.get(1L));
-        GT_FluidFactory.builder("potion.sweettea")
+        GTFluidFactory.builder("potion.sweettea")
             .withLocalizedName("Sweet Tea")
             .withStateAndTemperature(LIQUID, 295)
             .buildAndRegister()
             .registerPContainers(ItemList.ThermosCan_Sweet_Tea.get(1L), ItemList.ThermosCan_Empty.get(1L));
-        GT_FluidFactory.builder("potion.icetea")
+        GTFluidFactory.builder("potion.icetea")
             .withLocalizedName("Ice Tea")
             .withStateAndTemperature(LIQUID, 255)
             .buildAndRegister()
             .registerPContainers(ItemList.ThermosCan_Ice_Tea.get(1L), ItemList.ThermosCan_Empty.get(1L));
-        GT_FluidFactory.builder("liquid_sodium")
+        GTFluidFactory.builder("liquid_sodium")
             .withLocalizedName("Liquid Sodium")
             .withStateAndTemperature(LIQUID, 495)
             .buildAndRegister()
             .configureMaterials(Materials.Sodium)
             .registerBContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Sodium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Sodium, 1L),
                 ItemList.Cell_Empty.get(1L));
 
         FluidContainerRegistry.registerFluidContainer(
@@ -1989,139 +1986,136 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 ItemList.IC2_Spray_WeedEx.get(1L),
                 ItemList.Spray_Empty.get(1L)));
 
-        if (!GT_Values.D1) {
+        if (!GTValues.D1) {
             try {
                 Class.forName("codechicken.nei.api.API");
-                GT_Log.out.println("GT_Mod: Hiding certain Items from NEI.");
+                GTLog.out.println("GTMod: Hiding certain Items from NEI.");
                 API.hideItem(ItemList.Display_Fluid.getWildcard(1L));
             } catch (Throwable e) {
-                if (GT_Values.D1) {
-                    e.printStackTrace(GT_Log.err);
+                if (GTValues.D1) {
+                    e.printStackTrace(GTLog.err);
                 }
             }
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.cobblestone, 1, WILDCARD))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.gravel, 1, WILDCARD))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), new ItemStack(Items.flint, 1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), new ItemStack(Items.flint, 1))
             .outputChances(10000, 1000)
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.furnace, 1, WILDCARD))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.lit_furnace, 1, WILDCARD))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
 
-        GT_OreDictUnificator.set(
+        GTOreDictUnificator.set(
             OrePrefixes.ingot,
             Materials.FierySteel,
-            GT_ModHandler.getModItem(TwilightForest.ID, "item.fieryIngot", 1L, 0));
-        GT_OreDictUnificator.set(
+            GTModHandler.getModItem(TwilightForest.ID, "item.fieryIngot", 1L, 0));
+        GTOreDictUnificator.set(
             OrePrefixes.ingot,
             Materials.Knightmetal,
-            GT_ModHandler.getModItem(TwilightForest.ID, "item.knightMetal", 1L, 0));
-        GT_OreDictUnificator.set(
+            GTModHandler.getModItem(TwilightForest.ID, "item.knightMetal", 1L, 0));
+        GTOreDictUnificator.set(
             OrePrefixes.ingot,
             Materials.Steeleaf,
-            GT_ModHandler.getModItem(TwilightForest.ID, "item.steeleafIngot", 1L, 0));
-        GT_OreDictUnificator.set(
+            GTModHandler.getModItem(TwilightForest.ID, "item.steeleafIngot", 1L, 0));
+        GTOreDictUnificator.set(
             OrePrefixes.ingot,
             Materials.IronWood,
-            GT_ModHandler.getModItem(TwilightForest.ID, "item.ironwoodIngot", 1L, 0));
-        GT_OreDictUnificator
-            .set(OrePrefixes.gem, Materials.InfusedAir, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 0));
-        GT_OreDictUnificator
-            .set(OrePrefixes.gem, Materials.InfusedFire, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 1));
-        GT_OreDictUnificator
-            .set(OrePrefixes.gem, Materials.InfusedWater, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 2));
-        GT_OreDictUnificator
-            .set(OrePrefixes.gem, Materials.InfusedEarth, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 3));
-        GT_OreDictUnificator
-            .set(OrePrefixes.gem, Materials.InfusedOrder, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 4));
-        GT_OreDictUnificator.set(
-            OrePrefixes.gem,
-            Materials.InfusedEntropy,
-            GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 5));
-        GT_OreDictUnificator
-            .set(OrePrefixes.nugget, Materials.Mercury, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 5));
-        GT_OreDictUnificator
-            .set(OrePrefixes.nugget, Materials.Thaumium, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 6));
-        GT_OreDictUnificator
-            .set(OrePrefixes.ingot, Materials.Thaumium, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 2));
-        GT_OreDictUnificator
-            .set(OrePrefixes.gem, Materials.Mercury, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 3));
-        GT_OreDictUnificator
-            .set(OrePrefixes.gem, Materials.Amber, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 6));
-        GT_OreDictUnificator
-            .set(OrePrefixes.gem, Materials.Firestone, GT_ModHandler.getModItem(Railcraft.ID, "firestone.raw", 1L));
-
-        GT_OreDictUnificator
-            .set(OrePrefixes.nugget, Materials.Void, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 7));
-        GT_OreDictUnificator
-            .set(OrePrefixes.ingot, Materials.Void, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 16));
-
-        GT_OreDictUnificator.set(
+            GTModHandler.getModItem(TwilightForest.ID, "item.ironwoodIngot", 1L, 0));
+        GTOreDictUnificator
+            .set(OrePrefixes.gem, Materials.InfusedAir, GTModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 0));
+        GTOreDictUnificator
+            .set(OrePrefixes.gem, Materials.InfusedFire, GTModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 1));
+        GTOreDictUnificator
+            .set(OrePrefixes.gem, Materials.InfusedWater, GTModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 2));
+        GTOreDictUnificator
+            .set(OrePrefixes.gem, Materials.InfusedEarth, GTModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 3));
+        GTOreDictUnificator
+            .set(OrePrefixes.gem, Materials.InfusedOrder, GTModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 4));
+        GTOreDictUnificator
+            .set(OrePrefixes.gem, Materials.InfusedEntropy, GTModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 5));
+        GTOreDictUnificator
+            .set(OrePrefixes.nugget, Materials.Mercury, GTModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 5));
+        GTOreDictUnificator
+            .set(OrePrefixes.nugget, Materials.Thaumium, GTModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 6));
+        GTOreDictUnificator
+            .set(OrePrefixes.ingot, Materials.Thaumium, GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 2));
+        GTOreDictUnificator
+            .set(OrePrefixes.gem, Materials.Mercury, GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 3));
+        GTOreDictUnificator
+            .set(OrePrefixes.gem, Materials.Amber, GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 6));
+        GTOreDictUnificator
+            .set(OrePrefixes.gem, Materials.Firestone, GTModHandler.getModItem(Railcraft.ID, "firestone.raw", 1L));
+
+        GTOreDictUnificator
+            .set(OrePrefixes.nugget, Materials.Void, GTModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 7));
+        GTOreDictUnificator
+            .set(OrePrefixes.ingot, Materials.Void, GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 16));
+
+        GTOreDictUnificator.set(
             OrePrefixes.plate,
             Materials.Iron,
-            GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 0),
+            GTModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 0),
             false,
             false);
 
-        GT_OreDictUnificator.set(
+        GTOreDictUnificator.set(
             OrePrefixes.plate,
             Materials.Steel,
-            GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 1),
+            GTModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 1),
             false,
             false);
 
-        GT_OreDictUnificator.set(
+        GTOreDictUnificator.set(
             OrePrefixes.plate,
             Materials.TinAlloy,
-            GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 2),
+            GTModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 2),
             false,
             false);
 
-        GT_OreDictUnificator.set(
+        GTOreDictUnificator.set(
             OrePrefixes.plate,
             Materials.Copper,
-            GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 3),
+            GTModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 3),
             false,
             false);
 
-        GT_OreDictUnificator.set(
+        GTOreDictUnificator.set(
             OrePrefixes.dust,
             Materials.Cocoa,
-            GT_ModHandler.getModItem(PamsHarvestCraft.ID, "cocoapowderItem", 1L, 0));
-        GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Coffee, ItemList.IC2_CoffeePowder.get(1L));
+            GTModHandler.getModItem(PamsHarvestCraft.ID, "cocoapowderItem", 1L, 0));
+        GTOreDictUnificator.set(OrePrefixes.dust, Materials.Coffee, ItemList.IC2_CoffeePowder.get(1L));
 
-        GregTech_API
-            .registerMachineBlock(GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("reinforcedGlass", 0)), 0);
+        GregTechAPI.registerMachineBlock(GTUtility.getBlockFromStack(GTModHandler.getIC2Item("reinforcedGlass", 0)), 0);
 
-        GregTech_API.sSolenoidCoilCasings = new GT_Cyclotron_Coils();
+        GregTechAPI.sSolenoidCoilCasings = new BlockCyclotronCoils();
         ItemList.TierdDrone0
-            .set(new GT_TierDrone("tierdDrone0", "Drone (Level 1)", "Quadcopter Stable Small Aircraft", 1));
+            .set(new ItemTierDrone("tierdDrone0", "Drone (Level 1)", "Quadcopter Stable Small Aircraft", 1));
         ItemList.TierdDrone1
-            .set(new GT_TierDrone("tierdDrone1", "Drone (Level 2)", "Dual Turbo High-Ejection Medium Aircraft", 2));
+            .set(new ItemTierDrone("tierdDrone1", "Drone (Level 2)", "Dual Turbo High-Ejection Medium Aircraft", 2));
         ItemList.TierdDrone2
-            .set(new GT_TierDrone("tierdDrone2", "Drone (Level 3)", "Single Engine Anti-Gravity Large Aircraft", 3));
+            .set(new ItemTierDrone("tierdDrone2", "Drone (Level 3)", "Single Engine Anti-Gravity Large Aircraft", 3));
 
     }
 }
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java b/src/main/java/gregtech/loaders/preload/LoaderGTItemData.java
index a4d1644b6b..778916fe38 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java
+++ b/src/main/java/gregtech/loaders/preload/LoaderGTItemData.java
@@ -17,375 +17,366 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.objects.ItemData;
 import gregtech.api.objects.MaterialStack;
-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.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
-public class GT_Loader_ItemData implements Runnable {
+public class LoaderGTItemData implements Runnable {
 
     @Override
     public void run() {
-        GT_Log.out.println("GT_Mod: Loading Item Data Tags");
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(TwilightForest.ID, "item.giantPick", 1L, 0),
+        GTLog.out.println("GTMod: Loading Item Data Tags");
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(TwilightForest.ID, "item.giantPick", 1L, 0),
             new ItemData(Materials.Stone, 696729600L, new MaterialStack(Materials.Wood, 464486400L)));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(TwilightForest.ID, "item.giantSword", 1L, 0),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(TwilightForest.ID, "item.giantSword", 1L, 0),
             new ItemData(Materials.Stone, 464486400L, new MaterialStack(Materials.Wood, 232243200L)));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantLog", 1L, 32767),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(TwilightForest.ID, "tile.GiantLog", 1L, 32767),
             new ItemData(Materials.Wood, 232243200L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantCobble", 1L, 32767),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(TwilightForest.ID, "tile.GiantCobble", 1L, 32767),
             new ItemData(Materials.Stone, 232243200L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantObsidian", 1L, 32767),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(TwilightForest.ID, "tile.GiantObsidian", 1L, 32767),
             new ItemData(Materials.Obsidian, 232243200L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(TwilightForest.ID, "item.minotaurAxe", 1L, 0),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(TwilightForest.ID, "item.minotaurAxe", 1L, 0),
             new ItemData(
                 Materials.Diamond,
                 14515200L,
                 new MaterialStack(Materials.Wood, OrePrefixes.stick.mMaterialAmount * 2L)));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(TwilightForest.ID, "item.armorShards", 1L, 0),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(TwilightForest.ID, "item.armorShards", 1L, 0),
             new ItemData(Materials.Knightmetal, 403200L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(TwilightForest.ID, "item.shardCluster", 1L, 0),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(TwilightForest.ID, "item.shardCluster", 1L, 0),
             new ItemData(Materials.Knightmetal, 3628800L));
-        GT_OreDictUnificator.addItemData(ItemList.TF_LiveRoot.get(1L), new ItemData(Materials.LiveRoot, 3628800L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10),
+        GTOreDictUnificator.addItemData(ItemList.TF_LiveRoot.get(1L), new ItemData(Materials.LiveRoot, 3628800L));
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10),
             new ItemData(Materials.CertusQuartz, 1814400L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11),
             new ItemData(Materials.NetherQuartz, 1814400L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12),
             new ItemData(Materials.Fluix, 1814400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.quartz_block, 1, 32767), new ItemData(Materials.NetherQuartz, 14515200L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L, 32767),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L, 32767),
             new ItemData(Materials.CertusQuartz, 14515200L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzPillar", 1L, 32767),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzPillar", 1L, 32767),
             new ItemData(Materials.CertusQuartz, 14515200L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L, 32767),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L, 32767),
             new ItemData(Materials.CertusQuartz, 14515200L));
-        GT_OreDictUnificator.addItemData(new ItemStack(Items.wheat, 1, 32767), new ItemData(Materials.Wheat, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(new ItemStack(Items.wheat, 1, 32767), new ItemData(Materials.Wheat, 3628800L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.hay_block, 1, 32767), new ItemData(Materials.Wheat, 32659200L));
-        GT_OreDictUnificator
-            .addItemData(new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L));
-        GT_OreDictUnificator.addItemData(new ItemStack(Blocks.snow, 1, 32767), new ItemData(Materials.Snow, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L));
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.snow, 1, 32767), new ItemData(Materials.Snow, 3628800L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.glowstone, 1, 32767), new ItemData(Materials.Glowstone, 14515200L));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.redstone_lamp, 1, 32767),
             new ItemData(
                 Materials.Glowstone,
                 14515200L,
                 new MaterialStack(Materials.Redstone, OrePrefixes.dust.mMaterialAmount * 4L)));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.lit_redstone_lamp, 1, 32767),
             new ItemData(
                 Materials.Glowstone,
                 14515200L,
                 new MaterialStack(Materials.Redstone, OrePrefixes.dust.mMaterialAmount * 4L)));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(Forestry.ID, "craftingMaterial", 1L, 5),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(Forestry.ID, "craftingMaterial", 1L, 5),
             new ItemData(Materials.Ice, 3628800L));
-        GT_OreDictUnificator.addItemData(new ItemStack(Blocks.ice, 1, 32767), new ItemData(Materials.Ice, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.ice, 1, 32767), new ItemData(Materials.Ice, 3628800L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.packed_ice, 1, 32767), new ItemData(Materials.Ice, 7257600L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Items.clay_ball, 1, 32767), new ItemData(Materials.Clay, 1814400L));
-        GT_OreDictUnificator.removeItemData(new ItemStack(Blocks.clay, 1, 0));
-        GT_OreDictUnificator.addItemData(new ItemStack(Blocks.clay, 1, 32767), new ItemData(Materials.Clay, 7257600L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.removeItemData(new ItemStack(Blocks.clay, 1, 0));
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.clay, 1, 32767), new ItemData(Materials.Clay, 7257600L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.hardened_clay, 1, 32767), new ItemData(Materials.Clay, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.stained_hardened_clay, 1, 32767), new ItemData(Materials.Clay, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.brick_block, 1, 32767), new ItemData(Materials.Brick, 3628800L));
-        GT_OreDictUnificator
-            .addItemData(GT_ModHandler.getIC2Item("Uran238", 1L), new ItemData(Materials.Uranium, 3628800L));
-        GT_OreDictUnificator
-            .addItemData(GT_ModHandler.getIC2Item("Uran235", 1L), new ItemData(Materials.Uranium235, 3628800L));
-        GT_OreDictUnificator
-            .addItemData(GT_ModHandler.getIC2Item("Plutonium", 1L), new ItemData(Materials.Plutonium, 3628800L));
-        GT_OreDictUnificator
-            .addItemData(GT_ModHandler.getIC2Item("smallUran235", 1L), new ItemData(Materials.Uranium235, 403200L));
-        GT_OreDictUnificator
-            .addItemData(GT_ModHandler.getIC2Item("smallPlutonium", 1L), new ItemData(Materials.Plutonium, 403200L));
-        GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Iron.get(1L), new ItemData(Materials.Iron, 1814400L));
-        GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Gold.get(1L), new ItemData(Materials.Gold, 1814400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
+            .addItemData(GTModHandler.getIC2Item("Uran238", 1L), new ItemData(Materials.Uranium, 3628800L));
+        GTOreDictUnificator
+            .addItemData(GTModHandler.getIC2Item("Uran235", 1L), new ItemData(Materials.Uranium235, 3628800L));
+        GTOreDictUnificator
+            .addItemData(GTModHandler.getIC2Item("Plutonium", 1L), new ItemData(Materials.Plutonium, 3628800L));
+        GTOreDictUnificator
+            .addItemData(GTModHandler.getIC2Item("smallUran235", 1L), new ItemData(Materials.Uranium235, 403200L));
+        GTOreDictUnificator
+            .addItemData(GTModHandler.getIC2Item("smallPlutonium", 1L), new ItemData(Materials.Plutonium, 403200L));
+        GTOreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Iron.get(1L), new ItemData(Materials.Iron, 1814400L));
+        GTOreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Gold.get(1L), new ItemData(Materials.Gold, 1814400L));
+        GTOreDictUnificator
             .addItemData(ItemList.IC2_Item_Casing_Bronze.get(1L), new ItemData(Materials.Bronze, 1814400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(ItemList.IC2_Item_Casing_Copper.get(1L), new ItemData(Materials.Copper, 1814400L));
-        GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Tin.get(1L), new ItemData(Materials.Tin, 1814400L));
-        GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Lead.get(1L), new ItemData(Materials.Lead, 1814400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Tin.get(1L), new ItemData(Materials.Tin, 1814400L));
+        GTOreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Lead.get(1L), new ItemData(Materials.Lead, 1814400L));
+        GTOreDictUnificator
             .addItemData(ItemList.IC2_Item_Casing_Steel.get(1L), new ItemData(Materials.Steel, 1814400L));
-        GT_OreDictUnificator.addItemData(new ItemStack(Items.book, 1, 32767), new ItemData(Materials.Paper, 10886400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(new ItemStack(Items.book, 1, 32767), new ItemData(Materials.Paper, 10886400L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Items.written_book, 1, 32767), new ItemData(Materials.Paper, 10886400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Items.writable_book, 1, 32767), new ItemData(Materials.Paper, 10886400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Items.enchanted_book, 1, 32767), new ItemData(Materials.Paper, 10886400L));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Items.golden_apple, 1, 1),
             new ItemData(Materials.Gold, OrePrefixes.block.mMaterialAmount * 8L));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Items.golden_apple, 1, 0),
             new ItemData(Materials.Gold, OrePrefixes.ingot.mMaterialAmount * 8L));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Items.golden_carrot, 1, 0),
             new ItemData(Materials.Gold, OrePrefixes.nugget.mMaterialAmount * 8L));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Items.speckled_melon, 1, 0),
             new ItemData(Materials.Gold, OrePrefixes.nugget.mMaterialAmount * 8L));
-        GT_OreDictUnificator.addItemData(new ItemStack(Items.minecart, 1), new ItemData(Materials.Iron, 18144000L));
-        GT_OreDictUnificator.addItemData(new ItemStack(Items.iron_door, 1), new ItemData(Materials.Iron, 21772800L));
-        GT_OreDictUnificator.addItemData(new ItemStack(Items.cauldron, 1), new ItemData(Materials.Iron, 25401600L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(new ItemStack(Items.minecart, 1), new ItemData(Materials.Iron, 18144000L));
+        GTOreDictUnificator.addItemData(new ItemStack(Items.iron_door, 1), new ItemData(Materials.Iron, 21772800L));
+        GTOreDictUnificator.addItemData(new ItemStack(Items.cauldron, 1), new ItemData(Materials.Iron, 25401600L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.iron_bars, 8, 32767), new ItemData(Materials.Iron, 10886400L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.SteelBars", 8L, 0),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.SteelBars", 8L, 0),
             new ItemData(Materials.Steel, 10886400L));
-        GT_OreDictUnificator
-            .addItemData(GT_ModHandler.getIC2Item("ironFurnace", 1L), new ItemData(Materials.Iron, 18144000L));
-        GT_OreDictUnificator.addItemData(ItemList.IC2_Food_Can_Empty.get(1L), new ItemData(Materials.Tin, 1814400L));
-        GT_OreDictUnificator.addItemData(ItemList.IC2_Fuel_Rod_Empty.get(1L), new ItemData(Materials.Iron, 3628800L));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator
+            .addItemData(GTModHandler.getIC2Item("ironFurnace", 1L), new ItemData(Materials.Iron, 18144000L));
+        GTOreDictUnificator.addItemData(ItemList.IC2_Food_Can_Empty.get(1L), new ItemData(Materials.Tin, 1814400L));
+        GTOreDictUnificator.addItemData(ItemList.IC2_Fuel_Rod_Empty.get(1L), new ItemData(Materials.Iron, 3628800L));
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.light_weighted_pressure_plate, 1, 32767),
             new ItemData(Materials.Gold, 7257600L));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.heavy_weighted_pressure_plate, 1, 32767),
             new ItemData(Materials.Iron, 7257600L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(Railcraft.ID, "anvil", 1L, 0),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(Railcraft.ID, "anvil", 1L, 0),
             new ItemData(Materials.Steel, 108864000L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(Railcraft.ID, "anvil", 1L, 1),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(Railcraft.ID, "anvil", 1L, 1),
             new ItemData(Materials.Steel, 72576000L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(Railcraft.ID, "anvil", 1L, 2),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(Railcraft.ID, "anvil", 1L, 2),
             new ItemData(Materials.Steel, 36288000L));
-        GT_OreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 0), new ItemData(Materials.Iron, 108864000L));
-        GT_OreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 1), new ItemData(Materials.Iron, 72576000L));
-        GT_OreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 2), new ItemData(Materials.Iron, 36288000L));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 0), new ItemData(Materials.Iron, 108864000L));
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 1), new ItemData(Materials.Iron, 72576000L));
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 2), new ItemData(Materials.Iron, 36288000L));
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.hopper, 1, 32767),
             new ItemData(Materials.Iron, 18144000L, new MaterialStack(Materials.Wood, 29030400L)));
-        GT_OreDictUnificator.addItemData(ItemList.Cell_Universal_Fluid.get(1L), new ItemData(Materials.Tin, 7257600L));
-        GT_OreDictUnificator.addItemData(ItemList.Cell_Empty.get(1L), new ItemData(Materials.Tin, 7257600L));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(ItemList.Cell_Universal_Fluid.get(1L), new ItemData(Materials.Tin, 7257600L));
+        GTOreDictUnificator.addItemData(ItemList.Cell_Empty.get(1L), new ItemData(Materials.Tin, 7257600L));
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.tripwire_hook, 1, 32767),
             new ItemData(
                 Materials.Iron,
                 OrePrefixes.ring.mMaterialAmount * 2L,
                 new MaterialStack(Materials.Wood, 3628800L)));
-        GT_OreDictUnificator.addItemData(ItemList.Bottle_Empty.get(1L), new ItemData(Materials.Glass, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(ItemList.Bottle_Empty.get(1L), new ItemData(Materials.Glass, 3628800L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Items.potionitem, 1, 32767), new ItemData(Materials.Glass, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.stained_glass, 1, 32767), new ItemData(Materials.Glass, 3628800L));
-        GT_OreDictUnificator
-            .addItemData(new ItemStack(Blocks.glass, 1, 32767), new ItemData(Materials.Glass, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.glass, 1, 32767), new ItemData(Materials.Glass, 3628800L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.stained_glass_pane, 1, 32767), new ItemData(Materials.Glass, 1360800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.glass_pane, 1, 32767), new ItemData(Materials.Glass, 1360800L));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Items.clock, 1, 32767),
             new ItemData(Materials.Gold, 14515200L, new MaterialStack(Materials.Redstone, 3628800L)));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Items.compass, 1, 32767),
             new ItemData(Materials.Iron, 14515200L, new MaterialStack(Materials.Redstone, 3628800L)));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Items.iron_horse_armor, 1, 32767),
             new ItemData(Materials.Iron, 29030400L, new MaterialStack(Materials.Leather, 21772800L)));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Items.golden_horse_armor, 1, 32767),
             new ItemData(Materials.Gold, 29030400L, new MaterialStack(Materials.Leather, 21772800L)));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Items.diamond_horse_armor, 1, 32767),
             new ItemData(Materials.Diamond, 29030400L, new MaterialStack(Materials.Leather, 21772800L)));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Items.leather, 1, 32767), new ItemData(Materials.Leather, 3628800L));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.beacon, 1, 32767),
             new ItemData(
                 Materials.NetherStar,
                 3628800L,
                 new MaterialStack(Materials.Obsidian, 10886400L),
                 new MaterialStack(Materials.Glass, 18144000L)));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.enchanting_table, 1, 32767),
             new ItemData(
                 Materials.Diamond,
                 7257600L,
                 new MaterialStack(Materials.Obsidian, 14515200L),
                 new MaterialStack(Materials.Paper, 10886400L)));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.ender_chest, 1, 32767),
             new ItemData(Materials.EnderEye, 3628800L, new MaterialStack(Materials.Obsidian, 29030400L)));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.bookshelf, 1, 32767),
             new ItemData(Materials.Paper, 32659200L, new MaterialStack(Materials.Wood, 21772800L)));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.lever, 1, 32767),
             new ItemData(Materials.Stone, 3628800L, new MaterialStack(Materials.Wood, 1814400L)));
-        GT_OreDictUnificator.addItemData(new ItemStack(Blocks.ice, 1, 32767), new ItemData(Materials.Ice, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.ice, 1, 32767), new ItemData(Materials.Ice, 3628800L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.packed_ice, 1, 32767), new ItemData(Materials.Ice, 7257600L));
-        GT_OreDictUnificator.addItemData(new ItemStack(Blocks.snow, 1, 32767), new ItemData(Materials.Snow, 3628800L));
-        GT_OreDictUnificator
-            .addItemData(new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L));
-        GT_OreDictUnificator.addItemData(new ItemStack(Blocks.snow_layer, 1, 32767), new ItemData(Materials.Snow, -1L));
-        GT_OreDictUnificator.addItemData(new ItemStack(Blocks.sand, 1, 32767), new ItemData(Materials.Sand, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.snow, 1, 32767), new ItemData(Materials.Snow, 3628800L));
+        GTOreDictUnificator.addItemData(new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L));
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.snow_layer, 1, 32767), new ItemData(Materials.Snow, -1L));
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.sand, 1, 32767), new ItemData(Materials.Sand, 3628800L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.sandstone, 1, 32767), new ItemData(Materials.Sand, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.stone_slab, 1, 0), new ItemData(Materials.Stone, 1814400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.stone_slab, 1, 8), new ItemData(Materials.Stone, 1814400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 0), new ItemData(Materials.Stone, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 8), new ItemData(Materials.Stone, 3628800L));
-        GT_OreDictUnificator
-            .addItemData(new ItemStack(Blocks.stone_slab, 1, 1), new ItemData(Materials.Sand, 1814400L));
-        GT_OreDictUnificator
-            .addItemData(new ItemStack(Blocks.stone_slab, 1, 9), new ItemData(Materials.Sand, 1814400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.stone_slab, 1, 1), new ItemData(Materials.Sand, 1814400L));
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.stone_slab, 1, 9), new ItemData(Materials.Sand, 1814400L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 1), new ItemData(Materials.Sand, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 9), new ItemData(Materials.Sand, 3628800L));
-        GT_OreDictUnificator
-            .addItemData(new ItemStack(Blocks.stone_slab, 1, 2), new ItemData(Materials.Wood, 1814400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.stone_slab, 1, 2), new ItemData(Materials.Wood, 1814400L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.stone_slab, 1, 10), new ItemData(Materials.Wood, 1814400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 2), new ItemData(Materials.Wood, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 10), new ItemData(Materials.Wood, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.stone_slab, 1, 3), new ItemData(Materials.Stone, 1814400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.stone_slab, 1, 11), new ItemData(Materials.Stone, 1814400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 3), new ItemData(Materials.Stone, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 11), new ItemData(Materials.Stone, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.stone_slab, 1, 5), new ItemData(Materials.Stone, 1814400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.stone_slab, 1, 13), new ItemData(Materials.Stone, 1814400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 5), new ItemData(Materials.Stone, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 13), new ItemData(Materials.Stone, 3628800L));
-        GT_OreDictUnificator
-            .addItemData(new ItemStack(Blocks.stone, 1, 32767), new ItemData(Materials.Stone, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.stone, 1, 32767), new ItemData(Materials.Stone, 3628800L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.furnace, 1, 32767), new ItemData(Materials.Stone, 29030400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.lit_furnace, 1, 32767), new ItemData(Materials.Stone, 29030400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.stonebrick, 1, 32767), new ItemData(Materials.Stone, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.cobblestone, 1, 32767), new ItemData(Materials.Stone, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.mossy_cobblestone, 1, 32767), new ItemData(Materials.Stone, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.stone_button, 1, 32767), new ItemData(Materials.Stone, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.stone_pressure_plate, 1, 32767), new ItemData(Materials.Stone, 7257600L));
-        GT_OreDictUnificator
-            .addItemData(new ItemStack(Blocks.ladder, 1, 32767), new ItemData(Materials.Wood, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.ladder, 1, 32767), new ItemData(Materials.Wood, 3628800L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.wooden_button, 1, 32767), new ItemData(Materials.Wood, 3628800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.wooden_pressure_plate, 1, 32767), new ItemData(Materials.Wood, 7257600L));
-        GT_OreDictUnificator.addItemData(new ItemStack(Blocks.fence, 1, 32767), new ItemData(Materials.Wood, 5443200L));
-        GT_OreDictUnificator.addItemData(new ItemStack(Items.bowl, 1, 32767), new ItemData(Materials.Wood, 3628800L));
-        GT_OreDictUnificator.addItemData(new ItemStack(Items.sign, 1, 32767), new ItemData(Materials.Wood, 7257600L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.fence, 1, 32767), new ItemData(Materials.Wood, 5443200L));
+        GTOreDictUnificator.addItemData(new ItemStack(Items.bowl, 1, 32767), new ItemData(Materials.Wood, 3628800L));
+        GTOreDictUnificator.addItemData(new ItemStack(Items.sign, 1, 32767), new ItemData(Materials.Wood, 7257600L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Items.wooden_door, 1, 32767), new ItemData(Materials.Wood, 21772800L));
-        GT_OreDictUnificator
-            .addItemData(new ItemStack(Blocks.chest, 1, 32767), new ItemData(Materials.Wood, 29030400L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(new ItemStack(Blocks.chest, 1, 32767), new ItemData(Materials.Wood, 29030400L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.trapped_chest, 1, 32767), new ItemData(Materials.Wood, 29030400L));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.unlit_redstone_torch, 1, 32767),
             new ItemData(Materials.Wood, 1814400L, new MaterialStack(Materials.Redstone, 3628800L)));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.redstone_torch, 1, 32767),
             new ItemData(Materials.Wood, 1814400L, new MaterialStack(Materials.Redstone, 3628800L)));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.noteblock, 1, 32767),
             new ItemData(Materials.Wood, 29030400L, new MaterialStack(Materials.Redstone, 3628800L)));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.jukebox, 1, 32767),
             new ItemData(Materials.Wood, 29030400L, new MaterialStack(Materials.Diamond, 3628800L)));
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .addItemData(new ItemStack(Blocks.crafting_table, 1, 32767), new ItemData(Materials.Wood, 14515200L));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.piston, 1, 32767),
             new ItemData(Materials.Stone, 14515200L, new MaterialStack(Materials.Wood, 10886400L)));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.sticky_piston, 1, 32767),
             new ItemData(Materials.Stone, 14515200L, new MaterialStack(Materials.Wood, 10886400L)));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.dispenser, 1, 32767),
             new ItemData(Materials.Stone, 25401600L, new MaterialStack(Materials.Redstone, 3628800L)));
-        GT_OreDictUnificator.addItemData(
+        GTOreDictUnificator.addItemData(
             new ItemStack(Blocks.dropper, 1, 32767),
             new ItemData(Materials.Stone, 25401600L, new MaterialStack(Materials.Redstone, 3628800L)));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetChicken", 1L, 32767),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(Thaumcraft.ID, "ItemNuggetChicken", 1L, 32767),
             new ItemData(Materials.MeatCooked, 403200L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetBeef", 1L, 32767),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(Thaumcraft.ID, "ItemNuggetBeef", 1L, 32767),
             new ItemData(Materials.MeatCooked, 403200L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetPork", 1L, 32767),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(Thaumcraft.ID, "ItemNuggetPork", 1L, 32767),
             new ItemData(Materials.MeatCooked, 403200L));
-        GT_OreDictUnificator.addItemData(
-            GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetFish", 1L, 32767),
+        GTOreDictUnificator.addItemData(
+            GTModHandler.getModItem(Thaumcraft.ID, "ItemNuggetFish", 1L, 32767),
             new ItemData(Materials.MeatCooked, 403200L));
 
-        for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem(TwilightForest.ID, "item.meefRaw", 1L, 0),
-            GT_ModHandler.getModItem(TwilightForest.ID, "item.venisonRaw", 1L, 0),
-            GT_ModHandler.getModItem(PamsHarvestCraft.ID, "muttonrawItem", 1L, 0),
-            GT_ModHandler.getModItem(PamsHarvestCraft.ID, "turkeyrawItem", 1L, 0),
-            GT_ModHandler.getModItem(PamsHarvestCraft.ID, "rabbitrawItem", 1L, 0),
-            GT_ModHandler.getModItem(PamsHarvestCraft.ID, "venisonrawItem", 1L, 0), new ItemStack(Items.porkchop),
+        for (ItemStack tItem : new ItemStack[] { GTModHandler.getModItem(TwilightForest.ID, "item.meefRaw", 1L, 0),
+            GTModHandler.getModItem(TwilightForest.ID, "item.venisonRaw", 1L, 0),
+            GTModHandler.getModItem(PamsHarvestCraft.ID, "muttonrawItem", 1L, 0),
+            GTModHandler.getModItem(PamsHarvestCraft.ID, "turkeyrawItem", 1L, 0),
+            GTModHandler.getModItem(PamsHarvestCraft.ID, "rabbitrawItem", 1L, 0),
+            GTModHandler.getModItem(PamsHarvestCraft.ID, "venisonrawItem", 1L, 0), new ItemStack(Items.porkchop),
             new ItemStack(Items.beef), new ItemStack(Items.chicken), new ItemStack(Items.fish) }) {
             if (tItem != null) {
-                GT_OreDictUnificator.addItemData(
-                    GT_Utility.copyMetaData(32767, tItem),
+                GTOreDictUnificator.addItemData(
+                    GTUtility.copyMetaData(32767, tItem),
                     new ItemData(Materials.MeatRaw, 3628800L, new MaterialStack(Materials.Bone, 403200L)));
             }
         }
-        for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem(TwilightForest.ID, "item.meefSteak", 1L, 0),
-            GT_ModHandler.getModItem(TwilightForest.ID, "item.venisonCooked", 1L, 0),
-            GT_ModHandler.getModItem(PamsHarvestCraft.ID, "muttoncookedItem", 1L, 0),
-            GT_ModHandler.getModItem(PamsHarvestCraft.ID, "turkeycookedItem", 1L, 0),
-            GT_ModHandler.getModItem(PamsHarvestCraft.ID, "rabbitcookedItem", 1L, 0),
-            GT_ModHandler.getModItem(PamsHarvestCraft.ID, "venisoncookedItem", 1L, 0),
+        for (ItemStack tItem : new ItemStack[] { GTModHandler.getModItem(TwilightForest.ID, "item.meefSteak", 1L, 0),
+            GTModHandler.getModItem(TwilightForest.ID, "item.venisonCooked", 1L, 0),
+            GTModHandler.getModItem(PamsHarvestCraft.ID, "muttoncookedItem", 1L, 0),
+            GTModHandler.getModItem(PamsHarvestCraft.ID, "turkeycookedItem", 1L, 0),
+            GTModHandler.getModItem(PamsHarvestCraft.ID, "rabbitcookedItem", 1L, 0),
+            GTModHandler.getModItem(PamsHarvestCraft.ID, "venisoncookedItem", 1L, 0),
             new ItemStack(Items.cooked_porkchop), new ItemStack(Items.cooked_beef), new ItemStack(Items.cooked_chicken),
             new ItemStack(Items.cooked_fished) }) {
             if (tItem != null) {
-                GT_OreDictUnificator.addItemData(
-                    GT_Utility.copyMetaData(32767, tItem),
+                GTOreDictUnificator.addItemData(
+                    GTUtility.copyMetaData(32767, tItem),
                     new ItemData(Materials.MeatCooked, 3628800L, new MaterialStack(Materials.Bone, 403200L)));
             }
         }
diff --git a/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java b/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java
new file mode 100644
index 0000000000..0d2bd3ad55
--- /dev/null
+++ b/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java
@@ -0,0 +1,456 @@
+package gregtech.loaders.preload;
+
+import static gregtech.api.enums.Mods.AppliedEnergistics2;
+import static gregtech.api.enums.Mods.Botania;
+import static gregtech.api.enums.Mods.IndustrialCraft2;
+import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
+import static gregtech.api.enums.Mods.Railcraft;
+import static gregtech.api.enums.Mods.Thaumcraft;
+import static gregtech.api.enums.Mods.TwilightForest;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.MaterialsBotania;
+import gregtech.api.enums.OreDictNames;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+
+public class LoaderGTOreDictionary implements Runnable {
+
+    @Override
+    public void run() {
+        GTLog.out.println("GTMod: Register OreDict Entries of Non-GT-Items.");
+        GTOreDictUnificator.set(OrePrefixes.cell, Materials.Empty, ItemList.Cell_Empty.get(1L));
+        GTOreDictUnificator.set(OrePrefixes.cell, Materials.Lava, ItemList.Cell_Lava.get(1L));
+        GTOreDictUnificator.set(OrePrefixes.cell, Materials.Lava, GTModHandler.getIC2Item("lavaCell", 1L));
+        GTOreDictUnificator.set(OrePrefixes.cell, Materials.Water, ItemList.Cell_Water.get(1L));
+        GTOreDictUnificator.set(OrePrefixes.cell, Materials.Water, GTModHandler.getIC2Item("waterCell", 1L));
+        GTOreDictUnificator.set(
+            OrePrefixes.cell,
+            Materials.Creosote,
+            GTModHandler.getModItem(Railcraft.ID, "fluid.creosote.cell", 1L));
+
+        GTOreDictUnificator.set(OrePrefixes.cell, Materials.UUMatter, GTModHandler.getIC2Item("uuMatterCell", 1L));
+        GTOreDictUnificator.set(OrePrefixes.cell, Materials.ConstructionFoam, GTModHandler.getIC2Item("CFCell", 1L));
+
+        GTOreDictUnificator.set(OrePrefixes.bucket, Materials.Empty, new ItemStack(Items.bucket, 1, 0));
+        GTOreDictUnificator.set(OrePrefixes.bucket, Materials.Water, new ItemStack(Items.water_bucket, 1, 0));
+        GTOreDictUnificator.set(OrePrefixes.bucket, Materials.Lava, new ItemStack(Items.lava_bucket, 1, 0));
+        GTOreDictUnificator.set(OrePrefixes.bucket, Materials.Milk, new ItemStack(Items.milk_bucket, 1, 0));
+        // Clay buckets handled in gregtech.common.GTProxy.onLoad() as they aren't registered until Iguana Tweaks
+        // pre-init.
+
+        GTOreDictUnificator.set(OrePrefixes.bottle, Materials.Empty, new ItemStack(Items.glass_bottle, 1, 0));
+        GTOreDictUnificator.set(OrePrefixes.bottle, Materials.Water, new ItemStack(Items.potionitem, 1, 0));
+
+        GTOreDictUnificator.set(OrePrefixes.plateAlloy, Materials.Iridium, GTModHandler.getIC2Item("iridiumPlate", 1L));
+        GTOreDictUnificator
+            .set(OrePrefixes.plateAlloy, Materials.Advanced, GTModHandler.getIC2Item("advancedAlloy", 1L));
+        GTOreDictUnificator.set(OrePrefixes.plateAlloy, Materials.Carbon, GTModHandler.getIC2Item("carbonPlate", 1L));
+
+        GTOreDictUnificator.set(OrePrefixes.ore, Materials.Coal, new ItemStack(Blocks.coal_ore, 1));
+        GTOreDictUnificator.set(OrePrefixes.ore, Materials.Iron, new ItemStack(Blocks.iron_ore, 1));
+        GTOreDictUnificator.set(OrePrefixes.ore, Materials.Lapis, new ItemStack(Blocks.lapis_ore, 1));
+        GTOreDictUnificator.set(OrePrefixes.ore, Materials.Redstone, new ItemStack(Blocks.redstone_ore, 1));
+        GTOreDictUnificator.set(OrePrefixes.ore, Materials.Redstone, new ItemStack(Blocks.lit_redstone_ore, 1));
+        GTOreDictUnificator.set(OrePrefixes.ore, Materials.Gold, new ItemStack(Blocks.gold_ore, 1));
+        GTOreDictUnificator.set(OrePrefixes.ore, Materials.Diamond, new ItemStack(Blocks.diamond_ore, 1));
+        GTOreDictUnificator.set(OrePrefixes.ore, Materials.Emerald, new ItemStack(Blocks.emerald_ore, 1));
+        GTOreDictUnificator.set(OrePrefixes.ore, Materials.NetherQuartz, new ItemStack(Blocks.quartz_ore, 1));
+        GTOreDictUnificator.set(OrePrefixes.ingot, Materials.Copper, GTModHandler.getIC2Item("copperIngot", 1L));
+        GTOreDictUnificator.set(OrePrefixes.ingot, Materials.Tin, GTModHandler.getIC2Item("tinIngot", 1L));
+        GTOreDictUnificator.set(OrePrefixes.ingot, Materials.Lead, GTModHandler.getIC2Item("leadIngot", 1L));
+        GTOreDictUnificator.set(OrePrefixes.ingot, Materials.Bronze, GTModHandler.getIC2Item("bronzeIngot", 1L));
+        GTOreDictUnificator.set(OrePrefixes.ingot, Materials.Silver, GTModHandler.getIC2Item("silverIngot", 1L));
+        GTOreDictUnificator.set(OrePrefixes.gem, Materials.Iridium, GTModHandler.getIC2Item("iridiumOre", 1L));
+        GTOreDictUnificator.set(OrePrefixes.gem, Materials.Lapis, new ItemStack(Items.dye, 1, 4));
+        GTOreDictUnificator.set(OrePrefixes.gem, Materials.EnderEye, new ItemStack(Items.ender_eye, 1));
+        GTOreDictUnificator.set(OrePrefixes.gem, Materials.EnderPearl, new ItemStack(Items.ender_pearl, 1));
+        GTOreDictUnificator.set(OrePrefixes.gem, Materials.Diamond, new ItemStack(Items.diamond, 1));
+        GTOreDictUnificator.set(OrePrefixes.gem, Materials.Emerald, new ItemStack(Items.emerald, 1));
+        GTOreDictUnificator.set(OrePrefixes.gem, Materials.Coal, new ItemStack(Items.coal, 1, 0));
+        GTOreDictUnificator.set(OrePrefixes.gem, Materials.Charcoal, new ItemStack(Items.coal, 1, 1));
+        GTOreDictUnificator.set(OrePrefixes.gem, Materials.NetherQuartz, new ItemStack(Items.quartz, 1));
+        GTOreDictUnificator.set(OrePrefixes.gem, Materials.NetherStar, new ItemStack(Items.nether_star, 1));
+        GTOreDictUnificator.set(OrePrefixes.nugget, Materials.Gold, new ItemStack(Items.gold_nugget, 1));
+        GTOreDictUnificator.set(OrePrefixes.ingot, Materials.Gold, new ItemStack(Items.gold_ingot, 1));
+        GTOreDictUnificator.set(OrePrefixes.ingot, Materials.Iron, new ItemStack(Items.iron_ingot, 1));
+        GTOreDictUnificator.set(OrePrefixes.plate, Materials.Paper, new ItemStack(Items.paper, 1));
+        GTOreDictUnificator.set(OrePrefixes.dust, Materials.Sugar, new ItemStack(Items.sugar, 1));
+        GTOreDictUnificator.set(OrePrefixes.dust, Materials.Bone, ItemList.Dye_Bonemeal.get(1L));
+        GTOreDictUnificator.set(OrePrefixes.stick, Materials.Wood, new ItemStack(Items.stick, 1));
+        GTOreDictUnificator.set(OrePrefixes.dust, Materials.Redstone, new ItemStack(Items.redstone, 1));
+        GTOreDictUnificator.set(OrePrefixes.dust, Materials.Gunpowder, new ItemStack(Items.gunpowder, 1));
+        GTOreDictUnificator.set(OrePrefixes.dust, Materials.Glowstone, new ItemStack(Items.glowstone_dust, 1));
+        GTOreDictUnificator.set(OrePrefixes.dust, Materials.Blaze, new ItemStack(Items.blaze_powder, 1));
+        GTOreDictUnificator.set(OrePrefixes.stick, Materials.Blaze, new ItemStack(Items.blaze_rod, 1));
+        GTOreDictUnificator.set(OrePrefixes.block, Materials.Iron, new ItemStack(Blocks.iron_block, 1, 0));
+        GTOreDictUnificator.set(OrePrefixes.block, Materials.Gold, new ItemStack(Blocks.gold_block, 1, 0));
+        GTOreDictUnificator.set(OrePrefixes.block, Materials.Diamond, new ItemStack(Blocks.diamond_block, 1, 0));
+        GTOreDictUnificator.set(OrePrefixes.block, Materials.Emerald, new ItemStack(Blocks.emerald_block, 1, 0));
+        GTOreDictUnificator.set(OrePrefixes.block, Materials.Lapis, new ItemStack(Blocks.lapis_block, 1, 0));
+        GTOreDictUnificator.set(OrePrefixes.block, Materials.Coal, new ItemStack(Blocks.coal_block, 1, 0));
+        GTOreDictUnificator.set(OrePrefixes.block, Materials.Redstone, new ItemStack(Blocks.redstone_block, 1, 0));
+        GTOreDictUnificator.set(OrePrefixes.block, Materials.NetherQuartz, new ItemStack(Blocks.quartz_block, 1, 0));
+        GTOreDictUnificator.set(OrePrefixes.block, Materials.Clay, new ItemStack(Blocks.clay, 1, 0));
+        if (Blocks.ender_chest != null) {
+            GTOreDictUnificator.registerOre(OreDictNames.enderChest, new ItemStack(Blocks.ender_chest, 1));
+        }
+        GTOreDictUnificator.registerOre(OreDictNames.craftingAnvil, new ItemStack(Blocks.anvil, 1));
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingAnvil, GTModHandler.getModItem(Railcraft.ID, "anvil", 1L, 0));
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingIndustrialDiamond, ItemList.IC2_Industrial_Diamond.get(1L));
+        GTOreDictUnificator
+            .registerOre(OrePrefixes.glass, Materials.Reinforced, GTModHandler.getIC2Item("reinforcedGlass", 1L));
+
+        GTOreDictUnificator
+            .registerOre(OrePrefixes.stone, Materials.Basalt, GTModHandler.getModItem(Railcraft.ID, "cube", 1L, 6));
+        GTOreDictUnificator
+            .registerOre(OrePrefixes.stone, Materials.Marble, GTModHandler.getModItem(Railcraft.ID, "cube", 1L, 7));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.stone,
+            Materials.Basalt,
+            GTModHandler.getModItem(Railcraft.ID, "brick.abyssal", 1L, 32767));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.stone,
+            Materials.Marble,
+            GTModHandler.getModItem(Railcraft.ID, "brick.quarried", 1L, 32767));
+        GTOreDictUnificator
+            .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(Blocks.obsidian, 1, 32767));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Stone, new ItemStack(Blocks.stone, 1, 32767));
+        GTOreDictUnificator.registerOre(OrePrefixes.stoneMossy, new ItemStack(Blocks.mossy_cobblestone, 1, 32767));
+        GTOreDictUnificator.registerOre(OrePrefixes.stoneCobble, new ItemStack(Blocks.mossy_cobblestone, 1, 32767));
+        GTOreDictUnificator.registerOre(OrePrefixes.stoneCobble, new ItemStack(Blocks.cobblestone, 1, 32767));
+        GTOreDictUnificator.registerOre(OrePrefixes.stoneSmooth, new ItemStack(Blocks.stone, 1, 32767));
+        GTOreDictUnificator.registerOre(OrePrefixes.stoneBricks, new ItemStack(Blocks.stonebrick, 1, 32767));
+        GTOreDictUnificator.registerOre(OrePrefixes.stoneMossy, new ItemStack(Blocks.stonebrick, 1, 1));
+        GTOreDictUnificator.registerOre(OrePrefixes.stoneCracked, new ItemStack(Blocks.stonebrick, 1, 2));
+        GTOreDictUnificator.registerOre(OrePrefixes.stoneChiseled, new ItemStack(Blocks.stonebrick, 1, 3));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Sand, new ItemStack(Blocks.sandstone, 1, 32767));
+        GTOreDictUnificator
+            .registerOre(OrePrefixes.stone, Materials.Netherrack, new ItemStack(Blocks.netherrack, 1, 32767));
+        GTOreDictUnificator
+            .registerOre(OrePrefixes.stone, Materials.NetherBrick, new ItemStack(Blocks.nether_brick, 1, 32767));
+        GTOreDictUnificator
+            .registerOre(OrePrefixes.stone, Materials.Endstone, new ItemStack(Blocks.end_stone, 1, 32767));
+        GTOreDictUnificator
+            .registerOre(OrePrefixes.stone, Materials.Glowstone, new ItemStack(Blocks.glowstone, 1, 32767));
+
+        GTOreDictUnificator
+            .registerOre("paperResearchFragment", GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 9));
+        GTOreDictUnificator.registerOre(
+            "itemCertusQuartz",
+            GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1));
+        GTOreDictUnificator.registerOre(
+            "itemCertusQuartz",
+            GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10));
+        GTOreDictUnificator.registerOre(
+            "itemNetherQuartz",
+            GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11));
+        GTOreDictUnificator.registerOre(
+            OreDictNames.craftingQuartz,
+            GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1));
+        GTOreDictUnificator.registerOre(
+            OreDictNames.craftingQuartz,
+            GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10));
+        GTOreDictUnificator.registerOre(
+            OreDictNames.craftingQuartz,
+            GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11));
+        GTOreDictUnificator.registerOre("cropLemon", ItemList.FR_Lemon.get(1L));
+        GTOreDictUnificator.registerOre("cropCoffee", ItemList.IC2_CoffeeBeans.get(1L));
+        GTOreDictUnificator.registerOre("cropPotato", ItemList.Food_Raw_Potato.get(1L));
+        GTOreDictUnificator.registerOre(OrePrefixes.battery, Materials.LV, GTModHandler.getIC2Item("reBattery", 1L));
+        GTOreDictUnificator
+            .registerOre(OrePrefixes.battery, Materials.LV, GTModHandler.getIC2Item("chargedReBattery", 1L, 32767));
+        GTOreDictUnificator
+            .registerOre(OrePrefixes.battery, Materials.MV, GTModHandler.getIC2Item("advBattery", 1L, 32767));
+        GTOreDictUnificator
+            .registerOre(OrePrefixes.battery, Materials.HV, GTModHandler.getIC2Item("energyCrystal", 1L, 32767));
+        GTOreDictUnificator
+            .registerOre(OrePrefixes.battery, Materials.EV, GTModHandler.getIC2Item("lapotronCrystal", 1L, 32767));
+
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingWireCopper, GTModHandler.getIC2Item("insulatedCopperCableItem", 1L));
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingWireGold, GTModHandler.getIC2Item("insulatedGoldCableItem", 1L));
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingWireIron, GTModHandler.getIC2Item("insulatedIronCableItem", 1L));
+        GTOreDictUnificator.registerOre(
+            OreDictNames.craftingWireTin,
+            GTModHandler
+                .getIC2Item("insulatedTinCableItem", 1L, GTModHandler.getIC2Item("insulatedCopperCableItem", 1L)));
+
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingRedstoneTorch, new ItemStack(Blocks.redstone_torch, 1, 32767));
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingRedstoneTorch, new ItemStack(Blocks.unlit_redstone_torch, 1, 32767));
+
+        GTOreDictUnificator.registerOre(OreDictNames.craftingWorkBench, new ItemStack(Blocks.crafting_table, 1));
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingWorkBench, new ItemStack(GregTechAPI.sBlockMachines, 1, 16));
+
+        GTOreDictUnificator.registerOre(OreDictNames.craftingPiston, new ItemStack(Blocks.piston, 1, 32767));
+        GTOreDictUnificator.registerOre(OreDictNames.craftingPiston, new ItemStack(Blocks.sticky_piston, 1, 32767));
+
+        GTOreDictUnificator.registerOre(OreDictNames.craftingSafe, new ItemStack(GregTechAPI.sBlockMachines, 1, 45));
+        GTOreDictUnificator.registerOre(OreDictNames.craftingSafe, GTModHandler.getIC2Item("personalSafe", 1L));
+
+        GTOreDictUnificator.registerOre(OreDictNames.craftingChest, new ItemStack(Blocks.chest, 1, 32767));
+        GTOreDictUnificator.registerOre(OreDictNames.craftingChest, new ItemStack(Blocks.trapped_chest, 1, 32767));
+
+        GTOreDictUnificator.registerOre(OreDictNames.craftingFurnace, new ItemStack(Blocks.furnace, 1, 32767));
+        GTOreDictUnificator.registerOre(OreDictNames.craftingFurnace, new ItemStack(Blocks.lit_furnace, 1, 32767));
+
+        GTOreDictUnificator.registerOre(OreDictNames.craftingPump, GTModHandler.getIC2Item("pump", 1L));
+        GTOreDictUnificator.registerOre(OreDictNames.craftingElectromagnet, GTModHandler.getIC2Item("magnetizer", 1L));
+        GTOreDictUnificator.registerOre(OreDictNames.craftingTeleporter, GTModHandler.getIC2Item("teleporter", 1L));
+
+        GTOreDictUnificator.registerOre(OreDictNames.craftingMacerator, GTModHandler.getIC2Item("macerator", 1L));
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingMacerator, new ItemStack(GregTechAPI.sBlockMachines, 1, 50));
+
+        GTOreDictUnificator.registerOre(OreDictNames.craftingExtractor, GTModHandler.getIC2Item("extractor", 1L));
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingExtractor, new ItemStack(GregTechAPI.sBlockMachines, 1, 51));
+
+        GTOreDictUnificator.registerOre(OreDictNames.craftingCompressor, GTModHandler.getIC2Item("compressor", 1L));
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingCompressor, new ItemStack(GregTechAPI.sBlockMachines, 1, 52));
+
+        GTOreDictUnificator.registerOre(OreDictNames.craftingRecycler, GTModHandler.getIC2Item("recycler", 1L));
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingRecycler, new ItemStack(GregTechAPI.sBlockMachines, 1, 53));
+
+        GTOreDictUnificator.registerOre(OreDictNames.craftingIronFurnace, GTModHandler.getIC2Item("ironFurnace", 1L));
+
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingCentrifuge, new ItemStack(GregTechAPI.sBlockMachines, 1, 62));
+
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingInductionFurnace, GTModHandler.getIC2Item("inductionFurnace", 1L));
+
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingElectricFurnace, GTModHandler.getIC2Item("electroFurnace", 1L));
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingElectricFurnace, new ItemStack(GregTechAPI.sBlockMachines, 1, 54));
+
+        GTOreDictUnificator.registerOre(OreDictNames.craftingGenerator, GTModHandler.getIC2Item("generator", 1L));
+
+        GTOreDictUnificator
+            .registerOre(OreDictNames.craftingGeothermalGenerator, GTModHandler.getIC2Item("geothermalGenerator", 1L));
+
+        GTOreDictUnificator.registerOre(OreDictNames.craftingFeather, new ItemStack(Items.feather, 1, 32767));
+        GTOreDictUnificator.registerOre(
+            OreDictNames.craftingFeather,
+            GTModHandler.getModItem(TwilightForest.ID, "item.tfFeather", 1L, 32767));
+
+        GTOreDictUnificator.registerOre("itemWheat", new ItemStack(Items.wheat, 1, 32767));
+        GTOreDictUnificator.registerOre("paperEmpty", new ItemStack(Items.paper, 1, 32767));
+        GTOreDictUnificator.registerOre("paperMap", new ItemStack(Items.map, 1, 32767));
+        GTOreDictUnificator.registerOre("paperMap", new ItemStack(Items.filled_map, 1, 32767));
+        GTOreDictUnificator.registerOre("bookEmpty", new ItemStack(Items.book, 1, 32767));
+        GTOreDictUnificator.registerOre("bookWritable", new ItemStack(Items.writable_book, 1, 32767));
+        GTOreDictUnificator.registerOre("bookWritten", new ItemStack(Items.written_book, 1, 32767));
+        GTOreDictUnificator.registerOre("bookEnchanted", new ItemStack(Items.enchanted_book, 1, 32767));
+        GTOreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.book, 1, 32767));
+        GTOreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.writable_book, 1, 32767));
+        GTOreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.written_book, 1, 32767));
+        GTOreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.enchanted_book, 1, 32767));
+
+        GTOreDictUnificator.addToBlacklist(GTModHandler.getIC2Item("electronicCircuit", 1L));
+        GTOreDictUnificator.addToBlacklist(GTModHandler.getIC2Item("advancedCircuit", 1L));
+        GTOreDictUnificator
+            .registerOre(OrePrefixes.circuit, Materials.LV, GTModHandler.getIC2Item("electronicCircuit", 1L));
+        GTOreDictUnificator
+            .registerOre(OrePrefixes.circuit, Materials.HV, GTModHandler.getIC2Item("advancedCircuit", 1L));
+
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.itemCasing,
+            Materials.Copper,
+            GTModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 0));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.itemCasing,
+            Materials.Tin,
+            GTModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 1));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.itemCasing,
+            Materials.Bronze,
+            GTModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 2));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.itemCasing,
+            Materials.Gold,
+            GTModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 3));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.itemCasing,
+            Materials.Iron,
+            GTModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 4));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.itemCasing,
+            Materials.Steel,
+            GTModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 5));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.itemCasing,
+            Materials.Lead,
+            GTModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 6));
+
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.itemCasing,
+            Materials.Osmium,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OsmiumItemCasing", 1L, 0));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.itemCasing,
+            Materials.Aluminium,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.AluminiumItemCasing", 1L, 0));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.itemCasing,
+            Materials.StainlessSteel,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.StainlessSteelItemCasing", 1L, 0));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.itemCasing,
+            Materials.Tungsten,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TungstenItemCasing", 1L, 0));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.itemCasing,
+            Materials.Neutronium,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NeutroniumItemCasing", 1L, 0));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.itemCasing,
+            Materials.TungstenSteel,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TungstenSteelItemCasing", 1L, 0));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.itemCasing,
+            Materials.Iridium,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IridiumItemCasing", 1L, 0));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.itemCasing,
+            Materials.Titanium,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitaniumItemCasing", 1L, 0));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.itemCasing,
+            Materials.Chrome,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ChromeItemCasing", 1L, 0));
+
+        // Fake Circuits
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.circuit,
+            Materials.ULV,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitULV", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.circuit,
+            Materials.LV,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitLV", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.circuit,
+            Materials.MV,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMV", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.circuit,
+            Materials.HV,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitHV", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.circuit,
+            Materials.EV,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitEV", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.circuit,
+            Materials.IV,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitIV", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.circuit,
+            Materials.LuV,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitLuV", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.circuit,
+            Materials.ZPM,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitZPM", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.circuit,
+            Materials.UV,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUV", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.circuit,
+            Materials.UHV,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUHV", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.circuit,
+            Materials.UEV,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUEV", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.circuit,
+            Materials.UIV,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUIV", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.circuit,
+            Materials.UMV,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUMV", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.circuit,
+            Materials.UXV,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUXV", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.circuit,
+            Materials.MAX,
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMAX", 1L));
+
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.block,
+            MaterialsBotania.Manasteel,
+            GTModHandler.getModItem(Botania.ID, "storage", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.block,
+            MaterialsBotania.Terrasteel,
+            GTModHandler.getModItem(Botania.ID, "storage", 1L, 1));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.ingot,
+            MaterialsBotania.ElvenElementium,
+            GTModHandler.getModItem(Botania.ID, "manaResource", 1L, 7));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.nugget,
+            MaterialsBotania.ElvenElementium,
+            GTModHandler.getModItem(Botania.ID, "manaResource", 1L, 19));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.block,
+            MaterialsBotania.ElvenElementium,
+            GTModHandler.getModItem(Botania.ID, "storage", 1L, 2));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.block,
+            MaterialsBotania.Livingrock,
+            GTModHandler.getModItem(Botania.ID, "livingrock", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.ingot,
+            MaterialsBotania.GaiaSpirit,
+            GTModHandler.getModItem(Botania.ID, "manaResource", 1L, 14));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.block,
+            MaterialsBotania.Livingwood,
+            GTModHandler.getModItem(Botania.ID, "livingwood", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.block,
+            MaterialsBotania.Dreamwood,
+            GTModHandler.getModItem(Botania.ID, "dreamwood", 1L));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.gem,
+            MaterialsBotania.ManaDiamond,
+            GTModHandler.getModItem(Botania.ID, "manaResource", 1L, 2));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.block,
+            MaterialsBotania.ManaDiamond,
+            GTModHandler.getModItem(Botania.ID, "storage", 1L, 3));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.gem,
+            MaterialsBotania.BotaniaDragonstone,
+            GTModHandler.getModItem(Botania.ID, "manaResource", 1L, 9));
+        GTOreDictUnificator.registerOre(
+            OrePrefixes.block,
+            MaterialsBotania.BotaniaDragonstone,
+            GTModHandler.getModItem(Botania.ID, "storage", 1L, 4));
+    }
+}
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java
index e7ad9e9337..b462e065cd 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java
@@ -928,14 +928,14 @@ import static gregtech.api.recipe.RecipeMaps.sifterRecipes;
 import static gregtech.api.recipe.RecipeMaps.slicerRecipes;
 import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes;
 import static gregtech.api.recipe.RecipeMaps.wiremillRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTUtility.calculateRecipeEU;
 
 import net.minecraft.util.EnumChatFormatting;
 
-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.MachineType;
 import gregtech.api.enums.Materials;
@@ -944,176 +944,176 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.SubTag;
 import gregtech.api.enums.TierEU;
-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.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_DataAccess;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_MultiInput;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_QuadrupleHumongous;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MagHatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_WetTransformer;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Wireless_Dynamo;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Wireless_Hatch;
+import gregtech.api.metatileentity.implementations.MTEBasicBatteryBuffer;
+import gregtech.api.metatileentity.implementations.MTEBasicHull;
+import gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe;
+import gregtech.api.metatileentity.implementations.MTECable;
+import gregtech.api.metatileentity.implementations.MTEFluid;
+import gregtech.api.metatileentity.implementations.MTEFrame;
+import gregtech.api.metatileentity.implementations.MTEHatchDataAccess;
+import gregtech.api.metatileentity.implementations.MTEHatchDynamo;
+import gregtech.api.metatileentity.implementations.MTEHatchEnergy;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
+import gregtech.api.metatileentity.implementations.MTEHatchMagnet;
+import gregtech.api.metatileentity.implementations.MTEHatchMaintenance;
+import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
+import gregtech.api.metatileentity.implementations.MTEHatchMultiInput;
+import gregtech.api.metatileentity.implementations.MTEHatchOutput;
+import gregtech.api.metatileentity.implementations.MTEHatchOutputBus;
+import gregtech.api.metatileentity.implementations.MTEHatchQuadrupleHumongous;
+import gregtech.api.metatileentity.implementations.MTEItem;
+import gregtech.api.metatileentity.implementations.MTETransformer;
+import gregtech.api.metatileentity.implementations.MTEWetTransformer;
+import gregtech.api.metatileentity.implementations.MTEWirelessDynamo;
+import gregtech.api.metatileentity.implementations.MTEWirelessEnergy;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_LanguageManager;
-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.blocks.GT_Block_FrameBox;
-import gregtech.common.tileentities.automation.GT_MetaTileEntity_ChestBuffer;
-import gregtech.common.tileentities.automation.GT_MetaTileEntity_Filter;
-import gregtech.common.tileentities.automation.GT_MetaTileEntity_ItemDistributor;
-import gregtech.common.tileentities.automation.GT_MetaTileEntity_RecipeFilter;
-import gregtech.common.tileentities.automation.GT_MetaTileEntity_Regulator;
-import gregtech.common.tileentities.automation.GT_MetaTileEntity_SuperBuffer;
-import gregtech.common.tileentities.automation.GT_MetaTileEntity_TypeFilter;
-import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler_Bronze;
-import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler_Lava;
-import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler_Solar;
-import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler_Solar_Steel;
-import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler_Steel;
-import gregtech.common.tileentities.debug.GT_MetaTileEntity_AdvDebugStructureWriter;
-import gregtech.common.tileentities.generators.GT_MetaTileEntity_DieselGenerator;
-import gregtech.common.tileentities.generators.GT_MetaTileEntity_GasTurbine;
-import gregtech.common.tileentities.generators.GT_MetaTileEntity_LightningRod;
-import gregtech.common.tileentities.generators.GT_MetaTileEntity_MagicEnergyConverter;
-import gregtech.common.tileentities.generators.GT_MetaTileEntity_MagicalEnergyAbsorber;
-import gregtech.common.tileentities.generators.GT_MetaTileEntity_NaquadahReactor;
-import gregtech.common.tileentities.generators.GT_MetaTileEntity_PlasmaGenerator;
-import gregtech.common.tileentities.generators.GT_MetaTileEntity_SteamTurbine;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_BasicHull_Bronze;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_BasicHull_BronzeBricks;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_BasicHull_Steel;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_BasicHull_SteelBricks;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_CraftingInput_ME;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_CraftingInput_Slave;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_InputBus_ME;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Input_ME;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_OutputBus_ME;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_AdvSeismicProspector;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_BetterJukebox;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Boxinator;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Charger;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_IndustrialApiary;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Massfabricator;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_MicrowaveEnergyTransmitter;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Miner;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_MonsterRepellent;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_PotionBrewer;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Pump;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Replicator;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_RockBreaker;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Scanner;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Teleporter;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_TurboCharger;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator;
-import gregtech.common.tileentities.machines.long_distance.GT_MetaTileEntity_LongDistancePipelineFluid;
-import gregtech.common.tileentities.machines.long_distance.GT_MetaTileEntity_LongDistancePipelineItem;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_AssemblyLine;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_BrickedBlastFurnace;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Charcoal_Pit;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Cleanroom;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_ConcreteBackfiller1;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_ConcreteBackfiller2;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_DieselEngine;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_DistillationTower;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_ElectricBlastFurnace;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_ExtremeDieselEngine;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer1;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer2;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer3;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_HeatExchanger;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_ImplosionCompressor;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_IndustrialElectromagneticSeparator;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_IndustrialExtractor;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_IndustrialLaserEngraver;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_IntegratedOreFactory;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeBoiler_Bronze;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeBoiler_Steel;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeBoiler_Titanium;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeBoiler_TungstenSteel;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeChemicalReactor;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeFluidExtractor;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_Gas;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_GasAdvanced;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_HPSteam;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_Plasma;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_Steam;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_MultiAutoclave;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_MultiCanner;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_MultiFurnace;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_MultiLathe;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_NanoForge;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OilCracker;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OilDrill1;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OilDrill2;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OilDrill3;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OilDrill4;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OilDrillInfinite;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OreDrillingPlant1;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OreDrillingPlant2;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OreDrillingPlant3;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OreDrillingPlant4;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_PCBFactory;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_PlasmaForge;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_ProcessingArray;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_PyrolyseOven;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_TranscendentPlasmaMixer;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_VacuumFreezer;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_WormholeGenerator;
-import gregtech.common.tileentities.machines.multi.compressor.GT_MetaTileEntity_BlackHoleCompressor;
-import gregtech.common.tileentities.machines.multi.compressor.GT_MetaTileEntity_HIPCompressor;
-import gregtech.common.tileentities.machines.multi.compressor.GT_MetaTileEntity_HeatSensor;
-import gregtech.common.tileentities.machines.multi.compressor.GT_MetaTileEntity_IndustrialCompressor;
-import gregtech.common.tileentities.machines.multi.compressor.GT_MetaTileEntity_NeutroniumCompressor;
-import gregtech.common.tileentities.machines.multi.drone.GT_MetaTileEntity_DroneCentre;
-import gregtech.common.tileentities.machines.multi.drone.GT_MetaTileEntity_Hatch_DroneDownLink;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_Hatch_DegasifierControlHatch;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_LensHousing;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_LensIndicator;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationPlant;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitClarifier;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitDegasifier;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitFlocculation;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitOzonation;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitParticleExtractor;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitPhAdjustment;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitPlasmaHeater;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitUVTreatment;
-import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_pHSensor;
-import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_AlloySmelter_Bronze;
-import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_AlloySmelter_Steel;
-import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Compressor_Bronze;
-import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Compressor_Steel;
-import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Extractor_Bronze;
-import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Extractor_Steel;
-import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_ForgeHammer_Bronze;
-import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_ForgeHammer_Steel;
-import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Furnace_Bronze;
-import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Furnace_Steel;
-import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Macerator_Bronze;
-import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Macerator_Steel;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_Locker;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumChest;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumTank;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperChest;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperTank;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTransformerHiAmp;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.blocks.BlockFrameBox;
+import gregtech.common.tileentities.automation.MTEChestBuffer;
+import gregtech.common.tileentities.automation.MTEFilter;
+import gregtech.common.tileentities.automation.MTEItemDistributor;
+import gregtech.common.tileentities.automation.MTERecipeFilter;
+import gregtech.common.tileentities.automation.MTERegulator;
+import gregtech.common.tileentities.automation.MTESuperBuffer;
+import gregtech.common.tileentities.automation.MTETypeFilter;
+import gregtech.common.tileentities.boilers.MTEBoilerBronze;
+import gregtech.common.tileentities.boilers.MTEBoilerLava;
+import gregtech.common.tileentities.boilers.MTEBoilerSolar;
+import gregtech.common.tileentities.boilers.MTEBoilerSolarSteel;
+import gregtech.common.tileentities.boilers.MTEBoilerSteel;
+import gregtech.common.tileentities.debug.MTEAdvDebugStructureWriter;
+import gregtech.common.tileentities.generators.MTEDieselGenerator;
+import gregtech.common.tileentities.generators.MTEGasTurbine;
+import gregtech.common.tileentities.generators.MTELightningRod;
+import gregtech.common.tileentities.generators.MTEMagicEnergyConverter;
+import gregtech.common.tileentities.generators.MTEMagicalEnergyAbsorber;
+import gregtech.common.tileentities.generators.MTENaquadahReactor;
+import gregtech.common.tileentities.generators.MTEPlasmaGenerator;
+import gregtech.common.tileentities.generators.MTESteamTurbine;
+import gregtech.common.tileentities.machines.MTEBasicHullBronze;
+import gregtech.common.tileentities.machines.MTEBasicHullBronzeBricks;
+import gregtech.common.tileentities.machines.MTEBasicHullSteel;
+import gregtech.common.tileentities.machines.MTEBasicHullSteelBricks;
+import gregtech.common.tileentities.machines.MTEHatchCraftingInputME;
+import gregtech.common.tileentities.machines.MTEHatchCraftingInputSlave;
+import gregtech.common.tileentities.machines.MTEHatchInputBusME;
+import gregtech.common.tileentities.machines.MTEHatchInputME;
+import gregtech.common.tileentities.machines.MTEHatchOutputBusME;
+import gregtech.common.tileentities.machines.MTEHatchOutputME;
+import gregtech.common.tileentities.machines.basic.MTEAdvSeismicProspector;
+import gregtech.common.tileentities.machines.basic.MTEBetterJukebox;
+import gregtech.common.tileentities.machines.basic.MTEBoxinator;
+import gregtech.common.tileentities.machines.basic.MTECharger;
+import gregtech.common.tileentities.machines.basic.MTEIndustrialApiary;
+import gregtech.common.tileentities.machines.basic.MTEMassfabricator;
+import gregtech.common.tileentities.machines.basic.MTEMicrowaveEnergyTransmitter;
+import gregtech.common.tileentities.machines.basic.MTEMiner;
+import gregtech.common.tileentities.machines.basic.MTEMonsterRepellent;
+import gregtech.common.tileentities.machines.basic.MTEPotionBrewer;
+import gregtech.common.tileentities.machines.basic.MTEPump;
+import gregtech.common.tileentities.machines.basic.MTEReplicator;
+import gregtech.common.tileentities.machines.basic.MTERockBreaker;
+import gregtech.common.tileentities.machines.basic.MTEScanner;
+import gregtech.common.tileentities.machines.basic.MTETeleporter;
+import gregtech.common.tileentities.machines.basic.MTETurboCharger;
+import gregtech.common.tileentities.machines.basic.MTEWorldAccelerator;
+import gregtech.common.tileentities.machines.long_distance.MTELongDistancePipelineFluid;
+import gregtech.common.tileentities.machines.long_distance.MTELongDistancePipelineItem;
+import gregtech.common.tileentities.machines.multi.MTEAssemblyLine;
+import gregtech.common.tileentities.machines.multi.MTEBrickedBlastFurnace;
+import gregtech.common.tileentities.machines.multi.MTECharcoalPit;
+import gregtech.common.tileentities.machines.multi.MTECleanroom;
+import gregtech.common.tileentities.machines.multi.MTEConcreteBackfiller1;
+import gregtech.common.tileentities.machines.multi.MTEConcreteBackfiller2;
+import gregtech.common.tileentities.machines.multi.MTEDieselEngine;
+import gregtech.common.tileentities.machines.multi.MTEDistillationTower;
+import gregtech.common.tileentities.machines.multi.MTEElectricBlastFurnace;
+import gregtech.common.tileentities.machines.multi.MTEExtremeDieselEngine;
+import gregtech.common.tileentities.machines.multi.MTEFusionComputer1;
+import gregtech.common.tileentities.machines.multi.MTEFusionComputer2;
+import gregtech.common.tileentities.machines.multi.MTEFusionComputer3;
+import gregtech.common.tileentities.machines.multi.MTEHeatExchanger;
+import gregtech.common.tileentities.machines.multi.MTEImplosionCompressor;
+import gregtech.common.tileentities.machines.multi.MTEIndustrialElectromagneticSeparator;
+import gregtech.common.tileentities.machines.multi.MTEIndustrialExtractor;
+import gregtech.common.tileentities.machines.multi.MTEIndustrialLaserEngraver;
+import gregtech.common.tileentities.machines.multi.MTEIntegratedOreFactory;
+import gregtech.common.tileentities.machines.multi.MTELargeBoilerBronze;
+import gregtech.common.tileentities.machines.multi.MTELargeBoilerSteel;
+import gregtech.common.tileentities.machines.multi.MTELargeBoilerTitanium;
+import gregtech.common.tileentities.machines.multi.MTELargeBoilerTungstenSteel;
+import gregtech.common.tileentities.machines.multi.MTELargeChemicalReactor;
+import gregtech.common.tileentities.machines.multi.MTELargeFluidExtractor;
+import gregtech.common.tileentities.machines.multi.MTELargeTurbineGas;
+import gregtech.common.tileentities.machines.multi.MTELargeTurbineGasAdvanced;
+import gregtech.common.tileentities.machines.multi.MTELargeTurbineHPSteam;
+import gregtech.common.tileentities.machines.multi.MTELargeTurbinePlasma;
+import gregtech.common.tileentities.machines.multi.MTELargeTurbineSteam;
+import gregtech.common.tileentities.machines.multi.MTEMultiAutoclave;
+import gregtech.common.tileentities.machines.multi.MTEMultiCanner;
+import gregtech.common.tileentities.machines.multi.MTEMultiFurnace;
+import gregtech.common.tileentities.machines.multi.MTEMultiLathe;
+import gregtech.common.tileentities.machines.multi.MTENanoForge;
+import gregtech.common.tileentities.machines.multi.MTEOilCracker;
+import gregtech.common.tileentities.machines.multi.MTEOilDrill1;
+import gregtech.common.tileentities.machines.multi.MTEOilDrill2;
+import gregtech.common.tileentities.machines.multi.MTEOilDrill3;
+import gregtech.common.tileentities.machines.multi.MTEOilDrill4;
+import gregtech.common.tileentities.machines.multi.MTEOilDrillInfinite;
+import gregtech.common.tileentities.machines.multi.MTEOreDrillingPlant1;
+import gregtech.common.tileentities.machines.multi.MTEOreDrillingPlant2;
+import gregtech.common.tileentities.machines.multi.MTEOreDrillingPlant3;
+import gregtech.common.tileentities.machines.multi.MTEOreDrillingPlant4;
+import gregtech.common.tileentities.machines.multi.MTEPCBFactory;
+import gregtech.common.tileentities.machines.multi.MTEPlasmaForge;
+import gregtech.common.tileentities.machines.multi.MTEProcessingArray;
+import gregtech.common.tileentities.machines.multi.MTEPyrolyseOven;
+import gregtech.common.tileentities.machines.multi.MTETranscendentPlasmaMixer;
+import gregtech.common.tileentities.machines.multi.MTEVacuumFreezer;
+import gregtech.common.tileentities.machines.multi.MTEWormholeGenerator;
+import gregtech.common.tileentities.machines.multi.compressor.MTEBlackHoleCompressor;
+import gregtech.common.tileentities.machines.multi.compressor.MTEHIPCompressor;
+import gregtech.common.tileentities.machines.multi.compressor.MTEHeatSensor;
+import gregtech.common.tileentities.machines.multi.compressor.MTEIndustrialCompressor;
+import gregtech.common.tileentities.machines.multi.compressor.MTENeutroniumCompressor;
+import gregtech.common.tileentities.machines.multi.drone.MTEDroneCentre;
+import gregtech.common.tileentities.machines.multi.drone.MTEHatchDroneDownLink;
+import gregtech.common.tileentities.machines.multi.purification.MTEHatchDegasifierControl;
+import gregtech.common.tileentities.machines.multi.purification.MTEHatchLensHousing;
+import gregtech.common.tileentities.machines.multi.purification.MTEHatchLensIndicator;
+import gregtech.common.tileentities.machines.multi.purification.MTEHatchPHSensor;
+import gregtech.common.tileentities.machines.multi.purification.MTEPurificationPlant;
+import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitBaryonicPerfection;
+import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitClarifier;
+import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitDegasser;
+import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitFlocculation;
+import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitOzonation;
+import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitPhAdjustment;
+import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitPlasmaHeater;
+import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitUVTreatment;
+import gregtech.common.tileentities.machines.steam.MTESteamAlloySmelterBronze;
+import gregtech.common.tileentities.machines.steam.MTESteamAlloySmelterSteel;
+import gregtech.common.tileentities.machines.steam.MTESteamCompressorBronze;
+import gregtech.common.tileentities.machines.steam.MTESteamCompressorSteel;
+import gregtech.common.tileentities.machines.steam.MTESteamExtractorBronze;
+import gregtech.common.tileentities.machines.steam.MTESteamExtractorSteel;
+import gregtech.common.tileentities.machines.steam.MTESteamForgeHammerBronze;
+import gregtech.common.tileentities.machines.steam.MTESteamForgeHammerSteel;
+import gregtech.common.tileentities.machines.steam.MTESteamFurnaceBronze;
+import gregtech.common.tileentities.machines.steam.MTESteamFurnaceSteel;
+import gregtech.common.tileentities.machines.steam.MTESteamMaceratorBronze;
+import gregtech.common.tileentities.machines.steam.MTESteamMaceratorSteel;
+import gregtech.common.tileentities.storage.MTELocker;
+import gregtech.common.tileentities.storage.MTEQuantumChest;
+import gregtech.common.tileentities.storage.MTEQuantumTank;
+import gregtech.common.tileentities.storage.MTESuperChest;
+import gregtech.common.tileentities.storage.MTESuperTank;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTETransformerHiAmp;
 
 // Free IDs left for machines in GT as of 29th of July 2022 - Colen. Please try use them up in order.
 // 366
@@ -1292,7 +1292,7 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.Gregtech
 // TODO Some GT MetaTileEntity registrations are done in load/GT_Loader_MetaTileEntities_Recipes.java due to joint
 // registration+recipe methods, they should be split and brought here to register all in preload.
 
-public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRCUIT RECIPES AND USAGES
+public class LoaderMetaTileEntities implements Runnable { // TODO CHECK CIRCUIT RECIPES AND USAGES
 
     private static final String aTextWire1 = "wire.";
     private static final String aTextCable1 = "cable.";
@@ -1326,376 +1326,329 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerMultiblockControllers() {
         ItemList.Machine_Bricked_BlastFurnace.set(
-            new GT_MetaTileEntity_BrickedBlastFurnace(
+            new MTEBrickedBlastFurnace(
                 BRICKED_BLAST_FURNACE_CONTROLLER.ID,
                 "multimachine.brickedblastfurnace",
                 "Bricked Blast Furnace").getStackForm(1L));
 
         ItemList.Machine_Multi_BlastFurnace.set(
-            new GT_MetaTileEntity_ElectricBlastFurnace(
-                EBF_CONTROLLER.ID,
-                "multimachine.blastfurnace",
-                "Electric Blast Furnace").getStackForm(1L));
+            new MTEElectricBlastFurnace(EBF_CONTROLLER.ID, "multimachine.blastfurnace", "Electric Blast Furnace")
+                .getStackForm(1L));
         ItemList.Machine_Multi_ImplosionCompressor.set(
-            new GT_MetaTileEntity_ImplosionCompressor(
+            new MTEImplosionCompressor(
                 IMPLOSION_COMPRESSOR_CONTROLLER.ID,
                 "multimachine.implosioncompressor",
                 "Implosion Compressor").getStackForm(1L));
         ItemList.Machine_Multi_VacuumFreezer.set(
-            new GT_MetaTileEntity_VacuumFreezer(
-                VACUUM_FREEZER_CONTROLLER.ID,
-                "multimachine.vacuumfreezer",
-                "Vacuum Freezer").getStackForm(1L));
+            new MTEVacuumFreezer(VACUUM_FREEZER_CONTROLLER.ID, "multimachine.vacuumfreezer", "Vacuum Freezer")
+                .getStackForm(1L));
         ItemList.Machine_Multi_Furnace.set(
-            new GT_MetaTileEntity_MultiFurnace(
-                MULTI_SMELTER_CONTROLLER.ID,
-                "multimachine.multifurnace",
-                "Multi Smelter").getStackForm(1L));
+            new MTEMultiFurnace(MULTI_SMELTER_CONTROLLER.ID, "multimachine.multifurnace", "Multi Smelter")
+                .getStackForm(1L));
         ItemList.Machine_Multi_PlasmaForge.set(
-            new GT_MetaTileEntity_PlasmaForge(
+            new MTEPlasmaForge(
                 DTPF_CONTROLLER.ID,
                 "multimachine.plasmaforge",
                 "Dimensionally Transcendent Plasma Forge").getStackForm(1L));
         ItemList.Machine_Multi_PurificationPlant.set(
-            new GT_MetaTileEntity_PurificationPlant(
+            new MTEPurificationPlant(
                 PURIFICATION_PLANT_CONTROLLER.ID,
                 "multimachine.purificationplant",
                 "Water Purification Plant").getStackForm(1L));
         ItemList.Machine_Multi_PurificationUnitClarifier.set(
-            new GT_MetaTileEntity_PurificationUnitClarifier(
+            new MTEPurificationUnitClarifier(
                 PURIFICATION_UNIT_CLARIFIER.ID,
                 "multimachine.purificationunitclarifier",
                 "Clarifier Purification Unit").getStackForm(1L));
         ItemList.Machine_Multi_PurificationUnitFlocculator.set(
-            new GT_MetaTileEntity_PurificationUnitFlocculation(
+            new MTEPurificationUnitFlocculation(
                 PURIFICATION_UNIT_FLOCCULATOR.ID,
                 "multimachine.purificationunitflocculator",
                 "Flocculation Purification Unit").getStackForm(1L));
         ItemList.Machine_Multi_PurificationUnitPhAdjustment.set(
-            new GT_MetaTileEntity_PurificationUnitPhAdjustment(
+            new MTEPurificationUnitPhAdjustment(
                 PURIFICATION_UNIT_PH_ADJUSTMENT.ID,
                 "multimachine.purificationunitphadjustment",
                 "pH Neutralization Purification Unit").getStackForm(1L));
         ItemList.Machine_Multi_PurificationUnitOzonation.set(
-            new GT_MetaTileEntity_PurificationUnitOzonation(
+            new MTEPurificationUnitOzonation(
                 PURIFICATION_UNIT_OZONATION.ID,
                 "multimachine.purificationunitozonation",
                 "Ozonation Purification Unit").getStackForm(1L));
         ItemList.Machine_Multi_PurificationUnitPlasmaHeater.set(
-            new GT_MetaTileEntity_PurificationUnitPlasmaHeater(
+            new MTEPurificationUnitPlasmaHeater(
                 PURIFICATION_UNIT_PLASMA_HEATER.ID,
                 "multimachine.purificationunitplasmaheater",
                 "Extreme Temperature Fluctuation Purification Unit").getStackForm(1L));
         ItemList.Machine_Multi_PurificationUnitUVTreatment.set(
-            new GT_MetaTileEntity_PurificationUnitUVTreatment(
+            new MTEPurificationUnitUVTreatment(
                 PURIFICATION_UNIT_UV_TREATMENT.ID,
                 "multimachine.purificationunituvtreatment",
                 "High Energy Laser Purification Unit").getStackForm(1L));
         ItemList.Machine_Multi_PurificationUnitDegasifier.set(
-            new GT_MetaTileEntity_PurificationUnitDegasifier(
+            new MTEPurificationUnitDegasser(
                 PURIFICATION_UNIT_DEGASIFIER.ID,
                 "multimachine.purificationunitdegasifier",
                 "Residual Decontaminant Degasser Purification Unit").getStackForm(1L));
         ItemList.Machine_Multi_PurificationUnitParticleExtractor.set(
-            new GT_MetaTileEntity_PurificationUnitParticleExtractor(
+            new MTEPurificationUnitBaryonicPerfection(
                 PURIFICATION_UNIT_PARTICLE_EXTRACTOR.ID,
                 "multimachine.purificationunitextractor",
                 "Absolute Baryonic Perfection Purification Unit").getStackForm(1L));
         ItemList.Hatch_DegasifierControl.set(
-            new GT_MetaTileEntity_Hatch_DegasifierControlHatch(
+            new MTEHatchDegasifierControl(
                 HATCH_DEGASIFIER_CONTROL.ID,
                 "hatch.degasifiercontrol",
                 "Degasser Control Hatch",
                 8).getStackForm(1L));
         ItemList.Machine_Multi_LargeBoiler_Bronze.set(
-            new GT_MetaTileEntity_LargeBoiler_Bronze(
+            new MTELargeBoilerBronze(
                 LARGE_BRONZE_BOILER_CONTROLLER.ID,
                 "multimachine.boiler.bronze",
                 "Large Bronze Boiler").getStackForm(1L));
         ItemList.Machine_Multi_LargeBoiler_Steel.set(
-            new GT_MetaTileEntity_LargeBoiler_Steel(
-                LARGE_STEEL_BOILER_CONTROLLER.ID,
-                "multimachine.boiler.steel",
-                "Large Steel Boiler").getStackForm(1L));
+            new MTELargeBoilerSteel(LARGE_STEEL_BOILER_CONTROLLER.ID, "multimachine.boiler.steel", "Large Steel Boiler")
+                .getStackForm(1L));
         ItemList.Machine_Multi_LargeBoiler_Titanium.set(
-            new GT_MetaTileEntity_LargeBoiler_Titanium(
+            new MTELargeBoilerTitanium(
                 LARGE_TITANIUM_BOILER_CONTROLLER.ID,
                 "multimachine.boiler.titanium",
                 "Large Titanium Boiler").getStackForm(1L));
         ItemList.Machine_Multi_LargeBoiler_TungstenSteel.set(
-            new GT_MetaTileEntity_LargeBoiler_TungstenSteel(
+            new MTELargeBoilerTungstenSteel(
                 LARGE_TUNGSTENSTEEL_BOILER_CONTROLLER.ID,
                 "multimachine.boiler.tungstensteel",
                 "Large Tungstensteel Boiler").getStackForm(1L));
         ItemList.FusionComputer_LuV.set(
-            new GT_MetaTileEntity_FusionComputer1(
-                FUSION_CONTROLLER_MKI.ID,
-                "fusioncomputer.tier.06",
-                "Fusion Control Computer Mark I").getStackForm(1L));
+            new MTEFusionComputer1(FUSION_CONTROLLER_MKI.ID, "fusioncomputer.tier.06", "Fusion Control Computer Mark I")
+                .getStackForm(1L));
         ItemList.FusionComputer_ZPMV.set(
-            new GT_MetaTileEntity_FusionComputer2(
+            new MTEFusionComputer2(
                 FUSION_CONTROLLER_MKII.ID,
                 "fusioncomputer.tier.07",
                 "Fusion Control Computer Mark II").getStackForm(1L));
         ItemList.FusionComputer_UV.set(
-            new GT_MetaTileEntity_FusionComputer3(
+            new MTEFusionComputer3(
                 FUSION_CONTROLLER_MKIII.ID,
                 "fusioncomputer.tier.08",
                 "Fusion Control Computer Mark III").getStackForm(1L));
 
         ItemList.Processing_Array.set(
-            new GT_MetaTileEntity_ProcessingArray(
-                PROCESSING_ARRAY_CONTROLLER.ID,
-                "multimachine.processingarray",
-                "Processing Array").getStackForm(1L));
+            new MTEProcessingArray(PROCESSING_ARRAY_CONTROLLER.ID, "multimachine.processingarray", "Processing Array")
+                .getStackForm(1L));
         ItemList.Distillation_Tower.set(
-            new GT_MetaTileEntity_DistillationTower(
+            new MTEDistillationTower(
                 DISTILLATION_TOWER_CONTROLLER.ID,
                 "multimachine.distillationtower",
                 "Distillation Tower").getStackForm(1L));
         ItemList.Ore_Processor.set(
-            new GT_MetaTileEntity_IntegratedOreFactory(
+            new MTEIntegratedOreFactory(
                 INTEGRATED_ORE_FACTORY_CONTROLLER.ID,
                 "multimachine.oreprocessor",
                 "Integrated Ore Factory").getStackForm(1L));
 
         ItemList.LargeSteamTurbine.set(
-            new GT_MetaTileEntity_LargeTurbine_Steam(
+            new MTELargeTurbineSteam(
                 LARGE_STEAM_TURBINE_CONTROLLER.ID,
                 "multimachine.largeturbine",
                 "Large Steam Turbine").getStackForm(1L));
         ItemList.LargeGasTurbine.set(
-            new GT_MetaTileEntity_LargeTurbine_Gas(
-                LARGE_GAS_TURBINE_CONTROLLER.ID,
-                "multimachine.largegasturbine",
-                "Large Gas Turbine").getStackForm(1L));
+            new MTELargeTurbineGas(LARGE_GAS_TURBINE_CONTROLLER.ID, "multimachine.largegasturbine", "Large Gas Turbine")
+                .getStackForm(1L));
         ItemList.LargeHPSteamTurbine.set(
-            new GT_MetaTileEntity_LargeTurbine_HPSteam(
+            new MTELargeTurbineHPSteam(
                 LARGE_HP_STEAM_TURBINE_CONTROLLER.ID,
                 "multimachine.largehpturbine",
                 "Large HP Steam Turbine").getStackForm(1L));
         ItemList.LargeAdvancedGasTurbine.set(
-            new GT_MetaTileEntity_LargeTurbine_GasAdvanced(
+            new MTELargeTurbineGasAdvanced(
                 LARGE_ADVANCED_GAS_TURBINE_CONTROLLER.ID,
                 "multimachine.largeadvancedgasturbine",
                 "Large Advanced Gas Turbine").getStackForm(1L));
         ItemList.Machine_Multi_TranscendentPlasmaMixer.set(
-            new GT_MetaTileEntity_TranscendentPlasmaMixer(
+            new MTETranscendentPlasmaMixer(
                 TRANSCENDENT_PLASMA_MIXER_CONTROLLER.ID,
                 "multimachine.transcendentplasmamixer",
                 "Transcendent Plasma Mixer").getStackForm(1));
 
         ItemList.LargePlasmaTurbine.set(
-            new GT_MetaTileEntity_LargeTurbine_Plasma(
+            new MTELargeTurbinePlasma(
                 LARGE_PLASMA_TURBINE_CONTROLLER.ID,
                 "multimachine.largeplasmaturbine",
                 "Large Plasma Generator").getStackForm(1L));
         ItemList.Machine_Multi_HeatExchanger.set(
-            new GT_MetaTileEntity_HeatExchanger(
+            new MTEHeatExchanger(
                 LARGE_HEAT_EXCHANGER_CONTROLLER.ID,
                 "multimachine.heatexchanger",
                 "Large Heat Exchanger").getStackForm(1L));
         ItemList.Charcoal_Pile.set(
-            new GT_MetaTileEntity_Charcoal_Pit(
+            new MTECharcoalPit(
                 CHARCOAL_PILE_IGNITER_CONTROLLER.ID,
                 "multimachine.charcoalpile",
                 "Charcoal Pile Igniter").getStackForm(1));
 
         // Converter recipes in case you had old one lying around
         ItemList.OilDrill1.set(
-            new GT_MetaTileEntity_OilDrill1(
-                MULTIBLOCK_PUMP_MKI_CONTROLLER.ID,
-                "multimachine.oildrill1",
-                "Oil/Gas/Fluid Drilling Rig").getStackForm(1));
+            new MTEOilDrill1(MULTIBLOCK_PUMP_MKI_CONTROLLER.ID, "multimachine.oildrill1", "Oil/Gas/Fluid Drilling Rig")
+                .getStackForm(1));
         ItemList.OilDrill2.set(
-            new GT_MetaTileEntity_OilDrill2(
+            new MTEOilDrill2(
                 MULTILOCK_PUMP_MKII_CONTROLLER.ID,
                 "multimachine.oildrill2",
                 "Oil/Gas/Fluid Drilling Rig II").getStackForm(1));
         ItemList.OilDrill3.set(
-            new GT_MetaTileEntity_OilDrill3(
+            new MTEOilDrill3(
                 MULTILOCK_PUMP_MKIII_CONTROLLER.ID,
                 "multimachine.oildrill3",
                 "Oil/Gas/Fluid Drilling Rig III").getStackForm(1));
         ItemList.OilDrill4.set(
-            new GT_MetaTileEntity_OilDrill4(
+            new MTEOilDrill4(
                 MULTILOCK_PUMP_MKIV_CONTROLLER.ID,
                 "multimachine.oildrill4",
                 "Oil/Gas/Fluid Drilling Rig IV").getStackForm(1));
         ItemList.OilDrillInfinite.set(
-            new GT_MetaTileEntity_OilDrillInfinite(
+            new MTEOilDrillInfinite(
                 MULTIBLOCK_PUMP_INFINITE_CONTROLLER.ID,
                 "multimachine.oildrillinfinite",
                 "Infinite Oil/Gas/Fluid Drilling Rig").getStackForm(1));
 
         ItemList.ConcreteBackfiller1.set(
-            new GT_MetaTileEntity_ConcreteBackfiller1(
+            new MTEConcreteBackfiller1(
                 CONCRETE_BACKFILLER_I_CONTROLLER.ID,
                 "multimachine.concretebackfiller1",
                 "Concrete Backfiller").getStackForm(1));
         ItemList.ConcreteBackfiller2.set(
-            new GT_MetaTileEntity_ConcreteBackfiller2(
+            new MTEConcreteBackfiller2(
                 CONCRETE_BACKFILLER_II_CONTROLLER.ID,
                 "multimachine.concretebackfiller3",
                 "Advanced Concrete Backfiller").getStackForm(1));
         ItemList.OreDrill1.set(
-            new GT_MetaTileEntity_OreDrillingPlant1(
-                ORE_DRILL_MKI_CONTROLLER.ID,
-                "multimachine.oredrill1",
-                "Ore Drilling Plant").getStackForm(1));
+            new MTEOreDrillingPlant1(ORE_DRILL_MKI_CONTROLLER.ID, "multimachine.oredrill1", "Ore Drilling Plant")
+                .getStackForm(1));
         ItemList.OreDrill2.set(
-            new GT_MetaTileEntity_OreDrillingPlant2(
-                ORE_DRILL_MKII_CONTROLLER.ID,
-                "multimachine.oredrill2",
-                "Ore Drilling Plant II").getStackForm(1));
+            new MTEOreDrillingPlant2(ORE_DRILL_MKII_CONTROLLER.ID, "multimachine.oredrill2", "Ore Drilling Plant II")
+                .getStackForm(1));
         ItemList.OreDrill3.set(
-            new GT_MetaTileEntity_OreDrillingPlant3(
-                ORE_DRILL_MKIII_CONTROLLER.ID,
-                "multimachine.oredrill3",
-                "Ore Drilling Plant III").getStackForm(1));
+            new MTEOreDrillingPlant3(ORE_DRILL_MKIII_CONTROLLER.ID, "multimachine.oredrill3", "Ore Drilling Plant III")
+                .getStackForm(1));
         ItemList.OreDrill4.set(
-            new GT_MetaTileEntity_OreDrillingPlant4(
-                ORE_DRILL_MKIV_CONTROLLER.ID,
-                "multimachine.oredrill4",
-                "Ore Drilling Plant IV").getStackForm(1));
+            new MTEOreDrillingPlant4(ORE_DRILL_MKIV_CONTROLLER.ID, "multimachine.oredrill4", "Ore Drilling Plant IV")
+                .getStackForm(1));
 
         ItemList.PyrolyseOven.set(
-            new GT_MetaTileEntity_PyrolyseOven(PYROLYSE_OVEN_CONTROLLER.ID, "multimachine.pyro", "Pyrolyse Oven")
-                .getStackForm(1));
+            new MTEPyrolyseOven(PYROLYSE_OVEN_CONTROLLER.ID, "multimachine.pyro", "Pyrolyse Oven").getStackForm(1));
         ItemList.OilCracker.set(
-            new GT_MetaTileEntity_OilCracker(OIL_CRACKER_CONTROLLER.ID, "multimachine.cracker", "Oil Cracking Unit")
-                .getStackForm(1));
+            new MTEOilCracker(OIL_CRACKER_CONTROLLER.ID, "multimachine.cracker", "Oil Cracking Unit").getStackForm(1));
 
         ItemList.Machine_Multi_Assemblyline.set(
-            new GT_MetaTileEntity_AssemblyLine(
-                ASSEMBLING_LINE_CONTROLLER.ID,
-                "multimachine.assemblyline",
-                "Assembling Line").getStackForm(1L));
+            new MTEAssemblyLine(ASSEMBLING_LINE_CONTROLLER.ID, "multimachine.assemblyline", "Assembling Line")
+                .getStackForm(1L));
         ItemList.Machine_Multi_DieselEngine.set(
-            new GT_MetaTileEntity_DieselEngine(
-                COMBUSTION_ENGINE_CONTROLLER.ID,
-                "multimachine.dieselengine",
-                "Combustion Engine").getStackForm(1L));
+            new MTEDieselEngine(COMBUSTION_ENGINE_CONTROLLER.ID, "multimachine.dieselengine", "Combustion Engine")
+                .getStackForm(1L));
         ItemList.Machine_Multi_ExtremeDieselEngine.set(
-            new GT_MetaTileEntity_ExtremeDieselEngine(
+            new MTEExtremeDieselEngine(
                 EXTREME_COMBUSTION_ENGINE_CONTROLLER.ID,
                 "multimachine.extremedieselengine",
                 "Extreme Combustion Engine").getStackForm(1L));
         ItemList.Machine_Multi_Cleanroom.set(
-            new GT_MetaTileEntity_Cleanroom(CLEANROOM_CONTROLLER.ID, "multimachine.cleanroom", "Cleanroom Controller")
+            new MTECleanroom(CLEANROOM_CONTROLLER.ID, "multimachine.cleanroom", "Cleanroom Controller")
                 .getStackForm(1));
 
         ItemList.Machine_Multi_LargeChemicalReactor.set(
-            new GT_MetaTileEntity_LargeChemicalReactor(
-                LCR_CONTROLLER.ID,
-                "multimachine.chemicalreactor",
-                "Large Chemical Reactor").getStackForm(1));
-        ItemList.PCBFactory.set(
-            new GT_MetaTileEntity_PCBFactory(PCB_FACTORY_CONTROLLER.ID, "multimachine.pcbfactory", "PCB Factory")
-                .getStackForm(1));
-        ItemList.NanoForge.set(
-            new GT_MetaTileEntity_NanoForge(NANO_FORGE_CONTROLLER.ID, "multimachine.nanoforge", "Nano Forge")
-                .getStackForm(1));
-        ItemList.Machine_Multi_DroneCentre.set(
-            new GT_MetaTileEntity_DroneCentre(Drone_Centre.ID, "multimachine_DroneCentre", "Drone Centre")
+            new MTELargeChemicalReactor(LCR_CONTROLLER.ID, "multimachine.chemicalreactor", "Large Chemical Reactor")
                 .getStackForm(1));
+        ItemList.PCBFactory.set(
+            new MTEPCBFactory(PCB_FACTORY_CONTROLLER.ID, "multimachine.pcbfactory", "PCB Factory").getStackForm(1));
+        ItemList.NanoForge
+            .set(new MTENanoForge(NANO_FORGE_CONTROLLER.ID, "multimachine.nanoforge", "Nano Forge").getStackForm(1));
+        ItemList.Machine_Multi_DroneCentre
+            .set(new MTEDroneCentre(Drone_Centre.ID, "multimachine_DroneCentre", "Drone Centre").getStackForm(1));
 
         ItemList.Machine_Multi_IndustrialElectromagneticSeparator.set(
-            new GT_MetaTileEntity_IndustrialElectromagneticSeparator(
+            new MTEIndustrialElectromagneticSeparator(
                 INDUSTRIAL_ELECTROMAGNETIC_SEPARATOR_CONTROLLER.ID,
                 "multimachine.electromagneticseparator",
                 "Magnetic Flux Exhibitor").getStackForm(1));
-        ItemList.Machine_Multi_Canner.set(
-            new GT_MetaTileEntity_MultiCanner(MULTI_CANNER_CONTROLLER.ID, "multimachine.canner", "TurboCan Pro")
-                .getStackForm(1));
+        ItemList.Machine_Multi_Canner
+            .set(new MTEMultiCanner(MULTI_CANNER_CONTROLLER.ID, "multimachine.canner", "TurboCan Pro").getStackForm(1));
 
         ItemList.WormholeGenerator.set(
-            new GT_MetaTileEntity_WormholeGenerator(
+            new MTEWormholeGenerator(
                 WORMHOLE_GENERATOR_CONTROLLER.ID,
                 "multimachine.wormhole",
                 "Miniature Wormhole Generator").getStackForm(1));
 
         ItemList.Machine_Multi_IndustrialLaserEngraver.set(
-            new GT_MetaTileEntity_IndustrialLaserEngraver(
+            new MTEIndustrialLaserEngraver(
                 INDUSTRIAL_LASER_ENGRAVER_CONTROLLER.ID,
                 "multimachine.engraver",
                 "Hyper-Intensity Laser Engraver").getStackForm(1));
 
         ItemList.Machine_Multi_IndustrialExtractor.set(
-            new GT_MetaTileEntity_IndustrialExtractor(
+            new MTEIndustrialExtractor(
                 INDUSTRIAL_EXTRACTOR_CONTROLLER.ID,
                 "multimachine.extractor",
                 "Dissection Apparatus").getStackForm(1));
 
         ItemList.Machine_Multi_Lathe.set(
-            new GT_MetaTileEntity_MultiLathe(
-                MULTI_LATHE_CONTROLLER.ID,
-                "multimachine.lathe",
-                "Industrial Precision Lathe").getStackForm(1));
+            new MTEMultiLathe(MULTI_LATHE_CONTROLLER.ID, "multimachine.lathe", "Industrial Precision Lathe")
+                .getStackForm(1));
 
         ItemList.Machine_Multi_IndustrialCompressor.set(
-            new GT_MetaTileEntity_IndustrialCompressor(
+            new MTEIndustrialCompressor(
                 INDUSTRIAL_COMPRESSOR_CONTROLLER.ID,
                 "multimachine.basiccompressor",
                 "Large Electric Compressor").getStackForm(1));
         ItemList.Machine_Multi_HIPCompressor.set(
-            new GT_MetaTileEntity_HIPCompressor(
+            new MTEHIPCompressor(
                 HIP_COMPRESSOR_CONTROLLER.ID,
                 "multimachine.hipcompressor",
                 "Hot Isostatic Pressurization Unit").getStackForm(1));
         ItemList.Machine_Multi_NeutroniumCompressor.set(
-            new GT_MetaTileEntity_NeutroniumCompressor(
+            new MTENeutroniumCompressor(
                 NEUTRONIUM_COMPRESSOR_CONTROLLER.ID,
                 "multimachine.neutroniumcompressor",
                 "Neutronium Compressor").getStackForm(1));
         ItemList.Machine_Multi_BlackHoleCompressor.set(
-            new GT_MetaTileEntity_BlackHoleCompressor(
+            new MTEBlackHoleCompressor(
                 BLACKHOLE_COMPRESSOR_CONTROLLER.ID,
                 "multimachine.blackholecompressor",
                 "Semi-Stable Black Hole Containment Field").getStackForm(1));
 
         ItemList.Machine_Multi_Autoclave.set(
-            new GT_MetaTileEntity_MultiAutoclave(
-                MULTI_AUTOCLAVE_CONTROLLER.ID,
-                "multimachine.autoclave",
-                "Industrial Autoclave").getStackForm(1));
+            new MTEMultiAutoclave(MULTI_AUTOCLAVE_CONTROLLER.ID, "multimachine.autoclave", "Industrial Autoclave")
+                .getStackForm(1));
 
         ItemList.LargeFluidExtractor.set(
-            new GT_MetaTileEntity_LargeFluidExtractor(
-                LARGE_FLUID_EXTRACTOR.ID,
-                "multimachine.fluidextractor",
-                "Large Fluid Extractor").getStackForm(1));
+            new MTELargeFluidExtractor(LARGE_FLUID_EXTRACTOR.ID, "multimachine.fluidextractor", "Large Fluid Extractor")
+                .getStackForm(1));
     }
 
     private static void registerSteamMachines() {
         ItemList.Machine_Bronze_Furnace.set(
-            new GT_MetaTileEntity_Furnace_Bronze(STEAM_FURNACE.ID, "bronzemachine.furnace", "Steam Furnace")
-                .getStackForm(1L));
+            new MTESteamFurnaceBronze(STEAM_FURNACE.ID, "bronzemachine.furnace", "Steam Furnace").getStackForm(1L));
         ItemList.Machine_Bronze_Macerator.set(
-            new GT_MetaTileEntity_Macerator_Bronze(STEAM_MACERATOR.ID, "bronzemachine.macerator", "Steam Macerator")
+            new MTESteamMaceratorBronze(STEAM_MACERATOR.ID, "bronzemachine.macerator", "Steam Macerator")
                 .getStackForm(1L));
         ItemList.Machine_Bronze_Extractor.set(
-            new GT_MetaTileEntity_Extractor_Bronze(STEAM_EXTRACTOR.ID, "bronzemachine.extractor", "Steam Extractor")
+            new MTESteamExtractorBronze(STEAM_EXTRACTOR.ID, "bronzemachine.extractor", "Steam Extractor")
                 .getStackForm(1L));
         ItemList.Machine_Bronze_Hammer.set(
-            new GT_MetaTileEntity_ForgeHammer_Bronze(
-                STEAM_FORGE_HAMMER.ID,
-                "bronzemachine.hammer",
-                "Steam Forge Hammer").getStackForm(1L));
+            new MTESteamForgeHammerBronze(STEAM_FORGE_HAMMER.ID, "bronzemachine.hammer", "Steam Forge Hammer")
+                .getStackForm(1L));
         ItemList.Machine_Bronze_Compressor.set(
-            new GT_MetaTileEntity_Compressor_Bronze(STEAM_COMPRESSOR.ID, "bronzemachine.compressor", "Steam Compressor")
+            new MTESteamCompressorBronze(STEAM_COMPRESSOR.ID, "bronzemachine.compressor", "Steam Compressor")
                 .getStackForm(1L));
         ItemList.Machine_Bronze_AlloySmelter.set(
-            new GT_MetaTileEntity_AlloySmelter_Bronze(
-                STEAM_ALLOY_SMELTER.ID,
-                "bronzemachine.alloysmelter",
-                "Steam Alloy Smelter").getStackForm(1L));
+            new MTESteamAlloySmelterBronze(STEAM_ALLOY_SMELTER.ID, "bronzemachine.alloysmelter", "Steam Alloy Smelter")
+                .getStackForm(1L));
 
     }
 
     private static void registerUnpackager() {
         ItemList.Machine_LV_Unboxinator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 UNPACKAGER_LV.ID,
                 "basicmachine.unboxinator.tier.01",
                 "Basic Unpackager",
@@ -1706,12 +1659,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "UNBOXINATOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Unboxinator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 UNPACKAGER_MV.ID,
                 "basicmachine.unboxinator.tier.02",
                 "Advanced Unpackager",
@@ -1722,12 +1675,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "UNBOXINATOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Unboxinator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 UNPACKAGER_HV.ID,
                 "basicmachine.unboxinator.tier.03",
                 "Advanced Unpackager II",
@@ -1738,12 +1691,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "UNBOXINATOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Unboxinator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 UNPACKAGER_EV.ID,
                 "basicmachine.unboxinator.tier.04",
                 "Advanced Unpackager III",
@@ -1754,12 +1707,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "UNBOXINATOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Unboxinator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 UNPACKAGER_IV.ID,
                 "basicmachine.unboxinator.tier.05",
                 "Unboxinator",
@@ -1770,12 +1723,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "UNBOXINATOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_LuV_Unboxinator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 UNPACKAGER_LuV.ID,
                 "basicmachine.unboxinator.tier.06",
                 "Unboxinator",
@@ -1786,12 +1739,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "UNBOXINATOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_ZPM_Unboxinator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 UNPACKAGER_ZPM.ID,
                 "basicmachine.unboxinator.tier.07",
                 "Unboxinator",
@@ -1802,12 +1755,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "UNBOXINATOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_UV_Unboxinator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 UNPACKAGER_UV.ID,
                 "basicmachine.unboxinator.tier.08",
                 "Unboxinator",
@@ -1818,7 +1771,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "UNBOXINATOR",
                 null).getStackForm(1L));
     }
@@ -1826,7 +1779,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
     private static void registerAssemblingMachine() {
 
         ItemList.Machine_LV_Assembler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ASSEMBLER_LV.ID,
                 "basicmachine.assembler.tier.01",
                 "Basic Assembling Machine",
@@ -1837,12 +1790,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Assembler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ASSEMBLER_MV.ID,
                 "basicmachine.assembler.tier.02",
                 "Advanced Assembling Machine",
@@ -1853,12 +1806,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Assembler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ASSEMBLER_HV.ID,
                 "basicmachine.assembler.tier.03",
                 "Advanced Assembling Machine II",
@@ -1869,12 +1822,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Assembler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ASSEMBLER_EV.ID,
                 "basicmachine.assembler.tier.04",
                 "Advanced Assembling Machine III",
@@ -1885,12 +1838,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Assembler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ASSEMBLER_IV.ID,
                 "basicmachine.assembler.tier.05",
                 "Advanced Assembling Machine IV",
@@ -1901,12 +1854,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.AssemblingMachineLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ASSEMBLING_MACHINE_LuV.ID,
                 "basicmachine.assembler.tier.06",
                 "Elite Assembling Machine",
@@ -1917,12 +1870,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.AssemblingMachineZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ASSEMBLING_MACHINE_ZPM.ID,
                 "basicmachine.assembler.tier.07",
                 "Elite Assembling Machine II",
@@ -1933,12 +1886,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.AssemblingMachineUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ASSEMBLING_MACHINE_UV.ID,
                 "basicmachine.assembler.tier.08",
                 "Ultimate Assembly Constructor",
@@ -1949,12 +1902,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.AssemblingMachineUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ASSEMBLING_MACHINE_UHV.ID,
                 "basicmachine.assembler.tier.09",
                 "Epic Assembly Constructor",
@@ -1965,12 +1918,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.AssemblingMachineUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ASSEMBLING_MACHINE_UEV.ID,
                 "basicmachine.assembler.tier.10",
                 "Epic Assembly Constructor II",
@@ -1981,12 +1934,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.AssemblingMachineUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ASSEMBLING_MACHINE_UIV.ID,
                 "basicmachine.assembler.tier.11",
                 "Epic Assembly Constructor III",
@@ -1997,12 +1950,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.AssemblingMachineUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ASSEMBLING_MACHINE_UMV.ID,
                 "basicmachine.assembler.tier.12",
                 "Epic Assembly Constructor IV",
@@ -2013,14 +1966,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ASSEMBLER",
                 null).getStackForm(1L));
     }
 
     private static void registerMatterAmplifier() {
         ItemList.Machine_LV_Amplifab.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MATTER_AMPLIFIER_LV.ID,
                 "basicmachine.amplifab.tier.01",
                 "Basic Amplifabricator",
@@ -2031,12 +1984,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 1000,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AMPLIFAB",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Amplifab.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MATTER_AMPLIFIER_MV.ID,
                 "basicmachine.amplifab.tier.02",
                 "Advanced Amplifabricator",
@@ -2047,12 +2000,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 1000,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AMPLIFAB",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Amplifab.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MATTER_AMPLIFIER_HV.ID,
                 "basicmachine.amplifab.tier.03",
                 "Advanced Amplifabricator II",
@@ -2063,12 +2016,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 1000,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AMPLIFAB",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Amplifab.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MATTER_AMPLIFIER_EV.ID,
                 "basicmachine.amplifab.tier.04",
                 "Advanced Amplifabricator III",
@@ -2079,12 +2032,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 1000,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AMPLIFAB",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Amplifab.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MATTER_AMPLIFIER_IV.ID,
                 "basicmachine.amplifab.tier.05",
                 "Advanced Amplifabricator IV",
@@ -2095,12 +2048,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 1000,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AMPLIFAB",
                 null).getStackForm(1L));
 
         ItemList.AmplifabricatorLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MATTER_AMPLIFIER_LuV.ID,
                 "basicmachine.amplifab.tier.06",
                 "Elite Amplifabricator",
@@ -2111,12 +2064,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 1000,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AMPLIFAB",
                 null).getStackForm(1L));
 
         ItemList.AmplifabricatorZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MATTER_AMPLIFIER_ZPM.ID,
                 "basicmachine.amplifab.tier.07",
                 "Elite Amplifabricator II",
@@ -2127,12 +2080,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 1000,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AMPLIFAB",
                 null).getStackForm(1L));
 
         ItemList.AmplifabricatorUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MATTER_AMPLIFIER_UV.ID,
                 "basicmachine.amplifab.tier.08",
                 "Ultimate Amplicreator",
@@ -2143,12 +2096,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 1000,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AMPLIFAB",
                 null).getStackForm(1L));
 
         ItemList.AmplifabricatorUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MATTER_AMPLIFIER_UHV.ID,
                 "basicmachine.amplifab.tier.09",
                 "Epic Amplicreator",
@@ -2159,12 +2112,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 1000,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AMPLIFAB",
                 null).getStackForm(1L));
 
         ItemList.AmplifabricatorUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MATTER_AMPLIFIER_UEV.ID,
                 "basicmachine.amplifab.tier.10",
                 "Epic Amplicreator II",
@@ -2175,12 +2128,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 1000,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AMPLIFAB",
                 null).getStackForm(1L));
 
         ItemList.AmplifabricatorUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MATTER_AMPLIFIER_UIV.ID,
                 "basicmachine.amplifab.tier.11",
                 "Epic Amplicreator III",
@@ -2191,12 +2144,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 1000,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AMPLIFAB",
                 null).getStackForm(1L));
 
         ItemList.AmplifabricatorUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MATTER_AMPLIFIER_UMV.ID,
                 "basicmachine.amplifab.tier.12",
                 "Epic Amplicreator IV",
@@ -2207,14 +2160,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 1000,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AMPLIFAB",
                 null).getStackForm(1L));
     }
 
     private static void registerAlloySmelter() {
         ItemList.Machine_LV_AlloySmelter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ALLOY_SMELTER_LV.ID,
                 "basicmachine.alloysmelter.tier.01",
                 "Basic Alloy Smelter",
@@ -2225,12 +2178,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ALLOY_SMELTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_AlloySmelter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ALLOY_SMELTER_MV.ID,
                 "basicmachine.alloysmelter.tier.02",
                 "Advanced Alloy Smelter",
@@ -2241,12 +2194,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ALLOY_SMELTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_AlloySmelter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ALLOY_SMELTER_HV.ID,
                 "basicmachine.alloysmelter.tier.03",
                 "Advanced Alloy Smelter II",
@@ -2257,12 +2210,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ALLOY_SMELTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_AlloySmelter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ALLOY_SMELTER_EV.ID,
                 "basicmachine.alloysmelter.tier.04",
                 "Advanced Alloy Smelter III",
@@ -2273,12 +2226,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ALLOY_SMELTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_AlloySmelter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ALLOY_SMELTER_IV.ID,
                 "basicmachine.alloysmelter.tier.05",
                 "Advanced Alloy Smelter IV",
@@ -2289,12 +2242,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ALLOY_SMELTER",
                 null).getStackForm(1L));
 
         ItemList.AlloySmelterLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ALLOY_SMELTER_LuV.ID,
                 "basicmachine.alloysmelter.tier.06",
                 "Elite Alloy Smelter",
@@ -2305,12 +2258,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ALLOY_SMELTER",
                 null).getStackForm(1L));
 
         ItemList.AlloySmelterZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ALLOY_SMELTER_ZPM.ID,
                 "basicmachine.alloysmelter.tier.07",
                 "Elite Alloy Smelter II",
@@ -2321,12 +2274,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ALLOY_SMELTER",
                 null).getStackForm(1L));
 
         ItemList.AlloySmelterUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ALLOY_SMELTER_UV.ID,
                 "basicmachine.alloysmelter.tier.08",
                 "Ultimate Alloy Integrator",
@@ -2337,12 +2290,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ALLOY_SMELTER",
                 null).getStackForm(1L));
 
         ItemList.AlloySmelterUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ALLOY_SMELTER_UHV.ID,
                 "basicmachine.alloysmelter.tier.09",
                 "Epic Alloy Integrator",
@@ -2353,12 +2306,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ALLOY_SMELTER",
                 null).getStackForm(1L));
 
         ItemList.AlloySmelterUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ALLOY_SMELTER_UEV.ID,
                 "basicmachine.alloysmelter.tier.10",
                 "Epic Alloy Integrator II",
@@ -2369,12 +2322,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ALLOY_SMELTER",
                 null).getStackForm(1L));
 
         ItemList.AlloySmelterUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ALLOY_SMELTER_UIV.ID,
                 "basicmachine.alloysmelter.tier.11",
                 "Epic Alloy Integrator III",
@@ -2385,12 +2338,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ALLOY_SMELTER",
                 null).getStackForm(1L));
 
         ItemList.AlloySmelterUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ALLOY_SMELTER_UMV.ID,
                 "basicmachine.alloysmelter.tier.12",
                 "Epic Alloy Integrator IV",
@@ -2401,269 +2354,187 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ALLOY_SMELTER",
                 null).getStackForm(1L));
     }
 
     private static void registerHPSteamMachines() {
         ItemList.Machine_HP_Extractor.set(
-            new GT_MetaTileEntity_Extractor_Steel(
-                HP_STEAM_EXTRACTOR.ID,
-                "hpmachine.extractor",
-                "High Pressure Extractor").getStackForm(1L));
+            new MTESteamExtractorSteel(HP_STEAM_EXTRACTOR.ID, "hpmachine.extractor", "High Pressure Extractor")
+                .getStackForm(1L));
         ItemList.Machine_HP_Furnace.set(
-            new GT_MetaTileEntity_Furnace_Steel(HP_STEAM_FURNACE.ID, "hpmachine.furnace", "High Pressure Furnace")
+            new MTESteamFurnaceSteel(HP_STEAM_FURNACE.ID, "hpmachine.furnace", "High Pressure Furnace")
                 .getStackForm(1L));
         ItemList.Machine_HP_Macerator.set(
-            new GT_MetaTileEntity_Macerator_Steel(
-                HP_STEAM_MACERATOR.ID,
-                "hpmachine.macerator",
-                "High Pressure Macerator").getStackForm(1L));
+            new MTESteamMaceratorSteel(HP_STEAM_MACERATOR.ID, "hpmachine.macerator", "High Pressure Macerator")
+                .getStackForm(1L));
         ItemList.Machine_HP_Hammer.set(
-            new GT_MetaTileEntity_ForgeHammer_Steel(
-                HP_STEAM_FORGE_HAMMER.ID,
-                "hpmachine.hammer",
-                "High Pressure Forge Hammer").getStackForm(1L));
+            new MTESteamForgeHammerSteel(HP_STEAM_FORGE_HAMMER.ID, "hpmachine.hammer", "High Pressure Forge Hammer")
+                .getStackForm(1L));
         ItemList.Machine_HP_Compressor.set(
-            new GT_MetaTileEntity_Compressor_Steel(
-                HP_STEAM_COMPRESSOR.ID,
-                "hpmachine.compressor",
-                "High Pressure Compressor").getStackForm(1L));
+            new MTESteamCompressorSteel(HP_STEAM_COMPRESSOR.ID, "hpmachine.compressor", "High Pressure Compressor")
+                .getStackForm(1L));
         ItemList.Machine_HP_AlloySmelter.set(
-            new GT_MetaTileEntity_AlloySmelter_Steel(
+            new MTESteamAlloySmelterSteel(
                 HP_STEAM_ALLOY_SMELTER.ID,
                 "hpmachine.alloysmelter",
                 "High Pressure Alloy Smelter").getStackForm(1L));
     }
 
     private static void registerLocker() {
-        ItemList.Locker_ULV.set(
-            new GT_MetaTileEntity_Locker(LOCKER_ULV.ID, "locker.tier.00", "Ultra Low Voltage Locker", 0)
-                .getStackForm(1L));
-        ItemList.Locker_LV.set(
-            new GT_MetaTileEntity_Locker(LOCKER_LV.ID, "locker.tier.01", "Low Voltage Locker", 1).getStackForm(1L));
-        ItemList.Locker_MV.set(
-            new GT_MetaTileEntity_Locker(LOCKER_MV.ID, "locker.tier.02", "Medium Voltage Locker", 2).getStackForm(1L));
-        ItemList.Locker_HV.set(
-            new GT_MetaTileEntity_Locker(LOCKER_HV.ID, "locker.tier.03", "High Voltage Locker", 3).getStackForm(1L));
-        ItemList.Locker_EV.set(
-            new GT_MetaTileEntity_Locker(LOCKER_EV.ID, "locker.tier.04", "Extreme Voltage Locker", 4).getStackForm(1L));
-        ItemList.Locker_IV.set(
-            new GT_MetaTileEntity_Locker(LOCKER_IV.ID, "locker.tier.05", "Insane Voltage Locker", 5).getStackForm(1L));
-        ItemList.Locker_LuV.set(
-            new GT_MetaTileEntity_Locker(LOCKER_LuV.ID, "locker.tier.06", "Ludicrous Voltage Locker", 6)
-                .getStackForm(1L));
-        ItemList.Locker_ZPM.set(
-            new GT_MetaTileEntity_Locker(LOCKER_ZPM.ID, "locker.tier.07", "ZPM Voltage Locker", 7).getStackForm(1L));
-        ItemList.Locker_UV.set(
-            new GT_MetaTileEntity_Locker(LOCKER_UV.ID, "locker.tier.08", "Ultimate Voltage Locker", 8)
-                .getStackForm(1L));
-        ItemList.Locker_MAX.set(
-            new GT_MetaTileEntity_Locker(LOCKER_UHV.ID, "locker.tier.09", "Highly Ultimate Voltage Locker", 9)
-                .getStackForm(1L));
+        ItemList.Locker_ULV
+            .set(new MTELocker(LOCKER_ULV.ID, "locker.tier.00", "Ultra Low Voltage Locker", 0).getStackForm(1L));
+        ItemList.Locker_LV.set(new MTELocker(LOCKER_LV.ID, "locker.tier.01", "Low Voltage Locker", 1).getStackForm(1L));
+        ItemList.Locker_MV
+            .set(new MTELocker(LOCKER_MV.ID, "locker.tier.02", "Medium Voltage Locker", 2).getStackForm(1L));
+        ItemList.Locker_HV
+            .set(new MTELocker(LOCKER_HV.ID, "locker.tier.03", "High Voltage Locker", 3).getStackForm(1L));
+        ItemList.Locker_EV
+            .set(new MTELocker(LOCKER_EV.ID, "locker.tier.04", "Extreme Voltage Locker", 4).getStackForm(1L));
+        ItemList.Locker_IV
+            .set(new MTELocker(LOCKER_IV.ID, "locker.tier.05", "Insane Voltage Locker", 5).getStackForm(1L));
+        ItemList.Locker_LuV
+            .set(new MTELocker(LOCKER_LuV.ID, "locker.tier.06", "Ludicrous Voltage Locker", 6).getStackForm(1L));
+        ItemList.Locker_ZPM
+            .set(new MTELocker(LOCKER_ZPM.ID, "locker.tier.07", "ZPM Voltage Locker", 7).getStackForm(1L));
+        ItemList.Locker_UV
+            .set(new MTELocker(LOCKER_UV.ID, "locker.tier.08", "Ultimate Voltage Locker", 8).getStackForm(1L));
+        ItemList.Locker_MAX
+            .set(new MTELocker(LOCKER_UHV.ID, "locker.tier.09", "Highly Ultimate Voltage Locker", 9).getStackForm(1L));
     }
 
     private static void registerScanner() {
-        ItemList.Machine_LV_Scanner.set(
-            new GT_MetaTileEntity_Scanner(SCANNER_LV.ID, "basicmachine.scanner.tier.01", "Basic Scanner", 1)
-                .getStackForm(1L));
-        ItemList.Machine_MV_Scanner.set(
-            new GT_MetaTileEntity_Scanner(SCANNER_MV.ID, "basicmachine.scanner.tier.02", "Advanced Scanner", 2)
-                .getStackForm(1L));
+        ItemList.Machine_LV_Scanner
+            .set(new MTEScanner(SCANNER_LV.ID, "basicmachine.scanner.tier.01", "Basic Scanner", 1).getStackForm(1L));
+        ItemList.Machine_MV_Scanner
+            .set(new MTEScanner(SCANNER_MV.ID, "basicmachine.scanner.tier.02", "Advanced Scanner", 2).getStackForm(1L));
         ItemList.Machine_HV_Scanner.set(
-            new GT_MetaTileEntity_Scanner(SCANNER_HV.ID, "basicmachine.scanner.tier.03", "Advanced Scanner II", 3)
-                .getStackForm(1L));
+            new MTEScanner(SCANNER_HV.ID, "basicmachine.scanner.tier.03", "Advanced Scanner II", 3).getStackForm(1L));
         ItemList.Machine_EV_Scanner.set(
-            new GT_MetaTileEntity_Scanner(SCANNER_EV.ID, "basicmachine.scanner.tier.04", "Advanced Scanner III", 4)
-                .getStackForm(1L));
+            new MTEScanner(SCANNER_EV.ID, "basicmachine.scanner.tier.04", "Advanced Scanner III", 4).getStackForm(1L));
         ItemList.Machine_IV_Scanner.set(
-            new GT_MetaTileEntity_Scanner(SCANNER_IV.ID, "basicmachine.scanner.tier.05", "Advanced Scanner IV", 5)
-                .getStackForm(1L));
-        ItemList.ScannerLuV.set(
-            new GT_MetaTileEntity_Scanner(SCANNER_LuV.ID, "basicmachine.scanner.tier.06", "Elite Scanner", 6)
-                .getStackForm(1L));
+            new MTEScanner(SCANNER_IV.ID, "basicmachine.scanner.tier.05", "Advanced Scanner IV", 5).getStackForm(1L));
+        ItemList.ScannerLuV
+            .set(new MTEScanner(SCANNER_LuV.ID, "basicmachine.scanner.tier.06", "Elite Scanner", 6).getStackForm(1L));
         ItemList.ScannerZPM.set(
-            new GT_MetaTileEntity_Scanner(SCANNER_ZPM.ID, "basicmachine.scanner.tier.07", "Elite Scanner II", 7)
-                .getStackForm(1L));
+            new MTEScanner(SCANNER_ZPM.ID, "basicmachine.scanner.tier.07", "Elite Scanner II", 7).getStackForm(1L));
         ItemList.ScannerUV.set(
-            new GT_MetaTileEntity_Scanner(
-                SCANNER_UV.ID,
-                "basicmachine.scanner.tier.08",
-                "Ultimate Electron Microscope",
-                8).getStackForm(1L));
+            new MTEScanner(SCANNER_UV.ID, "basicmachine.scanner.tier.08", "Ultimate Electron Microscope", 8)
+                .getStackForm(1L));
         ItemList.ScannerUHV.set(
-            new GT_MetaTileEntity_Scanner(SCANNER_UHV.ID, "basicmachine.scanner.tier.09", "Epic Electron Microscope", 9)
+            new MTEScanner(SCANNER_UHV.ID, "basicmachine.scanner.tier.09", "Epic Electron Microscope", 9)
                 .getStackForm(1L));
         ItemList.ScannerUEV.set(
-            new GT_MetaTileEntity_Scanner(
-                SCANNER_UEV.ID,
-                "basicmachine.scanner.tier.10",
-                "Epic Electron Microscope II",
-                10).getStackForm(1L));
+            new MTEScanner(SCANNER_UEV.ID, "basicmachine.scanner.tier.10", "Epic Electron Microscope II", 10)
+                .getStackForm(1L));
         ItemList.ScannerUIV.set(
-            new GT_MetaTileEntity_Scanner(
-                SCANNER_UIV.ID,
-                "basicmachine.scanner.tier.11",
-                "Epic Electron Microscope III",
-                11).getStackForm(1L));
+            new MTEScanner(SCANNER_UIV.ID, "basicmachine.scanner.tier.11", "Epic Electron Microscope III", 11)
+                .getStackForm(1L));
         ItemList.ScannerUMV.set(
-            new GT_MetaTileEntity_Scanner(
-                SCANNER_UMV.ID,
-                "basicmachine.scanner.tier.12",
-                "Epic Electron Microscope IV",
-                12).getStackForm(1L));
+            new MTEScanner(SCANNER_UMV.ID, "basicmachine.scanner.tier.12", "Epic Electron Microscope IV", 12)
+                .getStackForm(1L));
     }
 
     private static void registerPackager() {
         ItemList.Machine_LV_Boxinator.set(
-            new GT_MetaTileEntity_Boxinator(PACKAGER_LV.ID, "basicmachine.boxinator.tier.01", "Basic Packager", 1)
-                .getStackForm(1L));
+            new MTEBoxinator(PACKAGER_LV.ID, "basicmachine.boxinator.tier.01", "Basic Packager", 1).getStackForm(1L));
         ItemList.Machine_MV_Boxinator.set(
-            new GT_MetaTileEntity_Boxinator(PACKAGER_MV.ID, "basicmachine.boxinator.tier.02", "Advanced Packager", 2)
+            new MTEBoxinator(PACKAGER_MV.ID, "basicmachine.boxinator.tier.02", "Advanced Packager", 2)
                 .getStackForm(1L));
         ItemList.Machine_HV_Boxinator.set(
-            new GT_MetaTileEntity_Boxinator(PACKAGER_HV.ID, "basicmachine.boxinator.tier.03", "Advanced Packager II", 3)
+            new MTEBoxinator(PACKAGER_HV.ID, "basicmachine.boxinator.tier.03", "Advanced Packager II", 3)
                 .getStackForm(1L));
         ItemList.Machine_EV_Boxinator.set(
-            new GT_MetaTileEntity_Boxinator(
-                PACKAGER_EV.ID,
-                "basicmachine.boxinator.tier.04",
-                "Advanced Packager III",
-                4).getStackForm(1L));
-        ItemList.Machine_IV_Boxinator.set(
-            new GT_MetaTileEntity_Boxinator(PACKAGER_IV.ID, "basicmachine.boxinator.tier.05", "Boxinator", 5)
-                .getStackForm(1L));
-        ItemList.Machine_LuV_Boxinator.set(
-            new GT_MetaTileEntity_Boxinator(PACKAGER_LuV.ID, "basicmachine.boxinator.tier.06", "Boxinator", 6)
-                .getStackForm(1L));
-        ItemList.Machine_ZPM_Boxinator.set(
-            new GT_MetaTileEntity_Boxinator(PACKAGER_ZPM.ID, "basicmachine.boxinator.tier.07", "Boxinator", 7)
-                .getStackForm(1L));
-        ItemList.Machine_UV_Boxinator.set(
-            new GT_MetaTileEntity_Boxinator(PACKAGER_UV.ID, "basicmachine.boxinator.tier.08", "Boxinator", 8)
-                .getStackForm(1L));
+            new MTEBoxinator(PACKAGER_EV.ID, "basicmachine.boxinator.tier.04", "Advanced Packager III", 4)
+                .getStackForm(1L));
+        ItemList.Machine_IV_Boxinator
+            .set(new MTEBoxinator(PACKAGER_IV.ID, "basicmachine.boxinator.tier.05", "Boxinator", 5).getStackForm(1L));
+        ItemList.Machine_LuV_Boxinator
+            .set(new MTEBoxinator(PACKAGER_LuV.ID, "basicmachine.boxinator.tier.06", "Boxinator", 6).getStackForm(1L));
+        ItemList.Machine_ZPM_Boxinator
+            .set(new MTEBoxinator(PACKAGER_ZPM.ID, "basicmachine.boxinator.tier.07", "Boxinator", 7).getStackForm(1L));
+        ItemList.Machine_UV_Boxinator
+            .set(new MTEBoxinator(PACKAGER_UV.ID, "basicmachine.boxinator.tier.08", "Boxinator", 8).getStackForm(1L));
     }
 
     private static void registerRockBreaker() {
         ItemList.Machine_LV_RockBreaker.set(
-            new GT_MetaTileEntity_RockBreaker(
-                ROCK_BREAKER_LV.ID,
-                "basicmachine.rockbreaker.tier.01",
-                "Basic Rock Breaker",
-                1).getStackForm(1L));
+            new MTERockBreaker(ROCK_BREAKER_LV.ID, "basicmachine.rockbreaker.tier.01", "Basic Rock Breaker", 1)
+                .getStackForm(1L));
         ItemList.Machine_MV_RockBreaker.set(
-            new GT_MetaTileEntity_RockBreaker(
-                ROCK_BREAKER_MV.ID,
-                "basicmachine.rockbreaker.tier.02",
-                "Advanced Rock Breaker",
-                2).getStackForm(1L));
+            new MTERockBreaker(ROCK_BREAKER_MV.ID, "basicmachine.rockbreaker.tier.02", "Advanced Rock Breaker", 2)
+                .getStackForm(1L));
         ItemList.Machine_HV_RockBreaker.set(
-            new GT_MetaTileEntity_RockBreaker(
-                ROCK_BREAKER_HV.ID,
-                "basicmachine.rockbreaker.tier.03",
-                "Advanced Rock Breaker II",
-                3).getStackForm(1L));
+            new MTERockBreaker(ROCK_BREAKER_HV.ID, "basicmachine.rockbreaker.tier.03", "Advanced Rock Breaker II", 3)
+                .getStackForm(1L));
         ItemList.Machine_EV_RockBreaker.set(
-            new GT_MetaTileEntity_RockBreaker(
-                ROCK_BREAKER_EV.ID,
-                "basicmachine.rockbreaker.tier.04",
-                "Advanced Rock Breaker III",
-                4).getStackForm(1L));
+            new MTERockBreaker(ROCK_BREAKER_EV.ID, "basicmachine.rockbreaker.tier.04", "Advanced Rock Breaker III", 4)
+                .getStackForm(1L));
         ItemList.Machine_IV_RockBreaker.set(
-            new GT_MetaTileEntity_RockBreaker(
+            new MTERockBreaker(
                 ROCK_BREAKER_IV.ID,
                 "basicmachine.rockbreaker.tier.05",
                 "Cryogenic Magma Solidifier R-8200",
                 5).getStackForm(1L));
         ItemList.RockBreakerLuV.set(
-            new GT_MetaTileEntity_RockBreaker(
-                ROCK_BREAKER_LuV.ID,
-                "rockbreaker.tier.06",
-                "Cryogenic Magma Solidifier R-9200",
-                6).getStackForm(1L));
+            new MTERockBreaker(ROCK_BREAKER_LuV.ID, "rockbreaker.tier.06", "Cryogenic Magma Solidifier R-9200", 6)
+                .getStackForm(1L));
 
         ItemList.RockBreakerZPM.set(
-            new GT_MetaTileEntity_RockBreaker(
-                ROCK_BREAKER_ZPM.ID,
-                "rockbreaker.tier.07",
-                "Cryogenic Magma Solidifier R-10200",
-                7).getStackForm(1L));
+            new MTERockBreaker(ROCK_BREAKER_ZPM.ID, "rockbreaker.tier.07", "Cryogenic Magma Solidifier R-10200", 7)
+                .getStackForm(1L));
 
         ItemList.RockBreakerUV.set(
-            new GT_MetaTileEntity_RockBreaker(
-                ROCK_BREAKER_UV.ID,
-                "rockbreaker.tier.08",
-                "Cryogenic Magma Solidifier R-11200",
-                8).getStackForm(1L));
+            new MTERockBreaker(ROCK_BREAKER_UV.ID, "rockbreaker.tier.08", "Cryogenic Magma Solidifier R-11200", 8)
+                .getStackForm(1L));
 
         ItemList.RockBreakerUHV.set(
-            new GT_MetaTileEntity_RockBreaker(
-                ROCK_BREAKER_UHV.ID,
-                "rockbreaker.tier.09",
-                "Cryogenic Magma Solidifier R-12200",
-                9).getStackForm(1L));
+            new MTERockBreaker(ROCK_BREAKER_UHV.ID, "rockbreaker.tier.09", "Cryogenic Magma Solidifier R-12200", 9)
+                .getStackForm(1L));
 
         ItemList.RockBreakerUEV.set(
-            new GT_MetaTileEntity_RockBreaker(
-                ROCK_BREAKER_UEV.ID,
-                "rockbreaker.tier.10",
-                "Cryogenic Magma Solidifier R-13200",
-                10).getStackForm(1L));
+            new MTERockBreaker(ROCK_BREAKER_UEV.ID, "rockbreaker.tier.10", "Cryogenic Magma Solidifier R-13200", 10)
+                .getStackForm(1L));
 
         ItemList.RockBreakerUIV.set(
-            new GT_MetaTileEntity_RockBreaker(
-                ROCK_BREAKER_UIV.ID,
-                "rockbreaker.tier.11",
-                "Cryogenic Magma Solidifier R-14200",
-                11).getStackForm(1L));
+            new MTERockBreaker(ROCK_BREAKER_UIV.ID, "rockbreaker.tier.11", "Cryogenic Magma Solidifier R-14200", 11)
+                .getStackForm(1L));
 
         ItemList.RockBreakerUMV.set(
-            new GT_MetaTileEntity_RockBreaker(
-                ROCK_BREAKER_UMV.ID,
-                "rockbreaker.tier.12",
-                "Cryogenic Magma Solidifier R-15200",
-                12).getStackForm(1L));
+            new MTERockBreaker(ROCK_BREAKER_UMV.ID, "rockbreaker.tier.12", "Cryogenic Magma Solidifier R-15200", 12)
+                .getStackForm(1L));
     }
 
     private static void registerIndustrialApiary() {
         if (Forestry.isModLoaded()) {
             ItemList.Machine_IndustrialApiary.set(
-                new GT_MetaTileEntity_IndustrialApiary(
-                    INDUSTRIAL_APIARY.ID,
-                    "basicmachine.industrialapiary",
-                    "Industrial Apiary",
-                    8).getStackForm(1L));
+                new MTEIndustrialApiary(INDUSTRIAL_APIARY.ID, "basicmachine.industrialapiary", "Industrial Apiary", 8)
+                    .getStackForm(1L));
         }
     }
 
     private static void registerMassFab() {
         ItemList.Machine_LV_Massfab.set(
-            new GT_MetaTileEntity_Massfabricator(
-                MASS_FABRICATOR_LV.ID,
-                "basicmachine.massfab.tier.01",
-                "Basic Mass Fabricator",
-                1).getStackForm(1L));
+            new MTEMassfabricator(MASS_FABRICATOR_LV.ID, "basicmachine.massfab.tier.01", "Basic Mass Fabricator", 1)
+                .getStackForm(1L));
         ItemList.Machine_MV_Massfab.set(
-            new GT_MetaTileEntity_Massfabricator(
-                MASS_FABRICATOR_MV.ID,
-                "basicmachine.massfab.tier.02",
-                "Advanced Mass Fabricator",
-                2).getStackForm(1L));
+            new MTEMassfabricator(MASS_FABRICATOR_MV.ID, "basicmachine.massfab.tier.02", "Advanced Mass Fabricator", 2)
+                .getStackForm(1L));
         ItemList.Machine_HV_Massfab.set(
-            new GT_MetaTileEntity_Massfabricator(
+            new MTEMassfabricator(
                 MASS_FABRICATOR_HV.ID,
                 "basicmachine.massfab.tier.03",
                 "Advanced Mass Fabricator II",
                 3).getStackForm(1L));
         ItemList.Machine_EV_Massfab.set(
-            new GT_MetaTileEntity_Massfabricator(
+            new MTEMassfabricator(
                 MASS_FABRICATOR_EV.ID,
                 "basicmachine.massfab.tier.04",
                 "Advanced Mass Fabricator III",
                 4).getStackForm(1L));
         ItemList.Machine_IV_Massfab.set(
-            new GT_MetaTileEntity_Massfabricator(
+            new MTEMassfabricator(
                 MASS_FABRICATOR_IV.ID,
                 "basicmachine.massfab.tier.05",
                 "Advanced Mass Fabricator IV",
@@ -2672,71 +2543,50 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerReplicator() {
         ItemList.Machine_LV_Replicator.set(
-            new GT_MetaTileEntity_Replicator(REPLICATOR_LV.ID, "basicmachine.replicator.tier.01", "Basic Replicator", 1)
+            new MTEReplicator(REPLICATOR_LV.ID, "basicmachine.replicator.tier.01", "Basic Replicator", 1)
                 .getStackForm(1L));
         ItemList.Machine_MV_Replicator.set(
-            new GT_MetaTileEntity_Replicator(
-                REPLICATOR_MV.ID,
-                "basicmachine.replicator.tier.02",
-                "Advanced Replicator",
-                2).getStackForm(1L));
+            new MTEReplicator(REPLICATOR_MV.ID, "basicmachine.replicator.tier.02", "Advanced Replicator", 2)
+                .getStackForm(1L));
         ItemList.Machine_HV_Replicator.set(
-            new GT_MetaTileEntity_Replicator(
-                REPLICATOR_HV.ID,
-                "basicmachine.replicator.tier.03",
-                "Advanced Replicator II",
-                3).getStackForm(1L));
+            new MTEReplicator(REPLICATOR_HV.ID, "basicmachine.replicator.tier.03", "Advanced Replicator II", 3)
+                .getStackForm(1L));
         ItemList.Machine_EV_Replicator.set(
-            new GT_MetaTileEntity_Replicator(
-                REPLICATOR_EV.ID,
-                "basicmachine.replicator.tier.04",
-                "Advanced Replicator III",
-                4).getStackForm(1L));
+            new MTEReplicator(REPLICATOR_EV.ID, "basicmachine.replicator.tier.04", "Advanced Replicator III", 4)
+                .getStackForm(1L));
         ItemList.Machine_IV_Replicator.set(
-            new GT_MetaTileEntity_Replicator(
-                REPLICATOR_IV.ID,
-                "basicmachine.replicator.tier.05",
-                "Advanced Replicator IV",
-                5).getStackForm(1L));
+            new MTEReplicator(REPLICATOR_IV.ID, "basicmachine.replicator.tier.05", "Advanced Replicator IV", 5)
+                .getStackForm(1L));
 
         ItemList.ReplicatorLuV.set(
-            new GT_MetaTileEntity_Replicator(
-                MATTER_REPLICATOR_LuV.ID,
-                "basicmachine.replicator.tier.06",
-                "Elite Replicator",
-                6).getStackForm(1L));
+            new MTEReplicator(MATTER_REPLICATOR_LuV.ID, "basicmachine.replicator.tier.06", "Elite Replicator", 6)
+                .getStackForm(1L));
         ItemList.ReplicatorZPM.set(
-            new GT_MetaTileEntity_Replicator(
-                MATTER_REPLICATOR_ZPM.ID,
-                "basicmachine.replicator.tier.07",
-                "Elite Replicator II",
-                7).getStackForm(1L));
+            new MTEReplicator(MATTER_REPLICATOR_ZPM.ID, "basicmachine.replicator.tier.07", "Elite Replicator II", 7)
+                .getStackForm(1L));
         ItemList.ReplicatorUV.set(
-            new GT_MetaTileEntity_Replicator(
+            new MTEReplicator(
                 MATTER_REPLICATOR_UV.ID,
                 "basicmachine.replicator.tier.08",
                 "Ultimate Elemental Composer",
                 8).getStackForm(1L));
         ItemList.ReplicatorUHV.set(
-            new GT_MetaTileEntity_Replicator(
-                MATTER_REPLICATOR_UHV.ID,
-                "basicmachine.replicator.tier.09",
-                "Epic Elemental Composer",
-                9).getStackForm(1L));
+            new MTEReplicator(MATTER_REPLICATOR_UHV.ID, "basicmachine.replicator.tier.09", "Epic Elemental Composer", 9)
+                .getStackForm(1L));
         ItemList.ReplicatorUEV.set(
-            new GT_MetaTileEntity_Replicator(
+            new MTEReplicator(
                 MATTER_REPLICATOR_UEV.ID,
                 "basicmachine.replicator.tier.10",
                 "Epic Elemental Composer II",
                 10).getStackForm(1L));
         ItemList.ReplicatorUIV.set(
-            new GT_MetaTileEntity_Replicator(
+            new MTEReplicator(
                 MATTER_REPLICATOR_UIV.ID,
                 "basicmachine.replicator.tier.11",
                 "Epic Elemental Composer III",
                 11).getStackForm(1L));
         ItemList.ReplicatorUMV.set(
-            new GT_MetaTileEntity_Replicator(
+            new MTEReplicator(
                 MATTER_REPLICATOR_UMV.ID,
                 "basicmachine.replicator.tier.12",
                 "Epic Elemental Composer IV",
@@ -2745,136 +2595,115 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerBrewery() {
         ItemList.Machine_LV_Brewery.set(
-            new GT_MetaTileEntity_PotionBrewer(BREWERY_LV.ID, "basicmachine.brewery.tier.01", "Basic Brewery", 1)
-                .getStackForm(1L));
+            new MTEPotionBrewer(BREWERY_LV.ID, "basicmachine.brewery.tier.01", "Basic Brewery", 1).getStackForm(1L));
         ItemList.Machine_MV_Brewery.set(
-            new GT_MetaTileEntity_PotionBrewer(BREWERY_MV.ID, "basicmachine.brewery.tier.02", "Advanced Brewery", 2)
-                .getStackForm(1L));
+            new MTEPotionBrewer(BREWERY_MV.ID, "basicmachine.brewery.tier.02", "Advanced Brewery", 2).getStackForm(1L));
         ItemList.Machine_HV_Brewery.set(
-            new GT_MetaTileEntity_PotionBrewer(BREWERY_HV.ID, "basicmachine.brewery.tier.03", "Advanced Brewery II", 3)
+            new MTEPotionBrewer(BREWERY_HV.ID, "basicmachine.brewery.tier.03", "Advanced Brewery II", 3)
                 .getStackForm(1L));
         ItemList.Machine_EV_Brewery.set(
-            new GT_MetaTileEntity_PotionBrewer(BREWERY_EV.ID, "basicmachine.brewery.tier.04", "Advanced Brewery III", 4)
+            new MTEPotionBrewer(BREWERY_EV.ID, "basicmachine.brewery.tier.04", "Advanced Brewery III", 4)
                 .getStackForm(1L));
         ItemList.Machine_IV_Brewery.set(
-            new GT_MetaTileEntity_PotionBrewer(BREWERY_IV.ID, "basicmachine.brewery.tier.05", "Advanced Brewery IV", 5)
+            new MTEPotionBrewer(BREWERY_IV.ID, "basicmachine.brewery.tier.05", "Advanced Brewery IV", 5)
                 .getStackForm(1L));
 
         ItemList.BreweryLuV.set(
-            new GT_MetaTileEntity_PotionBrewer(BREWERY_LuV.ID, "basicmachine.brewery.tier.06", "Elite Brewery", 6)
-                .getStackForm(1L));
+            new MTEPotionBrewer(BREWERY_LuV.ID, "basicmachine.brewery.tier.06", "Elite Brewery", 6).getStackForm(1L));
         ItemList.BreweryZPM.set(
-            new GT_MetaTileEntity_PotionBrewer(BREWERY_ZPM.ID, "basicmachine.brewery.tier.07", "Elite Brewery II", 7)
+            new MTEPotionBrewer(BREWERY_ZPM.ID, "basicmachine.brewery.tier.07", "Elite Brewery II", 7)
                 .getStackForm(1L));
         ItemList.BreweryUV.set(
-            new GT_MetaTileEntity_PotionBrewer(BREWERY_UV.ID, "basicmachine.brewery.tier.08", "Ultimate Brew Rusher", 8)
+            new MTEPotionBrewer(BREWERY_UV.ID, "basicmachine.brewery.tier.08", "Ultimate Brew Rusher", 8)
                 .getStackForm(1L));
         ItemList.BreweryUHV.set(
-            new GT_MetaTileEntity_PotionBrewer(BREWERY_UHV.ID, "basicmachine.brewery.tier.09", "Epic Brew Rusher", 9)
+            new MTEPotionBrewer(BREWERY_UHV.ID, "basicmachine.brewery.tier.09", "Epic Brew Rusher", 9)
                 .getStackForm(1L));
         ItemList.BreweryUEV.set(
-            new GT_MetaTileEntity_PotionBrewer(
-                BREWERY_UEV.ID,
-                "basicmachine.brewery.tier.10",
-                "Epic Brew Rusher II",
-                10).getStackForm(1L));
+            new MTEPotionBrewer(BREWERY_UEV.ID, "basicmachine.brewery.tier.10", "Epic Brew Rusher II", 10)
+                .getStackForm(1L));
         ItemList.BreweryUIV.set(
-            new GT_MetaTileEntity_PotionBrewer(
-                BREWERY_UIV.ID,
-                "basicmachine.brewery.tier.11",
-                "Epic Brew Rusher III",
-                11).getStackForm(1L));
+            new MTEPotionBrewer(BREWERY_UIV.ID, "basicmachine.brewery.tier.11", "Epic Brew Rusher III", 11)
+                .getStackForm(1L));
         ItemList.BreweryUMV.set(
-            new GT_MetaTileEntity_PotionBrewer(
-                BREWERY_UMV.ID,
-                "basicmachine.brewery.tier.12",
-                "Epic Brew Rusher IV",
-                12).getStackForm(1L));
+            new MTEPotionBrewer(BREWERY_UMV.ID, "basicmachine.brewery.tier.12", "Epic Brew Rusher IV", 12)
+                .getStackForm(1L));
     }
 
     private static void registerMiner() {
-        ItemList.Machine_LV_Miner.set(
-            new GT_MetaTileEntity_Miner(MINER_LV.ID, "basicmachine.miner.tier.01", "Basic Miner", 1).getStackForm(1L));
-        ItemList.Machine_MV_Miner.set(
-            new GT_MetaTileEntity_Miner(MINER_MV.ID, "basicmachine.miner.tier.02", "Good Miner", 2).getStackForm(1L));
-        ItemList.Machine_HV_Miner.set(
-            new GT_MetaTileEntity_Miner(MINER_HV.ID, "basicmachine.miner.tier.03", "Advanced Miner", 3)
-                .getStackForm(1L));
+        ItemList.Machine_LV_Miner
+            .set(new MTEMiner(MINER_LV.ID, "basicmachine.miner.tier.01", "Basic Miner", 1).getStackForm(1L));
+        ItemList.Machine_MV_Miner
+            .set(new MTEMiner(MINER_MV.ID, "basicmachine.miner.tier.02", "Good Miner", 2).getStackForm(1L));
+        ItemList.Machine_HV_Miner
+            .set(new MTEMiner(MINER_HV.ID, "basicmachine.miner.tier.03", "Advanced Miner", 3).getStackForm(1L));
     }
 
     private static void registerPump() {
-        ItemList.Pump_LV
-            .set(new GT_MetaTileEntity_Pump(PUMP_LV.ID, "basicmachine.pump.tier.01", "Basic Pump", 1).getStackForm(1L));
-        ItemList.Pump_MV.set(
-            new GT_MetaTileEntity_Pump(PUMP_MV.ID, "basicmachine.pump.tier.02", "Advanced Pump", 2).getStackForm(1L));
-        ItemList.Pump_HV.set(
-            new GT_MetaTileEntity_Pump(PUMP_HV.ID, "basicmachine.pump.tier.03", "Advanced Pump II", 3)
-                .getStackForm(1L));
-        ItemList.Pump_EV.set(
-            new GT_MetaTileEntity_Pump(PUMP_EV.ID, "basicmachine.pump.tier.04", "Advanced Pump III", 4)
-                .getStackForm(1L));
-        ItemList.Pump_IV.set(
-            new GT_MetaTileEntity_Pump(PUMP_IV.ID, "basicmachine.pump.tier.05", "Advanced Pump IV", 5)
-                .getStackForm(1L));
-        ItemList.PumpLuV.set(
-            new GT_MetaTileEntity_Pump(PUMP_LuV.ID, "basicmachine.pump.tier.06", "Lake Dislocator", 6)
-                .getStackForm(1L));
-        ItemList.PumpZPM.set(
-            new GT_MetaTileEntity_Pump(PUMP_ZPM.ID, "basicmachine.pump.tier.07", "Ocean Transposer", 7)
-                .getStackForm(1L));
+        ItemList.Pump_LV.set(new MTEPump(PUMP_LV.ID, "basicmachine.pump.tier.01", "Basic Pump", 1).getStackForm(1L));
+        ItemList.Pump_MV.set(new MTEPump(PUMP_MV.ID, "basicmachine.pump.tier.02", "Advanced Pump", 2).getStackForm(1L));
+        ItemList.Pump_HV
+            .set(new MTEPump(PUMP_HV.ID, "basicmachine.pump.tier.03", "Advanced Pump II", 3).getStackForm(1L));
+        ItemList.Pump_EV
+            .set(new MTEPump(PUMP_EV.ID, "basicmachine.pump.tier.04", "Advanced Pump III", 4).getStackForm(1L));
+        ItemList.Pump_IV
+            .set(new MTEPump(PUMP_IV.ID, "basicmachine.pump.tier.05", "Advanced Pump IV", 5).getStackForm(1L));
+        ItemList.PumpLuV
+            .set(new MTEPump(PUMP_LuV.ID, "basicmachine.pump.tier.06", "Lake Dislocator", 6).getStackForm(1L));
+        ItemList.PumpZPM
+            .set(new MTEPump(PUMP_ZPM.ID, "basicmachine.pump.tier.07", "Ocean Transposer", 7).getStackForm(1L));
     }
 
     private static void registerTeleporter() {
-        ItemList.Teleporter.set(
-            new GT_MetaTileEntity_Teleporter(TELEPORTER.ID, "basicmachine.teleporter", "Teleporter", 9)
-                .getStackForm(1L));
+        ItemList.Teleporter
+            .set(new MTETeleporter(TELEPORTER.ID, "basicmachine.teleporter", "Teleporter", 9).getStackForm(1L));
     }
 
     private static void registerMonsterRepellator() {
         ItemList.MobRep_LV.set(
-            new GT_MetaTileEntity_MonsterRepellent(
+            new MTEMonsterRepellent(
                 MONSTER_REPELLATOR_LV.ID,
                 "basicmachine.mobrep.tier.01",
                 "Basic Monster Repellator",
                 1).getStackForm(1L));
         ItemList.MobRep_MV.set(
-            new GT_MetaTileEntity_MonsterRepellent(
+            new MTEMonsterRepellent(
                 MONSTER_REPELLATOR_MV.ID,
                 "basicmachine.mobrep.tier.02",
                 "Advanced Monster Repellator",
                 2).getStackForm(1L));
         ItemList.MobRep_HV.set(
-            new GT_MetaTileEntity_MonsterRepellent(
+            new MTEMonsterRepellent(
                 MONSTER_REPELLATOR_HV.ID,
                 "basicmachine.mobrep.tier.03",
                 "Advanced Monster Repellator II",
                 3).getStackForm(1L));
         ItemList.MobRep_EV.set(
-            new GT_MetaTileEntity_MonsterRepellent(
+            new MTEMonsterRepellent(
                 MONSTER_REPELLATOR_EV.ID,
                 "basicmachine.mobrep.tier.04",
                 "Advanced Monster Repellator III",
                 4).getStackForm(1L));
         ItemList.MobRep_IV.set(
-            new GT_MetaTileEntity_MonsterRepellent(
+            new MTEMonsterRepellent(
                 MONSTER_REPELLATOR_IV.ID,
                 "basicmachine.mobrep.tier.05",
                 "Advanced Monster Repellator IV",
                 5).getStackForm(1L));
         ItemList.MobRep_LuV.set(
-            new GT_MetaTileEntity_MonsterRepellent(
+            new MTEMonsterRepellent(
                 MONSTER_REPELLATOR_LuV.ID,
                 "basicmachine.mobrep.tier.06",
                 "Advanced Monster Repellator V",
                 6).getStackForm(1L));
         ItemList.MobRep_ZPM.set(
-            new GT_MetaTileEntity_MonsterRepellent(
+            new MTEMonsterRepellent(
                 MONSTER_REPELLATOR_ZPM.ID,
                 "basicmachine.mobrep.tier.07",
                 "Advanced Monster Repellator VI",
                 7).getStackForm(1L));
         ItemList.MobRep_UV.set(
-            new GT_MetaTileEntity_MonsterRepellent(
+            new MTEMonsterRepellent(
                 MONSTER_REPELLATOR_UV.ID,
                 "basicmachine.mobrep.tier.08",
                 "Advanced Monster Repellator VII",
@@ -2883,49 +2712,49 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerWorldAccelerator() {
         ItemList.AcceleratorLV.set(
-            new GT_MetaTileEntity_WorldAccelerator(
+            new MTEWorldAccelerator(
                 WORLD_ACCELERATOR_LV.ID,
                 "basicmachine.accelerator.tier.01",
                 "Basic World Accelerator",
                 1).getStackForm(1L));
         ItemList.AcceleratorMV.set(
-            new GT_MetaTileEntity_WorldAccelerator(
+            new MTEWorldAccelerator(
                 WORLD_ACCELERATOR_MV.ID,
                 "basicmachine.accelerator.tier.02",
                 "Advanced World Accelerator",
                 2).getStackForm(1L));
         ItemList.AcceleratorHV.set(
-            new GT_MetaTileEntity_WorldAccelerator(
+            new MTEWorldAccelerator(
                 WORLD_ACCELERATOR_HV.ID,
                 "basicmachine.accelerator.tier.03",
                 "Advanced World Accelerator II",
                 3).getStackForm(1L));
         ItemList.AcceleratorEV.set(
-            new GT_MetaTileEntity_WorldAccelerator(
+            new MTEWorldAccelerator(
                 WORLD_ACCELERATOR_EV.ID,
                 "basicmachine.accelerator.tier.04",
                 "Advanced World Accelerator III",
                 4).getStackForm(1L));
         ItemList.AcceleratorIV.set(
-            new GT_MetaTileEntity_WorldAccelerator(
+            new MTEWorldAccelerator(
                 WORLD_ACCELERATOR_IV.ID,
                 "basicmachine.accelerator.tier.05",
                 "Advanced World Accelerator IV",
                 5).getStackForm(1L));
         ItemList.AcceleratorLuV.set(
-            new GT_MetaTileEntity_WorldAccelerator(
+            new MTEWorldAccelerator(
                 WORLD_ACCELERATOR_LuV.ID,
                 "basicmachine.accelerator.tier.06",
                 "Elite World Accelerator",
                 6).getStackForm(1L));
         ItemList.AcceleratorZPM.set(
-            new GT_MetaTileEntity_WorldAccelerator(
+            new MTEWorldAccelerator(
                 WORLD_ACCELERATOR_ZPM.ID,
                 "basicmachine.accelerator.tier.07",
                 "Elite World Accelerator II",
                 7).getStackForm(1L));
         ItemList.AcceleratorUV.set(
-            new GT_MetaTileEntity_WorldAccelerator(
+            new MTEWorldAccelerator(
                 WORLD_ACCELERATOR_UV.ID,
                 "basicmachine.accelerator.tier.08",
                 "Ultimate Time Anomaly",
@@ -2935,7 +2764,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerAdvancedSeismicProspector() {
         ItemList.Seismic_Prospector_Adv_LV.set(
-            new GT_MetaTileEntity_AdvSeismicProspector(
+            new MTEAdvSeismicProspector(
                 ADVANCED_SEISMIC_PROSPECTOR_LV.ID,
                 "basicmachine.seismicprospector.07",
                 "Advanced Seismic Prospector LV",
@@ -2943,7 +2772,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 5 * 16 / 2,
                 2).getStackForm(1));
         ItemList.Seismic_Prospector_Adv_MV.set(
-            new GT_MetaTileEntity_AdvSeismicProspector(
+            new MTEAdvSeismicProspector(
                 ADVANCED_SEISMIC_PROSPECTOR_MV.ID,
                 "basicmachine.seismicprospector.06",
                 "Advanced Seismic Prospector MV",
@@ -2951,7 +2780,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 7 * 16 / 2,
                 2).getStackForm(1));
         ItemList.Seismic_Prospector_Adv_HV.set(
-            new GT_MetaTileEntity_AdvSeismicProspector(
+            new MTEAdvSeismicProspector(
                 ADVANCED_SEISMIC_PROSPECTOR_HV.ID,
                 "basicmachine.seismicprospector.05",
                 "Advanced Seismic Prospector HV",
@@ -2959,7 +2788,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9 * 16 / 2,
                 2).getStackForm(1));
         ItemList.Seismic_Prospector_Adv_EV.set(
-            new GT_MetaTileEntity_AdvSeismicProspector(
+            new MTEAdvSeismicProspector(
                 ADVANCED_SEISMIC_PROSPECTOR_EV.ID,
                 "basicmachine.seismicprospector.04",
                 "Advanced Seismic Prospector EV",
@@ -2970,37 +2799,37 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerMicrowaveEnergyTransmitter() {
         ItemList.MicroTransmitter_HV.set(
-            new GT_MetaTileEntity_MicrowaveEnergyTransmitter(
+            new MTEMicrowaveEnergyTransmitter(
                 MICROWAVE_ENERGY_TRANSMITTER_HV.ID,
                 "basicmachine.microtransmitter.03",
                 "HV Microwave Energy Transmitter",
                 3).getStackForm(1L));
         ItemList.MicroTransmitter_EV.set(
-            new GT_MetaTileEntity_MicrowaveEnergyTransmitter(
+            new MTEMicrowaveEnergyTransmitter(
                 MICROWAVE_ENERGY_TRANSMITTER_EV.ID,
                 "basicmachine.microtransmitter.04",
                 "EV Microwave Energy Transmitter",
                 4).getStackForm(1L));
         ItemList.MicroTransmitter_IV.set(
-            new GT_MetaTileEntity_MicrowaveEnergyTransmitter(
+            new MTEMicrowaveEnergyTransmitter(
                 MICROWAVE_ENERGY_TRANSMITTER_IV.ID,
                 "basicmachine.microtransmitter.05",
                 "IV Microwave Energy Transmitter",
                 5).getStackForm(1L));
         ItemList.MicroTransmitter_LUV.set(
-            new GT_MetaTileEntity_MicrowaveEnergyTransmitter(
+            new MTEMicrowaveEnergyTransmitter(
                 MICROWAVE_ENERGY_TRANSMITTER_LuV.ID,
                 "basicmachine.microtransmitter.06",
                 "LuV Microwave Energy Transmitter",
                 6).getStackForm(1L));
         ItemList.MicroTransmitter_ZPM.set(
-            new GT_MetaTileEntity_MicrowaveEnergyTransmitter(
+            new MTEMicrowaveEnergyTransmitter(
                 MICROWAVE_ENERGY_TRANSMITTER_ZPM.ID,
                 "basicmachine.microtransmitter.07",
                 "ZPM Microwave Energy Transmitter",
                 7).getStackForm(1L));
         ItemList.MicroTransmitter_UV.set(
-            new GT_MetaTileEntity_MicrowaveEnergyTransmitter(
+            new MTEMicrowaveEnergyTransmitter(
                 MICROWAVE_ENERGY_TRANSMITTER_UV.ID,
                 "basicmachine.microtransmitter.08",
                 "UV Microwave Energy Transmitter",
@@ -3009,232 +2838,151 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerBetterJukebox() {
         ItemList.BetterJukebox_LV.set(
-            new GT_MetaTileEntity_BetterJukebox(
+            new MTEBetterJukebox(
                 BETTER_JUKEBOX_LV.ID,
                 "basicmachine.betterjukebox.tier.01",
                 "Basic Electric Jukebox",
                 1).getStackForm(1L));
         ItemList.BetterJukebox_MV.set(
-            new GT_MetaTileEntity_BetterJukebox(
+            new MTEBetterJukebox(
                 BETTER_JUKEBOX_MV.ID,
                 "basicmachine.betterjukebox.tier.02",
                 "Advanced Electric Jukebox",
                 2).getStackForm(1L));
         ItemList.BetterJukebox_HV.set(
-            new GT_MetaTileEntity_BetterJukebox(
+            new MTEBetterJukebox(
                 BETTER_JUKEBOX_HV.ID,
                 "basicmachine.betterjukebox.tier.03",
                 "Advanced Electric Jukebox II",
                 3).getStackForm(1L));
         ItemList.BetterJukebox_EV.set(
-            new GT_MetaTileEntity_BetterJukebox(
-                BETTER_JUKEBOX_EV.ID,
-                "basicmachine.betterjukebox.tier.04",
-                "Extreme Music Mixer",
-                4).getStackForm(1L));
+            new MTEBetterJukebox(BETTER_JUKEBOX_EV.ID, "basicmachine.betterjukebox.tier.04", "Extreme Music Mixer", 4)
+                .getStackForm(1L));
         ItemList.BetterJukebox_IV.set(
-            new GT_MetaTileEntity_BetterJukebox(
-                BETTER_JUKEBOX_IV.ID,
-                "basicmachine.betterjukebox.tier.05",
-                "Duke Mix'em 3D",
-                5).getStackForm(1L));
+            new MTEBetterJukebox(BETTER_JUKEBOX_IV.ID, "basicmachine.betterjukebox.tier.05", "Duke Mix'em 3D", 5)
+                .getStackForm(1L));
     }
 
     private static void registerChestBuffer() {
         ItemList.Automation_ChestBuffer_ULV.set(
-            new GT_MetaTileEntity_ChestBuffer(
+            new MTEChestBuffer(
                 CHEST_BUFFER_ULV.ID,
                 "automation.chestbuffer.tier.00",
                 "Ultra Low Voltage Chest Buffer",
                 0).getStackForm(1L));
         ItemList.Automation_ChestBuffer_LV.set(
-            new GT_MetaTileEntity_ChestBuffer(
-                CHEST_BUFFER_LV.ID,
-                "automation.chestbuffer.tier.01",
-                "Low Voltage Chest Buffer",
-                1).getStackForm(1L));
+            new MTEChestBuffer(CHEST_BUFFER_LV.ID, "automation.chestbuffer.tier.01", "Low Voltage Chest Buffer", 1)
+                .getStackForm(1L));
         ItemList.Automation_ChestBuffer_MV.set(
-            new GT_MetaTileEntity_ChestBuffer(
-                CHEST_BUFFER_MV.ID,
-                "automation.chestbuffer.tier.02",
-                "Medium Voltage Chest Buffer",
-                2).getStackForm(1L));
+            new MTEChestBuffer(CHEST_BUFFER_MV.ID, "automation.chestbuffer.tier.02", "Medium Voltage Chest Buffer", 2)
+                .getStackForm(1L));
         ItemList.Automation_ChestBuffer_HV.set(
-            new GT_MetaTileEntity_ChestBuffer(
-                CHEST_BUFFER_HV.ID,
-                "automation.chestbuffer.tier.03",
-                "High Voltage Chest Buffer",
-                3).getStackForm(1L));
+            new MTEChestBuffer(CHEST_BUFFER_HV.ID, "automation.chestbuffer.tier.03", "High Voltage Chest Buffer", 3)
+                .getStackForm(1L));
         ItemList.Automation_ChestBuffer_EV.set(
-            new GT_MetaTileEntity_ChestBuffer(
-                CHEST_BUFFER_EV.ID,
-                "automation.chestbuffer.tier.04",
-                "Extreme Voltage Chest Buffer",
-                4).getStackForm(1L));
+            new MTEChestBuffer(CHEST_BUFFER_EV.ID, "automation.chestbuffer.tier.04", "Extreme Voltage Chest Buffer", 4)
+                .getStackForm(1L));
         ItemList.Automation_ChestBuffer_IV.set(
-            new GT_MetaTileEntity_ChestBuffer(
-                CHEST_BUFFER_IV.ID,
-                "automation.chestbuffer.tier.05",
-                "Insane Voltage Chest Buffer",
-                5).getStackForm(1L));
+            new MTEChestBuffer(CHEST_BUFFER_IV.ID, "automation.chestbuffer.tier.05", "Insane Voltage Chest Buffer", 5)
+                .getStackForm(1L));
         ItemList.Automation_ChestBuffer_LuV.set(
-            new GT_MetaTileEntity_ChestBuffer(
+            new MTEChestBuffer(
                 CHEST_BUFFER_LuV.ID,
                 "automation.chestbuffer.tier.06",
                 "Ludicrous Voltage Chest Buffer",
                 6).getStackForm(1L));
         ItemList.Automation_ChestBuffer_ZPM.set(
-            new GT_MetaTileEntity_ChestBuffer(
-                CHEST_BUFFER_ZPM.ID,
-                "automation.chestbuffer.tier.07",
-                "ZPM Voltage Chest Buffer",
-                7).getStackForm(1L));
+            new MTEChestBuffer(CHEST_BUFFER_ZPM.ID, "automation.chestbuffer.tier.07", "ZPM Voltage Chest Buffer", 7)
+                .getStackForm(1L));
         ItemList.Automation_ChestBuffer_UV.set(
-            new GT_MetaTileEntity_ChestBuffer(
-                CHEST_BUFFER_UV.ID,
-                "automation.chestbuffer.tier.08",
-                "Ultimate Voltage Chest Buffer",
-                8).getStackForm(1L));
+            new MTEChestBuffer(CHEST_BUFFER_UV.ID, "automation.chestbuffer.tier.08", "Ultimate Voltage Chest Buffer", 8)
+                .getStackForm(1L));
         ItemList.Automation_ChestBuffer_UHV.set(
-            new GT_MetaTileEntity_ChestBuffer(
+            new MTEChestBuffer(
                 CHEST_BUFFER_UHV.ID,
                 "automation.chestbuffer.tier.09",
                 "Highly Ultimate Voltage Chest Buffer",
                 9).getStackForm(1L));
 
         ItemList.Automation_ChestBuffer_UEV.set(
-            new GT_MetaTileEntity_ChestBuffer(
+            new MTEChestBuffer(
                 CHEST_BUFFER_UEV.ID,
                 "automation.chestbuffer.tier.10",
                 "Ultra High Voltage Chest Buffer",
                 10).getStackForm(1L));
 
         ItemList.Automation_ChestBuffer_UIV.set(
-            new GT_MetaTileEntity_ChestBuffer(
-                CHEST_BUFFER_UIV.ID,
-                "automation.chestbuffer.tier.11",
-                "UIV Voltage Chest Buffer",
-                11).getStackForm(1L));
+            new MTEChestBuffer(CHEST_BUFFER_UIV.ID, "automation.chestbuffer.tier.11", "UIV Voltage Chest Buffer", 11)
+                .getStackForm(1L));
 
         ItemList.Automation_ChestBuffer_UMV.set(
-            new GT_MetaTileEntity_ChestBuffer(
-                CHEST_BUFFER_UMV.ID,
-                "automation.chestbuffer.tier.12",
-                "UMV Voltage Chest Buffer",
-                12).getStackForm(1L));
+            new MTEChestBuffer(CHEST_BUFFER_UMV.ID, "automation.chestbuffer.tier.12", "UMV Voltage Chest Buffer", 12)
+                .getStackForm(1L));
     }
 
     private static void registerItemFilter() {
         ItemList.Automation_Filter_ULV.set(
-            new GT_MetaTileEntity_Filter(
-                ITEM_FILTER_ULV.ID,
-                "automation.filter.tier.00",
-                "Ultra Low Voltage Item Filter",
-                0).getStackForm(1L));
+            new MTEFilter(ITEM_FILTER_ULV.ID, "automation.filter.tier.00", "Ultra Low Voltage Item Filter", 0)
+                .getStackForm(1L));
         ItemList.Automation_Filter_LV.set(
-            new GT_MetaTileEntity_Filter(ITEM_FILTER_LV.ID, "automation.filter.tier.01", "Low Voltage Item Filter", 1)
+            new MTEFilter(ITEM_FILTER_LV.ID, "automation.filter.tier.01", "Low Voltage Item Filter", 1)
                 .getStackForm(1L));
         ItemList.Automation_Filter_MV.set(
-            new GT_MetaTileEntity_Filter(
-                ITEM_FILTER_MV.ID,
-                "automation.filter.tier.02",
-                "Medium Voltage Item Filter",
-                2).getStackForm(1L));
+            new MTEFilter(ITEM_FILTER_MV.ID, "automation.filter.tier.02", "Medium Voltage Item Filter", 2)
+                .getStackForm(1L));
         ItemList.Automation_Filter_HV.set(
-            new GT_MetaTileEntity_Filter(ITEM_FILTER_HV.ID, "automation.filter.tier.03", "High Voltage Item Filter", 3)
+            new MTEFilter(ITEM_FILTER_HV.ID, "automation.filter.tier.03", "High Voltage Item Filter", 3)
                 .getStackForm(1L));
         ItemList.Automation_Filter_EV.set(
-            new GT_MetaTileEntity_Filter(
-                ITEM_FILTER_EV.ID,
-                "automation.filter.tier.04",
-                "Extreme Voltage Item Filter",
-                4).getStackForm(1L));
+            new MTEFilter(ITEM_FILTER_EV.ID, "automation.filter.tier.04", "Extreme Voltage Item Filter", 4)
+                .getStackForm(1L));
         ItemList.Automation_Filter_IV.set(
-            new GT_MetaTileEntity_Filter(
-                ITEM_FILTER_IV.ID,
-                "automation.filter.tier.05",
-                "Insane Voltage Item Filter",
-                5).getStackForm(1L));
+            new MTEFilter(ITEM_FILTER_IV.ID, "automation.filter.tier.05", "Insane Voltage Item Filter", 5)
+                .getStackForm(1L));
         ItemList.Automation_Filter_LuV.set(
-            new GT_MetaTileEntity_Filter(
-                ITEM_FILTER_LuV.ID,
-                "automation.filter.tier.06",
-                "Ludicrous Voltage Item Filter",
-                6).getStackForm(1L));
+            new MTEFilter(ITEM_FILTER_LuV.ID, "automation.filter.tier.06", "Ludicrous Voltage Item Filter", 6)
+                .getStackForm(1L));
         ItemList.Automation_Filter_ZPM.set(
-            new GT_MetaTileEntity_Filter(ITEM_FILTER_ZPM.ID, "automation.filter.tier.07", "ZPM Voltage Item Filter", 7)
+            new MTEFilter(ITEM_FILTER_ZPM.ID, "automation.filter.tier.07", "ZPM Voltage Item Filter", 7)
                 .getStackForm(1L));
         ItemList.Automation_Filter_UV.set(
-            new GT_MetaTileEntity_Filter(
-                ITEM_FILTER_UV.ID,
-                "automation.filter.tier.08",
-                "Ultimate Voltage Item Filter",
-                8).getStackForm(1L));
+            new MTEFilter(ITEM_FILTER_UV.ID, "automation.filter.tier.08", "Ultimate Voltage Item Filter", 8)
+                .getStackForm(1L));
         ItemList.Automation_Filter_MAX.set(
-            new GT_MetaTileEntity_Filter(
-                ITEM_FILTER_UHV.ID,
-                "automation.filter.tier.09",
-                "Highly Ultimate Voltage Item Filter",
-                9).getStackForm(1L));
+            new MTEFilter(ITEM_FILTER_UHV.ID, "automation.filter.tier.09", "Highly Ultimate Voltage Item Filter", 9)
+                .getStackForm(1L));
     }
 
     private static void registerTypeFilter() {
         ItemList.Automation_TypeFilter_ULV.set(
-            new GT_MetaTileEntity_TypeFilter(
-                TYPE_FILTER_ULV.ID,
-                "automation.typefilter.tier.00",
-                "Ultra Low Voltage Type Filter",
-                0).getStackForm(1L));
+            new MTETypeFilter(TYPE_FILTER_ULV.ID, "automation.typefilter.tier.00", "Ultra Low Voltage Type Filter", 0)
+                .getStackForm(1L));
         ItemList.Automation_TypeFilter_LV.set(
-            new GT_MetaTileEntity_TypeFilter(
-                TYPE_FILTER_LV.ID,
-                "automation.typefilter.tier.01",
-                "Low Voltage Type Filter",
-                1).getStackForm(1L));
+            new MTETypeFilter(TYPE_FILTER_LV.ID, "automation.typefilter.tier.01", "Low Voltage Type Filter", 1)
+                .getStackForm(1L));
         ItemList.Automation_TypeFilter_MV.set(
-            new GT_MetaTileEntity_TypeFilter(
-                TYPE_FILTER_MV.ID,
-                "automation.typefilter.tier.02",
-                "Medium Voltage Type Filter",
-                2).getStackForm(1L));
+            new MTETypeFilter(TYPE_FILTER_MV.ID, "automation.typefilter.tier.02", "Medium Voltage Type Filter", 2)
+                .getStackForm(1L));
         ItemList.Automation_TypeFilter_HV.set(
-            new GT_MetaTileEntity_TypeFilter(
-                TYPE_FILTER_HV.ID,
-                "automation.typefilter.tier.03",
-                "High Voltage Type Filter",
-                3).getStackForm(1L));
+            new MTETypeFilter(TYPE_FILTER_HV.ID, "automation.typefilter.tier.03", "High Voltage Type Filter", 3)
+                .getStackForm(1L));
         ItemList.Automation_TypeFilter_EV.set(
-            new GT_MetaTileEntity_TypeFilter(
-                TYPE_FILTER_EV.ID,
-                "automation.typefilter.tier.04",
-                "Extreme Voltage Type Filter",
-                4).getStackForm(1L));
+            new MTETypeFilter(TYPE_FILTER_EV.ID, "automation.typefilter.tier.04", "Extreme Voltage Type Filter", 4)
+                .getStackForm(1L));
         ItemList.Automation_TypeFilter_IV.set(
-            new GT_MetaTileEntity_TypeFilter(
-                TYPE_FILTER_IV.ID,
-                "automation.typefilter.tier.05",
-                "Insane Voltage Type Filter",
-                5).getStackForm(1L));
+            new MTETypeFilter(TYPE_FILTER_IV.ID, "automation.typefilter.tier.05", "Insane Voltage Type Filter", 5)
+                .getStackForm(1L));
         ItemList.Automation_TypeFilter_LuV.set(
-            new GT_MetaTileEntity_TypeFilter(
-                TYPE_FILTER_LuV.ID,
-                "automation.typefilter.tier.06",
-                "Ludicrous Voltage Type Filter",
-                6).getStackForm(1L));
+            new MTETypeFilter(TYPE_FILTER_LuV.ID, "automation.typefilter.tier.06", "Ludicrous Voltage Type Filter", 6)
+                .getStackForm(1L));
         ItemList.Automation_TypeFilter_ZPM.set(
-            new GT_MetaTileEntity_TypeFilter(
-                TYPE_FILTER_ZPM.ID,
-                "automation.typefilter.tier.07",
-                "ZPM Voltage Type Filter",
-                7).getStackForm(1L));
+            new MTETypeFilter(TYPE_FILTER_ZPM.ID, "automation.typefilter.tier.07", "ZPM Voltage Type Filter", 7)
+                .getStackForm(1L));
         ItemList.Automation_TypeFilter_UV.set(
-            new GT_MetaTileEntity_TypeFilter(
-                TYPE_FILTER_UV.ID,
-                "automation.typefilter.tier.08",
-                "Ultimate Voltage Type Filter",
-                8).getStackForm(1L));
+            new MTETypeFilter(TYPE_FILTER_UV.ID, "automation.typefilter.tier.08", "Ultimate Voltage Type Filter", 8)
+                .getStackForm(1L));
         ItemList.Automation_TypeFilter_MAX.set(
-            new GT_MetaTileEntity_TypeFilter(
+            new MTETypeFilter(
                 TYPE_FILTER_UHV.ID,
                 "automation.typefilter.tier.09",
                 "Highly Ultimate Voltage Type Filter",
@@ -3243,61 +2991,34 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerRegulator() {
         ItemList.Automation_Regulator_ULV.set(
-            new GT_MetaTileEntity_Regulator(
-                VOLTAGE_REGULATOR_ULV.ID,
-                "automation.regulator.tier.00",
-                "Ultra Low Voltage Regulator",
-                0).getStackForm(1L));
+            new MTERegulator(VOLTAGE_REGULATOR_ULV.ID, "automation.regulator.tier.00", "Ultra Low Voltage Regulator", 0)
+                .getStackForm(1L));
         ItemList.Automation_Regulator_LV.set(
-            new GT_MetaTileEntity_Regulator(
-                VOLTAGE_REGULATOR_LV.ID,
-                "automation.regulator.tier.01",
-                "Low Voltage Regulator",
-                1).getStackForm(1L));
+            new MTERegulator(VOLTAGE_REGULATOR_LV.ID, "automation.regulator.tier.01", "Low Voltage Regulator", 1)
+                .getStackForm(1L));
         ItemList.Automation_Regulator_MV.set(
-            new GT_MetaTileEntity_Regulator(
-                VOLTAGE_REGULATOR_MV.ID,
-                "automation.regulator.tier.02",
-                "Medium Voltage Regulator",
-                2).getStackForm(1L));
+            new MTERegulator(VOLTAGE_REGULATOR_MV.ID, "automation.regulator.tier.02", "Medium Voltage Regulator", 2)
+                .getStackForm(1L));
         ItemList.Automation_Regulator_HV.set(
-            new GT_MetaTileEntity_Regulator(
-                VOLTAGE_REGULATOR_HV.ID,
-                "automation.regulator.tier.03",
-                "High Voltage Regulator",
-                3).getStackForm(1L));
+            new MTERegulator(VOLTAGE_REGULATOR_HV.ID, "automation.regulator.tier.03", "High Voltage Regulator", 3)
+                .getStackForm(1L));
         ItemList.Automation_Regulator_EV.set(
-            new GT_MetaTileEntity_Regulator(
-                VOLTAGE_REGULATOR_EV.ID,
-                "automation.regulator.tier.04",
-                "Extreme Voltage Regulator",
-                4).getStackForm(1L));
+            new MTERegulator(VOLTAGE_REGULATOR_EV.ID, "automation.regulator.tier.04", "Extreme Voltage Regulator", 4)
+                .getStackForm(1L));
         ItemList.Automation_Regulator_IV.set(
-            new GT_MetaTileEntity_Regulator(
-                VOLTAGE_REGULATOR_IV.ID,
-                "automation.regulator.tier.05",
-                "Insane Voltage Regulator",
-                5).getStackForm(1L));
+            new MTERegulator(VOLTAGE_REGULATOR_IV.ID, "automation.regulator.tier.05", "Insane Voltage Regulator", 5)
+                .getStackForm(1L));
         ItemList.Automation_Regulator_LuV.set(
-            new GT_MetaTileEntity_Regulator(
-                VOLTAGE_REGULATOR_LuV.ID,
-                "automation.regulator.tier.06",
-                "Ludicrous Voltage Regulator",
-                6).getStackForm(1L));
+            new MTERegulator(VOLTAGE_REGULATOR_LuV.ID, "automation.regulator.tier.06", "Ludicrous Voltage Regulator", 6)
+                .getStackForm(1L));
         ItemList.Automation_Regulator_ZPM.set(
-            new GT_MetaTileEntity_Regulator(
-                VOLTAGE_REGULATOR_ZPM.ID,
-                "automation.regulator.tier.07",
-                "ZPM Voltage Regulator",
-                7).getStackForm(1L));
+            new MTERegulator(VOLTAGE_REGULATOR_ZPM.ID, "automation.regulator.tier.07", "ZPM Voltage Regulator", 7)
+                .getStackForm(1L));
         ItemList.Automation_Regulator_UV.set(
-            new GT_MetaTileEntity_Regulator(
-                VOLTAGE_REGULATOR_UV.ID,
-                "automation.regulator.tier.08",
-                "Ultimate Voltage Regulator",
-                8).getStackForm(1L));
+            new MTERegulator(VOLTAGE_REGULATOR_UV.ID, "automation.regulator.tier.08", "Ultimate Voltage Regulator", 8)
+                .getStackForm(1L));
         ItemList.Automation_Regulator_MAX.set(
-            new GT_MetaTileEntity_Regulator(
+            new MTERegulator(
                 VOLTAGE_REGULATOR_UHV.ID,
                 "automation.regulator.tier.09",
                 "Highly Ultimate Voltage Regulator",
@@ -3306,61 +3027,40 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerSuperBuffer() {
         ItemList.Automation_SuperBuffer_ULV.set(
-            new GT_MetaTileEntity_SuperBuffer(
+            new MTESuperBuffer(
                 SUPER_BUFFER_ULV.ID,
                 "automation.superbuffer.tier.00",
                 "Ultra Low Voltage Super Buffer",
                 0).getStackForm(1L));
         ItemList.Automation_SuperBuffer_LV.set(
-            new GT_MetaTileEntity_SuperBuffer(
-                SUPER_BUFFER_LV.ID,
-                "automation.superbuffer.tier.01",
-                "Low Voltage Super Buffer",
-                1).getStackForm(1L));
+            new MTESuperBuffer(SUPER_BUFFER_LV.ID, "automation.superbuffer.tier.01", "Low Voltage Super Buffer", 1)
+                .getStackForm(1L));
         ItemList.Automation_SuperBuffer_MV.set(
-            new GT_MetaTileEntity_SuperBuffer(
-                SUPER_BUFFER_MV.ID,
-                "automation.superbuffer.tier.02",
-                "Medium Voltage Super Buffer",
-                2).getStackForm(1L));
+            new MTESuperBuffer(SUPER_BUFFER_MV.ID, "automation.superbuffer.tier.02", "Medium Voltage Super Buffer", 2)
+                .getStackForm(1L));
         ItemList.Automation_SuperBuffer_HV.set(
-            new GT_MetaTileEntity_SuperBuffer(
-                SUPER_BUFFER_HV.ID,
-                "automation.superbuffer.tier.03",
-                "High Voltage Super Buffer",
-                3).getStackForm(1L));
+            new MTESuperBuffer(SUPER_BUFFER_HV.ID, "automation.superbuffer.tier.03", "High Voltage Super Buffer", 3)
+                .getStackForm(1L));
         ItemList.Automation_SuperBuffer_EV.set(
-            new GT_MetaTileEntity_SuperBuffer(
-                SUPER_BUFFER_EV.ID,
-                "automation.superbuffer.tier.04",
-                "Extreme Voltage Super Buffer",
-                4).getStackForm(1L));
+            new MTESuperBuffer(SUPER_BUFFER_EV.ID, "automation.superbuffer.tier.04", "Extreme Voltage Super Buffer", 4)
+                .getStackForm(1L));
         ItemList.Automation_SuperBuffer_IV.set(
-            new GT_MetaTileEntity_SuperBuffer(
-                SUPER_BUFFER_IV.ID,
-                "automation.superbuffer.tier.05",
-                "Insane Voltage Super Buffer",
-                5).getStackForm(1L));
+            new MTESuperBuffer(SUPER_BUFFER_IV.ID, "automation.superbuffer.tier.05", "Insane Voltage Super Buffer", 5)
+                .getStackForm(1L));
         ItemList.Automation_SuperBuffer_LuV.set(
-            new GT_MetaTileEntity_SuperBuffer(
+            new MTESuperBuffer(
                 SUPER_BUFFER_LuV.ID,
                 "automation.superbuffer.tier.06",
                 "Ludicrous Voltage Super Buffer",
                 6).getStackForm(1L));
         ItemList.Automation_SuperBuffer_ZPM.set(
-            new GT_MetaTileEntity_SuperBuffer(
-                SUPER_BUFFER_ZPM.ID,
-                "automation.superbuffer.tier.07",
-                "ZPM Voltage Super Buffer",
-                7).getStackForm(1L));
+            new MTESuperBuffer(SUPER_BUFFER_ZPM.ID, "automation.superbuffer.tier.07", "ZPM Voltage Super Buffer", 7)
+                .getStackForm(1L));
         ItemList.Automation_SuperBuffer_UV.set(
-            new GT_MetaTileEntity_SuperBuffer(
-                SUPER_BUFFER_UV.ID,
-                "automation.superbuffer.tier.08",
-                "Ultimate Voltage Super Buffer",
-                8).getStackForm(1L));
+            new MTESuperBuffer(SUPER_BUFFER_UV.ID, "automation.superbuffer.tier.08", "Ultimate Voltage Super Buffer", 8)
+                .getStackForm(1L));
         ItemList.Automation_SuperBuffer_MAX.set(
-            new GT_MetaTileEntity_SuperBuffer(
+            new MTESuperBuffer(
                 SUPER_BUFFER_UHV.ID,
                 "automation.superbuffer.tier.09",
                 "Highly Ultimate Voltage Super Buffer",
@@ -3369,61 +3069,61 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerItemDistributor() {
         ItemList.Automation_ItemDistributor_ULV.set(
-            new GT_MetaTileEntity_ItemDistributor(
+            new MTEItemDistributor(
                 ITEM_DISTRIBUTOR_ULV.ID,
                 "automation.itemdistributor.tier.00",
                 "Ultra Low Voltage Item Distributor",
                 0).getStackForm(1L));
         ItemList.Automation_ItemDistributor_LV.set(
-            new GT_MetaTileEntity_ItemDistributor(
+            new MTEItemDistributor(
                 ITEM_DISTRIBUTOR_LV.ID,
                 "automation.itemdistributor.tier.01",
                 "Low Voltage Item Distributor",
                 1).getStackForm(1L));
         ItemList.Automation_ItemDistributor_MV.set(
-            new GT_MetaTileEntity_ItemDistributor(
+            new MTEItemDistributor(
                 ITEM_DISTRIBUTOR_MV.ID,
                 "automation.itemdistributor.tier.02",
                 "Medium Voltage Item Distributor",
                 2).getStackForm(1L));
         ItemList.Automation_ItemDistributor_HV.set(
-            new GT_MetaTileEntity_ItemDistributor(
+            new MTEItemDistributor(
                 ITEM_DISTRIBUTOR_HV.ID,
                 "automation.itemdistributor.tier.03",
                 "High Voltage Item Distributor",
                 3).getStackForm(1L));
         ItemList.Automation_ItemDistributor_EV.set(
-            new GT_MetaTileEntity_ItemDistributor(
+            new MTEItemDistributor(
                 ITEM_DISTRIBUTOR_EV.ID,
                 "automation.itemdistributor.tier.04",
                 "Extreme Voltage Item Distributor",
                 4).getStackForm(1L));
         ItemList.Automation_ItemDistributor_IV.set(
-            new GT_MetaTileEntity_ItemDistributor(
+            new MTEItemDistributor(
                 ITEM_DISTRIBUTOR_IV.ID,
                 "automation.itemdistributor.tier.05",
                 "Insane Voltage Item Distributor",
                 5).getStackForm(1L));
         ItemList.Automation_ItemDistributor_LuV.set(
-            new GT_MetaTileEntity_ItemDistributor(
+            new MTEItemDistributor(
                 ITEM_DISTRIBUTOR_LuV.ID,
                 "automation.itemdistributor.tier.06",
                 "Ludicrous Voltage Item Distributor",
                 6).getStackForm(1L));
         ItemList.Automation_ItemDistributor_ZPM.set(
-            new GT_MetaTileEntity_ItemDistributor(
+            new MTEItemDistributor(
                 ITEM_DISTRIBUTOR_ZPM.ID,
                 "automation.itemdistributor.tier.07",
                 "ZPM Voltage Item Distributor",
                 7).getStackForm(1L));
         ItemList.Automation_ItemDistributor_UV.set(
-            new GT_MetaTileEntity_ItemDistributor(
+            new MTEItemDistributor(
                 ITEM_DISTRIBUTOR_UV.ID,
                 "automation.itemdistributor.tier.08",
                 "Ultimate Voltage Item Distributor",
                 8).getStackForm(1L));
         ItemList.Automation_ItemDistributor_MAX.set(
-            new GT_MetaTileEntity_ItemDistributor(
+            new MTEItemDistributor(
                 ITEM_DISTRIBUTOR_UHV.ID,
                 "automation.itemdistributor.tier.09",
                 "MAX Voltage Item Distributor",
@@ -3432,61 +3132,52 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerRecipeFilter() {
         ItemList.Automation_RecipeFilter_ULV.set(
-            new GT_MetaTileEntity_RecipeFilter(
+            new MTERecipeFilter(
                 RECIPE_FILTER_ULV.ID,
                 "automation.recipefilter.tier.00",
                 "Ultra Low Voltage Recipe Filter",
                 0).getStackForm(1L));
         ItemList.Automation_RecipeFilter_LV.set(
-            new GT_MetaTileEntity_RecipeFilter(
-                RECIPE_FILTER_LV.ID,
-                "automation.recipefilter.tier.01",
-                "Low Voltage Recipe Filter",
-                1).getStackForm(1L));
+            new MTERecipeFilter(RECIPE_FILTER_LV.ID, "automation.recipefilter.tier.01", "Low Voltage Recipe Filter", 1)
+                .getStackForm(1L));
         ItemList.Automation_RecipeFilter_MV.set(
-            new GT_MetaTileEntity_RecipeFilter(
+            new MTERecipeFilter(
                 RECIPE_FILTER_MV.ID,
                 "automation.recipefilter.tier.02",
                 "Medium Voltage Recipe Filter",
                 2).getStackForm(1L));
         ItemList.Automation_RecipeFilter_HV.set(
-            new GT_MetaTileEntity_RecipeFilter(
-                RECIPE_FILTER_HV.ID,
-                "automation.recipefilter.tier.03",
-                "High Voltage Recipe Filter",
-                3).getStackForm(1L));
+            new MTERecipeFilter(RECIPE_FILTER_HV.ID, "automation.recipefilter.tier.03", "High Voltage Recipe Filter", 3)
+                .getStackForm(1L));
         ItemList.Automation_RecipeFilter_EV.set(
-            new GT_MetaTileEntity_RecipeFilter(
+            new MTERecipeFilter(
                 RECIPE_FILTER_EV.ID,
                 "automation.recipefilter.tier.04",
                 "Extreme Voltage Recipe Filter",
                 4).getStackForm(1L));
         ItemList.Automation_RecipeFilter_IV.set(
-            new GT_MetaTileEntity_RecipeFilter(
+            new MTERecipeFilter(
                 RECIPE_FILTER_IV.ID,
                 "automation.recipefilter.tier.05",
                 "Insane Voltage Recipe Filter",
                 5).getStackForm(1L));
         ItemList.Automation_RecipeFilter_LuV.set(
-            new GT_MetaTileEntity_RecipeFilter(
+            new MTERecipeFilter(
                 RECIPE_FILTER_LuV.ID,
                 "automation.recipefilter.tier.06",
                 "Ludicrous Voltage Recipe Filter",
                 6).getStackForm(1L));
         ItemList.Automation_RecipeFilter_ZPM.set(
-            new GT_MetaTileEntity_RecipeFilter(
-                RECIPE_FILTER_ZPM.ID,
-                "automation.recipefilter.tier.07",
-                "ZPM Voltage Recipe Filter",
-                7).getStackForm(1L));
+            new MTERecipeFilter(RECIPE_FILTER_ZPM.ID, "automation.recipefilter.tier.07", "ZPM Voltage Recipe Filter", 7)
+                .getStackForm(1L));
         ItemList.Automation_RecipeFilter_UV.set(
-            new GT_MetaTileEntity_RecipeFilter(
+            new MTERecipeFilter(
                 RECIPE_FILTER_UV.ID,
                 "automation.recipefilter.tier.08",
                 "Ultimate Voltage Recipe Filter",
                 8).getStackForm(1L));
         ItemList.Automation_RecipeFilter_MAX.set(
-            new GT_MetaTileEntity_RecipeFilter(
+            new MTERecipeFilter(
                 RECIPE_FILTER_UHV.ID,
                 "automation.recipefilter.tier.09",
                 "Highly Ultimate Voltage Recipe Filter",
@@ -3495,172 +3186,134 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerMachineHull() {
         ItemList.Hull_Bronze.set(
-            new GT_MetaTileEntity_BasicHull_Bronze(
-                HULL_BRONZE.ID,
-                "hull.bronze",
-                "Bronze Hull",
-                0,
-                "For your first Steam Machines").getStackForm(1L));
+            new MTEBasicHullBronze(HULL_BRONZE.ID, "hull.bronze", "Bronze Hull", 0, "For your first Steam Machines")
+                .getStackForm(1L));
         ItemList.Hull_Bronze_Bricks.set(
-            new GT_MetaTileEntity_BasicHull_BronzeBricks(
+            new MTEBasicHullBronzeBricks(
                 HULL_BRICKED_BRONZE.ID,
                 "hull.bronze_bricked",
                 "Bricked Bronze Hull",
                 0,
                 "For your first Steam Machines").getStackForm(1L));
         ItemList.Hull_HP.set(
-            new GT_MetaTileEntity_BasicHull_Steel(
-                HULL_STEEL.ID,
-                "hull.steel",
-                "Steel Hull",
-                0,
-                "For improved Steam Machines").getStackForm(1L));
+            new MTEBasicHullSteel(HULL_STEEL.ID, "hull.steel", "Steel Hull", 0, "For improved Steam Machines")
+                .getStackForm(1L));
         ItemList.Hull_HP_Bricks.set(
-            new GT_MetaTileEntity_BasicHull_SteelBricks(
+            new MTEBasicHullSteelBricks(
                 HULL_WROUGHT_IRON.ID,
                 "hull.steel_bricked",
                 "Bricked Wrought Iron Hull",
                 0,
                 "For improved Steam Machines").getStackForm(1L));
 
-        ItemList.Hull_ULV.set(
-            new GT_MetaTileEntity_BasicHull(HULL_ULV.ID, "hull.tier.00", "ULV Machine Hull", 0, imagination)
-                .getStackForm(1L));
-        ItemList.Hull_LV.set(
-            new GT_MetaTileEntity_BasicHull(HULL_LV.ID, "hull.tier.01", "LV Machine Hull", 1, imagination)
-                .getStackForm(1L));
-        ItemList.Hull_MV.set(
-            new GT_MetaTileEntity_BasicHull(HULL_MV.ID, "hull.tier.02", "MV Machine Hull", 2, imagination)
-                .getStackForm(1L));
-        ItemList.Hull_HV.set(
-            new GT_MetaTileEntity_BasicHull(HULL_HV.ID, "hull.tier.03", "HV Machine Hull", 3, imagination)
-                .getStackForm(1L));
-        ItemList.Hull_EV.set(
-            new GT_MetaTileEntity_BasicHull(HULL_EV.ID, "hull.tier.04", "EV Machine Hull", 4, imagination)
-                .getStackForm(1L));
-        ItemList.Hull_IV.set(
-            new GT_MetaTileEntity_BasicHull(HULL_IV.ID, "hull.tier.05", "IV Machine Hull", 5, imagination)
-                .getStackForm(1L));
-        ItemList.Hull_LuV.set(
-            new GT_MetaTileEntity_BasicHull(HULL_LuV.ID, "hull.tier.06", "LuV Machine Hull", 6, imagination)
-                .getStackForm(1L));
-        ItemList.Hull_ZPM.set(
-            new GT_MetaTileEntity_BasicHull(HULL_ZPM.ID, "hull.tier.07", "ZPM Machine Hull", 7, imagination)
-                .getStackForm(1L));
-        ItemList.Hull_UV.set(
-            new GT_MetaTileEntity_BasicHull(HULL_UV.ID, "hull.tier.08", "UV Machine Hull", 8, imagination)
-                .getStackForm(1L));
-        ItemList.Hull_MAX.set(
-            new GT_MetaTileEntity_BasicHull(HULL_UHV.ID, "hull.tier.09", "UHV Machine Hull", 9, imagination)
-                .getStackForm(1L));
+        ItemList.Hull_ULV
+            .set(new MTEBasicHull(HULL_ULV.ID, "hull.tier.00", "ULV Machine Hull", 0, imagination).getStackForm(1L));
+        ItemList.Hull_LV
+            .set(new MTEBasicHull(HULL_LV.ID, "hull.tier.01", "LV Machine Hull", 1, imagination).getStackForm(1L));
+        ItemList.Hull_MV
+            .set(new MTEBasicHull(HULL_MV.ID, "hull.tier.02", "MV Machine Hull", 2, imagination).getStackForm(1L));
+        ItemList.Hull_HV
+            .set(new MTEBasicHull(HULL_HV.ID, "hull.tier.03", "HV Machine Hull", 3, imagination).getStackForm(1L));
+        ItemList.Hull_EV
+            .set(new MTEBasicHull(HULL_EV.ID, "hull.tier.04", "EV Machine Hull", 4, imagination).getStackForm(1L));
+        ItemList.Hull_IV
+            .set(new MTEBasicHull(HULL_IV.ID, "hull.tier.05", "IV Machine Hull", 5, imagination).getStackForm(1L));
+        ItemList.Hull_LuV
+            .set(new MTEBasicHull(HULL_LuV.ID, "hull.tier.06", "LuV Machine Hull", 6, imagination).getStackForm(1L));
+        ItemList.Hull_ZPM
+            .set(new MTEBasicHull(HULL_ZPM.ID, "hull.tier.07", "ZPM Machine Hull", 7, imagination).getStackForm(1L));
+        ItemList.Hull_UV
+            .set(new MTEBasicHull(HULL_UV.ID, "hull.tier.08", "UV Machine Hull", 8, imagination).getStackForm(1L));
+        ItemList.Hull_MAX
+            .set(new MTEBasicHull(HULL_UHV.ID, "hull.tier.09", "UHV Machine Hull", 9, imagination).getStackForm(1L));
 
         ItemList.Hull_UEV.set(
-            new GT_MetaTileEntity_BasicHull(
-                HULL_UEV.ID,
-                "hull.tier.10",
-                "UEV Machine Hull",
-                10,
-                GT_Loader_MetaTileEntities.imagination).getStackForm(1L));
+            new MTEBasicHull(HULL_UEV.ID, "hull.tier.10", "UEV Machine Hull", 10, LoaderMetaTileEntities.imagination)
+                .getStackForm(1L));
 
         ItemList.Hull_UIV.set(
-            new GT_MetaTileEntity_BasicHull(
-                HULL_UIV.ID,
-                "hull.tier.11",
-                "UIV Machine Hull",
-                11,
-                GT_Loader_MetaTileEntities.imagination).getStackForm(1L));
+            new MTEBasicHull(HULL_UIV.ID, "hull.tier.11", "UIV Machine Hull", 11, LoaderMetaTileEntities.imagination)
+                .getStackForm(1L));
 
         ItemList.Hull_UMV.set(
-            new GT_MetaTileEntity_BasicHull(
-                HULL_UMV.ID,
-                "hull.tier.12",
-                "UMV Machine Hull",
-                12,
-                GT_Loader_MetaTileEntities.imagination).getStackForm(1L));
+            new MTEBasicHull(HULL_UMV.ID, "hull.tier.12", "UMV Machine Hull", 12, LoaderMetaTileEntities.imagination)
+                .getStackForm(1L));
 
         ItemList.Hull_UXV.set(
-            new GT_MetaTileEntity_BasicHull(
-                HULL_UXV.ID,
-                "hull.tier.13",
-                "UXV Machine Hull",
-                13,
-                GT_Loader_MetaTileEntities.imagination).getStackForm(1L));
+            new MTEBasicHull(HULL_UXV.ID, "hull.tier.13", "UXV Machine Hull", 13, LoaderMetaTileEntities.imagination)
+                .getStackForm(1L));
 
         ItemList.Hull_MAXV.set(
-            new GT_MetaTileEntity_BasicHull(
-                HULL_MAX.ID,
-                "hull.tier.14",
-                "MAX Machine Hull",
-                14,
-                GT_Loader_MetaTileEntities.imagination).getStackForm(1L));
+            new MTEBasicHull(HULL_MAX.ID, "hull.tier.14", "MAX Machine Hull", 14, LoaderMetaTileEntities.imagination)
+                .getStackForm(1L));
     }
 
     private static void registerTransformer() {
         ItemList.Transformer_LV_ULV.set(
-            new GT_MetaTileEntity_Transformer(
+            new MTETransformer(
                 transformer_LV_ULV.ID,
                 "transformer.tier.00",
                 "Ultra Low Voltage Transformer",
                 0,
                 "LV -> ULV (Use Soft Mallet to invert)").getStackForm(1L));
         ItemList.Transformer_MV_LV.set(
-            new GT_MetaTileEntity_Transformer(
+            new MTETransformer(
                 transformer_MV_LV.ID,
                 "transformer.tier.01",
                 "Low Voltage Transformer",
                 1,
                 "MV -> LV (Use Soft Mallet to invert)").getStackForm(1L));
         ItemList.Transformer_HV_MV.set(
-            new GT_MetaTileEntity_Transformer(
+            new MTETransformer(
                 transformer_HV_MV.ID,
                 "transformer.tier.02",
                 "Medium Voltage Transformer",
                 2,
                 "HV -> MV (Use Soft Mallet to invert)").getStackForm(1L));
         ItemList.Transformer_EV_HV.set(
-            new GT_MetaTileEntity_Transformer(
+            new MTETransformer(
                 transformer_EV_HV.ID,
                 "transformer.tier.03",
                 "High Voltage Transformer",
                 3,
                 "EV -> HV (Use Soft Mallet to invert)").getStackForm(1L));
         ItemList.Transformer_IV_EV.set(
-            new GT_MetaTileEntity_Transformer(
+            new MTETransformer(
                 transformer_IV_EV.ID,
                 "transformer.tier.04",
                 "Extreme Transformer",
                 4,
                 "IV -> EV (Use Soft Mallet to invert)").getStackForm(1L));
         ItemList.Transformer_LuV_IV.set(
-            new GT_MetaTileEntity_Transformer(
+            new MTETransformer(
                 transformer_LuV_IV.ID,
                 "transformer.tier.05",
                 "Insane Transformer",
                 5,
                 "LuV -> IV (Use Soft Mallet to invert)").getStackForm(1L));
         ItemList.Transformer_ZPM_LuV.set(
-            new GT_MetaTileEntity_Transformer(
+            new MTETransformer(
                 transformer_ZPM_LuV.ID,
                 "transformer.tier.06",
                 "Ludicrous Transformer",
                 6,
                 "ZPM -> LuV (Use Soft Mallet to invert)").getStackForm(1L));
         ItemList.Transformer_UV_ZPM.set(
-            new GT_MetaTileEntity_Transformer(
+            new MTETransformer(
                 transformer_UV_ZPM.ID,
                 "transformer.tier.07",
                 "ZPM Voltage Transformer",
                 7,
                 "UV -> ZPM (Use Soft Mallet to invert)").getStackForm(1L));
         ItemList.Transformer_MAX_UV.set(
-            new GT_MetaTileEntity_Transformer(
+            new MTETransformer(
                 transformer_UHV_UV.ID,
                 "transformer.tier.08",
                 "Ultimate Transformer",
                 8,
                 "UHV -> UV (Use Soft Mallet to invert)").getStackForm(1L));
         ItemList.Transformer_UEV_UHV.set(
-            new GT_MetaTileEntity_Transformer(
+            new MTETransformer(
                 TRANSFORMER_UEV_UHV.ID,
                 "transformer.tier.09",
                 "Highly Ultimate Transformer",
@@ -3668,7 +3321,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "UEV -> UHV (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.Transformer_UIV_UEV.set(
-            new GT_MetaTileEntity_Transformer(
+            new MTETransformer(
                 TRANSFORMER_UIV_UEV.ID,
                 "transformer.tier.10",
                 "Extremely Ultimate Transformer",
@@ -3676,7 +3329,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "UIV -> UEV (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.Transformer_UMV_UIV.set(
-            new GT_MetaTileEntity_Transformer(
+            new MTETransformer(
                 TRANSFORMER_UMV_UIV.ID,
                 "transformer.tier.11",
                 "Insanely Ultimate Transformer",
@@ -3684,7 +3337,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "UMV -> UIV (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.Transformer_UXV_UMV.set(
-            new GT_MetaTileEntity_Transformer(
+            new MTETransformer(
                 TRANSFORMER_UXV_UMV.ID,
                 "transformer.tier.12",
                 "Mega Ultimate Transformer",
@@ -3692,7 +3345,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "UXV -> UMV (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.Transformer_MAX_UXV.set(
-            new GT_MetaTileEntity_Transformer(
+            new MTETransformer(
                 TRANSFORMER_MAX_UXV.ID,
                 "transformer.tier.13",
                 "Extended Mega Ultimate Transformer",
@@ -3702,7 +3355,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerChemicalBath() {
         ItemList.Machine_LV_ChemicalBath.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_BATH_LV.ID,
                 "basicmachine.chemicalbath.tier.01",
                 "Basic Chemical Bath",
@@ -3713,12 +3366,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_BATH",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_ChemicalBath.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_BATH_MV.ID,
                 "basicmachine.chemicalbath.tier.02",
                 "Advanced Chemical Bath",
@@ -3729,12 +3382,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_BATH",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_ChemicalBath.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_BATH_HV.ID,
                 "basicmachine.chemicalbath.tier.03",
                 "Advanced Chemical Bath II",
@@ -3745,12 +3398,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_BATH",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_ChemicalBath.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_BATH_EV.ID,
                 "basicmachine.chemicalbath.tier.04",
                 "Advanced Chemical Bath III",
@@ -3761,12 +3414,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_BATH",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_ChemicalBath.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_BATH_IV.ID,
                 "basicmachine.chemicalbath.tier.05",
                 "Advanced Chemical Bath IV",
@@ -3777,12 +3430,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_BATH",
                 null).getStackForm(1L));
 
         ItemList.ChemicalBathLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_BATH_LuV.ID,
                 "basicmachine.chemicalbath.tier.06",
                 "Elite Chemical Bath",
@@ -3793,12 +3446,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_BATH",
                 null).getStackForm(1L));
 
         ItemList.ChemicalBathZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_BATH_ZPM.ID,
                 "basicmachine.chemicalbath.tier.07",
                 "Elite Chemical Bath II",
@@ -3809,12 +3462,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_BATH",
                 null).getStackForm(1L));
 
         ItemList.ChemicalBathUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_BATH_UV.ID,
                 "basicmachine.chemicalbath.tier.08",
                 "Ultimate Chemical Dunktron",
@@ -3825,12 +3478,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_BATH",
                 null).getStackForm(1L));
 
         ItemList.ChemicalBathUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_BATH_UHV.ID,
                 "basicmachine.chemicalbath.tier.09",
                 "Epic Chemical Dunktron",
@@ -3841,12 +3494,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_BATH",
                 null).getStackForm(1L));
 
         ItemList.ChemicalBathUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_BATH_UEV.ID,
                 "basicmachine.chemicalbath.tier.10",
                 "Epic Chemical Dunktron II",
@@ -3857,12 +3510,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_BATH",
                 null).getStackForm(1L));
 
         ItemList.ChemicalBathUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_BATH_UIV.ID,
                 "basicmachine.chemicalbath.tier.11",
                 "Epic Chemical Dunktron III",
@@ -3873,12 +3526,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_BATH",
                 null).getStackForm(1L));
 
         ItemList.ChemicalBathUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_BATH_UMV.ID,
                 "basicmachine.chemicalbath.tier.12",
                 "Epic Chemical Dunktron IV",
@@ -3889,14 +3542,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_BATH",
                 null).getStackForm(1L));
     }
 
     private void registerChemicalReactor() {
         ItemList.Machine_LV_ChemicalReactor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_REACTOR_LV.ID,
                 "basicmachine.chemicalreactor.tier.01",
                 "Basic Chemical Reactor",
@@ -3907,12 +3560,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_REACTOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_ChemicalReactor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_REACTOR_MV.ID,
                 "basicmachine.chemicalreactor.tier.02",
                 "Advanced Chemical Reactor",
@@ -3923,12 +3576,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_REACTOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_ChemicalReactor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_REACTOR_HV.ID,
                 "basicmachine.chemicalreactor.tier.03",
                 "Advanced Chemical Reactor II",
@@ -3939,12 +3592,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_REACTOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_ChemicalReactor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_REACTOR_EV.ID,
                 "basicmachine.chemicalreactor.tier.04",
                 "Advanced Chemical Reactor III",
@@ -3955,12 +3608,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_REACTOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_ChemicalReactor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_REACTOR_IV.ID,
                 "basicmachine.chemicalreactor.tier.05",
                 "Advanced Chemical Reactor IV",
@@ -3971,12 +3624,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_REACTOR",
                 null).getStackForm(1L));
 
         ItemList.ChemicalReactorLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_REACTOR_LuV.ID,
                 "basicmachine.chemicalreactor.tier.06",
                 "Elite Chemical Reactor",
@@ -3987,12 +3640,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_REACTOR",
                 null).getStackForm(1L));
 
         ItemList.ChemicalReactorZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_REACTOR_ZPM.ID,
                 "basicmachine.chemicalreactor.tier.07",
                 "Elite Chemical Reactor II",
@@ -4003,12 +3656,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_REACTOR",
                 null).getStackForm(1L));
 
         ItemList.ChemicalReactorUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_REACTOR_UV.ID,
                 "basicmachine.chemicalreactor.tier.08",
                 "Ultimate Chemical Perforer",
@@ -4019,12 +3672,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_REACTOR",
                 null).getStackForm(1L));
 
         ItemList.ChemicalReactorUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_REACTOR_UHV.ID,
                 "basicmachine.chemicalreactor.tier.09",
                 "Epic Chemical Performer",
@@ -4035,12 +3688,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_REACTOR",
                 null).getStackForm(1L));
 
         ItemList.ChemicalReactorUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_REACTOR_UEV.ID,
                 "basicmachine.chemicalreactor.tier.10",
                 "Epic Chemical Performer II",
@@ -4051,12 +3704,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_REACTOR",
                 null).getStackForm(1L));
 
         ItemList.ChemicalReactorUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_REACTOR_UIV.ID,
                 "basicmachine.chemicalreactor.tier.11",
                 "Epic Chemical Performer III",
@@ -4067,12 +3720,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_REACTOR",
                 null).getStackForm(1L));
 
         ItemList.ChemicalReactorUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CHEMICAL_REACTOR_UMV.ID,
                 "basicmachine.chemicalreactor.tier.12",
                 "Epic Chemical Performer IV",
@@ -4083,7 +3736,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CHEMICAL_REACTOR",
                 null).getStackForm(1L));
 
@@ -4091,7 +3744,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerFermenter() {
         ItemList.Machine_LV_Fermenter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FERMENTER_LV.ID,
                 "basicmachine.fermenter.tier.01",
                 "Basic Fermenter",
@@ -4102,12 +3755,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FERMENTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Fermenter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FERMENTER_MV.ID,
                 "basicmachine.fermenter.tier.02",
                 "Advanced Fermenter",
@@ -4118,12 +3771,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FERMENTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Fermenter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FERMENTER_HV.ID,
                 "basicmachine.fermenter.tier.03",
                 "Advanced Fermenter II",
@@ -4134,12 +3787,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FERMENTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Fermenter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FERMENTER_EV.ID,
                 "basicmachine.fermenter.tier.04",
                 "Advanced Fermenter III",
@@ -4150,12 +3803,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FERMENTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Fermenter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FERMENTER_IV.ID,
                 "basicmachine.fermenter.tier.05",
                 "Advanced Fermenter IV",
@@ -4166,12 +3819,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FERMENTER",
                 null).getStackForm(1L));
 
         ItemList.FermenterLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FERMENTER_LuV.ID,
                 "basicmachine.fermenter.tier.06",
                 "Elite Fermenter",
@@ -4182,12 +3835,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FERMENTER",
                 null).getStackForm(1L));
 
         ItemList.FermenterZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FERMENTER_ZPM.ID,
                 "basicmachine.fermenter.tier.07",
                 "Elite Fermenter II",
@@ -4198,12 +3851,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FERMENTER",
                 null).getStackForm(1L));
 
         ItemList.FermenterUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FERMENTER_UV.ID,
                 "basicmachine.fermenter.tier.08",
                 "Ultimate Fermentation Hastener",
@@ -4214,12 +3867,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FERMENTER",
                 null).getStackForm(1L));
 
         ItemList.FermenterUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FERMENTER_UHV.ID,
                 "basicmachine.fermenter.tier.09",
                 "Epic Fermentation Hastener",
@@ -4230,12 +3883,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FERMENTER",
                 null).getStackForm(1L));
 
         ItemList.FermenterUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FERMENTER_UEV.ID,
                 "basicmachine.fermenter.tier.10",
                 "Epic Fermentation Hastener II",
@@ -4246,12 +3899,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FERMENTER",
                 null).getStackForm(1L));
 
         ItemList.FermenterUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FERMENTER_UIV.ID,
                 "basicmachine.fermenter.tier.11",
                 "Epic Fermentation Hastener III",
@@ -4262,12 +3915,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FERMENTER",
                 null).getStackForm(1L));
 
         ItemList.FermenterUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FERMENTER_UMV.ID,
                 "basicmachine.fermenter.tier.12",
                 "Epic Fermentation Hastener IV",
@@ -4278,14 +3931,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FERMENTER",
                 null).getStackForm(1L));
     }
 
     private void registerFluidCanner() {
         ItemList.Machine_LV_FluidCanner.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_CANNER_LV.ID,
                 "basicmachine.fluidcanner.tier.01",
                 "Basic Fluid Canner",
@@ -4296,12 +3949,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_CANNER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_FluidCanner.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_CANNER_MV.ID,
                 "basicmachine.fluidcanner.tier.02",
                 "Advanced Fluid Canner",
@@ -4312,12 +3965,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_CANNER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_FluidCanner.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_CANNER_HV.ID,
                 "basicmachine.fluidcanner.tier.03",
                 "Quick Fluid Canner",
@@ -4328,12 +3981,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_CANNER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_FluidCanner.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_CANNER_EV.ID,
                 "basicmachine.fluidcanner.tier.04",
                 "Turbo Fluid Canner",
@@ -4344,12 +3997,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_CANNER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_FluidCanner.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_CANNER_IV.ID,
                 "basicmachine.fluidcanner.tier.05",
                 "Instant Fluid Canner",
@@ -4360,12 +4013,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_CANNER",
                 null).getStackForm(1L));
 
         ItemList.FluidCannerLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_CANNER_LuV.ID,
                 "basicmachine.fluidcanner.tier.06",
                 "Elite Fluid Canner",
@@ -4376,12 +4029,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_CANNER",
                 null).getStackForm(1L));
 
         ItemList.FluidCannerZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_CANNER_ZPM.ID,
                 "basicmachine.fluidcanner.tier.07",
                 "Elite Fluid Canner II",
@@ -4392,12 +4045,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_CANNER",
                 null).getStackForm(1L));
 
         ItemList.FluidCannerUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_CANNER_UV.ID,
                 "basicmachine.fluidcanner.tier.08",
                 "Ultimate Liquid Can Actuator",
@@ -4408,12 +4061,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_CANNER",
                 null).getStackForm(1L));
 
         ItemList.FluidCannerUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_CANNER_UHV.ID,
                 "basicmachine.fluidcanner.tier.09",
                 "Epic Liquid Can Actuator",
@@ -4424,12 +4077,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_CANNER",
                 null).getStackForm(1L));
 
         ItemList.FluidCannerUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_CANNER_UEV.ID,
                 "basicmachine.fluidcanner.tier.10",
                 "Epic Liquid Can Actuator II",
@@ -4440,12 +4093,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_CANNER",
                 null).getStackForm(1L));
 
         ItemList.FluidCannerUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_CANNER_UIV.ID,
                 "basicmachine.fluidcanner.tier.11",
                 "Epic Liquid Can Actuator III",
@@ -4456,12 +4109,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_CANNER",
                 null).getStackForm(1L));
 
         ItemList.FluidCannerUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_CANNER_UMV.ID,
                 "basicmachine.fluidcanner.tier.12",
                 "Epic Liquid Can Actuator IV",
@@ -4472,14 +4125,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_CANNER",
                 null).getStackForm(1L));
     }
 
     private void registerFluidExtractor() {
         ItemList.Machine_LV_FluidExtractor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_EXTRACTOR_LV.ID,
                 "basicmachine.fluidextractor.tier.01",
                 "Basic Fluid Extractor",
@@ -4490,12 +4143,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_FluidExtractor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_EXTRACTOR_MV.ID,
                 "basicmachine.fluidextractor.tier.02",
                 "Advanced Fluid Extractor",
@@ -4506,12 +4159,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_FluidExtractor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_EXTRACTOR_HV.ID,
                 "basicmachine.fluidextractor.tier.03",
                 "Advanced Fluid Extractor II",
@@ -4522,12 +4175,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_FluidExtractor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_EXTRACTOR_EV.ID,
                 "basicmachine.fluidextractor.tier.04",
                 "Advanced Fluid Extractor III",
@@ -4538,12 +4191,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_FluidExtractor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_EXTRACTOR_IV.ID,
                 "basicmachine.fluidextractor.tier.05",
                 "Advanced Fluid Extractor IV",
@@ -4554,12 +4207,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.FluidExtractorLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_EXTRACTOR_LuV.ID,
                 "basicmachine.fluidextractor.tier.06",
                 "Elite Fluid Extractor",
@@ -4570,12 +4223,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.FluidExtractorZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_EXTRACTOR_ZPM.ID,
                 "basicmachine.fluidextractor.tier.07",
                 "Elite Fluid Extractor II",
@@ -4586,12 +4239,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.FluidExtractorUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_EXTRACTOR_UV.ID,
                 "basicmachine.fluidextractor.tier.08",
                 "Ultimate Liquefying Sucker",
@@ -4602,12 +4255,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.FluidExtractorUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_EXTRACTOR_UHV.ID,
                 "basicmachine.fluidextractor.tier.09",
                 "Epic Liquefying Sucker",
@@ -4618,12 +4271,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.FluidExtractorUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_EXTRACTOR_UEV.ID,
                 "basicmachine.fluidextractor.tier.10",
                 "Epic Liquefying Sucker II",
@@ -4634,12 +4287,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.FluidExtractorUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_EXTRACTOR_UIV.ID,
                 "basicmachine.fluidextractor.tier.11",
                 "Epic Liquefying Sucker III",
@@ -4650,12 +4303,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.FluidExtractorUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_EXTRACTOR_UMV.ID,
                 "basicmachine.fluidextractor.tier.12",
                 "Epic Liquefying Sucker IV",
@@ -4666,14 +4319,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_EXTRACTOR",
                 null).getStackForm(1L));
     }
 
     private void registerFluidHeater() {
         ItemList.Machine_LV_FluidHeater.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_HEATER_LV.ID,
                 "basicmachine.fluidheater.tier.01",
                 "Basic Fluid Heater",
@@ -4684,12 +4337,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 0,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_HEATER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_FluidHeater.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_HEATER_MV.ID,
                 "basicmachine.fluidheater.tier.02",
                 "Advanced Fluid Heater",
@@ -4700,12 +4353,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 0,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_HEATER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_FluidHeater.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_HEATER_HV.ID,
                 "basicmachine.fluidheater.tier.03",
                 "Advanced Fluid Heater II",
@@ -4716,12 +4369,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 0,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_HEATER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_FluidHeater.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_HEATER_EV.ID,
                 "basicmachine.fluidheater.tier.04",
                 "Advanced Fluid Heater III",
@@ -4732,12 +4385,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 0,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_HEATER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_FluidHeater.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_HEATER_IV.ID,
                 "basicmachine.fluidheater.tier.05",
                 "Advanced Fluid Heater IV",
@@ -4748,12 +4401,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 0,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_HEATER",
                 null).getStackForm(1L));
 
         ItemList.FluidHeaterLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_HEATER_LuV.ID,
                 "basicmachine.fluidheater.tier.06",
                 "Elite Fluid Heater",
@@ -4764,12 +4417,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 0,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_HEATER",
                 null).getStackForm(1L));
 
         ItemList.FluidHeaterZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_HEATER_ZPM.ID,
                 "basicmachine.fluidheater.tier.07",
                 "Elite Fluid Heater II",
@@ -4780,12 +4433,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 0,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_HEATER",
                 null).getStackForm(1L));
 
         ItemList.FluidHeaterUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_HEATER_UV.ID,
                 "basicmachine.fluidheater.tier.08",
                 "Ultimate Heat Infuser",
@@ -4796,12 +4449,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 0,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_HEATER",
                 null).getStackForm(1L));
 
         ItemList.FluidHeaterUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_HEATER_UHV.ID,
                 "basicmachine.fluidheater.tier.09",
                 "Epic Heat Infuser",
@@ -4812,12 +4465,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 0,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_HEATER",
                 null).getStackForm(1L));
 
         ItemList.FluidHeaterUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_HEATER_UEV.ID,
                 "basicmachine.fluidheater.tier.10",
                 "Epic Heat Infuser II",
@@ -4828,12 +4481,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 0,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_HEATER",
                 null).getStackForm(1L));
 
         ItemList.FluidHeaterUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_HEATER_UIV.ID,
                 "basicmachine.fluidheater.tier.11",
                 "Epic Heat Infuser III",
@@ -4844,12 +4497,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 0,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_HEATER",
                 null).getStackForm(1L));
 
         ItemList.FluidHeaterUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_HEATER_UMV.ID,
                 "basicmachine.fluidheater.tier.12",
                 "Epic Heat Infuser IV",
@@ -4860,14 +4513,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 0,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_HEATER",
                 null).getStackForm(1L));
     }
 
     private void registerMixer() {
         ItemList.Machine_LV_Mixer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MIXER_LV.ID,
                 "basicmachine.mixer.tier.01",
                 "Basic Mixer",
@@ -4878,12 +4531,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MIXER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Mixer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MIXER_MV.ID,
                 "basicmachine.mixer.tier.02",
                 "Advanced Mixer",
@@ -4894,12 +4547,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MIXER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Mixer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MIXER_HV.ID,
                 "basicmachine.mixer.tier.03",
                 "Advanced Mixer II",
@@ -4910,12 +4563,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MIXER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Mixer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MIXER_EV.ID,
                 "basicmachine.mixer.tier.04",
                 "Advanced Mixer III",
@@ -4926,12 +4579,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MIXER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Mixer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MIXER_IV.ID,
                 "basicmachine.mixer.tier.05",
                 "Advanced Mixer IV",
@@ -4942,12 +4595,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MIXER",
                 null).getStackForm(1L));
 
         ItemList.MixerLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MIXER_LuV.ID,
                 "basicmachine.mixer.tier.06",
                 "Elite Mixer",
@@ -4958,12 +4611,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MIXER",
                 null).getStackForm(1L));
 
         ItemList.MixerZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MIXER_ZPM.ID,
                 "basicmachine.mixer.tier.07",
                 "Elite Mixer II",
@@ -4974,12 +4627,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MIXER",
                 null).getStackForm(1L));
 
         ItemList.MixerUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MIXER_UV.ID,
                 "basicmachine.mixer.tier.08",
                 "Ultimate Matter Organizer",
@@ -4990,12 +4643,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MIXER",
                 null).getStackForm(1L));
 
         ItemList.MixerUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MIXER_UHV.ID,
                 "basicmachine.mixer.tier.09",
                 "Epic Matter Organizer",
@@ -5006,12 +4659,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MIXER",
                 null).getStackForm(1L));
 
         ItemList.MixerUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MIXER_UEV.ID,
                 "basicmachine.mixer.tier.10",
                 "Epic Matter Organizer II",
@@ -5022,12 +4675,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MIXER",
                 null).getStackForm(1L));
 
         ItemList.MixerUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MIXER_UIV.ID,
                 "basicmachine.mixer.tier.11",
                 "Epic Matter Organizer III",
@@ -5038,12 +4691,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MIXER",
                 null).getStackForm(1L));
 
         ItemList.MixerUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MIXER_UMV.ID,
                 "basicmachine.mixer.tier.12",
                 "Epic Matter Organizer IV",
@@ -5054,14 +4707,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MIXER",
                 null).getStackForm(1L));
     }
 
     private void registerAutoclave() {
         ItemList.Machine_LV_Autoclave.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 AUTOCLAVE_LV.ID,
                 "basicmachine.autoclave.tier.01",
                 "Basic Autoclave",
@@ -5072,12 +4725,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AUTOCLAVE",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Autoclave.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 AUTOCLAVE_MV.ID,
                 "basicmachine.autoclave.tier.02",
                 "Advanced Autoclave",
@@ -5088,12 +4741,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AUTOCLAVE",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Autoclave.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 AUTOCLAVE_HV.ID,
                 "basicmachine.autoclave.tier.03",
                 "Advanced Autoclave II",
@@ -5104,12 +4757,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AUTOCLAVE",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Autoclave.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 AUTOCLAVE_EV.ID,
                 "basicmachine.autoclave.tier.04",
                 "Advanced Autoclave III",
@@ -5120,12 +4773,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AUTOCLAVE",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Autoclave.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 AUTOCLAVE_IV.ID,
                 "basicmachine.autoclave.tier.05",
                 "Advanced Autoclave IV",
@@ -5136,12 +4789,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AUTOCLAVE",
                 null).getStackForm(1L));
 
         ItemList.AutoclaveLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 AUTOCLAVE_LuV.ID,
                 "basicmachine.autoclave.tier.06",
                 "Elite Autoclave",
@@ -5152,12 +4805,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AUTOCLAVE",
                 null).getStackForm(1L));
 
         ItemList.AutoclaveZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 AUTOCLAVE_ZPM.ID,
                 "basicmachine.autoclave.tier.07",
                 "Elite Autoclave II",
@@ -5168,12 +4821,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AUTOCLAVE",
                 null).getStackForm(1L));
 
         ItemList.AutoclaveUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 AUTOCLAVE_UV.ID,
                 "basicmachine.autoclave.tier.08",
                 "Ultimate Pressure Cooker",
@@ -5184,12 +4837,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AUTOCLAVE",
                 null).getStackForm(1L));
 
         ItemList.AutoclaveUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 AUTOCLAVE_UHV.ID,
                 "basicmachine.autoclave.tier.09",
                 "Epic Pressure Cooker",
@@ -5200,12 +4853,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AUTOCLAVE",
                 null).getStackForm(1L));
 
         ItemList.AutoclaveUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 AUTOCLAVE_UEV.ID,
                 "basicmachine.autoclave.tier.10",
                 "Epic Pressure Cooker II",
@@ -5216,12 +4869,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AUTOCLAVE",
                 null).getStackForm(1L));
 
         ItemList.AutoclaveUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 AUTOCLAVE_UIV.ID,
                 "basicmachine.autoclave.tier.11",
                 "Epic Pressure Cooker III",
@@ -5232,12 +4885,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AUTOCLAVE",
                 null).getStackForm(1L));
 
         ItemList.AutoclaveUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 AUTOCLAVE_UMV.ID,
                 "basicmachine.autoclave.tier.12",
                 "Epic Pressure Cooker IV",
@@ -5248,7 +4901,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "AUTOCLAVE",
                 null).getStackForm(1L));
 
@@ -5256,7 +4909,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerBendingMachine() {
         ItemList.Machine_LV_Bender.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 BENDING_MACHINE_LV.ID,
                 "basicmachine.bender.tier.01",
                 "Basic Bending Machine",
@@ -5267,12 +4920,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "BENDER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Bender.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 BENDING_MACHINE_MV.ID,
                 "basicmachine.bender.tier.02",
                 "Advanced Bending Machine",
@@ -5283,12 +4936,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "BENDER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Bender.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 BENDING_MACHINE_HV.ID,
                 "basicmachine.bender.tier.03",
                 "Advanced Bending Machine II",
@@ -5299,12 +4952,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "BENDER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Bender.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 BENDING_MACHINE_EV.ID,
                 "basicmachine.bender.tier.04",
                 "Advanced Bending Machine III",
@@ -5315,12 +4968,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "BENDER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Bender.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 BENDING_MACHINE_IV.ID,
                 "basicmachine.bender.tier.05",
                 "Advanced Bending Machine IV",
@@ -5331,12 +4984,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "BENDER",
                 null).getStackForm(1L));
 
         ItemList.BendingMachineLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 BENDING_MACHINE_LuV.ID,
                 "basicmachine.bender.tier.06",
                 "Elite Bending Machine",
@@ -5347,12 +5000,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "BENDER",
                 null).getStackForm(1L));
 
         ItemList.BendingMachineZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 BENDING_MACHINE_ZPM.ID,
                 "basicmachine.bender.tier.07",
                 "Elite Bending Machine II",
@@ -5363,12 +5016,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "BENDER",
                 null).getStackForm(1L));
 
         ItemList.BendingMachineUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 BENDING_MACHINE_UV.ID,
                 "basicmachine.bender.tier.08",
                 "Ultimate Bending Unit",
@@ -5379,12 +5032,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "BENDER",
                 null).getStackForm(1L));
 
         ItemList.BendingMachineUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 BENDING_MACHINE_UHV.ID,
                 "basicmachine.bender.tier.09",
                 "Epic Bending Unit",
@@ -5395,12 +5048,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "BENDER",
                 null).getStackForm(1L));
 
         ItemList.BendingMachineUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 BENDING_MACHINE_UEV.ID,
                 "basicmachine.bender.tier.10",
                 "Epic Bending Unit II",
@@ -5411,12 +5064,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "BENDER",
                 null).getStackForm(1L));
 
         ItemList.BendingMachineUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 BENDING_MACHINE_UIV.ID,
                 "basicmachine.bender.tier.11",
                 "Epic Bending Unit III",
@@ -5427,12 +5080,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "BENDER",
                 null).getStackForm(1L));
 
         ItemList.BendingMachineUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 BENDING_MACHINE_UMV.ID,
                 "basicmachine.bender.tier.12",
                 "Epic Bending Unit IV",
@@ -5443,14 +5096,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "BENDER",
                 null).getStackForm(1L));
     }
 
     private void registerCompressor() {
         ItemList.Machine_LV_Compressor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 COMPRESSOR_LV.ID,
                 "basicmachine.compressor.tier.01",
                 "Basic Compressor",
@@ -5461,12 +5114,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "COMPRESSOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Compressor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 COMPRESSOR_MV.ID,
                 "basicmachine.compressor.tier.02",
                 "Advanced Compressor",
@@ -5477,12 +5130,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "COMPRESSOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Compressor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 COMPRESSOR_HV.ID,
                 "basicmachine.compressor.tier.03",
                 "Advanced Compressor II",
@@ -5493,12 +5146,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "COMPRESSOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Compressor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 COMPRESSOR_EV.ID,
                 "basicmachine.compressor.tier.04",
                 "Advanced Compressor III",
@@ -5509,12 +5162,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "COMPRESSOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Compressor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 COMPRESSOR_IV.ID,
                 "basicmachine.compressor.tier.05",
                 "Singularity Compressor",
@@ -5525,12 +5178,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "COMPRESSOR",
                 null).getStackForm(1L));
 
         ItemList.CompressorLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 COMPRESSOR_LuV.ID,
                 "basicmachine.compressor.tier.06",
                 "Elite Compressor",
@@ -5541,12 +5194,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "COMPRESSOR",
                 null).getStackForm(1L));
 
         ItemList.CompressorZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 COMPRESSOR_ZPM.ID,
                 "basicmachine.compressor.tier.07",
                 "Elite Compressor II",
@@ -5557,12 +5210,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "COMPRESSOR",
                 null).getStackForm(1L));
 
         ItemList.CompressorUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 COMPRESSOR_UV.ID,
                 "basicmachine.compressor.tier.08",
                 "Ultimate Matter Constrictor",
@@ -5573,12 +5226,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "COMPRESSOR",
                 null).getStackForm(1L));
 
         ItemList.CompressorUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 COMPRESSOR_UHV.ID,
                 "basicmachine.compressor.tier.09",
                 "Epic Matter Constrictor",
@@ -5589,12 +5242,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "COMPRESSOR",
                 null).getStackForm(1L));
 
         ItemList.CompressorUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 COMPRESSOR_UEV.ID,
                 "basicmachine.compressor.tier.10",
                 "Epic Matter Constrictor II",
@@ -5605,12 +5258,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "COMPRESSOR",
                 null).getStackForm(1L));
 
         ItemList.CompressorUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 COMPRESSOR_UIV.ID,
                 "basicmachine.compressor.tier.11",
                 "Epic Matter Constrictor III",
@@ -5621,12 +5274,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "COMPRESSOR",
                 null).getStackForm(1L));
 
         ItemList.CompressorUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 COMPRESSOR_UMV.ID,
                 "basicmachine.compressor.tier.12",
                 "Epic Matter Constrictor IV",
@@ -5637,7 +5290,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "COMPRESSOR",
                 null).getStackForm(1L));
 
@@ -5645,7 +5298,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerCuttingMachine() {
         ItemList.Machine_LV_Cutter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CUTTING_MACHINE_LV.ID,
                 "basicmachine.cutter.tier.01",
                 "Basic Cutting Machine",
@@ -5656,12 +5309,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CUTTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Cutter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CUTTING_MACHINE_MV.ID,
                 "basicmachine.cutter.tier.02",
                 "Advanced Cutting Machine",
@@ -5672,12 +5325,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CUTTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Cutter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CUTTING_MACHINE_HV.ID,
                 "basicmachine.cutter.tier.03",
                 "Advanced Cutting Machine II",
@@ -5688,12 +5341,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CUTTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Cutter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CUTTING_MACHINE_EV.ID,
                 "basicmachine.cutter.tier.04",
                 "Advanced Cutting Machine III",
@@ -5704,12 +5357,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CUTTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Cutter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CUTTING_MACHINE_IV.ID,
                 "basicmachine.cutter.tier.05",
                 "Advanced Cutting Machine IV",
@@ -5720,12 +5373,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CUTTER",
                 null).getStackForm(1L));
 
         ItemList.CuttingMachineLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CUTTING_MACHINE_LuV.ID,
                 "basicmachine.cutter.tier.06",
                 "Elite Cutting Machine",
@@ -5736,12 +5389,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CUTTER",
                 null).getStackForm(1L));
 
         ItemList.CuttingMachineZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CUTTING_MACHINE_ZPM.ID,
                 "basicmachine.cutter.tier.07",
                 "Elite Cutting Machine II",
@@ -5752,12 +5405,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CUTTER",
                 null).getStackForm(1L));
 
         ItemList.CuttingMachineUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CUTTING_MACHINE_UV.ID,
                 "basicmachine.cutter.tier.08",
                 "Ultimate Object Divider",
@@ -5768,12 +5421,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CUTTER",
                 null).getStackForm(1L));
 
         ItemList.CuttingMachineUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CUTTING_MACHINE_UHV.ID,
                 "basicmachine.cutter.tier.09",
                 "Epic Object Divider",
@@ -5784,12 +5437,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CUTTER",
                 null).getStackForm(1L));
 
         ItemList.CuttingMachineUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CUTTING_MACHINE_UEV.ID,
                 "basicmachine.cutter.tier.10",
                 "Epic Object Divider II",
@@ -5800,12 +5453,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CUTTER",
                 null).getStackForm(1L));
 
         ItemList.CuttingMachineUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CUTTING_MACHINE_UIV.ID,
                 "basicmachine.cutter.tier.11",
                 "Epic Object Divider III",
@@ -5816,12 +5469,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CUTTER",
                 null).getStackForm(1L));
 
         ItemList.CuttingMachineUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CUTTING_MACHINE_UMV.ID,
                 "basicmachine.cutter.tier.12",
                 "Epic Object Divider IV",
@@ -5832,7 +5485,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CUTTER",
                 null).getStackForm(1L));
 
@@ -5840,7 +5493,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerDistillery() {
         ItemList.Machine_LV_Distillery.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 DISTILLERY_LV.ID,
                 "basicmachine.distillery.tier.01",
                 "Basic Distillery",
@@ -5851,12 +5504,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.GT_MACHINES_DISTILLERY_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "DISTILLERY",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Distillery.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 DISTILLERY_MV.ID,
                 "basicmachine.distillery.tier.02",
                 "Advanced Distillery",
@@ -5867,12 +5520,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.GT_MACHINES_DISTILLERY_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "DISTILLERY",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Distillery.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 DISTILLERY_HV.ID,
                 "basicmachine.distillery.tier.03",
                 "Advanced Distillery II",
@@ -5883,12 +5536,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.GT_MACHINES_DISTILLERY_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "DISTILLERY",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Distillery.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 DISTILLERY_EV.ID,
                 "basicmachine.distillery.tier.04",
                 "Advanced Distillery III",
@@ -5899,12 +5552,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.GT_MACHINES_DISTILLERY_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "DISTILLERY",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Distillery.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 DISTILLERY_IV.ID,
                 "basicmachine.distillery.tier.05",
                 "Advanced Distillery IV",
@@ -5915,12 +5568,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.GT_MACHINES_DISTILLERY_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "DISTILLERY",
                 null).getStackForm(1L));
 
         ItemList.DistilleryLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 DISTILLERY_LuV.ID,
                 "basicmachine.distillery.tier.06",
                 "Elite Distillery",
@@ -5931,12 +5584,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "DISTILLERY",
                 null).getStackForm(1L));
 
         ItemList.DistilleryZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 DISTILLERY_ZPM.ID,
                 "basicmachine.distillery.tier.07",
                 "Elite Distillery II",
@@ -5947,12 +5600,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "DISTILLERY",
                 null).getStackForm(1L));
 
         ItemList.DistilleryUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 DISTILLERY_UV.ID,
                 "basicmachine.distillery.tier.08",
                 "Ultimate Fraction Splitter",
@@ -5963,12 +5616,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "DISTILLERY",
                 null).getStackForm(1L));
 
         ItemList.DistilleryUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 DISTILLERY_UHV.ID,
                 "basicmachine.distillery.tier.09",
                 "Epic Fraction Splitter",
@@ -5979,12 +5632,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "DISTILLERY",
                 null).getStackForm(1L));
 
         ItemList.DistilleryUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 DISTILLERY_UEV.ID,
                 "basicmachine.distillery.tier.10",
                 "Epic Fraction Splitter II",
@@ -5995,12 +5648,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "DISTILLERY",
                 null).getStackForm(1L));
 
         ItemList.DistilleryUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 DISTILLERY_UIV.ID,
                 "basicmachine.distillery.tier.11",
                 "Epic Fraction Splitter III",
@@ -6011,12 +5664,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "DISTILLERY",
                 null).getStackForm(1L));
 
         ItemList.DistilleryUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 DISTILLERY_UMV.ID,
                 "basicmachine.distillery.tier.12",
                 "Epic Fraction Splitter IV",
@@ -6027,7 +5680,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "DISTILLERY",
                 null).getStackForm(1L));
 
@@ -6035,7 +5688,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerElectricFurnace() {
         ItemList.Machine_LV_E_Furnace.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTRIC_FURNACE_LV.ID,
                 "basicmachine.e_furnace.tier.01",
                 "Basic Electric Furnace",
@@ -6046,13 +5699,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_FURNACE",
                 null).setProgressBarTextureName("E_Furnace")
                     .getStackForm(1L));
 
         ItemList.Machine_MV_E_Furnace.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTRIC_FURNACE_MV.ID,
                 "basicmachine.e_furnace.tier.02",
                 "Advanced Electric Furnace",
@@ -6063,13 +5716,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_FURNACE",
                 null).setProgressBarTextureName("E_Furnace")
                     .getStackForm(1L));
 
         ItemList.Machine_HV_E_Furnace.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTRIC_FURNACE_HV.ID,
                 "basicmachine.e_furnace.tier.03",
                 "Advanced Electric Furnace II",
@@ -6080,13 +5733,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_FURNACE",
                 null).setProgressBarTextureName("E_Furnace")
                     .getStackForm(1L));
 
         ItemList.Machine_EV_E_Furnace.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTRIC_FURNACE_EV.ID,
                 "basicmachine.e_furnace.tier.04",
                 "Advanced Electric Furnace III",
@@ -6097,13 +5750,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_FURNACE",
                 null).setProgressBarTextureName("E_Furnace")
                     .getStackForm(1L));
 
         ItemList.Machine_IV_E_Furnace.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTRIC_FURNACE_IV.ID,
                 "basicmachine.e_furnace.tier.05",
                 "Electron Exitement Processor",
@@ -6114,13 +5767,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_FURNACE",
                 null).setProgressBarTextureName("E_Furnace")
                     .getStackForm(1L));
 
         ItemList.ElectricFurnaceLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTRIC_FURNACE_LuV.ID,
                 "basicmachine.e_furnace.tier.06",
                 "Elite Electric Furnace",
@@ -6131,12 +5784,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.ElectricFurnaceZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTRIC_FURNACE_ZPM.ID,
                 "basicmachine.e_furnace.tier.07",
                 "Elite Electric Furnace II",
@@ -6147,12 +5800,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.ElectricFurnaceUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTRIC_FURNACE_UV.ID,
                 "basicmachine.e_furnace.tier.08",
                 "Ultimate Atom Stimulator",
@@ -6163,12 +5816,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.ElectricFurnaceUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTRIC_FURNACE_UHV.ID,
                 "basicmachine.e_furnace.tier.09",
                 "Epic Atom Stimulator",
@@ -6179,12 +5832,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.ElectricFurnaceUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTRIC_FURNACE_UEV.ID,
                 "basicmachine.e_furnace.tier.10",
                 "Epic Atom Stimulator II",
@@ -6195,12 +5848,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.ElectricFurnaceUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTRIC_FURNACE_UIV.ID,
                 "basicmachine.e_furnace.tier.11",
                 "Epic Atom Stimulator III",
@@ -6211,12 +5864,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.ElectricFurnaceUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTRIC_FURNACE_UMV.ID,
                 "basicmachine.e_furnace.tier.12",
                 "Epic Atom Stimulator IV",
@@ -6227,14 +5880,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_FURNACE",
                 null).getStackForm(1L));
     }
 
     private void registerElectrolyzer() {
         ItemList.Machine_LV_Electrolyzer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROLYSER_LV.ID,
                 "basicmachine.electrolyzer.tier.01",
                 "Basic Electrolyzer",
@@ -6245,12 +5898,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROLYZER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Electrolyzer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROLYSER_MV.ID,
                 "basicmachine.electrolyzer.tier.02",
                 "Advanced Electrolyzer",
@@ -6261,12 +5914,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROLYZER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Electrolyzer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROLYSER_HV.ID,
                 "basicmachine.electrolyzer.tier.03",
                 "Advanced Electrolyzer II",
@@ -6277,12 +5930,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROLYZER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Electrolyzer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROLYSER_EV.ID,
                 "basicmachine.electrolyzer.tier.04",
                 "Advanced Electrolyzer III",
@@ -6293,12 +5946,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROLYZER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Electrolyzer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROLYSER_IV.ID,
                 "basicmachine.electrolyzer.tier.05",
                 "Molecular Disintegrator E-4908",
@@ -6309,12 +5962,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROLYZER",
                 null).getStackForm(1L));
 
         ItemList.ElectrolyzerLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROLYZER_LuV.ID,
                 "basicmachine.electrolyzer.tier.06",
                 "Elite Electrolyzer",
@@ -6325,12 +5978,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROLYZER",
                 null).getStackForm(1L));
 
         ItemList.ElectrolyzerZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROLYZER_ZPM.ID,
                 "basicmachine.electrolyzer.tier.07",
                 "Elite Electrolyzer II",
@@ -6341,12 +5994,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROLYZER",
                 null).getStackForm(1L));
 
         ItemList.ElectrolyzerUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROLYZER_UV.ID,
                 "basicmachine.electrolyzer.tier.08",
                 "Ultimate Ionizer",
@@ -6357,12 +6010,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROLYZER",
                 null).getStackForm(1L));
 
         ItemList.ElectrolyzerUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROLYZER_UHV.ID,
                 "basicmachine.electrolyzer.tier.09",
                 "Epic Ionizer",
@@ -6373,12 +6026,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROLYZER",
                 null).getStackForm(1L));
 
         ItemList.ElectrolyzerUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROLYZER_UEV.ID,
                 "basicmachine.electrolyzer.tier.10",
                 "Epic Ionizer II",
@@ -6389,12 +6042,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROLYZER",
                 null).getStackForm(1L));
 
         ItemList.ElectrolyzerUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROLYZER_UIV.ID,
                 "basicmachine.electrolyzer.tier.11",
                 "Epic Ionizer III",
@@ -6405,12 +6058,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROLYZER",
                 null).getStackForm(1L));
 
         ItemList.ElectrolyzerUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROLYZER_UMV.ID,
                 "basicmachine.electrolyzer.tier.12",
                 "Epic Ionizer IV",
@@ -6421,7 +6074,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROLYZER",
                 null).getStackForm(1L));
 
@@ -6429,7 +6082,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerElectromagneticSeparator() {
         ItemList.Machine_LV_ElectromagneticSeparator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROMAGNETIC_SEPARATOR_LV.ID,
                 "basicmachine.electromagneticseparator.tier.01",
                 "Basic Electromagnetic Separator",
@@ -6440,12 +6093,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROMAGNETIC_SEPARATOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_ElectromagneticSeparator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROMAGNETIC_SEPARATOR_MV.ID,
                 "basicmachine.electromagneticseparator.tier.02",
                 "Advanced Electromagnetic Separator",
@@ -6456,12 +6109,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROMAGNETIC_SEPARATOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_ElectromagneticSeparator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROMAGNETIC_SEPARATOR_HV.ID,
                 "basicmachine.electromagneticseparator.tier.03",
                 "Advanced Electromagnetic Separator II",
@@ -6472,12 +6125,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROMAGNETIC_SEPARATOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_ElectromagneticSeparator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROMAGNETIC_SEPARATOR_EV.ID,
                 "basicmachine.electromagneticseparator.tier.04",
                 "Advanced Electromagnetic Separator III",
@@ -6488,12 +6141,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROMAGNETIC_SEPARATOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_ElectromagneticSeparator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROMAGNETIC_SEPARATOR_IV.ID,
                 "basicmachine.electromagneticseparator.tier.05",
                 "Advanced Electromagnetic Separator IV",
@@ -6504,12 +6157,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROMAGNETIC_SEPARATOR",
                 null).getStackForm(1L));
 
         ItemList.ElectromagneticSeparatorLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROMAGNETIC_SEPARATOR_LuV.ID,
                 "basicmachine.electromagneticseparator.tier.06",
                 "Elite Electromagnetic Separator",
@@ -6520,12 +6173,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROMAGNETIC_SEPARATOR",
                 null).getStackForm(1L));
 
         ItemList.ElectromagneticSeparatorZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROMAGNETIC_SEPARATOR_ZPM.ID,
                 "basicmachine.electromagneticseparator.tier.07",
                 "Elite Electromagnetic Separator II",
@@ -6536,12 +6189,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROMAGNETIC_SEPARATOR",
                 null).getStackForm(1L));
 
         ItemList.ElectromagneticSeparatorUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROMAGNETIC_SEPARATOR_UV.ID,
                 "basicmachine.electromagneticseparator.tier.08",
                 "Ultimate Magnetar Separator",
@@ -6552,12 +6205,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROMAGNETIC_SEPARATOR",
                 null).getStackForm(1L));
 
         ItemList.ElectromagneticSeparatorUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROMAGNETIC_SEPARATOR_UHV.ID,
                 "basicmachine.electromagneticseparator.tier.09",
                 "Epic Magnetar Separator",
@@ -6568,12 +6221,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROMAGNETIC_SEPARATOR",
                 null).getStackForm(1L));
 
         ItemList.ElectromagneticSeparatorUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROMAGNETIC_SEPARATOR_UEV.ID,
                 "basicmachine.electromagneticseparator.tier.10",
                 "Epic Magnetar Separator II",
@@ -6584,12 +6237,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROMAGNETIC_SEPARATOR",
                 null).getStackForm(1L));
 
         ItemList.ElectromagneticSeparatorUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROMAGNETIC_SEPARATOR_UIV.ID,
                 "basicmachine.electromagneticseparator.tier.11",
                 "Epic Magnetar Separator III",
@@ -6600,12 +6253,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROMAGNETIC_SEPARATOR",
                 null).getStackForm(1L));
 
         ItemList.ElectromagneticSeparatorUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ELECTROMAGNETIC_SEPARATOR_UMV.ID,
                 "basicmachine.electromagneticseparator.tier.12",
                 "Epic Magnetar Separator IV",
@@ -6616,7 +6269,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTROMAGNETIC_SEPARATOR",
                 null).getStackForm(1L));
 
@@ -6624,7 +6277,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerExtractor() {
         ItemList.Machine_LV_Extractor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRACTOR_LV.ID,
                 "basicmachine.extractor.tier.01",
                 "Basic Extractor",
@@ -6635,12 +6288,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Extractor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRACTOR_MV.ID,
                 "basicmachine.extractor.tier.02",
                 "Advanced Extractor",
@@ -6651,12 +6304,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Extractor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRACTOR_HV.ID,
                 "basicmachine.extractor.tier.03",
                 "Advanced Extractor II",
@@ -6667,12 +6320,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Extractor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRACTOR_EV.ID,
                 "basicmachine.extractor.tier.04",
                 "Advanced Extractor III",
@@ -6683,12 +6336,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Extractor.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRACTOR_IV.ID,
                 "basicmachine.extractor.tier.05",
                 "Vacuum Extractor",
@@ -6699,12 +6352,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.ExtractorLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRACTOR_LuV.ID,
                 "basicmachine.extractor.tier.06",
                 "Elite Extractor",
@@ -6715,12 +6368,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.ExtractorZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRACTOR_ZPM.ID,
                 "basicmachine.extractor.tier.07",
                 "Elite Extractor II",
@@ -6731,12 +6384,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.ExtractorUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRACTOR_UV.ID,
                 "basicmachine.extractor.tier.08",
                 "Ultimate Extractinator",
@@ -6747,12 +6400,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.ExtractorUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRACTOR_UHV.ID,
                 "basicmachine.extractor.tier.09",
                 "Epic Extractinator",
@@ -6763,12 +6416,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.ExtractorUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRACTOR_UEV.ID,
                 "basicmachine.extractor.tier.10",
                 "Epic Extractinator II",
@@ -6779,12 +6432,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.ExtractorUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRACTOR_UIV.ID,
                 "basicmachine.extractor.tier.11",
                 "Epic Extractinator III",
@@ -6795,12 +6448,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRACTOR",
                 null).getStackForm(1L));
 
         ItemList.ExtractorUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRACTOR_UMV.ID,
                 "basicmachine.extractor.tier.12",
                 "Epic Extractinator IV",
@@ -6811,7 +6464,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRACTOR",
                 null).getStackForm(1L));
 
@@ -6819,7 +6472,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerExtruder() {
         ItemList.Machine_LV_Extruder.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRUDER_LV.ID,
                 "basicmachine.extruder.tier.01",
                 "Basic Extruder",
@@ -6830,12 +6483,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRUDER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Extruder.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRUDER_MV.ID,
                 "basicmachine.extruder.tier.02",
                 "Advanced Extruder",
@@ -6846,12 +6499,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRUDER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Extruder.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRUDER_HV.ID,
                 "basicmachine.extruder.tier.03",
                 "Advanced Extruder II",
@@ -6862,12 +6515,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRUDER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Extruder.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRUDER_EV.ID,
                 "basicmachine.extruder.tier.04",
                 "Advanced Extruder III",
@@ -6878,12 +6531,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRUDER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Extruder.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRUDER_IV.ID,
                 "basicmachine.extruder.tier.05",
                 "Advanced Extruder IV",
@@ -6894,12 +6547,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRUDER",
                 null).getStackForm(1L));
 
         ItemList.ExtruderLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRUDER_LuV.ID,
                 "basicmachine.extruder.tier.06",
                 "Elite Extruder",
@@ -6910,12 +6563,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRUDER",
                 null).getStackForm(1L));
 
         ItemList.ExtruderZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRUDER_ZPM.ID,
                 "basicmachine.extruder.tier.07",
                 "Elite Extruder II",
@@ -6926,12 +6579,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRUDER",
                 null).getStackForm(1L));
 
         ItemList.ExtruderUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRUDER_UV.ID,
                 "basicmachine.extruder.tier.08",
                 "Ultimate Shape Driver",
@@ -6942,12 +6595,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRUDER",
                 null).getStackForm(1L));
 
         ItemList.ExtruderUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRUDER_UHV.ID,
                 "basicmachine.extruder.tier.09",
                 "Epic Shape Driver",
@@ -6958,12 +6611,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRUDER",
                 null).getStackForm(1L));
 
         ItemList.ExtruderUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRUDER_UEV.ID,
                 "basicmachine.extruder.tier.10",
                 "Epic Shape Driver II",
@@ -6974,12 +6627,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRUDER",
                 null).getStackForm(1L));
 
         ItemList.ExtruderUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRUDER_UIV.ID,
                 "basicmachine.extruder.tier.11",
                 "Epic Shape Driver III",
@@ -6990,12 +6643,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRUDER",
                 null).getStackForm(1L));
 
         ItemList.ExtruderUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 EXTRUDER_UMV.ID,
                 "basicmachine.extruder.tier.12",
                 "Epic Shape Driver IV",
@@ -7006,7 +6659,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "EXTRUDER",
                 null).getStackForm(1L));
 
@@ -7014,7 +6667,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerFluidSolidifier() {
         ItemList.Machine_LV_FluidSolidifier.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_SOLIDIFIER_LV.ID,
                 "basicmachine.fluidsolidifier.tier.01",
                 "Basic Fluid Solidifier",
@@ -7025,12 +6678,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_SOLIDIFIER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_FluidSolidifier.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_SOLIDIFIER_MV.ID,
                 "basicmachine.fluidsolidifier.tier.02",
                 "Advanced Fluid Solidifier",
@@ -7041,12 +6694,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_SOLIDIFIER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_FluidSolidifier.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_SOLIDIFIER_HV.ID,
                 "basicmachine.fluidsolidifier.tier.03",
                 "Advanced Fluid Solidifier II",
@@ -7057,12 +6710,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_SOLIDIFIER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_FluidSolidifier.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_SOLIDIFIER_EV.ID,
                 "basicmachine.fluidsolidifier.tier.04",
                 "Advanced Fluid Solidifier III",
@@ -7073,12 +6726,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_SOLIDIFIER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_FluidSolidifier.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_SOLIDIFIER_IV.ID,
                 "basicmachine.fluidsolidifier.tier.05",
                 "Advanced Fluid Solidifier IV",
@@ -7089,12 +6742,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_SOLIDIFIER",
                 null).getStackForm(1L));
 
         ItemList.FluidSolidifierLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_SOLIDIFIER_LuV.ID,
                 "basicmachine.fluidsolidifier.tier.06",
                 "Elite Fluid Solidifier",
@@ -7105,12 +6758,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_SOLIDIFIER",
                 null).getStackForm(1L));
 
         ItemList.FluidSolidifierZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_SOLIDIFIER_ZPM.ID,
                 "basicmachine.fluidsolidifier.tier.07",
                 "Elite Fluid Solidifier II",
@@ -7121,12 +6774,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_SOLIDIFIER",
                 null).getStackForm(1L));
 
         ItemList.FluidSolidifierUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_SOLIDIFIER_UV.ID,
                 "basicmachine.fluidsolidifier.tier.08",
                 "Ultimate Fluid Petrificator",
@@ -7137,12 +6790,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_SOLIDIFIER",
                 null).getStackForm(1L));
 
         ItemList.FluidSolidifierUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_SOLIDIFIER_UHV.ID,
                 "basicmachine.fluidsolidifier.tier.09",
                 "Epic Fluid Petrificator",
@@ -7153,12 +6806,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_SOLIDIFIER",
                 null).getStackForm(1L));
 
         ItemList.FluidSolidifierUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_SOLIDIFIER_UEV.ID,
                 "basicmachine.fluidsolidifier.tier.10",
                 "Epic Fluid Petrificator II",
@@ -7169,12 +6822,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_SOLIDIFIER",
                 null).getStackForm(1L));
 
         ItemList.FluidSolidifierUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_SOLIDIFIER_UIV.ID,
                 "basicmachine.fluidsolidifier.tier.11",
                 "Epic Fluid Petrificator III",
@@ -7185,12 +6838,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_SOLIDIFIER",
                 null).getStackForm(1L));
 
         ItemList.FluidSolidifierUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FLUID_SOLIDIFIER_UMV.ID,
                 "basicmachine.fluidsolidifier.tier.12",
                 "Epic Fluid Petrificator IV",
@@ -7201,7 +6854,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "FLUID_SOLIDIFIER",
                 null).getStackForm(1L));
 
@@ -7209,7 +6862,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerFormingPress() {
         ItemList.Machine_LV_Press.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORMING_PRESS_LV.ID,
                 "basicmachine.press.tier.01",
                 "Basic Forming Press",
@@ -7220,12 +6873,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PRESS",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Press.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORMING_PRESS_MV.ID,
                 "basicmachine.press.tier.02",
                 "Advanced Forming Press",
@@ -7236,12 +6889,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PRESS",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Press.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORMING_PRESS_HV.ID,
                 "basicmachine.press.tier.03",
                 "Advanced Forming Press II",
@@ -7252,12 +6905,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PRESS",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Press.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORMING_PRESS_EV.ID,
                 "basicmachine.press.tier.04",
                 "Advanced Forming Press III",
@@ -7268,12 +6921,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PRESS",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Press.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORMING_PRESS_IV.ID,
                 "basicmachine.press.tier.05",
                 "Advanced Forming Press IV",
@@ -7284,12 +6937,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PRESS",
                 null).getStackForm(1L));
 
         ItemList.FormingPressLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORMING_PRESS_LuV.ID,
                 "basicmachine.press.tier.06",
                 "Elite Forming Press",
@@ -7300,12 +6953,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PRESS",
                 null).getStackForm(1L));
 
         ItemList.FormingPressZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORMING_PRESS_ZPM.ID,
                 "basicmachine.press.tier.07",
                 "Elite Forming Press II",
@@ -7316,12 +6969,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PRESS",
                 null).getStackForm(1L));
 
         ItemList.FormingPressUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORMING_PRESS_UV.ID,
                 "basicmachine.press.tier.08",
                 "Ultimate Surface Shifter",
@@ -7332,12 +6985,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PRESS",
                 null).getStackForm(1L));
 
         ItemList.FormingPressUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORMING_PRESS_UHV.ID,
                 "basicmachine.press.tier.09",
                 "Epic Surface Shifter",
@@ -7348,12 +7001,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PRESS",
                 null).getStackForm(1L));
 
         ItemList.FormingPressUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORMING_PRESS_UEV.ID,
                 "basicmachine.press.tier.10",
                 "Epic Surface Shifter II",
@@ -7364,12 +7017,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PRESS",
                 null).getStackForm(1L));
 
         ItemList.FormingPressUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORMING_PRESS_UIV.ID,
                 "basicmachine.press.tier.11",
                 "Epic Surface Shifter III",
@@ -7380,12 +7033,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PRESS",
                 null).getStackForm(1L));
 
         ItemList.FormingPressUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORMING_PRESS_UMV.ID,
                 "basicmachine.press.tier.12",
                 "Epic Surface Shifter IV",
@@ -7396,7 +7049,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PRESS",
                 null).getStackForm(1L));
 
@@ -7404,7 +7057,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerForgeHammer() {
         ItemList.Machine_LV_Hammer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORGE_HAMMER_LV.ID,
                 "basicmachine.hammer.tier.01",
                 "Basic Forge Hammer",
@@ -7415,12 +7068,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.RANDOM_ANVIL_USE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.MAIN_RANDOM_SPARKS,
+                MTEBasicMachineWithRecipe.SpecialEffects.MAIN_RANDOM_SPARKS,
                 "HAMMER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Hammer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORGE_HAMMER_MV.ID,
                 "basicmachine.hammer.tier.02",
                 "Advanced Forge Hammer",
@@ -7431,12 +7084,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.RANDOM_ANVIL_USE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.MAIN_RANDOM_SPARKS,
+                MTEBasicMachineWithRecipe.SpecialEffects.MAIN_RANDOM_SPARKS,
                 "HAMMER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Hammer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORGE_HAMMER_HV.ID,
                 "basicmachine.hammer.tier.03",
                 "Advanced Forge Hammer II",
@@ -7447,12 +7100,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.RANDOM_ANVIL_USE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.MAIN_RANDOM_SPARKS,
+                MTEBasicMachineWithRecipe.SpecialEffects.MAIN_RANDOM_SPARKS,
                 "HAMMER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Hammer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORGE_HAMMER_EV.ID,
                 "basicmachine.hammer.tier.04",
                 "Advanced Forge Hammer III",
@@ -7463,12 +7116,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.RANDOM_ANVIL_USE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.MAIN_RANDOM_SPARKS,
+                MTEBasicMachineWithRecipe.SpecialEffects.MAIN_RANDOM_SPARKS,
                 "HAMMER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Hammer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORGE_HAMMER_IV.ID,
                 "basicmachine.hammer.tier.05",
                 "Advanced Forge Hammer IV",
@@ -7479,12 +7132,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.RANDOM_ANVIL_USE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.MAIN_RANDOM_SPARKS,
+                MTEBasicMachineWithRecipe.SpecialEffects.MAIN_RANDOM_SPARKS,
                 "HAMMER",
                 null).getStackForm(1L));
 
         ItemList.ForgeHammerLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORGE_HAMMER_LuV.ID,
                 "basicmachine.hammer.tier.06",
                 "Elite Forge Hammer",
@@ -7495,12 +7148,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.RANDOM_ANVIL_USE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "HAMMER",
                 null).getStackForm(1L));
 
         ItemList.ForgeHammerZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORGE_HAMMER_ZPM.ID,
                 "basicmachine.hammer.tier.07",
                 "Elite Forge Hammer II",
@@ -7511,12 +7164,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.RANDOM_ANVIL_USE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "HAMMER",
                 null).getStackForm(1L));
 
         ItemList.ForgeHammerUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORGE_HAMMER_UV.ID,
                 "basicmachine.hammer.tier.08",
                 "Ultimate Impact Modulator",
@@ -7527,12 +7180,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.RANDOM_ANVIL_USE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "HAMMER",
                 null).getStackForm(1L));
 
         ItemList.ForgeHammerUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORGE_HAMMER_UHV.ID,
                 "basicmachine.hammer.tier.09",
                 "Epic Impact Modulator",
@@ -7543,12 +7196,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.RANDOM_ANVIL_USE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "HAMMER",
                 null).getStackForm(1L));
 
         ItemList.ForgeHammerUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORGE_HAMMER_UEV.ID,
                 "basicmachine.hammer.tier.10",
                 "Epic Impact Modulator II",
@@ -7559,12 +7212,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.RANDOM_ANVIL_USE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "HAMMER",
                 null).getStackForm(1L));
 
         ItemList.ForgeHammerUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORGE_HAMMER_UIV.ID,
                 "basicmachine.hammer.tier.11",
                 "Epic Impact Modulator III",
@@ -7575,12 +7228,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.RANDOM_ANVIL_USE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "HAMMER",
                 null).getStackForm(1L));
 
         ItemList.ForgeHammerUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 FORGE_HAMMER_UMV.ID,
                 "basicmachine.hammer.tier.12",
                 "Epic Impact Modulator IV",
@@ -7591,7 +7244,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.RANDOM_ANVIL_USE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "HAMMER",
                 null).getStackForm(1L));
 
@@ -7599,7 +7252,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerLathe() {
         ItemList.Machine_LV_Lathe.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LATHE_LV.ID,
                 "basicmachine.lathe.tier.01",
                 "Basic Lathe",
@@ -7610,12 +7263,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LATHE",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Lathe.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LATHE_MV.ID,
                 "basicmachine.lathe.tier.02",
                 "Advanced Lathe",
@@ -7626,12 +7279,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LATHE",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Lathe.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LATHE_HV.ID,
                 "basicmachine.lathe.tier.03",
                 "Advanced Lathe II",
@@ -7642,12 +7295,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LATHE",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Lathe.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LATHE_EV.ID,
                 "basicmachine.lathe.tier.04",
                 "Advanced Lathe III",
@@ -7658,12 +7311,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LATHE",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Lathe.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LATHE_IV.ID,
                 "basicmachine.lathe.tier.05",
                 "Advanced Lathe IV",
@@ -7674,12 +7327,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LATHE",
                 null).getStackForm(1L));
 
         ItemList.LatheLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LATHE_LuV.ID,
                 "basicmachine.lathe.tier.06",
                 "Elite Lathe",
@@ -7690,12 +7343,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LATHE",
                 null).getStackForm(1L));
 
         ItemList.LatheZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LATHE_ZPM.ID,
                 "basicmachine.lathe.tier.07",
                 "Elite Lathe II",
@@ -7706,12 +7359,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LATHE",
                 null).getStackForm(1L));
 
         ItemList.LatheUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LATHE_UV.ID,
                 "basicmachine.lathe.tier.08",
                 "Ultimate Turn-O-Matic",
@@ -7722,12 +7375,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LATHE",
                 null).getStackForm(1L));
 
         ItemList.LatheUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LATHE_UHV.ID,
                 "basicmachine.lathe.tier.09",
                 "Epic Turn-O-Matic",
@@ -7738,12 +7391,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LATHE",
                 null).getStackForm(1L));
 
         ItemList.LatheUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LATHE_UEV.ID,
                 "basicmachine.lathe.tier.10",
                 "Epic Turn-O-Matic II",
@@ -7754,12 +7407,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LATHE",
                 null).getStackForm(1L));
 
         ItemList.LatheUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LATHE_UIV.ID,
                 "basicmachine.lathe.tier.11",
                 "Epic Turn-O-Matic III",
@@ -7770,12 +7423,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LATHE",
                 null).getStackForm(1L));
 
         ItemList.LatheUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LATHE_UMV.ID,
                 "basicmachine.lathe.tier.12",
                 "Epic Turn-O-Matic IV",
@@ -7786,7 +7439,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LATHE",
                 null).getStackForm(1L));
 
@@ -7794,7 +7447,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerPrecisionLaserEngraver() {
         ItemList.Machine_LV_LaserEngraver.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LASER_ENGRAVER_LV.ID,
                 "basicmachine.laserengraver.tier.01",
                 "Basic Precision Laser Engraver",
@@ -7805,12 +7458,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LASER_ENGRAVER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_LaserEngraver.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LASER_ENGRAVER_MV.ID,
                 "basicmachine.laserengraver.tier.02",
                 "Advanced Precision Laser Engraver",
@@ -7821,12 +7474,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LASER_ENGRAVER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_LaserEngraver.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LASER_ENGRAVER_HV.ID,
                 "basicmachine.laserengraver.tier.03",
                 "Advanced Precision Laser Engraver II",
@@ -7837,12 +7490,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LASER_ENGRAVER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_LaserEngraver.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LASER_ENGRAVER_EV.ID,
                 "basicmachine.laserengraver.tier.04",
                 "Advanced Precision Laser Engraver III",
@@ -7853,12 +7506,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LASER_ENGRAVER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_LaserEngraver.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 LASER_ENGRAVER_IV.ID,
                 "basicmachine.laserengraver.tier.05",
                 "Advanced Precision Laser Engraver IV",
@@ -7869,12 +7522,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LASER_ENGRAVER",
                 null).getStackForm(1L));
 
         ItemList.PrecisionLaserEngraverLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PRECISION_LASER_ENGRAVER_LuV.ID,
                 "basicmachine.laserengraver.tier.06",
                 "Elite Precision Laser Engraver",
@@ -7885,12 +7538,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LASER_ENGRAVER",
                 null).getStackForm(1L));
 
         ItemList.PrecisionLaserEngraverZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PRECISION_LASER_ENGRAVER_ZPM.ID,
                 "basicmachine.laserengraver.tier.07",
                 "Elite Precision Laser Engraver II",
@@ -7901,12 +7554,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LASER_ENGRAVER",
                 null).getStackForm(1L));
 
         ItemList.PrecisionLaserEngraverUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PRECISION_LASER_ENGRAVER_UV.ID,
                 "basicmachine.laserengraver.tier.08",
                 "Ultimate Exact Photon Cannon",
@@ -7917,12 +7570,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LASER_ENGRAVER",
                 null).getStackForm(1L));
 
         ItemList.PrecisionLaserEngraverUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PRECISION_LASER_ENGRAVER_UHV.ID,
                 "basicmachine.laserengraver.tier.09",
                 "Epic Exact Photon Cannon",
@@ -7933,12 +7586,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LASER_ENGRAVER",
                 null).getStackForm(1L));
 
         ItemList.PrecisionLaserEngraverUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PRECISION_LASER_ENGRAVER_UEV.ID,
                 "basicmachine.laserengraver.tier.10",
                 "Epic Exact Photon Cannon II",
@@ -7949,12 +7602,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LASER_ENGRAVER",
                 null).getStackForm(1L));
 
         ItemList.PrecisionLaserEngraverUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PRECISION_LASER_ENGRAVER_UIV.ID,
                 "basicmachine.laserengraver.tier.11",
                 "Epic Exact Photon Cannon III",
@@ -7965,12 +7618,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LASER_ENGRAVER",
                 null).getStackForm(1L));
 
         ItemList.PrecisionLaserEngraverUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PRECISION_LASER_ENGRAVER_UMV.ID,
                 "basicmachine.laserengraver.tier.12",
                 "Epic Exact Photon Cannon IV",
@@ -7981,7 +7634,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "LASER_ENGRAVER",
                 null).getStackForm(1L));
 
@@ -7989,7 +7642,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerMacerator() {
         ItemList.Machine_LV_Macerator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MACERATOR_LV.ID,
                 "basicmachine.macerator.tier.01",
                 "Basic Macerator",
@@ -8000,12 +7653,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_MACERATOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "MACERATOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Macerator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MACERATOR_MV.ID,
                 "basicmachine.macerator.tier.02",
                 "Advanced Macerator",
@@ -8016,12 +7669,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_MACERATOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "MACERATOR",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Macerator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MACERATOR_HV.ID,
                 "basicmachine.macerator.tier.03",
                 "Universal Macerator",
@@ -8032,12 +7685,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.IC2_MACHINES_MACERATOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PULVERIZER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Macerator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MACERATOR_EV.ID,
                 "basicmachine.macerator.tier.04",
                 "Universal Pulverizer",
@@ -8048,12 +7701,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.IC2_MACHINES_MACERATOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PULVERIZER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Macerator.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MACERATOR_IV.ID,
                 "basicmachine.macerator.tier.05",
                 "Blend-O-Matic 9001",
@@ -8064,12 +7717,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 false,
                 SoundResource.IC2_MACHINES_MACERATOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PULVERIZER",
                 null).getStackForm(1L));
 
         ItemList.MaceratorLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MACERATOR_LuV.ID,
                 "basicmachine.macerator.tier.06",
                 "Elite Pulverizer",
@@ -8080,12 +7733,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 false,
                 SoundResource.IC2_MACHINES_MACERATOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PULVERIZER",
                 null).getStackForm(1L));
 
         ItemList.MaceratorZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MACERATOR_ZPM.ID,
                 "basicmachine.macerator.tier.07",
                 "Elite Pulverizer II",
@@ -8096,12 +7749,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 false,
                 SoundResource.IC2_MACHINES_MACERATOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PULVERIZER",
                 null).getStackForm(1L));
 
         ItemList.MaceratorUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MACERATOR_UV.ID,
                 "basicmachine.macerator.tier.08",
                 "Ultimate Shape Eliminator",
@@ -8112,12 +7765,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 false,
                 SoundResource.IC2_MACHINES_MACERATOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PULVERIZER",
                 null).getStackForm(1L));
 
         ItemList.MaceratorUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MACERATOR_UHV.ID,
                 "basicmachine.macerator.tier.09",
                 "Epic Shape Eliminator",
@@ -8128,12 +7781,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 false,
                 SoundResource.IC2_MACHINES_MACERATOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PULVERIZER",
                 null).getStackForm(1L));
 
         ItemList.MaceratorUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MACERATOR_UEV.ID,
                 "basicmachine.macerator.tier.10",
                 "Epic Shape Eliminator II",
@@ -8144,12 +7797,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 false,
                 SoundResource.IC2_MACHINES_MACERATOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PULVERIZER",
                 null).getStackForm(1L));
 
         ItemList.MaceratorUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MACERATOR_UIV.ID,
                 "basicmachine.macerator.tier.11",
                 "Epic Shape Eliminator III",
@@ -8160,12 +7813,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 false,
                 SoundResource.IC2_MACHINES_MACERATOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PULVERIZER",
                 null).getStackForm(1L));
 
         ItemList.MaceratorUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MACERATOR_UMV.ID,
                 "basicmachine.macerator.tier.12",
                 "Epic Shape Eliminator IV",
@@ -8176,7 +7829,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 false,
                 SoundResource.IC2_MACHINES_MACERATOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PULVERIZER",
                 null).getStackForm(1L));
 
@@ -8185,43 +7838,40 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
     private void registerMatterFabricator() {
 
         ItemList.MassFabricatorLuV.set(
-            new GT_MetaTileEntity_Massfabricator(
-                MATTER_FABRICATOR_LuV.ID,
-                "basicmachine.massfab.tier.06",
-                "Elite Mass Fabricator",
-                6).getStackForm(1L));
+            new MTEMassfabricator(MATTER_FABRICATOR_LuV.ID, "basicmachine.massfab.tier.06", "Elite Mass Fabricator", 6)
+                .getStackForm(1L));
         ItemList.MassFabricatorZPM.set(
-            new GT_MetaTileEntity_Massfabricator(
+            new MTEMassfabricator(
                 MATTER_FABRICATOR_ZPM.ID,
                 "basicmachine.massfab.tier.07",
                 "Elite Mass Fabricator II",
                 7).getStackForm(1L));
         ItemList.MassFabricatorUV.set(
-            new GT_MetaTileEntity_Massfabricator(
+            new MTEMassfabricator(
                 MATTER_FABRICATOR_UV.ID,
                 "basicmachine.massfab.tier.08",
                 "Ultimate Existence Initiator",
                 8).getStackForm(1L));
         ItemList.MassFabricatorUHV.set(
-            new GT_MetaTileEntity_Massfabricator(
+            new MTEMassfabricator(
                 MATTER_FABRICATOR_UHV.ID,
                 "basicmachine.massfab.tier.09",
                 "Epic Existence Initiator",
                 9).getStackForm(1L));
         ItemList.MassFabricatorUEV.set(
-            new GT_MetaTileEntity_Massfabricator(
+            new MTEMassfabricator(
                 MATTER_FABRICATOR_UEV.ID,
                 "basicmachine.massfab.tier.10",
                 "Epic Existence Initiator II",
                 10).getStackForm(1L));
         ItemList.MassFabricatorUIV.set(
-            new GT_MetaTileEntity_Massfabricator(
+            new MTEMassfabricator(
                 MATTER_FABRICATOR_UIV.ID,
                 "basicmachine.massfab.tier.11",
                 "Epic Existence Initiator III",
                 11).getStackForm(1L));
         ItemList.MassFabricatorUMV.set(
-            new GT_MetaTileEntity_Massfabricator(
+            new MTEMassfabricator(
                 MATTER_FABRICATOR_UMV.ID,
                 "basicmachine.massfab.tier.12",
                 "Epic Existence Initiator IV",
@@ -8230,7 +7880,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerMicrowave() {
         ItemList.Machine_LV_Microwave.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MICROWAVE_OVEN_LV.ID,
                 "basicmachine.microwave.tier.01",
                 "Basic Microwave",
@@ -8241,12 +7891,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MICROWAVE",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Microwave.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MICROWAVE_OVEN_MV.ID,
                 "basicmachine.microwave.tier.02",
                 "Advanced Microwave",
@@ -8257,12 +7907,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MICROWAVE",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Microwave.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MICROWAVE_OVEN_HV.ID,
                 "basicmachine.microwave.tier.03",
                 "Advanced Microwave II",
@@ -8273,12 +7923,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MICROWAVE",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Microwave.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MICROWAVE_OVEN_EV.ID,
                 "basicmachine.microwave.tier.04",
                 "Advanced Microwave III",
@@ -8289,12 +7939,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MICROWAVE",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Microwave.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MICROWAVE_OVEN_IV.ID,
                 "basicmachine.microwave.tier.05",
                 "Advanced Microwave IV",
@@ -8305,12 +7955,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MICROWAVE",
                 null).getStackForm(1L));
 
         ItemList.MicrowaveLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MICROWAVE_LuV.ID,
                 "basicmachine.microwave.tier.06",
                 "Elite Microwave",
@@ -8321,12 +7971,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MICROWAVE",
                 null).getStackForm(1L));
 
         ItemList.MicrowaveZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MICROWAVE_ZPM.ID,
                 "basicmachine.microwave.tier.07",
                 "Elite Microwave II",
@@ -8337,12 +7987,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MICROWAVE",
                 null).getStackForm(1L));
 
         ItemList.MicrowaveUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MICROWAVE_UV.ID,
                 "basicmachine.microwave.tier.08",
                 "Ultimate UFO Engine",
@@ -8353,12 +8003,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MICROWAVE",
                 null).getStackForm(1L));
 
         ItemList.MicrowaveUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MICROWAVE_UHV.ID,
                 "basicmachine.microwave.tier.09",
                 "Epic UFO Engine",
@@ -8369,12 +8019,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MICROWAVE",
                 null).getStackForm(1L));
 
         ItemList.MicrowaveUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MICROWAVE_UEV.ID,
                 "basicmachine.microwave.tier.10",
                 "Epic UFO Engine II",
@@ -8385,12 +8035,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MICROWAVE",
                 null).getStackForm(1L));
 
         ItemList.MicrowaveUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MICROWAVE_UIV.ID,
                 "basicmachine.microwave.tier.11",
                 "Epic UFO Engine III",
@@ -8401,12 +8051,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MICROWAVE",
                 null).getStackForm(1L));
 
         ItemList.MicrowaveUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 MICROWAVE_UMV.ID,
                 "basicmachine.microwave.tier.12",
                 "Epic UFO Engine IV",
@@ -8417,7 +8067,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "MICROWAVE",
                 null).getStackForm(1L));
 
@@ -8425,7 +8075,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerOven() {
         ItemList.Machine_LV_Oven.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 OVEN_LV.ID,
                 "basicmachine.e_oven.tier.01",
                 "Basic Electric Oven",
@@ -8436,13 +8086,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_OVEN",
                 null).setProgressBarTextureName("E_Oven")
                     .getStackForm(1L));
 
         ItemList.Machine_MV_Oven.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 OVEN_MV.ID,
                 "basicmachine.e_oven.tier.02",
                 "Advanced Electric Oven",
@@ -8453,13 +8103,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_OVEN",
                 null).setProgressBarTextureName("E_Oven")
                     .getStackForm(1L));
 
         ItemList.Machine_HV_Oven.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 OVEN_HV.ID,
                 "basicmachine.e_oven.tier.03",
                 "Advanced Electric Oven II",
@@ -8470,13 +8120,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_OVEN",
                 null).setProgressBarTextureName("E_Oven")
                     .getStackForm(1L));
 
         ItemList.Machine_EV_Oven.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 OVEN_EV.ID,
                 "basicmachine.e_oven.tier.04",
                 "Advanced Electric Oven III",
@@ -8487,13 +8137,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_OVEN",
                 null).setProgressBarTextureName("E_Oven")
                     .getStackForm(1L));
 
         ItemList.Machine_IV_Oven.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 OVEN_IV.ID,
                 "basicmachine.e_oven.tier.05",
                 "Advanced Electric Oven IV",
@@ -8504,7 +8154,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ELECTRIC_OVEN",
                 null).setProgressBarTextureName("E_Oven")
                     .getStackForm(1L));
@@ -8512,7 +8162,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerOreWashingPlant() {
         ItemList.Machine_LV_OreWasher.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ORE_WASHER_LV.ID,
                 "basicmachine.orewasher.tier.01",
                 "Basic Ore Washing Plant",
@@ -8523,12 +8173,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ORE_WASHER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_OreWasher.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ORE_WASHER_MV.ID,
                 "basicmachine.orewasher.tier.02",
                 "Advanced Ore Washing Plant",
@@ -8539,12 +8189,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ORE_WASHER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_OreWasher.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ORE_WASHER_HV.ID,
                 "basicmachine.orewasher.tier.03",
                 "Advanced Ore Washing Plant II",
@@ -8555,12 +8205,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ORE_WASHER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_OreWasher.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ORE_WASHER_EV.ID,
                 "basicmachine.orewasher.tier.04",
                 "Advanced Ore Washing Plant III",
@@ -8571,12 +8221,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ORE_WASHER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_OreWasher.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ORE_WASHER_IV.ID,
                 "basicmachine.orewasher.tier.05",
                 "Repurposed Laundry-Washer I-360",
@@ -8587,12 +8237,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ORE_WASHER",
                 null).getStackForm(1L));
 
         ItemList.OreWashingPlantLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ORE_WASHING_PLANT_LuV.ID,
                 "basicmachine.orewasher.tier.06",
                 "Elite Ore Washing Plant",
@@ -8603,12 +8253,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ORE_WASHER",
                 null).getStackForm(1L));
 
         ItemList.OreWashingPlantZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ORE_WASHING_PLANT_ZPM.ID,
                 "basicmachine.orewasher.tier.07",
                 "Elite Ore Washing Plant II",
@@ -8619,12 +8269,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ORE_WASHER",
                 null).getStackForm(1L));
 
         ItemList.OreWashingPlantUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ORE_WASHING_PLANT_UV.ID,
                 "basicmachine.orewasher.tier.08",
                 "Ultimate Ore Washing Machine",
@@ -8635,12 +8285,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ORE_WASHER",
                 null).getStackForm(1L));
 
         ItemList.OreWashingPlantUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ORE_WASHING_PLANT_UHV.ID,
                 "basicmachine.orewasher.tier.09",
                 "Epic Ore Washing Machine",
@@ -8651,12 +8301,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ORE_WASHER",
                 null).getStackForm(1L));
 
         ItemList.OreWashingPlantUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ORE_WASHING_PLANT_UEV.ID,
                 "basicmachine.orewasher.tier.10",
                 "Epic Ore Washing Machine II",
@@ -8667,12 +8317,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ORE_WASHER",
                 null).getStackForm(1L));
 
         ItemList.OreWashingPlantUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ORE_WASHING_PLANT_UIV.ID,
                 "basicmachine.orewasher.tier.11",
                 "Epic Ore Washing Machine III",
@@ -8683,12 +8333,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ORE_WASHER",
                 null).getStackForm(1L));
 
         ItemList.OreWashingPlantUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ORE_WASHING_PLANT_UMV.ID,
                 "basicmachine.orewasher.tier.12",
                 "Epic Ore Washing Machine IV",
@@ -8699,7 +8349,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ORE_WASHER",
                 null).getStackForm(1L));
 
@@ -8707,7 +8357,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerPolarizer() {
         ItemList.Machine_LV_Polarizer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 POLARIZER_LV.ID,
                 "basicmachine.polarizer.tier.01",
                 "Basic Polarizer",
@@ -8718,12 +8368,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "POLARIZER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Polarizer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 POLARIZER_MV.ID,
                 "basicmachine.polarizer.tier.02",
                 "Advanced Polarizer",
@@ -8734,12 +8384,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "POLARIZER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Polarizer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 POLARIZER_HV.ID,
                 "basicmachine.polarizer.tier.03",
                 "Advanced Polarizer II",
@@ -8750,12 +8400,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "POLARIZER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Polarizer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 POLARIZER_EV.ID,
                 "basicmachine.polarizer.tier.04",
                 "Advanced Polarizer III",
@@ -8766,12 +8416,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "POLARIZER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Polarizer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 POLARIZER_IV.ID,
                 "basicmachine.polarizer.tier.05",
                 "Advanced Polarizer IV",
@@ -8782,12 +8432,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "POLARIZER",
                 null).getStackForm(1L));
 
         ItemList.PolarizerLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 POLARIZER_LuV.ID,
                 "basicmachine.polarizer.tier.06",
                 "Elite Polarizer",
@@ -8798,12 +8448,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "POLARIZER",
                 null).getStackForm(1L));
 
         ItemList.PolarizerZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 POLARIZER_ZPM.ID,
                 "basicmachine.polarizer.tier.07",
                 "Elite Polarizer II",
@@ -8814,12 +8464,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "POLARIZER",
                 null).getStackForm(1L));
 
         ItemList.PolarizerUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 POLARIZER_UV.ID,
                 "basicmachine.polarizer.tier.08",
                 "Ultimate Magnetism Inducer",
@@ -8830,12 +8480,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "POLARIZER",
                 null).getStackForm(1L));
 
         ItemList.PolarizerUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 POLARIZER_UHV.ID,
                 "basicmachine.polarizer.tier.09",
                 "Epic Magnetism Inducer",
@@ -8846,12 +8496,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "POLARIZER",
                 null).getStackForm(1L));
 
         ItemList.PolarizerUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 POLARIZER_UEV.ID,
                 "basicmachine.polarizer.tier.10",
                 "Epic Magnetism Inducer II",
@@ -8862,12 +8512,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "POLARIZER",
                 null).getStackForm(1L));
 
         ItemList.PolarizerUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 POLARIZER_UIV.ID,
                 "basicmachine.polarizer.tier.11",
                 "Epic Magnetism Inducer III",
@@ -8878,12 +8528,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "POLARIZER",
                 null).getStackForm(1L));
 
         ItemList.PolarizerUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 POLARIZER_UMV.ID,
                 "basicmachine.polarizer.tier.12",
                 "Epic Magnetism Inducer IV",
@@ -8894,7 +8544,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_MAGNETIZER_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "POLARIZER",
                 null).getStackForm(1L));
 
@@ -8902,7 +8552,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerPrinter() {
         ItemList.Machine_LV_Printer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PRINTER_LV.ID,
                 "basicmachine.printer.tier.01",
                 "Basic Printer",
@@ -8913,12 +8563,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PRINTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Printer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PRINTER_MV.ID,
                 "basicmachine.printer.tier.02",
                 "Advanced Printer",
@@ -8929,12 +8579,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PRINTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Printer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PRINTER_HV.ID,
                 "basicmachine.printer.tier.03",
                 "Advanced Printer II",
@@ -8945,12 +8595,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PRINTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Printer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PRINTER_EV.ID,
                 "basicmachine.printer.tier.04",
                 "Advanced Printer III",
@@ -8961,12 +8611,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PRINTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Printer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PRINTER_IV.ID,
                 "basicmachine.printer.tier.05",
                 "Advanced Printer IV",
@@ -8977,12 +8627,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PRINTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_LuV_Printer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PRINTER_LuV.ID,
                 "basicmachine.printer.tier.06",
                 "Advanced Printer V",
@@ -8993,12 +8643,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PRINTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_ZPM_Printer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PRINTER_ZPM.ID,
                 "basicmachine.printer.tier.07",
                 "Advanced Printer VI",
@@ -9009,12 +8659,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PRINTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_UV_Printer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PRINTER_UV.ID,
                 "basicmachine.printer.tier.08",
                 "Advanced Printer VII",
@@ -9025,14 +8675,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.IC2_MACHINES_COMPRESSOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE,
+                MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE,
                 "PRINTER",
                 null).getStackForm(1L));
     }
 
     private void registerRecycler() {
         ItemList.Machine_LV_Recycler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 RECYCLER_LV.ID,
                 "basicmachine.recycler.tier.01",
                 "Basic Recycler",
@@ -9043,12 +8693,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "RECYCLER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Recycler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 RECYCLER_MV.ID,
                 "basicmachine.recycler.tier.02",
                 "Advanced Recycler",
@@ -9059,12 +8709,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "RECYCLER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Recycler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 RECYCLER_HV.ID,
                 "basicmachine.recycler.tier.03",
                 "Advanced Recycler II",
@@ -9075,12 +8725,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "RECYCLER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Recycler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 RECYCLER_EV.ID,
                 "basicmachine.recycler.tier.04",
                 "Advanced Recycler III",
@@ -9091,12 +8741,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "RECYCLER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Recycler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 RECYCLER_IV.ID,
                 "basicmachine.recycler.tier.05",
                 "The Oblitterator",
@@ -9107,12 +8757,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "RECYCLER",
                 null).getStackForm(1L));
 
         ItemList.RecyclerLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 RECYCLER_LuV.ID,
                 "basicmachine.recycler.tier.06",
                 "Elite Recycler",
@@ -9123,12 +8773,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "RECYCLER",
                 null).getStackForm(1L));
 
         ItemList.RecyclerZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 RECYCLER_ZPM.ID,
                 "basicmachine.recycler.tier.07",
                 "Elite Recycler II",
@@ -9139,12 +8789,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "RECYCLER",
                 null).getStackForm(1L));
 
         ItemList.RecyclerUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 RECYCLER_UV.ID,
                 "basicmachine.recycler.tier.08",
                 "Ultimate Scrap-O-Matic",
@@ -9155,12 +8805,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "RECYCLER",
                 null).getStackForm(1L));
 
         ItemList.RecyclerUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 RECYCLER_UHV.ID,
                 "basicmachine.recycler.tier.09",
                 "Epic Scrap-O-Matic",
@@ -9171,12 +8821,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "RECYCLER",
                 null).getStackForm(1L));
 
         ItemList.RecyclerUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 RECYCLER_UEV.ID,
                 "basicmachine.recycler.tier.10",
                 "Epic Scrap-O-Matic II",
@@ -9187,12 +8837,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "RECYCLER",
                 null).getStackForm(1L));
 
         ItemList.RecyclerUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 RECYCLER_UIV.ID,
                 "basicmachine.recycler.tier.11",
                 "Epic Scrap-O-Matic III",
@@ -9203,12 +8853,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "RECYCLER",
                 null).getStackForm(1L));
 
         ItemList.RecyclerUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 RECYCLER_UMV.ID,
                 "basicmachine.recycler.tier.12",
                 "Epic Scrap-O-Matic IV",
@@ -9219,7 +8869,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "RECYCLER",
                 null).getStackForm(1L));
 
@@ -9227,7 +8877,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerSiftingMachine() {
         ItemList.Machine_LV_Sifter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SIFTER_LV.ID,
                 "basicmachine.sifter.tier.01",
                 "Basic Sifting Machine",
@@ -9238,12 +8888,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SIFTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Sifter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SIFTER_MV.ID,
                 "basicmachine.sifter.tier.02",
                 "Advanced Sifting Machine",
@@ -9254,12 +8904,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SIFTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Sifter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SIFTER_HV.ID,
                 "basicmachine.sifter.tier.03",
                 "Advanced Sifting Machine II",
@@ -9270,12 +8920,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SIFTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Sifter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SIFTER_EV.ID,
                 "basicmachine.sifter.tier.04",
                 "Advanced Sifting Machine III",
@@ -9286,12 +8936,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SIFTER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Sifter.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SIFTER_IV.ID,
                 "basicmachine.sifter.tier.05",
                 "Advanced Sifting Machine IV",
@@ -9302,12 +8952,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SIFTER",
                 null).getStackForm(1L));
 
         ItemList.SiftingMachineLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SIFTING_MACHINE_LuV.ID,
                 "basicmachine.sifter.tier.06",
                 "Elite Sifting Machine",
@@ -9318,12 +8968,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SIFTER",
                 null).getStackForm(1L));
 
         ItemList.SiftingMachineZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SIFTING_MACHINE_ZPM.ID,
                 "basicmachine.sifter.tier.07",
                 "Elite Sifting Machine II",
@@ -9334,12 +8984,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SIFTER",
                 null).getStackForm(1L));
 
         ItemList.SiftingMachineUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SIFTING_MACHINE_UV.ID,
                 "basicmachine.sifter.tier.08",
                 "Ultimate Pulsation Filter",
@@ -9350,12 +9000,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SIFTER",
                 null).getStackForm(1L));
 
         ItemList.SiftingMachineUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SIFTING_MACHINE_UHV.ID,
                 "basicmachine.sifter.tier.09",
                 "Epic Pulsation Filter",
@@ -9366,12 +9016,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SIFTER",
                 null).getStackForm(1L));
 
         ItemList.SiftingMachineUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SIFTING_MACHINE_UEV.ID,
                 "basicmachine.sifter.tier.10",
                 "Epic Pulsation Filter II",
@@ -9382,12 +9032,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SIFTER",
                 null).getStackForm(1L));
 
         ItemList.SiftingMachineUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SIFTING_MACHINE_UIV.ID,
                 "basicmachine.sifter.tier.11",
                 "Epic Pulsation Filter III",
@@ -9398,12 +9048,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SIFTER",
                 null).getStackForm(1L));
 
         ItemList.SiftingMachineUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SIFTING_MACHINE_UMV.ID,
                 "basicmachine.sifter.tier.12",
                 "Epic Pulsation Filter IV",
@@ -9414,7 +9064,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SIFTER",
                 null).getStackForm(1L));
 
@@ -9422,7 +9072,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerSlicingMachine() {
         ItemList.Machine_LV_Slicer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SLICER_LV.ID,
                 "basicmachine.slicer.tier.01",
                 "Basic Slicing Machine",
@@ -9433,12 +9083,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SLICER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Slicer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SLICER_MV.ID,
                 "basicmachine.slicer.tier.02",
                 "Advanced Slicing Machine",
@@ -9449,12 +9099,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SLICER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Slicer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SLICER_HV.ID,
                 "basicmachine.slicer.tier.03",
                 "Advanced Slicing Machine II",
@@ -9465,12 +9115,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SLICER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Slicer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SLICER_EV.ID,
                 "basicmachine.slicer.tier.04",
                 "Advanced Slicing Machine III",
@@ -9481,12 +9131,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SLICER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Slicer.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SLICER_IV.ID,
                 "basicmachine.slicer.tier.05",
                 "Advanced Slicing Machine IV",
@@ -9497,12 +9147,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SLICER",
                 null).getStackForm(1L));
 
         ItemList.SlicingMachineLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SLICING_MACHINE_LuV.ID,
                 "basicmachine.slicer.tier.06",
                 "Elite Slicing Machine",
@@ -9513,12 +9163,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SLICER",
                 null).getStackForm(1L));
 
         ItemList.SlicingMachineZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SLICING_MACHINE_ZPM.ID,
                 "basicmachine.slicer.tier.07",
                 "Elite Slicing Machine II",
@@ -9529,12 +9179,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SLICER",
                 null).getStackForm(1L));
 
         ItemList.SlicingMachineUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SLICING_MACHINE_UV.ID,
                 "basicmachine.slicer.tier.08",
                 "Ultimate Quantum Slicer",
@@ -9545,12 +9195,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SLICER",
                 null).getStackForm(1L));
 
         ItemList.SlicingMachineUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SLICING_MACHINE_UHV.ID,
                 "basicmachine.slicer.tier.09",
                 "Epic Quantum Slicer",
@@ -9561,12 +9211,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SLICER",
                 null).getStackForm(1L));
 
         ItemList.SlicingMachineUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SLICING_MACHINE_UEV.ID,
                 "basicmachine.slicer.tier.10",
                 "Epic Quantum Slicer II",
@@ -9577,12 +9227,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SLICER",
                 null).getStackForm(1L));
 
         ItemList.SlicingMachineUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SLICING_MACHINE_UIV.ID,
                 "basicmachine.slicer.tier.11",
                 "Epic Quantum Slicer III",
@@ -9593,12 +9243,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SLICER",
                 null).getStackForm(1L));
 
         ItemList.SlicingMachineUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 SLICING_MACHINE_UMV.ID,
                 "basicmachine.slicer.tier.12",
                 "Epic Quantum Slicer IV",
@@ -9609,7 +9259,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "SLICER",
                 null).getStackForm(1L));
 
@@ -9617,7 +9267,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerThermalCentrifuge() {
         ItemList.Machine_LV_ThermalCentrifuge.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 THERMAL_CENTRIFUGE_LV.ID,
                 "basicmachine.thermalcentrifuge.tier.01",
                 "Basic Thermal Centrifuge",
@@ -9628,12 +9278,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "THERMAL_CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_ThermalCentrifuge.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 THERMAL_CENTRIFUGE_MV.ID,
                 "basicmachine.thermalcentrifuge.tier.02",
                 "Advanced Thermal Centrifuge",
@@ -9644,12 +9294,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "THERMAL_CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_ThermalCentrifuge.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 THERMAL_CENTRIFUGE_HV.ID,
                 "basicmachine.thermalcentrifuge.tier.03",
                 "Advanced Thermal Centrifuge II",
@@ -9660,12 +9310,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "THERMAL_CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_ThermalCentrifuge.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 THERMAL_CENTRIFUGE_EV.ID,
                 "basicmachine.thermalcentrifuge.tier.04",
                 "Advanced Thermal Centrifuge III",
@@ -9676,12 +9326,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "THERMAL_CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_ThermalCentrifuge.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 THERMAL_CENTRIFUGE_IV.ID,
                 "basicmachine.thermalcentrifuge.tier.05",
                 "Blaze Sweatshop T-6350",
@@ -9692,12 +9342,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "THERMAL_CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.ThermalCentrifugeLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 THERMAL_CENTRIFUGE_LuV.ID,
                 "basicmachine.thermalcentrifuge.tier.06",
                 "Elite Thermal Centrifuge",
@@ -9708,12 +9358,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "THERMAL_CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.ThermalCentrifugeZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 THERMAL_CENTRIFUGE_ZPM.ID,
                 "basicmachine.thermalcentrifuge.tier.07",
                 "Elite Thermal Centrifuge II",
@@ -9724,12 +9374,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "THERMAL_CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.ThermalCentrifugeUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 THERMAL_CENTRIFUGE_UV.ID,
                 "basicmachine.thermalcentrifuge.tier.08",
                 "Ultimate Fire Cyclone",
@@ -9740,12 +9390,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "THERMAL_CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.ThermalCentrifugeUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 THERMAL_CENTRIFUGE_UHV.ID,
                 "basicmachine.thermalcentrifuge.tier.09",
                 "Epic Fire Cyclone",
@@ -9756,12 +9406,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "THERMAL_CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.ThermalCentrifugeUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 THERMAL_CENTRIFUGE_UEV.ID,
                 "basicmachine.thermalcentrifuge.tier.10",
                 "Epic Fire Cyclone II",
@@ -9772,12 +9422,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "THERMAL_CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.ThermalCentrifugeUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 THERMAL_CENTRIFUGE_UIV.ID,
                 "basicmachine.thermalcentrifuge.tier.11",
                 "Epic Fire Cyclone III",
@@ -9788,12 +9438,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "THERMAL_CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.ThermalCentrifugeUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 THERMAL_CENTRIFUGE_UMV.ID,
                 "basicmachine.thermalcentrifuge.tier.12",
                 "Epic Fire Cyclone IV",
@@ -9804,14 +9454,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 3,
                 false,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "THERMAL_CENTRIFUGE",
                 null).getStackForm(1L));
     }
 
     private void registerWiremill() {
         ItemList.Machine_LV_Wiremill.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 WIREMILL_LV.ID,
                 "basicmachine.wiremill.tier.01",
                 "Basic Wiremill",
@@ -9822,12 +9472,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "WIREMILL",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Wiremill.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 WIREMILL_MV.ID,
                 "basicmachine.wiremill.tier.02",
                 "Advanced Wiremill",
@@ -9838,12 +9488,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "WIREMILL",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Wiremill.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 WIREMILL_HV.ID,
                 "basicmachine.wiremill.tier.03",
                 "Advanced Wiremill II",
@@ -9854,12 +9504,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "WIREMILL",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Wiremill.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 WIREMILL_EV.ID,
                 "basicmachine.wiremill.tier.04",
                 "Advanced Wiremill III",
@@ -9870,12 +9520,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "WIREMILL",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Wiremill.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 WIREMILL_IV.ID,
                 "basicmachine.wiremill.tier.05",
                 "Advanced Wiremill IV",
@@ -9886,12 +9536,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "WIREMILL",
                 null).getStackForm(1L));
 
         ItemList.WiremillLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 WIREMILL_LuV.ID,
                 "basicmachine.wiremill.tier.06",
                 "Elite Wiremill",
@@ -9902,12 +9552,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "WIREMILL",
                 null).getStackForm(1L));
 
         ItemList.WiremillZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 WIREMILL_ZPM.ID,
                 "basicmachine.wiremill.tier.07",
                 "Elite Wiremill II",
@@ -9918,12 +9568,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "WIREMILL",
                 null).getStackForm(1L));
 
         ItemList.WiremillUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 WIREMILL_UV.ID,
                 "basicmachine.wiremill.tier.08",
                 "Ultimate Wire Transfigurator",
@@ -9934,12 +9584,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "WIREMILL",
                 null).getStackForm(1L));
 
         ItemList.WiremillUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 WIREMILL_UHV.ID,
                 "basicmachine.wiremill.tier.09",
                 "Epic Wire Transfigurator",
@@ -9950,12 +9600,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "WIREMILL",
                 null).getStackForm(1L));
 
         ItemList.WiremillUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 WIREMILL_UEV.ID,
                 "basicmachine.wiremill.tier.10",
                 "Epic Wire Transfigurator II",
@@ -9966,12 +9616,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "WIREMILL",
                 null).getStackForm(1L));
 
         ItemList.WiremillUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 WIREMILL_UIV.ID,
                 "basicmachine.wiremill.tier.11",
                 "Epic Wire Transfigurator III",
@@ -9982,12 +9632,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "WIREMILL",
                 null).getStackForm(1L));
 
         ItemList.WiremillUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 WIREMILL_UMV.ID,
                 "basicmachine.wiremill.tier.12",
                 "Epic Wire Transfigurator IV",
@@ -9998,7 +9648,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 false,
                 SoundResource.IC2_MACHINES_RECYCLER_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "WIREMILL",
                 null).getStackForm(1L));
 
@@ -10006,7 +9656,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerArcFurnace() {
         ItemList.Machine_LV_ArcFurnace.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ARC_FURNACE_LV.ID,
                 "basicmachine.arcfurnace.tier.01",
                 "Basic Arc Furnace",
@@ -10017,12 +9667,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_ArcFurnace.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ARC_FURNACE_MV.ID,
                 "basicmachine.arcfurnace.tier.02",
                 "Advanced Arc Furnace",
@@ -10033,12 +9683,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_ArcFurnace.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ARC_FURNACE_HV.ID,
                 "basicmachine.arcfurnace.tier.03",
                 "Advanced Arc Furnace II",
@@ -10049,12 +9699,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_ArcFurnace.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ARC_FURNACE_EV.ID,
                 "basicmachine.arcfurnace.tier.04",
                 "Advanced Arc Furnace III",
@@ -10065,12 +9715,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_ArcFurnace.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ARC_FURNACE_IV.ID,
                 "basicmachine.arcfurnace.tier.05",
                 "Advanced Arc Furnace IV",
@@ -10081,12 +9731,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.ArcFurnaceLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ARC_FURNACE_LuV.ID,
                 "basicmachine.arcfurnace.tier.06",
                 "Elite Arc Furnace",
@@ -10097,12 +9747,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.ArcFurnaceZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ARC_FURNACE_ZPM.ID,
                 "basicmachine.arcfurnace.tier.07",
                 "Elite Arc Furnace II",
@@ -10113,12 +9763,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.ArcFurnaceUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ARC_FURNACE_UV.ID,
                 "basicmachine.arcfurnace.tier.08",
                 "Ultimate Short Circuit Heater",
@@ -10129,12 +9779,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.ArcFurnaceUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ARC_FURNACE_UHV.ID,
                 "basicmachine.arcfurnace.tier.09",
                 "Epic Short Circuit Heater",
@@ -10145,12 +9795,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.ArcFurnaceUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ARC_FURNACE_UEV.ID,
                 "basicmachine.arcfurnace.tier.10",
                 "Epic Short Circuit Heater II",
@@ -10161,12 +9811,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.ArcFurnaceUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ARC_FURNACE_UIV.ID,
                 "basicmachine.arcfurnace.tier.11",
                 "Epic Short Circuit Heater III",
@@ -10177,12 +9827,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.ArcFurnaceUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 ARC_FURNACE_UMV.ID,
                 "basicmachine.arcfurnace.tier.12",
                 "Epic Short Circuit Heater IV",
@@ -10193,7 +9843,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "ARC_FURNACE",
                 null).getStackForm(1L));
 
@@ -10201,7 +9851,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerCentrifuge() {
         ItemList.Machine_LV_Centrifuge.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CENTRIFUGE_LV.ID,
                 "basicmachine.centrifuge.tier.01",
                 "Basic Centrifuge",
@@ -10212,12 +9862,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Centrifuge.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CENTRIFUGE_MV.ID,
                 "basicmachine.centrifuge.tier.02",
                 "Advanced Centrifuge",
@@ -10228,12 +9878,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Centrifuge.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CENTRIFUGE_HV.ID,
                 "basicmachine.centrifuge.tier.03",
                 "Turbo Centrifuge",
@@ -10244,12 +9894,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Centrifuge.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CENTRIFUGE_EV.ID,
                 "basicmachine.centrifuge.tier.04",
                 "Molecular Separator",
@@ -10260,12 +9910,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Centrifuge.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CENTRIFUGE_IV.ID,
                 "basicmachine.centrifuge.tier.05",
                 "Molecular Cyclone",
@@ -10276,12 +9926,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.CentrifugeLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CENTRIFUGE_LuV.ID,
                 "basicmachine.centrifuge.tier.06",
                 "Elite Centrifuge",
@@ -10292,12 +9942,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.CentrifugeZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CENTRIFUGE_ZPM.ID,
                 "basicmachine.centrifuge.tier.07",
                 "Elite Centrifuge II",
@@ -10308,12 +9958,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.CentrifugeUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CENTRIFUGE_UV.ID,
                 "basicmachine.centrifuge.tier.08",
                 "Ultimate Molecular Tornado",
@@ -10324,12 +9974,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.CentrifugeUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CENTRIFUGE_UHV.ID,
                 "basicmachine.centrifuge.tier.09",
                 "Epic Molecular Tornado",
@@ -10340,12 +9990,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.CentrifugeUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CENTRIFUGE_UEV.ID,
                 "basicmachine.centrifuge.tier.10",
                 "Epic Molecular Tornado II",
@@ -10356,12 +10006,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.CentrifugeUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CENTRIFUGE_UIV.ID,
                 "basicmachine.centrifuge.tier.11",
                 "Epic Molecular Tornado III",
@@ -10372,12 +10022,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CENTRIFUGE",
                 null).getStackForm(1L));
 
         ItemList.CentrifugeUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CENTRIFUGE_UMV.ID,
                 "basicmachine.centrifuge.tier.12",
                 "Epic Molecular Tornado IV",
@@ -10388,7 +10038,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 6,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CENTRIFUGE",
                 null).getStackForm(1L));
 
@@ -10396,7 +10046,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerPlasmaArcFurnace() {
         ItemList.Machine_LV_PlasmaArcFurnace.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PLASMA_ARC_FURNACE_LV.ID,
                 "basicmachine.plasmaarcfurnace.tier.01",
                 "Basic Plasma Arc Furnace",
@@ -10407,12 +10057,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PLASMA_ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_PlasmaArcFurnace.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PLASMA_ARC_FURNACE_MV.ID,
                 "basicmachine.plasmaarcfurnace.tier.02",
                 "Advanced Plasma Arc Furnace",
@@ -10423,12 +10073,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PLASMA_ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_PlasmaArcFurnace.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PLASMA_ARC_FURNACE_HV.ID,
                 "basicmachine.plasmaarcfurnace.tier.03",
                 "Advanced Plasma Arc Furnace II",
@@ -10439,12 +10089,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PLASMA_ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_PlasmaArcFurnace.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PLASMA_ARC_FURNACE_EV.ID,
                 "basicmachine.plasmaarcfurnace.tier.04",
                 "Advanced Plasma Arc Furnace III",
@@ -10455,12 +10105,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PLASMA_ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_PlasmaArcFurnace.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PLASMA_ARC_FURNACE_IV.ID,
                 "basicmachine.plasmaarcfurnace.tier.05",
                 "Advanced Plasma Arc Furnace IV",
@@ -10471,12 +10121,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PLASMA_ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.PlasmaArcFurnaceLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PLASMA_ARC_FURNACE_LuV.ID,
                 "basicmachine.plasmaarcfurnace.tier.06",
                 "Elite Plasma Arc Furnace",
@@ -10487,12 +10137,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PLASMA_ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.PlasmaArcFurnaceZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PLASMA_ARC_FURNACE_ZPM.ID,
                 "basicmachine.plasmaarcfurnace.tier.07",
                 "Elite Plasma Arc Furnace II",
@@ -10503,12 +10153,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PLASMA_ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.PlasmaArcFurnaceUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PLASMA_ARC_FURNACE_UV.ID,
                 "basicmachine.plasmaarcfurnace.tier.08",
                 "Ultimate Plasma Discharge Heater",
@@ -10519,12 +10169,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PLASMA_ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.PlasmaArcFurnaceUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PLASMA_ARC_FURNACE_UHV.ID,
                 "basicmachine.plasmaarcfurnace.tier.09",
                 "Epic Plasma Discharge Heater",
@@ -10535,12 +10185,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PLASMA_ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.PlasmaArcFurnaceUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PLASMA_ARC_FURNACE_UEV.ID,
                 "basicmachine.plasmaarcfurnace.tier.10",
                 "Epic Plasma Discharge Heater II",
@@ -10551,12 +10201,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PLASMA_ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.PlasmaArcFurnaceUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PLASMA_ARC_FURNACE_UIV.ID,
                 "basicmachine.plasmaarcfurnace.tier.11",
                 "Epic Plasma Discharge Heater III",
@@ -10567,12 +10217,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PLASMA_ARC_FURNACE",
                 null).getStackForm(1L));
 
         ItemList.PlasmaArcFurnaceUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 PLASMA_ARC_FURNACE_UMV.ID,
                 "basicmachine.plasmaarcfurnace.tier.12",
                 "Epic Plasma Discharge Heater IV",
@@ -10583,14 +10233,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9,
                 true,
                 SoundResource.IC2_MACHINES_INDUCTION_LOOP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "PLASMA_ARC_FURNACE",
                 null).getStackForm(1L));
     }
 
     private void registerCanningMachine() {
         ItemList.Machine_LV_Canner.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CANNER_LV.ID,
                 "basicmachine.canner.tier.01",
                 "Basic Canning Machine",
@@ -10601,12 +10251,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CANNER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_Canner.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CANNER_MV.ID,
                 "basicmachine.canner.tier.02",
                 "Advanced Canning Machine",
@@ -10617,12 +10267,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CANNER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_Canner.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CANNER_HV.ID,
                 "basicmachine.canner.tier.03",
                 "Advanced Canning Machine II",
@@ -10633,12 +10283,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CANNER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_Canner.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CANNER_EV.ID,
                 "basicmachine.canner.tier.04",
                 "Advanced Canning Machine III",
@@ -10649,12 +10299,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CANNER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_Canner.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CANNER_IV.ID,
                 "basicmachine.canner.tier.05",
                 "Advanced Canning Machine IV",
@@ -10665,12 +10315,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CANNER",
                 null).getStackForm(1L));
 
         ItemList.CanningMachineLuV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CANNING_MACHINE_LuV.ID,
                 "basicmachine.canner.tier.06",
                 "Elite Canning Machine",
@@ -10681,12 +10331,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CANNER",
                 null).getStackForm(1L));
 
         ItemList.CanningMachineZPM.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CANNING_MACHINE_ZPM.ID,
                 "basicmachine.canner.tier.07",
                 "Elite Canning Machine II",
@@ -10697,12 +10347,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CANNER",
                 null).getStackForm(1L));
 
         ItemList.CanningMachineUV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CANNING_MACHINE_UV.ID,
                 "basicmachine.canner.tier.08",
                 "Ultimate Can Operator",
@@ -10713,12 +10363,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CANNER",
                 null).getStackForm(1L));
 
         ItemList.CanningMachineUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CANNING_MACHINE_UHV.ID,
                 "basicmachine.canner.tier.09",
                 "Epic Can Operator",
@@ -10729,12 +10379,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CANNER",
                 null).getStackForm(1L));
 
         ItemList.CanningMachineUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CANNING_MACHINE_UEV.ID,
                 "basicmachine.canner.tier.10",
                 "Epic Can Operator II",
@@ -10745,12 +10395,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CANNER",
                 null).getStackForm(1L));
 
         ItemList.CanningMachineUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CANNING_MACHINE_UIV.ID,
                 "basicmachine.canner.tier.11",
                 "Epic Can Operator III",
@@ -10761,12 +10411,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CANNER",
                 null).getStackForm(1L));
 
         ItemList.CanningMachineUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CANNING_MACHINE_UMV.ID,
                 "basicmachine.canner.tier.12",
                 "Epic Can Operator IV",
@@ -10777,221 +10427,178 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 2,
                 false,
                 SoundResource.IC2_MACHINES_EXTRACTOR_OP,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CANNER",
                 null).getStackForm(1L));
     }
 
     private static void registerDynamoHatch() {
         ItemList.Hatch_Dynamo_ULV.set(
-            new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_ULV.ID, "hatch.dynamo.tier.00", "ULV Dynamo Hatch", 0)
-                .getStackForm(1L));
-        ItemList.Hatch_Dynamo_LV.set(
-            new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_LV.ID, "hatch.dynamo.tier.01", "LV Dynamo Hatch", 1)
-                .getStackForm(1L));
-        ItemList.Hatch_Dynamo_MV.set(
-            new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_MV.ID, "hatch.dynamo.tier.02", "MV Dynamo Hatch", 2)
-                .getStackForm(1L));
-        ItemList.Hatch_Dynamo_HV.set(
-            new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_HV.ID, "hatch.dynamo.tier.03", "HV Dynamo Hatch", 3)
-                .getStackForm(1L));
-        ItemList.Hatch_Dynamo_EV.set(
-            new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_EV.ID, "hatch.dynamo.tier.04", "EV Dynamo Hatch", 4)
-                .getStackForm(1L));
-        ItemList.Hatch_Dynamo_IV.set(
-            new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_IV.ID, "hatch.dynamo.tier.05", "IV Dynamo Hatch", 5)
-                .getStackForm(1L));
+            new MTEHatchDynamo(DYNAMO_HATCH_ULV.ID, "hatch.dynamo.tier.00", "ULV Dynamo Hatch", 0).getStackForm(1L));
+        ItemList.Hatch_Dynamo_LV
+            .set(new MTEHatchDynamo(DYNAMO_HATCH_LV.ID, "hatch.dynamo.tier.01", "LV Dynamo Hatch", 1).getStackForm(1L));
+        ItemList.Hatch_Dynamo_MV
+            .set(new MTEHatchDynamo(DYNAMO_HATCH_MV.ID, "hatch.dynamo.tier.02", "MV Dynamo Hatch", 2).getStackForm(1L));
+        ItemList.Hatch_Dynamo_HV
+            .set(new MTEHatchDynamo(DYNAMO_HATCH_HV.ID, "hatch.dynamo.tier.03", "HV Dynamo Hatch", 3).getStackForm(1L));
+        ItemList.Hatch_Dynamo_EV
+            .set(new MTEHatchDynamo(DYNAMO_HATCH_EV.ID, "hatch.dynamo.tier.04", "EV Dynamo Hatch", 4).getStackForm(1L));
+        ItemList.Hatch_Dynamo_IV
+            .set(new MTEHatchDynamo(DYNAMO_HATCH_IV.ID, "hatch.dynamo.tier.05", "IV Dynamo Hatch", 5).getStackForm(1L));
         ItemList.Hatch_Dynamo_LuV.set(
-            new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_LuV.ID, "hatch.dynamo.tier.06", "LuV Dynamo Hatch", 6)
-                .getStackForm(1L));
+            new MTEHatchDynamo(DYNAMO_HATCH_LuV.ID, "hatch.dynamo.tier.06", "LuV Dynamo Hatch", 6).getStackForm(1L));
         ItemList.Hatch_Dynamo_ZPM.set(
-            new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_ZPM.ID, "hatch.dynamo.tier.07", "ZPM Dynamo Hatch", 7)
-                .getStackForm(1L));
-        ItemList.Hatch_Dynamo_UV.set(
-            new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UV.ID, "hatch.dynamo.tier.08", "UV Dynamo Hatch", 8)
-                .getStackForm(1L));
+            new MTEHatchDynamo(DYNAMO_HATCH_ZPM.ID, "hatch.dynamo.tier.07", "ZPM Dynamo Hatch", 7).getStackForm(1L));
+        ItemList.Hatch_Dynamo_UV
+            .set(new MTEHatchDynamo(DYNAMO_HATCH_UV.ID, "hatch.dynamo.tier.08", "UV Dynamo Hatch", 8).getStackForm(1L));
         ItemList.Hatch_Dynamo_UHV.set(
-            new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UHV.ID, "hatch.dynamo.tier.09", "UHV Dynamo Hatch", 9)
-                .getStackForm(1L));
+            new MTEHatchDynamo(DYNAMO_HATCH_UHV.ID, "hatch.dynamo.tier.09", "UHV Dynamo Hatch", 9).getStackForm(1L));
         ItemList.Hatch_Dynamo_UEV.set(
-            new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UEV.ID, "hatch.dynamo.tier.10", "UEV Dynamo Hatch", 10)
-                .getStackForm(1L));
+            new MTEHatchDynamo(DYNAMO_HATCH_UEV.ID, "hatch.dynamo.tier.10", "UEV Dynamo Hatch", 10).getStackForm(1L));
 
         ItemList.Hatch_Dynamo_UIV.set(
-            new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UIV.ID, "hatch.dynamo.tier.11", "UIV Dynamo Hatch", 11)
-                .getStackForm(1L));
+            new MTEHatchDynamo(DYNAMO_HATCH_UIV.ID, "hatch.dynamo.tier.11", "UIV Dynamo Hatch", 11).getStackForm(1L));
 
         ItemList.Hatch_Dynamo_UMV.set(
-            new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UMV.ID, "hatch.dynamo.tier.12", "UMV Dynamo Hatch", 12)
-                .getStackForm(1L));
+            new MTEHatchDynamo(DYNAMO_HATCH_UMV.ID, "hatch.dynamo.tier.12", "UMV Dynamo Hatch", 12).getStackForm(1L));
 
         ItemList.Hatch_Dynamo_UXV.set(
-            new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UXV.ID, "hatch.dynamo.tier.13", "UXV Dynamo Hatch", 13)
-                .getStackForm(1L));
+            new MTEHatchDynamo(DYNAMO_HATCH_UXV.ID, "hatch.dynamo.tier.13", "UXV Dynamo Hatch", 13).getStackForm(1L));
     }
 
     private static void registerEnergyHatch() {
         ItemList.Hatch_Energy_ULV.set(
-            new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_ULV.ID, "hatch.energy.tier.00", "ULV Energy Hatch", 0)
-                .getStackForm(1L));
-        ItemList.Hatch_Energy_LV.set(
-            new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_LV.ID, "hatch.energy.tier.01", "LV Energy Hatch", 1)
-                .getStackForm(1L));
-        ItemList.Hatch_Energy_MV.set(
-            new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_MV.ID, "hatch.energy.tier.02", "MV Energy Hatch", 2)
-                .getStackForm(1L));
-        ItemList.Hatch_Energy_HV.set(
-            new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_HV.ID, "hatch.energy.tier.03", "HV Energy Hatch", 3)
-                .getStackForm(1L));
-        ItemList.Hatch_Energy_EV.set(
-            new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_EV.ID, "hatch.energy.tier.04", "EV Energy Hatch", 4)
-                .getStackForm(1L));
-        ItemList.Hatch_Energy_IV.set(
-            new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_IV.ID, "hatch.energy.tier.05", "IV Energy Hatch", 5)
-                .getStackForm(1L));
+            new MTEHatchEnergy(ENERGY_HATCH_ULV.ID, "hatch.energy.tier.00", "ULV Energy Hatch", 0).getStackForm(1L));
+        ItemList.Hatch_Energy_LV
+            .set(new MTEHatchEnergy(ENERGY_HATCH_LV.ID, "hatch.energy.tier.01", "LV Energy Hatch", 1).getStackForm(1L));
+        ItemList.Hatch_Energy_MV
+            .set(new MTEHatchEnergy(ENERGY_HATCH_MV.ID, "hatch.energy.tier.02", "MV Energy Hatch", 2).getStackForm(1L));
+        ItemList.Hatch_Energy_HV
+            .set(new MTEHatchEnergy(ENERGY_HATCH_HV.ID, "hatch.energy.tier.03", "HV Energy Hatch", 3).getStackForm(1L));
+        ItemList.Hatch_Energy_EV
+            .set(new MTEHatchEnergy(ENERGY_HATCH_EV.ID, "hatch.energy.tier.04", "EV Energy Hatch", 4).getStackForm(1L));
+        ItemList.Hatch_Energy_IV
+            .set(new MTEHatchEnergy(ENERGY_HATCH_IV.ID, "hatch.energy.tier.05", "IV Energy Hatch", 5).getStackForm(1L));
         ItemList.Hatch_Energy_LuV.set(
-            new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_LuV.ID, "hatch.energy.tier.06", "LuV Energy Hatch", 6)
-                .getStackForm(1L));
+            new MTEHatchEnergy(ENERGY_HATCH_LuV.ID, "hatch.energy.tier.06", "LuV Energy Hatch", 6).getStackForm(1L));
         ItemList.Hatch_Energy_ZPM.set(
-            new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_ZPM.ID, "hatch.energy.tier.07", "ZPM Energy Hatch", 7)
-                .getStackForm(1L));
-        ItemList.Hatch_Energy_UV.set(
-            new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UV.ID, "hatch.energy.tier.08", "UV Energy Hatch", 8)
-                .getStackForm(1L));
+            new MTEHatchEnergy(ENERGY_HATCH_ZPM.ID, "hatch.energy.tier.07", "ZPM Energy Hatch", 7).getStackForm(1L));
+        ItemList.Hatch_Energy_UV
+            .set(new MTEHatchEnergy(ENERGY_HATCH_UV.ID, "hatch.energy.tier.08", "UV Energy Hatch", 8).getStackForm(1L));
         ItemList.Hatch_Energy_UHV.set(
-            new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UHV.ID, "hatch.energy.tier.09", "UHV Energy Hatch", 9)
-                .getStackForm(1L));
+            new MTEHatchEnergy(ENERGY_HATCH_UHV.ID, "hatch.energy.tier.09", "UHV Energy Hatch", 9).getStackForm(1L));
         ItemList.Hatch_Energy_UEV.set(
-            new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UEV.ID, "hatch.energy.tier.10", "UEV Energy Hatch", 10)
-                .getStackForm(1L));
+            new MTEHatchEnergy(ENERGY_HATCH_UEV.ID, "hatch.energy.tier.10", "UEV Energy Hatch", 10).getStackForm(1L));
 
         ItemList.Hatch_Energy_UIV.set(
-            new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UIV.ID, "hatch.energy.tier.11", "UIV Energy Hatch", 11)
-                .getStackForm(1L));
+            new MTEHatchEnergy(ENERGY_HATCH_UIV.ID, "hatch.energy.tier.11", "UIV Energy Hatch", 11).getStackForm(1L));
 
         ItemList.Hatch_Energy_UMV.set(
-            new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UMV.ID, "hatch.energy.tier.12", "UMV Energy Hatch", 12)
-                .getStackForm(1L));
+            new MTEHatchEnergy(ENERGY_HATCH_UMV.ID, "hatch.energy.tier.12", "UMV Energy Hatch", 12).getStackForm(1L));
 
         ItemList.Hatch_Energy_UXV.set(
-            new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UXV.ID, "hatch.energy.tier.13", "UXV Energy Hatch", 13)
-                .getStackForm(1L));
+            new MTEHatchEnergy(ENERGY_HATCH_UXV.ID, "hatch.energy.tier.13", "UXV Energy Hatch", 13).getStackForm(1L));
     }
 
     private static void registerInputHatch() {
-        ItemList.Hatch_Input_ULV.set(
-            new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_ULV.ID, "hatch.input.tier.00", "Input Hatch (ULV)", 0)
-                .getStackForm(1L));
-        ItemList.Hatch_Input_LV.set(
-            new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_LV.ID, "hatch.input.tier.01", "Input Hatch (LV)", 1)
-                .getStackForm(1L));
-        ItemList.Hatch_Input_MV.set(
-            new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_MV.ID, "hatch.input.tier.02", "Input Hatch (MV)", 2)
-                .getStackForm(1L));
-        ItemList.Hatch_Input_HV.set(
-            new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_HV.ID, "hatch.input.tier.03", "Input Hatch (HV)", 3)
-                .getStackForm(1L));
-        ItemList.Hatch_Input_EV.set(
-            new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_EV.ID, "hatch.input.tier.04", "Input Hatch (EV)", 4)
-                .getStackForm(1L));
-        ItemList.Hatch_Input_IV.set(
-            new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_IV.ID, "hatch.input.tier.05", "Input Hatch (IV)", 5)
-                .getStackForm(1L));
-        ItemList.Hatch_Input_LuV.set(
-            new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_LuV.ID, "hatch.input.tier.06", "Input Hatch (LuV)", 6)
-                .getStackForm(1L));
-        ItemList.Hatch_Input_ZPM.set(
-            new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_ZPM.ID, "hatch.input.tier.07", "Input Hatch (ZPM)", 7)
-                .getStackForm(1L));
-        ItemList.Hatch_Input_UV.set(
-            new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UV.ID, "hatch.input.tier.08", "Input Hatch (UV)", 8)
-                .getStackForm(1L));
-        ItemList.Hatch_Input_UHV.set(
-            new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UHV.ID, "hatch.input.tier.09", "Input Hatch (UHV)", 9)
-                .getStackForm(1L));
+        ItemList.Hatch_Input_ULV
+            .set(new MTEHatchInput(INPUT_HATCH_ULV.ID, "hatch.input.tier.00", "Input Hatch (ULV)", 0).getStackForm(1L));
+        ItemList.Hatch_Input_LV
+            .set(new MTEHatchInput(INPUT_HATCH_LV.ID, "hatch.input.tier.01", "Input Hatch (LV)", 1).getStackForm(1L));
+        ItemList.Hatch_Input_MV
+            .set(new MTEHatchInput(INPUT_HATCH_MV.ID, "hatch.input.tier.02", "Input Hatch (MV)", 2).getStackForm(1L));
+        ItemList.Hatch_Input_HV
+            .set(new MTEHatchInput(INPUT_HATCH_HV.ID, "hatch.input.tier.03", "Input Hatch (HV)", 3).getStackForm(1L));
+        ItemList.Hatch_Input_EV
+            .set(new MTEHatchInput(INPUT_HATCH_EV.ID, "hatch.input.tier.04", "Input Hatch (EV)", 4).getStackForm(1L));
+        ItemList.Hatch_Input_IV
+            .set(new MTEHatchInput(INPUT_HATCH_IV.ID, "hatch.input.tier.05", "Input Hatch (IV)", 5).getStackForm(1L));
+        ItemList.Hatch_Input_LuV
+            .set(new MTEHatchInput(INPUT_HATCH_LuV.ID, "hatch.input.tier.06", "Input Hatch (LuV)", 6).getStackForm(1L));
+        ItemList.Hatch_Input_ZPM
+            .set(new MTEHatchInput(INPUT_HATCH_ZPM.ID, "hatch.input.tier.07", "Input Hatch (ZPM)", 7).getStackForm(1L));
+        ItemList.Hatch_Input_UV
+            .set(new MTEHatchInput(INPUT_HATCH_UV.ID, "hatch.input.tier.08", "Input Hatch (UV)", 8).getStackForm(1L));
+        ItemList.Hatch_Input_UHV
+            .set(new MTEHatchInput(INPUT_HATCH_UHV.ID, "hatch.input.tier.09", "Input Hatch (UHV)", 9).getStackForm(1L));
         ItemList.Hatch_Input_UEV.set(
-            new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UEV.ID, "hatch.input.tier.10", "Input Hatch (UEV)", 10)
-                .getStackForm(1L));
+            new MTEHatchInput(INPUT_HATCH_UEV.ID, "hatch.input.tier.10", "Input Hatch (UEV)", 10).getStackForm(1L));
         ItemList.Hatch_Input_UIV.set(
-            new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UIV.ID, "hatch.input.tier.11", "Input Hatch (UIV)", 11)
-                .getStackForm(1L));
+            new MTEHatchInput(INPUT_HATCH_UIV.ID, "hatch.input.tier.11", "Input Hatch (UIV)", 11).getStackForm(1L));
         ItemList.Hatch_Input_UMV.set(
-            new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UMV.ID, "hatch.input.tier.12", "Input Hatch (UMV)", 12)
-                .getStackForm(1L));
+            new MTEHatchInput(INPUT_HATCH_UMV.ID, "hatch.input.tier.12", "Input Hatch (UMV)", 12).getStackForm(1L));
         ItemList.Hatch_Input_UXV.set(
-            new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UXV.ID, "hatch.input.tier.13", "Input Hatch (UXV)", 13)
-                .getStackForm(1L));
+            new MTEHatchInput(INPUT_HATCH_UXV.ID, "hatch.input.tier.13", "Input Hatch (UXV)", 13).getStackForm(1L));
         ItemList.Hatch_Input_MAX.set(
-            new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_MAX.ID, "hatch.input.tier.14", "Input Hatch (MAX)", 14)
-                .getStackForm(1L));
+            new MTEHatchInput(INPUT_HATCH_MAX.ID, "hatch.input.tier.14", "Input Hatch (MAX)", 14).getStackForm(1L));
     }
 
     private static void registerQuadrupleInputHatch() {
         ItemList.Hatch_Input_Multi_2x2_EV.set(
-            new GT_MetaTileEntity_Hatch_MultiInput(
+            new MTEHatchMultiInput(
                 QUADRUPLE_INPUT_HATCHES_EV.ID,
                 4,
                 "hatch.multi.input.tier.01",
                 "Quadruple Input Hatch (EV)",
                 4).getStackForm(1L));
         ItemList.Hatch_Input_Multi_2x2_IV.set(
-            new GT_MetaTileEntity_Hatch_MultiInput(
+            new MTEHatchMultiInput(
                 QUADRUPLE_INPUT_HATCHES_IV.ID,
                 4,
                 "hatch.multi.input.tier.02",
                 "Quadruple Input Hatch (IV)",
                 5).getStackForm(1L));
         ItemList.Hatch_Input_Multi_2x2_LuV.set(
-            new GT_MetaTileEntity_Hatch_MultiInput(
+            new MTEHatchMultiInput(
                 QUADRUPLE_INPUT_HATCHES_LuV.ID,
                 4,
                 "hatch.multi.input.tier.03",
                 "Quadruple Input Hatch (LuV)",
                 6).getStackForm(1L));
         ItemList.Hatch_Input_Multi_2x2_ZPM.set(
-            new GT_MetaTileEntity_Hatch_MultiInput(
+            new MTEHatchMultiInput(
                 QUADRUPLE_INPUT_HATCHES_ZPM.ID,
                 4,
                 "hatch.multi.input.tier.04",
                 "Quadruple Input Hatch (ZPM)",
                 7).getStackForm(1L));
         ItemList.Hatch_Input_Multi_2x2_UV.set(
-            new GT_MetaTileEntity_Hatch_MultiInput(
+            new MTEHatchMultiInput(
                 QUADRUPLE_INPUT_HATCHES_UV.ID,
                 4,
                 "hatch.multi.input.tier.05",
                 "Quadruple Input Hatch (UV)",
                 8).getStackForm(1L));
         ItemList.Hatch_Input_Multi_2x2_UHV.set(
-            new GT_MetaTileEntity_Hatch_MultiInput(
+            new MTEHatchMultiInput(
                 QUADRUPLE_INPUT_HATCHES_UHV.ID,
                 4,
                 "hatch.multi.input.tier.06",
                 "Quadruple Input Hatch (UHV)",
                 9).getStackForm(1L));
         ItemList.Hatch_Input_Multi_2x2_UEV.set(
-            new GT_MetaTileEntity_Hatch_MultiInput(
+            new MTEHatchMultiInput(
                 QUADRUPLE_INPUT_HATCHES_UEV.ID,
                 4,
                 "hatch.multi.input.tier.07",
                 "Quadruple Input Hatch (UEV)",
                 10).getStackForm(1L));
         ItemList.Hatch_Input_Multi_2x2_UIV.set(
-            new GT_MetaTileEntity_Hatch_MultiInput(
+            new MTEHatchMultiInput(
                 QUADRUPLE_INPUT_HATCHES_UIV.ID,
                 4,
                 "hatch.multi.input.tier.08",
                 "Quadruple Input Hatch (UIV)",
                 11).getStackForm(1L));
         ItemList.Hatch_Input_Multi_2x2_UMV.set(
-            new GT_MetaTileEntity_Hatch_MultiInput(
+            new MTEHatchMultiInput(
                 QUADRUPLE_INPUT_HATCHES_UMV.ID,
                 4,
                 "hatch.multi.input.tier.09",
                 "Quadruple Input Hatch (UMV)",
                 12).getStackForm(1L));
         ItemList.Hatch_Input_Multi_2x2_UXV.set(
-            new GT_MetaTileEntity_Hatch_MultiInput(
+            new MTEHatchMultiInput(
                 QUADRUPLE_INPUT_HATCHES_UXV.ID,
                 4,
                 "hatch.multi.input.tier.10",
@@ -10999,7 +10606,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 13).getStackForm(1L));
 
         ItemList.Hatch_Input_Multi_2x2_Humongous.set(
-            new GT_MetaTileEntity_Hatch_QuadrupleHumongous(
+            new MTEHatchQuadrupleHumongous(
                 QUADRUPLE_INPUT_HATCHES_MAX.ID,
                 4,
                 "hatch.multi.input.tier.11",
@@ -11008,133 +10615,98 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerOutputHatch() {
         ItemList.Hatch_Output_ULV.set(
-            new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_ULV.ID, "hatch.output.tier.00", "Output Hatch (ULV)", 0)
-                .getStackForm(1L));
+            new MTEHatchOutput(OUTPUT_HATCH_ULV.ID, "hatch.output.tier.00", "Output Hatch (ULV)", 0).getStackForm(1L));
         ItemList.Hatch_Output_LV.set(
-            new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_LV.ID, "hatch.output.tier.01", "Output Hatch (LV)", 1)
-                .getStackForm(1L));
+            new MTEHatchOutput(OUTPUT_HATCH_LV.ID, "hatch.output.tier.01", "Output Hatch (LV)", 1).getStackForm(1L));
         ItemList.Hatch_Output_MV.set(
-            new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_MV.ID, "hatch.output.tier.02", "Output Hatch (MV)", 2)
-                .getStackForm(1L));
+            new MTEHatchOutput(OUTPUT_HATCH_MV.ID, "hatch.output.tier.02", "Output Hatch (MV)", 2).getStackForm(1L));
         ItemList.Hatch_Output_HV.set(
-            new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_HV.ID, "hatch.output.tier.03", "Output Hatch (HV)", 3)
-                .getStackForm(1L));
+            new MTEHatchOutput(OUTPUT_HATCH_HV.ID, "hatch.output.tier.03", "Output Hatch (HV)", 3).getStackForm(1L));
         ItemList.Hatch_Output_EV.set(
-            new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_EV.ID, "hatch.output.tier.04", "Output Hatch (EV)", 4)
-                .getStackForm(1L));
+            new MTEHatchOutput(OUTPUT_HATCH_EV.ID, "hatch.output.tier.04", "Output Hatch (EV)", 4).getStackForm(1L));
         ItemList.Hatch_Output_IV.set(
-            new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_IV.ID, "hatch.output.tier.05", "Output Hatch (IV)", 5)
-                .getStackForm(1L));
+            new MTEHatchOutput(OUTPUT_HATCH_IV.ID, "hatch.output.tier.05", "Output Hatch (IV)", 5).getStackForm(1L));
         ItemList.Hatch_Output_LuV.set(
-            new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_LuV.ID, "hatch.output.tier.06", "Output Hatch (LuV)", 6)
-                .getStackForm(1L));
+            new MTEHatchOutput(OUTPUT_HATCH_LuV.ID, "hatch.output.tier.06", "Output Hatch (LuV)", 6).getStackForm(1L));
         ItemList.Hatch_Output_ZPM.set(
-            new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_ZPM.ID, "hatch.output.tier.07", "Output Hatch (ZPM)", 7)
-                .getStackForm(1L));
+            new MTEHatchOutput(OUTPUT_HATCH_ZPM.ID, "hatch.output.tier.07", "Output Hatch (ZPM)", 7).getStackForm(1L));
         ItemList.Hatch_Output_UV.set(
-            new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UV.ID, "hatch.output.tier.08", "Output Hatch (UV)", 8)
-                .getStackForm(1L));
+            new MTEHatchOutput(OUTPUT_HATCH_UV.ID, "hatch.output.tier.08", "Output Hatch (UV)", 8).getStackForm(1L));
         ItemList.Hatch_Output_UHV.set(
-            new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UHV.ID, "hatch.output.tier.09", "Output Hatch (UHV)", 9)
-                .getStackForm(1L));
+            new MTEHatchOutput(OUTPUT_HATCH_UHV.ID, "hatch.output.tier.09", "Output Hatch (UHV)", 9).getStackForm(1L));
         ItemList.Hatch_Output_UEV.set(
-            new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UEV.ID, "hatch.output.tier.10", "Output Hatch (UEV)", 10)
-                .getStackForm(1L));
+            new MTEHatchOutput(OUTPUT_HATCH_UEV.ID, "hatch.output.tier.10", "Output Hatch (UEV)", 10).getStackForm(1L));
         ItemList.Hatch_Output_UIV.set(
-            new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UIV.ID, "hatch.output.tier.11", "Output Hatch (UIV)", 11)
-                .getStackForm(1L));
+            new MTEHatchOutput(OUTPUT_HATCH_UIV.ID, "hatch.output.tier.11", "Output Hatch (UIV)", 11).getStackForm(1L));
         ItemList.Hatch_Output_UMV.set(
-            new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UMV.ID, "hatch.output.tier.12", "Output Hatch (UMV)", 12)
-                .getStackForm(1L));
+            new MTEHatchOutput(OUTPUT_HATCH_UMV.ID, "hatch.output.tier.12", "Output Hatch (UMV)", 12).getStackForm(1L));
         ItemList.Hatch_Output_UXV.set(
-            new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UXV.ID, "hatch.output.tier.13", "Output Hatch (UXV)", 13)
-                .getStackForm(1L));
+            new MTEHatchOutput(OUTPUT_HATCH_UXV.ID, "hatch.output.tier.13", "Output Hatch (UXV)", 13).getStackForm(1L));
         ItemList.Hatch_Output_MAX.set(
-            new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_MAX.ID, "hatch.output.tier.14", "Output Hatch (MAX)", 14)
-                .getStackForm(1L));
+            new MTEHatchOutput(OUTPUT_HATCH_MAX.ID, "hatch.output.tier.14", "Output Hatch (MAX)", 14).getStackForm(1L));
     }
 
     private static void registerQuantumTank() {
-        ItemList.Quantum_Tank_LV.set(
-            new GT_MetaTileEntity_QuantumTank(QUANTUM_TANK_LV.ID, "quantum.tank.tier.06", "Quantum Tank I", 6)
-                .getStackForm(1L));
-        ItemList.Quantum_Tank_MV.set(
-            new GT_MetaTileEntity_QuantumTank(QUANTUM_TANK_MV.ID, "quantum.tank.tier.07", "Quantum Tank II", 7)
-                .getStackForm(1L));
+        ItemList.Quantum_Tank_LV
+            .set(new MTEQuantumTank(QUANTUM_TANK_LV.ID, "quantum.tank.tier.06", "Quantum Tank I", 6).getStackForm(1L));
+        ItemList.Quantum_Tank_MV
+            .set(new MTEQuantumTank(QUANTUM_TANK_MV.ID, "quantum.tank.tier.07", "Quantum Tank II", 7).getStackForm(1L));
         ItemList.Quantum_Tank_HV.set(
-            new GT_MetaTileEntity_QuantumTank(QUANTUM_TANK_HV.ID, "quantum.tank.tier.08", "Quantum Tank III", 8)
-                .getStackForm(1L));
-        ItemList.Quantum_Tank_EV.set(
-            new GT_MetaTileEntity_QuantumTank(QUANTUM_TANK_EV.ID, "quantum.tank.tier.09", "Quantum Tank IV", 9)
-                .getStackForm(1L));
-        ItemList.Quantum_Tank_IV.set(
-            new GT_MetaTileEntity_QuantumTank(QUANTUM_TANK_IV.ID, "quantum.tank.tier.10", "Quantum Tank V", 10)
-                .getStackForm(1L));
+            new MTEQuantumTank(QUANTUM_TANK_HV.ID, "quantum.tank.tier.08", "Quantum Tank III", 8).getStackForm(1L));
+        ItemList.Quantum_Tank_EV
+            .set(new MTEQuantumTank(QUANTUM_TANK_EV.ID, "quantum.tank.tier.09", "Quantum Tank IV", 9).getStackForm(1L));
+        ItemList.Quantum_Tank_IV
+            .set(new MTEQuantumTank(QUANTUM_TANK_IV.ID, "quantum.tank.tier.10", "Quantum Tank V", 10).getStackForm(1L));
     }
 
     private static void registerQuantumChest() {
         ItemList.Quantum_Chest_LV.set(
-            new GT_MetaTileEntity_QuantumChest(QUANTUM_CHEST_LV.ID, "quantum.chest.tier.06", "Quantum Chest I", 6)
-                .getStackForm(1L));
+            new MTEQuantumChest(QUANTUM_CHEST_LV.ID, "quantum.chest.tier.06", "Quantum Chest I", 6).getStackForm(1L));
         ItemList.Quantum_Chest_MV.set(
-            new GT_MetaTileEntity_QuantumChest(QUANTUM_CHEST_MV.ID, "quantum.chest.tier.07", "Quantum Chest II", 7)
-                .getStackForm(1L));
+            new MTEQuantumChest(QUANTUM_CHEST_MV.ID, "quantum.chest.tier.07", "Quantum Chest II", 7).getStackForm(1L));
         ItemList.Quantum_Chest_HV.set(
-            new GT_MetaTileEntity_QuantumChest(QUANTUM_CHEST_HV.ID, "quantum.chest.tier.08", "Quantum Chest III", 8)
-                .getStackForm(1L));
+            new MTEQuantumChest(QUANTUM_CHEST_HV.ID, "quantum.chest.tier.08", "Quantum Chest III", 8).getStackForm(1L));
         ItemList.Quantum_Chest_EV.set(
-            new GT_MetaTileEntity_QuantumChest(QUANTUM_CHEST_EV.ID, "quantum.chest.tier.09", "Quantum Chest IV", 9)
-                .getStackForm(1L));
+            new MTEQuantumChest(QUANTUM_CHEST_EV.ID, "quantum.chest.tier.09", "Quantum Chest IV", 9).getStackForm(1L));
         ItemList.Quantum_Chest_IV.set(
-            new GT_MetaTileEntity_QuantumChest(QUANTUM_CHEST_IV.ID, "quantum.chest.tier.10", "Quantum Chest V", 10)
-                .getStackForm(1L));
+            new MTEQuantumChest(QUANTUM_CHEST_IV.ID, "quantum.chest.tier.10", "Quantum Chest V", 10).getStackForm(1L));
     }
 
     private static void registerSuperTank() {
-        ItemList.Super_Tank_LV.set(
-            new GT_MetaTileEntity_SuperTank(SUPER_TANK_LV.ID, "super.tank.tier.01", "Super Tank I", 1)
-                .getStackForm(1L));
-        ItemList.Super_Tank_MV.set(
-            new GT_MetaTileEntity_SuperTank(SUPER_TANK_MV.ID, "super.tank.tier.02", "Super Tank II", 2)
-                .getStackForm(1L));
-        ItemList.Super_Tank_HV.set(
-            new GT_MetaTileEntity_SuperTank(SUPER_TANK_HV.ID, "super.tank.tier.03", "Super Tank III", 3)
-                .getStackForm(1L));
-        ItemList.Super_Tank_EV.set(
-            new GT_MetaTileEntity_SuperTank(SUPER_TANK_EV.ID, "super.tank.tier.04", "Super Tank IV", 4)
-                .getStackForm(1L));
-        ItemList.Super_Tank_IV.set(
-            new GT_MetaTileEntity_SuperTank(SUPER_TANK_IV.ID, "super.tank.tier.05", "Super Tank V", 5)
-                .getStackForm(1L));
+        ItemList.Super_Tank_LV
+            .set(new MTESuperTank(SUPER_TANK_LV.ID, "super.tank.tier.01", "Super Tank I", 1).getStackForm(1L));
+        ItemList.Super_Tank_MV
+            .set(new MTESuperTank(SUPER_TANK_MV.ID, "super.tank.tier.02", "Super Tank II", 2).getStackForm(1L));
+        ItemList.Super_Tank_HV
+            .set(new MTESuperTank(SUPER_TANK_HV.ID, "super.tank.tier.03", "Super Tank III", 3).getStackForm(1L));
+        ItemList.Super_Tank_EV
+            .set(new MTESuperTank(SUPER_TANK_EV.ID, "super.tank.tier.04", "Super Tank IV", 4).getStackForm(1L));
+        ItemList.Super_Tank_IV
+            .set(new MTESuperTank(SUPER_TANK_IV.ID, "super.tank.tier.05", "Super Tank V", 5).getStackForm(1L));
     }
 
     private static void registerSuperChest() {
-        ItemList.Super_Chest_LV.set(
-            new GT_MetaTileEntity_SuperChest(SUPER_CHEST_LV.ID, "super.chest.tier.01", "Super Chest I", 1)
-                .getStackForm(1L));
-        ItemList.Super_Chest_MV.set(
-            new GT_MetaTileEntity_SuperChest(SUPER_CHEST_MV.ID, "super.chest.tier.02", "Super Chest II", 2)
-                .getStackForm(1L));
-        ItemList.Super_Chest_HV.set(
-            new GT_MetaTileEntity_SuperChest(SUPER_CHEST_HV.ID, "super.chest.tier.03", "Super Chest III", 3)
-                .getStackForm(1L));
-        ItemList.Super_Chest_EV.set(
-            new GT_MetaTileEntity_SuperChest(SUPER_CHEST_EV.ID, "super.chest.tier.04", "Super Chest IV", 4)
-                .getStackForm(1L));
-        ItemList.Super_Chest_IV.set(
-            new GT_MetaTileEntity_SuperChest(SUPER_CHEST_IV.ID, "super.chest.tier.05", "Super Chest V", 5)
-                .getStackForm(1L));
+        ItemList.Super_Chest_LV
+            .set(new MTESuperChest(SUPER_CHEST_LV.ID, "super.chest.tier.01", "Super Chest I", 1).getStackForm(1L));
+        ItemList.Super_Chest_MV
+            .set(new MTESuperChest(SUPER_CHEST_MV.ID, "super.chest.tier.02", "Super Chest II", 2).getStackForm(1L));
+        ItemList.Super_Chest_HV
+            .set(new MTESuperChest(SUPER_CHEST_HV.ID, "super.chest.tier.03", "Super Chest III", 3).getStackForm(1L));
+        ItemList.Super_Chest_EV
+            .set(new MTESuperChest(SUPER_CHEST_EV.ID, "super.chest.tier.04", "Super Chest IV", 4).getStackForm(1L));
+        ItemList.Super_Chest_IV
+            .set(new MTESuperChest(SUPER_CHEST_IV.ID, "super.chest.tier.05", "Super Chest V", 5).getStackForm(1L));
     }
 
     private static void registerLongDistancePipe() {
         ItemList.Long_Distance_Pipeline_Fluid.set(
-            new GT_MetaTileEntity_LongDistancePipelineFluid(
+            new MTELongDistancePipelineFluid(
                 LONG_DISTANCE_PIPELINE_FLUID.ID,
                 "long.distance.pipeline.fluid",
                 "Long Distance Fluid Pipeline",
                 1).getStackForm(1L));
         ItemList.Long_Distance_Pipeline_Item.set(
-            new GT_MetaTileEntity_LongDistancePipelineItem(
+            new MTELongDistancePipelineItem(
                 LONG_DISTANCE_PIPELINE_ITEM.ID,
                 "long.distance.pipeline.item",
                 "Long Distance Item Pipeline",
@@ -11142,181 +10714,151 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
     }
 
     private static void registerAE2Hatches() {
-        ItemList.Hatch_Output_Bus_ME.set(
-            new GT_MetaTileEntity_Hatch_OutputBus_ME(OUTPUT_BUS_ME.ID, "hatch.output_bus.me", "Output Bus (ME)")
-                .getStackForm(1L));
+        ItemList.Hatch_Output_Bus_ME
+            .set(new MTEHatchOutputBusME(OUTPUT_BUS_ME.ID, "hatch.output_bus.me", "Output Bus (ME)").getStackForm(1L));
         ItemList.Hatch_Input_Bus_ME.set(
-            new GT_MetaTileEntity_Hatch_InputBus_ME(
-                INPUT_BUS_ME.ID,
-                false,
-                "hatch.input_bus.me.basic",
-                "Stocking Input Bus (ME)").getStackForm(1L));
+            new MTEHatchInputBusME(INPUT_BUS_ME.ID, false, "hatch.input_bus.me.basic", "Stocking Input Bus (ME)")
+                .getStackForm(1L));
         ItemList.Hatch_Input_Bus_ME_Advanced.set(
-            new GT_MetaTileEntity_Hatch_InputBus_ME(
+            new MTEHatchInputBusME(
                 INPUT_BUS_ME_ADVANCED.ID,
                 true,
                 "hatch.input_bus.me",
                 "Advanced Stocking Input Bus (ME)").getStackForm(1L));
         ItemList.Hatch_Input_ME.set(
-            new GT_MetaTileEntity_Hatch_Input_ME(
-                INPUT_HATCH_ME.ID,
-                false,
-                "hatch.input.me.basic",
-                "Stocking Input Hatch (ME)").getStackForm(1L));
+            new MTEHatchInputME(INPUT_HATCH_ME.ID, false, "hatch.input.me.basic", "Stocking Input Hatch (ME)")
+                .getStackForm(1L));
         ItemList.Hatch_Input_ME_Advanced.set(
-            new GT_MetaTileEntity_Hatch_Input_ME(
+            new MTEHatchInputME(
                 INPUT_HATCH_ME_ADVANCED.ID,
                 true,
                 "hatch.input.me",
                 "Advanced Stocking Input Hatch (ME)").getStackForm(1L));
-        ItemList.Hatch_Output_ME.set(
-            new GT_MetaTileEntity_Hatch_Output_ME(OUTPUT_HATCH_ME.ID, "hatch.output.me", "Output Hatch (ME)")
-                .getStackForm(1L));
+        ItemList.Hatch_Output_ME
+            .set(new MTEHatchOutputME(OUTPUT_HATCH_ME.ID, "hatch.output.me", "Output Hatch (ME)").getStackForm(1L));
         ItemList.Hatch_CraftingInput_Bus_ME.set(
-            new GT_MetaTileEntity_Hatch_CraftingInput_ME(
+            new MTEHatchCraftingInputME(
                 CRAFTING_INPUT_ME.ID,
                 "hatch.crafting_input.me",
                 "Crafting Input Buffer (ME)",
                 true).getStackForm(1L));
         ItemList.Hatch_CraftingInput_Bus_ME_ItemOnly.set(
-            new GT_MetaTileEntity_Hatch_CraftingInput_ME(
+            new MTEHatchCraftingInputME(
                 CRAFTING_INPUT_ME_BUS.ID,
                 "hatch.crafting_input.me.item_only",
                 "Crafting Input Bus (ME)",
                 false).getStackForm(1L));
         ItemList.Hatch_CraftingInput_Bus_Slave.set(
-            new GT_MetaTileEntity_Hatch_CraftingInput_Slave(
+            new MTEHatchCraftingInputSlave(
                 CRAFTING_INPUT_SLAVE.ID,
                 "hatch.crafting_input.proxy",
                 "Crafting Input Proxy").getStackForm(1L));
     }
 
     private static void registerMagHatch() {
-        ItemList.Hatch_Electromagnet.set(
-            new GT_MetaTileEntity_MagHatch(MAG_HATCH.ID, "hatch.mag_hatch", "Electromagnet Housing").getStackForm(1L));
+        ItemList.Hatch_Electromagnet
+            .set(new MTEHatchMagnet(MAG_HATCH.ID, "hatch.mag_hatch", "Electromagnet Housing").getStackForm(1L));
     }
 
     private static void registerInputBus() {
         ItemList.Hatch_Input_Bus_ULV.set(
-            new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_ULV.ID, "hatch.input_bus.tier.00", "Input Bus (ULV)", 0)
-                .getStackForm(1L));
+            new MTEHatchInputBus(INPUT_BUS_ULV.ID, "hatch.input_bus.tier.00", "Input Bus (ULV)", 0).getStackForm(1L));
         ItemList.Hatch_Input_Bus_LV.set(
-            new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_LV.ID, "hatch.input_bus.tier.01", "Input Bus (LV)", 1)
-                .getStackForm(1L));
+            new MTEHatchInputBus(INPUT_BUS_LV.ID, "hatch.input_bus.tier.01", "Input Bus (LV)", 1).getStackForm(1L));
         ItemList.Hatch_Input_Bus_MV.set(
-            new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_MV.ID, "hatch.input_bus.tier.02", "Input Bus (MV)", 2)
-                .getStackForm(1L));
+            new MTEHatchInputBus(INPUT_BUS_MV.ID, "hatch.input_bus.tier.02", "Input Bus (MV)", 2).getStackForm(1L));
         ItemList.Hatch_Input_Bus_HV.set(
-            new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_HV.ID, "hatch.input_bus.tier.03", "Input Bus (HV)", 3)
-                .getStackForm(1L));
+            new MTEHatchInputBus(INPUT_BUS_HV.ID, "hatch.input_bus.tier.03", "Input Bus (HV)", 3).getStackForm(1L));
         ItemList.Hatch_Input_Bus_EV.set(
-            new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_EV.ID, "hatch.input_bus.tier.04", "Input Bus (EV)", 4)
-                .getStackForm(1L));
+            new MTEHatchInputBus(INPUT_BUS_EV.ID, "hatch.input_bus.tier.04", "Input Bus (EV)", 4).getStackForm(1L));
         ItemList.Hatch_Input_Bus_IV.set(
-            new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_IV.ID, "hatch.input_bus.tier.05", "Input Bus (IV)", 5)
-                .getStackForm(1L));
+            new MTEHatchInputBus(INPUT_BUS_IV.ID, "hatch.input_bus.tier.05", "Input Bus (IV)", 5).getStackForm(1L));
         ItemList.Hatch_Input_Bus_LuV.set(
-            new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_LuV.ID, "hatch.input_bus.tier.06", "Input Bus (LuV)", 6)
-                .getStackForm(1L));
+            new MTEHatchInputBus(INPUT_BUS_LuV.ID, "hatch.input_bus.tier.06", "Input Bus (LuV)", 6).getStackForm(1L));
         ItemList.Hatch_Input_Bus_ZPM.set(
-            new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_ZPM.ID, "hatch.input_bus.tier.07", "Input Bus (ZPM)", 7)
-                .getStackForm(1L));
+            new MTEHatchInputBus(INPUT_BUS_ZPM.ID, "hatch.input_bus.tier.07", "Input Bus (ZPM)", 7).getStackForm(1L));
         ItemList.Hatch_Input_Bus_UV.set(
-            new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_UV.ID, "hatch.input_bus.tier.08", "Input Bus (UV)", 8)
-                .getStackForm(1L));
+            new MTEHatchInputBus(INPUT_BUS_UV.ID, "hatch.input_bus.tier.08", "Input Bus (UV)", 8).getStackForm(1L));
         ItemList.Hatch_Input_Bus_MAX.set(
-            new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_UHV.ID, "hatch.input_bus.tier.09", "Input Bus (UHV)", 9)
-                .getStackForm(1L));
+            new MTEHatchInputBus(INPUT_BUS_UHV.ID, "hatch.input_bus.tier.09", "Input Bus (UHV)", 9).getStackForm(1L));
     }
 
     private static void registerOutputBus() {
         ItemList.Hatch_Output_Bus_ULV.set(
-            new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_ULV.ID, "hatch.output_bus.tier.00", "Output Bus (ULV)", 0)
+            new MTEHatchOutputBus(OUTPUT_BUS_ULV.ID, "hatch.output_bus.tier.00", "Output Bus (ULV)", 0)
                 .getStackForm(1L));
         ItemList.Hatch_Output_Bus_LV.set(
-            new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_LV.ID, "hatch.output_bus.tier.01", "Output Bus (LV)", 1)
-                .getStackForm(1L));
+            new MTEHatchOutputBus(OUTPUT_BUS_LV.ID, "hatch.output_bus.tier.01", "Output Bus (LV)", 1).getStackForm(1L));
         ItemList.Hatch_Output_Bus_MV.set(
-            new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_MV.ID, "hatch.output_bus.tier.02", "Output Bus (MV)", 2)
-                .getStackForm(1L));
+            new MTEHatchOutputBus(OUTPUT_BUS_MV.ID, "hatch.output_bus.tier.02", "Output Bus (MV)", 2).getStackForm(1L));
         ItemList.Hatch_Output_Bus_HV.set(
-            new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_HV.ID, "hatch.output_bus.tier.03", "Output Bus (HV)", 3)
-                .getStackForm(1L));
+            new MTEHatchOutputBus(OUTPUT_BUS_HV.ID, "hatch.output_bus.tier.03", "Output Bus (HV)", 3).getStackForm(1L));
         ItemList.Hatch_Output_Bus_EV.set(
-            new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_EV.ID, "hatch.output_bus.tier.04", "Output Bus (EV)", 4)
-                .getStackForm(1L));
+            new MTEHatchOutputBus(OUTPUT_BUS_EV.ID, "hatch.output_bus.tier.04", "Output Bus (EV)", 4).getStackForm(1L));
         ItemList.Hatch_Output_Bus_IV.set(
-            new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_IV.ID, "hatch.output_bus.tier.05", "Output Bus (IV)", 5)
-                .getStackForm(1L));
+            new MTEHatchOutputBus(OUTPUT_BUS_IV.ID, "hatch.output_bus.tier.05", "Output Bus (IV)", 5).getStackForm(1L));
         ItemList.Hatch_Output_Bus_LuV.set(
-            new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_LuV.ID, "hatch.output_bus.tier.06", "Output Bus (LuV)", 6)
+            new MTEHatchOutputBus(OUTPUT_BUS_LuV.ID, "hatch.output_bus.tier.06", "Output Bus (LuV)", 6)
                 .getStackForm(1L));
         ItemList.Hatch_Output_Bus_ZPM.set(
-            new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_ZPM.ID, "hatch.output_bus.tier.07", "Output Bus (ZPM)", 7)
+            new MTEHatchOutputBus(OUTPUT_BUS_ZPM.ID, "hatch.output_bus.tier.07", "Output Bus (ZPM)", 7)
                 .getStackForm(1L));
         ItemList.Hatch_Output_Bus_UV.set(
-            new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_UV.ID, "hatch.output_bus.tier.08", "Output Bus (UV)", 8)
-                .getStackForm(1L));
+            new MTEHatchOutputBus(OUTPUT_BUS_UV.ID, "hatch.output_bus.tier.08", "Output Bus (UV)", 8).getStackForm(1L));
         ItemList.Hatch_Output_Bus_MAX.set(
-            new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_UHV.ID, "hatch.output_bus.tier.09", "Output Bus (UHV)", 9)
+            new MTEHatchOutputBus(OUTPUT_BUS_UHV.ID, "hatch.output_bus.tier.09", "Output Bus (UHV)", 9)
                 .getStackForm(1L));
     }
 
     private static void registerMufflerHatch() {
         ItemList.Hatch_Muffler_LV.set(
-            new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_LV.ID, "hatch.muffler.tier.01", "Muffler Hatch (LV)", 1)
+            new MTEHatchMuffler(MUFFLER_HATCH_LV.ID, "hatch.muffler.tier.01", "Muffler Hatch (LV)", 1)
                 .getStackForm(1L));
         ItemList.Hatch_Muffler_MV.set(
-            new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_MV.ID, "hatch.muffler.tier.02", "Muffler Hatch (MV)", 2)
+            new MTEHatchMuffler(MUFFLER_HATCH_MV.ID, "hatch.muffler.tier.02", "Muffler Hatch (MV)", 2)
                 .getStackForm(1L));
         ItemList.Hatch_Muffler_HV.set(
-            new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_HV.ID, "hatch.muffler.tier.03", "Muffler Hatch (HV)", 3)
+            new MTEHatchMuffler(MUFFLER_HATCH_HV.ID, "hatch.muffler.tier.03", "Muffler Hatch (HV)", 3)
                 .getStackForm(1L));
         ItemList.Hatch_Muffler_EV.set(
-            new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_EV.ID, "hatch.muffler.tier.04", "Muffler Hatch (EV)", 4)
+            new MTEHatchMuffler(MUFFLER_HATCH_EV.ID, "hatch.muffler.tier.04", "Muffler Hatch (EV)", 4)
                 .getStackForm(1L));
         ItemList.Hatch_Muffler_IV.set(
-            new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_IV.ID, "hatch.muffler.tier.05", "Muffler Hatch (IV)", 5)
+            new MTEHatchMuffler(MUFFLER_HATCH_IV.ID, "hatch.muffler.tier.05", "Muffler Hatch (IV)", 5)
                 .getStackForm(1L));
         ItemList.Hatch_Muffler_LuV.set(
-            new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_LuV.ID, "hatch.muffler.tier.06", "Muffler Hatch (LuV)", 6)
+            new MTEHatchMuffler(MUFFLER_HATCH_LuV.ID, "hatch.muffler.tier.06", "Muffler Hatch (LuV)", 6)
                 .getStackForm(1L));
         ItemList.Hatch_Muffler_ZPM.set(
-            new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_ZPM.ID, "hatch.muffler.tier.07", "Muffler Hatch (ZPM)", 7)
+            new MTEHatchMuffler(MUFFLER_HATCH_ZPM.ID, "hatch.muffler.tier.07", "Muffler Hatch (ZPM)", 7)
                 .getStackForm(1L));
         ItemList.Hatch_Muffler_UV.set(
-            new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_UV.ID, "hatch.muffler.tier.08", "Muffler Hatch (UV)", 8)
+            new MTEHatchMuffler(MUFFLER_HATCH_UV.ID, "hatch.muffler.tier.08", "Muffler Hatch (UV)", 8)
                 .getStackForm(1L));
         ItemList.Hatch_Muffler_MAX.set(
-            new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_UHV.ID, "hatch.muffler.tier.09", "Muffler Hatch (UHV)", 9)
+            new MTEHatchMuffler(MUFFLER_HATCH_UHV.ID, "hatch.muffler.tier.09", "Muffler Hatch (UHV)", 9)
                 .getStackForm(1L));
     }
 
     private static void registerBoiler() {
-        ItemList.Machine_Bronze_Boiler.set(
-            new GT_MetaTileEntity_Boiler_Bronze(SMALL_COAL_BOILER.ID, "boiler.bronze", "Small Coal Boiler")
-                .getStackForm(1L));
+        ItemList.Machine_Bronze_Boiler
+            .set(new MTEBoilerBronze(SMALL_COAL_BOILER.ID, "boiler.bronze", "Small Coal Boiler").getStackForm(1L));
         ItemList.Machine_Steel_Boiler.set(
-            new GT_MetaTileEntity_Boiler_Steel(
-                HIGH_PRESSURE_COAL_BOILER.ID,
-                "boiler.steel",
-                "High Pressure Coal Boiler").getStackForm(1L));
-        ItemList.Machine_Steel_Boiler_Lava.set(
-            new GT_MetaTileEntity_Boiler_Lava(HIGH_PRESSURE_LAVA_BOILER.ID, "boiler.lava", "High Pressure Lava Boiler")
+            new MTEBoilerSteel(HIGH_PRESSURE_COAL_BOILER.ID, "boiler.steel", "High Pressure Coal Boiler")
                 .getStackForm(1L));
-        ItemList.Machine_Bronze_Boiler_Solar.set(
-            new GT_MetaTileEntity_Boiler_Solar(SIMPLE_SOLAR_BOILER.ID, "boiler.solar", "Simple Solar Boiler")
+        ItemList.Machine_Steel_Boiler_Lava.set(
+            new MTEBoilerLava(HIGH_PRESSURE_LAVA_BOILER.ID, "boiler.lava", "High Pressure Lava Boiler")
                 .getStackForm(1L));
+        ItemList.Machine_Bronze_Boiler_Solar
+            .set(new MTEBoilerSolar(SIMPLE_SOLAR_BOILER.ID, "boiler.solar", "Simple Solar Boiler").getStackForm(1L));
         ItemList.Machine_HP_Solar.set(
-            new GT_MetaTileEntity_Boiler_Solar_Steel(
-                HIGH_PRESSURE_SOLAR_BOILER.ID,
-                "boiler.steel.solar",
-                "High Pressure Solar Boiler").getStackForm(1L));
+            new MTEBoilerSolarSteel(HIGH_PRESSURE_SOLAR_BOILER.ID, "boiler.steel.solar", "High Pressure Solar Boiler")
+                .getStackForm(1L));
     }
 
     private static void registerBatteryBuffer1x1() {
         ItemList.Battery_Buffer_1by1_ULV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_1_BY_1_ULV.ID,
                 "batterybuffer.01.tier.00",
                 "Ultra Low Voltage Battery Buffer",
@@ -11324,7 +10866,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 1).getStackForm(1L));
         ItemList.Battery_Buffer_1by1_LV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_1_BY_1_LV.ID,
                 "batterybuffer.01.tier.01",
                 "Low Voltage Battery Buffer",
@@ -11332,7 +10874,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 1).getStackForm(1L));
         ItemList.Battery_Buffer_1by1_MV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_1_BY_1_MV.ID,
                 "batterybuffer.01.tier.02",
                 "Medium Voltage Battery Buffer",
@@ -11340,7 +10882,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 1).getStackForm(1L));
         ItemList.Battery_Buffer_1by1_HV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_1_BY_1_HV.ID,
                 "batterybuffer.01.tier.03",
                 "High Voltage Battery Buffer",
@@ -11348,7 +10890,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 1).getStackForm(1L));
         ItemList.Battery_Buffer_1by1_EV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_1_BY_1_EV.ID,
                 "batterybuffer.01.tier.04",
                 "Extreme Voltage Battery Buffer",
@@ -11356,7 +10898,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 1).getStackForm(1L));
         ItemList.Battery_Buffer_1by1_IV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_1_BY_1_IV.ID,
                 "batterybuffer.01.tier.05",
                 "Insane Voltage Battery Buffer",
@@ -11364,7 +10906,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 1).getStackForm(1L));
         ItemList.Battery_Buffer_1by1_LuV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_1_BY_1_LuV.ID,
                 "batterybuffer.01.tier.06",
                 "Ludicrous Voltage Battery Buffer",
@@ -11372,7 +10914,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 1).getStackForm(1L));
         ItemList.Battery_Buffer_1by1_ZPM.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_1_BY_1_ZPM.ID,
                 "batterybuffer.01.tier.07",
                 "ZPM Voltage Battery Buffer",
@@ -11380,7 +10922,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 1).getStackForm(1L));
         ItemList.Battery_Buffer_1by1_UV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_1_BY_1_UV.ID,
                 "batterybuffer.01.tier.08",
                 "Ultimate Voltage Battery Buffer",
@@ -11388,7 +10930,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 1).getStackForm(1L));
         ItemList.Battery_Buffer_1by1_UHV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_1_BY_1_UHV.ID,
                 "batterybuffer.01.tier.09",
                 "Highly Ultimate Voltage Battery Buffer",
@@ -11397,7 +10939,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1).getStackForm(1L));
 
         ItemList.Battery_Buffer_1by1_UEV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_1_BY_1_UEV.ID,
                 "batterybuffer.01.tier.10",
                 "Extremely Ultimate Battery Buffer",
@@ -11406,7 +10948,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1).getStackForm(1L));
 
         ItemList.Battery_Buffer_1by1_UIV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_1_BY_1_UIV.ID,
                 "batterybuffer.01.tier.11",
                 "Insanely Ultimate Battery Buffer",
@@ -11415,7 +10957,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1).getStackForm(1L));
 
         ItemList.Battery_Buffer_1by1_UMV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_1_BY_1_UMV.ID,
                 "batterybuffer.01.tier.12",
                 "Mega Ultimate Battery Buffer",
@@ -11424,7 +10966,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1).getStackForm(1L));
 
         ItemList.Battery_Buffer_1by1_UXV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_1_BY_1_UXV.ID,
                 "batterybuffer.01.tier.13",
                 "Extended Mega Ultimate Battery Buffer",
@@ -11433,7 +10975,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1).getStackForm(1L));
 
         ItemList.Battery_Buffer_1by1_MAXV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_1_BY_1_MAX.ID,
                 "batterybuffer.01.tier.14",
                 "Maximum Battery Buffer",
@@ -11444,7 +10986,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerBatteryBuffer2x2() {
         ItemList.Battery_Buffer_2by2_ULV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_2_BY_2_ULV.ID,
                 "batterybuffer.04.tier.00",
                 "Ultra Low Voltage Battery Buffer",
@@ -11452,7 +10994,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 4).getStackForm(1L));
         ItemList.Battery_Buffer_2by2_LV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_2_BY_2_LV.ID,
                 "batterybuffer.04.tier.01",
                 "Low Voltage Battery Buffer",
@@ -11460,7 +11002,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 4).getStackForm(1L));
         ItemList.Battery_Buffer_2by2_MV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_2_BY_2_MV.ID,
                 "batterybuffer.04.tier.02",
                 "Medium Voltage Battery Buffer",
@@ -11468,7 +11010,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 4).getStackForm(1L));
         ItemList.Battery_Buffer_2by2_HV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_2_BY_2_HV.ID,
                 "batterybuffer.04.tier.03",
                 "High Voltage Battery Buffer",
@@ -11476,7 +11018,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 4).getStackForm(1L));
         ItemList.Battery_Buffer_2by2_EV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_2_BY_2_EV.ID,
                 "batterybuffer.04.tier.04",
                 "Extreme Voltage Battery Buffer",
@@ -11484,7 +11026,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 4).getStackForm(1L));
         ItemList.Battery_Buffer_2by2_IV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_2_BY_2_IV.ID,
                 "batterybuffer.04.tier.05",
                 "Insane Voltage Battery Buffer",
@@ -11492,7 +11034,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 4).getStackForm(1L));
         ItemList.Battery_Buffer_2by2_LuV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_2_BY_2_LuV.ID,
                 "batterybuffer.04.tier.06",
                 "Ludicrous Voltage Battery Buffer",
@@ -11500,7 +11042,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 4).getStackForm(1L));
         ItemList.Battery_Buffer_2by2_ZPM.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_2_BY_2_ZPM.ID,
                 "batterybuffer.04.tier.07",
                 "ZPM Voltage Battery Buffer",
@@ -11508,7 +11050,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 4).getStackForm(1L));
         ItemList.Battery_Buffer_2by2_UV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_2_BY_2_UV.ID,
                 "batterybuffer.04.tier.08",
                 "Ultimate Voltage Battery Buffer",
@@ -11516,7 +11058,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 4).getStackForm(1L));
         ItemList.Battery_Buffer_2by2_UHV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_2_BY_2_UHV.ID,
                 "batterybuffer.04.tier.09",
                 "Highly Ultimate Voltage Battery Buffer",
@@ -11525,7 +11067,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_Buffer_2by2_UEV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_2_BY_2_UEV.ID,
                 "batterybuffer.04.tier.10",
                 "Extremely Ultimate Battery Buffer",
@@ -11534,7 +11076,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_Buffer_2by2_UIV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_2_BY_2_UIV.ID,
                 "batterybuffer.04.tier.11",
                 "Insanely Ultimate Battery Buffer",
@@ -11543,7 +11085,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_Buffer_2by2_UMV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_2_BY_2_UMV.ID,
                 "batterybuffer.04.tier.12",
                 "Mega Ultimate Battery Buffer",
@@ -11552,7 +11094,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_Buffer_2by2_UXV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_2_BY_2_UXV.ID,
                 "batterybuffer.04.tier.13",
                 "Extended Mega Ultimate Battery Buffer",
@@ -11561,7 +11103,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_Buffer_2by2_MAXV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_2_BY_2_MAX.ID,
                 "batterybuffer.04.tier.14",
                 "Maximum Battery Buffer",
@@ -11572,7 +11114,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerBatteryBuffer3x3() {
         ItemList.Battery_Buffer_3by3_ULV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_3_BY_3_ULV.ID,
                 "batterybuffer.09.tier.00",
                 "Ultra Low Voltage Battery Buffer",
@@ -11580,7 +11122,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 9).getStackForm(1L));
         ItemList.Battery_Buffer_3by3_LV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_3_BY_3_LV.ID,
                 "batterybuffer.09.tier.01",
                 "Low Voltage Battery Buffer",
@@ -11588,7 +11130,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 9).getStackForm(1L));
         ItemList.Battery_Buffer_3by3_MV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_3_BY_3_MV.ID,
                 "batterybuffer.09.tier.02",
                 "Medium Voltage Battery Buffer",
@@ -11596,7 +11138,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 9).getStackForm(1L));
         ItemList.Battery_Buffer_3by3_HV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_3_BY_3_HV.ID,
                 "batterybuffer.09.tier.03",
                 "High Voltage Battery Buffer",
@@ -11604,7 +11146,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 9).getStackForm(1L));
         ItemList.Battery_Buffer_3by3_EV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_3_BY_3_EV.ID,
                 "batterybuffer.09.tier.04",
                 "Extreme Voltage Battery Buffer",
@@ -11612,7 +11154,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 9).getStackForm(1L));
         ItemList.Battery_Buffer_3by3_IV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_3_BY_3_IV.ID,
                 "batterybuffer.09.tier.05",
                 "Insane Voltage Battery Buffer",
@@ -11620,7 +11162,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 9).getStackForm(1L));
         ItemList.Battery_Buffer_3by3_LuV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_3_BY_3_LuV.ID,
                 "batterybuffer.09.tier.06",
                 "Ludicrous Voltage Battery Buffer",
@@ -11628,7 +11170,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 9).getStackForm(1L));
         ItemList.Battery_Buffer_3by3_ZPM.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_3_BY_3_ZPM.ID,
                 "batterybuffer.09.tier.07",
                 "ZPM Voltage Battery Buffer",
@@ -11636,7 +11178,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 9).getStackForm(1L));
         ItemList.Battery_Buffer_3by3_UV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_3_BY_3_UV.ID,
                 "batterybuffer.09.tier.08",
                 "Ultimate Voltage Battery Buffer",
@@ -11644,7 +11186,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 9).getStackForm(1L));
         ItemList.Battery_Buffer_3by3_UHV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_3_BY_3_UHV.ID,
                 "batterybuffer.09.tier.09",
                 "Highly Ultimate Voltage Battery Buffer",
@@ -11653,7 +11195,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9).getStackForm(1L));
 
         ItemList.Battery_Buffer_3by3_UEV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_3_BY_3_UEV.ID,
                 "batterybuffer.09.tier.10",
                 "Extremely Ultimate Battery Buffer",
@@ -11662,7 +11204,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9).getStackForm(1L));
 
         ItemList.Battery_Buffer_3by3_UIV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_3_BY_3_UIV.ID,
                 "batterybuffer.09.tier.11",
                 "Insanely Ultimate Battery Buffer",
@@ -11671,7 +11213,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9).getStackForm(1L));
 
         ItemList.Battery_Buffer_3by3_UMV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_3_BY_3_UMV.ID,
                 "batterybuffer.09.tier.12",
                 "Mega Ultimate Battery Buffer",
@@ -11680,7 +11222,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9).getStackForm(1L));
 
         ItemList.Battery_Buffer_3by3_UXV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_3_BY_3_UXV.ID,
                 "batterybuffer.09.tier.13",
                 "Extended Mega Ultimate Battery Buffer",
@@ -11689,7 +11231,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 9).getStackForm(1L));
 
         ItemList.Battery_Buffer_3by3_MAXV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_3_BY_3_MAX.ID,
                 "batterybuffer.09.tier.14",
                 "Maximum Battery Buffer",
@@ -11700,7 +11242,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerBatteryBuffer4x4() {
         ItemList.Battery_Buffer_4by4_ULV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_4_BY_4_ULV.ID,
                 "batterybuffer.16.tier.00",
                 "Ultra Low Voltage Battery Buffer",
@@ -11708,7 +11250,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 16).getStackForm(1L));
         ItemList.Battery_Buffer_4by4_LV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_4_BY_4_LV.ID,
                 "batterybuffer.16.tier.01",
                 "Low Voltage Battery Buffer",
@@ -11716,7 +11258,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 16).getStackForm(1L));
         ItemList.Battery_Buffer_4by4_MV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_4_BY_4_MV.ID,
                 "batterybuffer.16.tier.02",
                 "Medium Voltage Battery Buffer",
@@ -11724,7 +11266,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 16).getStackForm(1L));
         ItemList.Battery_Buffer_4by4_HV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_4_BY_4_HV.ID,
                 "batterybuffer.16.tier.03",
                 "High Voltage Battery Buffer",
@@ -11732,7 +11274,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 16).getStackForm(1L));
         ItemList.Battery_Buffer_4by4_EV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_4_BY_4_EV.ID,
                 "batterybuffer.16.tier.04",
                 "Extreme Voltage Battery Buffer",
@@ -11740,7 +11282,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 16).getStackForm(1L));
         ItemList.Battery_Buffer_4by4_IV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_4_BY_4_IV.ID,
                 "batterybuffer.16.tier.05",
                 "Insane Voltage Battery Buffer",
@@ -11748,7 +11290,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 16).getStackForm(1L));
         ItemList.Battery_Buffer_4by4_LuV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_4_BY_4_LuV.ID,
                 "batterybuffer.16.tier.06",
                 "Ludicrous Voltage Battery Buffer",
@@ -11756,7 +11298,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 16).getStackForm(1L));
         ItemList.Battery_Buffer_4by4_ZPM.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_4_BY_4_ZPM.ID,
                 "batterybuffer.16.tier.07",
                 "ZPM Voltage Battery Buffer",
@@ -11764,7 +11306,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 16).getStackForm(1L));
         ItemList.Battery_Buffer_4by4_UV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_4_BY_4_UV.ID,
                 "batterybuffer.16.tier.08",
                 "Ultimate Voltage Battery Buffer",
@@ -11772,7 +11314,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 16).getStackForm(1L));
         ItemList.Battery_Buffer_4by4_UHV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_4_BY_4_UHV.ID,
                 "batterybuffer.16.tier.09",
                 "Highly Ultimate Voltage Battery Buffer",
@@ -11780,7 +11322,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "",
                 16).getStackForm(1L));
         ItemList.Battery_Buffer_4by4_UEV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_4_BY_4_UEV.ID,
                 "batterybuffer.16.tier.10",
                 "Extremely Ultimate Battery Buffer",
@@ -11789,7 +11331,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 16).getStackForm(1L));
 
         ItemList.Battery_Buffer_4by4_UIV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_4_BY_4_UIV.ID,
                 "batterybuffer.16.tier.11",
                 "Insanely Ultimate Battery Buffer",
@@ -11798,7 +11340,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 16).getStackForm(1L));
 
         ItemList.Battery_Buffer_4by4_UMV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_4_BY_4_UMV.ID,
                 "batterybuffer.16.tier.12",
                 "Mega Ultimate Battery Buffer",
@@ -11807,7 +11349,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 16).getStackForm(1L));
 
         ItemList.Battery_Buffer_4by4_UXV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_4_BY_4_UXV.ID,
                 "batterybuffer.16.tier.13",
                 "Extended Mega Ultimate Battery Buffer",
@@ -11816,7 +11358,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 16).getStackForm(1L));
 
         ItemList.Battery_Buffer_4by4_MAXV.set(
-            new GT_MetaTileEntity_BasicBatteryBuffer(
+            new MTEBasicBatteryBuffer(
                 BATTERY_BUFFER_4_BY_4_MAX.ID,
                 "batterybuffer.16.tier.14",
                 "Maximum Battery Buffer",
@@ -11827,7 +11369,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerCharger4x4() {
         ItemList.Battery_Charger_4by4_ULV.set(
-            new GT_MetaTileEntity_Charger(
+            new MTECharger(
                 BATTERY_CHARGER_4_BY_4_ULV.ID,
                 "batterycharger.16.tier.00",
                 "Ultra Low Voltage Battery Charger",
@@ -11835,7 +11377,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "Each battery gives 8A in/4A out (min 4A/2A)",
                 4).getStackForm(1L));
         ItemList.Battery_Charger_4by4_LV.set(
-            new GT_MetaTileEntity_Charger(
+            new MTECharger(
                 BATTERY_CHARGER_4_BY_4_LV.ID,
                 "batterycharger.16.tier.01",
                 "Low Voltage Battery Charger",
@@ -11843,7 +11385,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "Each battery gives 8A in/4A out (min 4A/2A)",
                 4).getStackForm(1L));
         ItemList.Battery_Charger_4by4_MV.set(
-            new GT_MetaTileEntity_Charger(
+            new MTECharger(
                 BATTERY_CHARGER_4_BY_4_MV.ID,
                 "batterycharger.16.tier.02",
                 "Medium Voltage Battery Charger",
@@ -11851,7 +11393,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "Each battery gives 8A in/4A out (min 4A/2A)",
                 4).getStackForm(1L));
         ItemList.Battery_Charger_4by4_HV.set(
-            new GT_MetaTileEntity_Charger(
+            new MTECharger(
                 BATTERY_CHARGER_4_BY_4_HV.ID,
                 "batterycharger.16.tier.03",
                 "High Voltage Battery Charger",
@@ -11859,7 +11401,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "Each battery gives 8A in/4A out (min 4A/2A)",
                 4).getStackForm(1L));
         ItemList.Battery_Charger_4by4_EV.set(
-            new GT_MetaTileEntity_Charger(
+            new MTECharger(
                 BATTERY_CHARGER_4_BY_4_EV.ID,
                 "batterycharger.16.tier.04",
                 "Extreme Voltage Battery Charger",
@@ -11867,7 +11409,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "Each battery gives 8A in/4A out (min 4A/2A)",
                 4).getStackForm(1L));
         ItemList.Battery_Charger_4by4_IV.set(
-            new GT_MetaTileEntity_Charger(
+            new MTECharger(
                 BATTERY_CHARGER_4_BY_4_IV.ID,
                 "batterycharger.16.tier.05",
                 "Insane Voltage Battery Charger",
@@ -11875,7 +11417,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "Each battery gives 8A in/4A out (min 4A/2A)",
                 4).getStackForm(1L));
         ItemList.Battery_Charger_4by4_LuV.set(
-            new GT_MetaTileEntity_Charger(
+            new MTECharger(
                 BATTERY_CHARGER_4_BY_4_LuV.ID,
                 "batterycharger.16.tier.06",
                 "Ludicrous Voltage Battery Charger",
@@ -11883,7 +11425,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "Each battery gives 8A in/4A out (min 4A/2A)",
                 4).getStackForm(1L));
         ItemList.Battery_Charger_4by4_ZPM.set(
-            new GT_MetaTileEntity_Charger(
+            new MTECharger(
                 BATTERY_CHARGER_4_BY_4_ZPM.ID,
                 "batterycharger.16.tier.07",
                 "ZPM Voltage Battery Charger",
@@ -11891,7 +11433,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "Each battery gives 8A in/4A out (min 4A/2A)",
                 4).getStackForm(1L));
         ItemList.Battery_Charger_4by4_UV.set(
-            new GT_MetaTileEntity_Charger(
+            new MTECharger(
                 BATTERY_CHARGER_4_BY_4_UV.ID,
                 "batterycharger.16.tier.08",
                 "Ultimate Voltage Battery Charger",
@@ -11899,7 +11441,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "Each battery gives 8A in/4A out (min 4A/2A)",
                 4).getStackForm(1L));
         ItemList.Battery_Charger_4by4_UHV.set(
-            new GT_MetaTileEntity_Charger(
+            new MTECharger(
                 BATTERY_CHARGER_4_BY_4_UHV.ID,
                 "batterycharger.16.tier.09",
                 "Highly Ultimate Voltage Battery Charger",
@@ -11908,7 +11450,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_Charger_4by4_UEV.set(
-            new GT_MetaTileEntity_Charger(
+            new MTECharger(
                 BATTERY_CHARGER_4_4_UEV.ID,
                 "batterycharger.16.tier.10",
                 "Extremely Ultimate Battery Charger",
@@ -11917,7 +11459,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_Charger_4by4_UIV.set(
-            new GT_MetaTileEntity_Charger(
+            new MTECharger(
                 BATTERY_CHARGER_4_4_UIV.ID,
                 "batterycharger.16.tier.11",
                 "Insanely Ultimate Battery Charger",
@@ -11926,7 +11468,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_Charger_4by4_UMV.set(
-            new GT_MetaTileEntity_Charger(
+            new MTECharger(
                 BATTERY_CHARGER_4_4_UMV.ID,
                 "batterycharger.16.tier.12",
                 "Mega Ultimate Battery Charger",
@@ -11935,7 +11477,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_Charger_4by4_UXV.set(
-            new GT_MetaTileEntity_Charger(
+            new MTECharger(
                 BATTERY_CHARGER_4_4_UXV.ID,
                 "batterycharger.16.tier.13",
                 "Extended Mega Ultimate Battery Charger",
@@ -11946,7 +11488,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerCircuitAssembler() {
         ItemList.Machine_LV_CircuitAssembler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CIRCUIT_ASSEMBLER_LV.ID,
                 "basicmachine.circuitassembler.tier.01",
                 "Basic Circuit Assembler",
@@ -11957,12 +11499,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CIRCUITASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.Machine_MV_CircuitAssembler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CIRCUIT_ASSEMBLER_MV.ID,
                 "basicmachine.circuitassembler.tier.02",
                 "Advanced Circuit Assembler",
@@ -11973,12 +11515,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CIRCUITASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.Machine_HV_CircuitAssembler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CIRCUIT_ASSEMBLER_HV.ID,
                 "basicmachine.circuitassembler.tier.03",
                 "Advanced Circuit Assembler II",
@@ -11989,12 +11531,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CIRCUITASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.Machine_EV_CircuitAssembler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CIRCUIT_ASSEMBLER_EV.ID,
                 "basicmachine.circuitassembler.tier.04",
                 "Advanced Circuit Assembler III",
@@ -12005,12 +11547,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CIRCUITASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.Machine_IV_CircuitAssembler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CIRCUIT_ASSEMBLER_IV.ID,
                 "basicmachine.circuitassembler.tier.05",
                 "Advanced Circuit Assembler IV",
@@ -12021,12 +11563,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CIRCUITASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.Machine_LuV_CircuitAssembler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CIRCUIT_ASSEMBLER_LuV.ID,
                 "basicmachine.circuitassembler.tier.06",
                 "Advanced Circuit Assembler V",
@@ -12037,12 +11579,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CIRCUITASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.Machine_ZPM_CircuitAssembler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CIRCUIT_ASSEMBLER_ZPM.ID,
                 "basicmachine.circuitassembler.tier.07",
                 "Advanced Circuit Assembler VI",
@@ -12053,12 +11595,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CIRCUITASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.Machine_UV_CircuitAssembler.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CIRCUIT_ASSEMBLER_UV.ID,
                 "basicmachine.circuitassembler.tier.08",
                 "Advanced Circuit Assembler VII",
@@ -12069,12 +11611,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CIRCUITASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.CircuitAssemblerUHV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CIRCUIT_ASSEMBLER_UHV.ID,
                 "basicmachine.circuitassembler.tier.09",
                 "Ultimate Circuit Assembling Machine",
@@ -12085,12 +11627,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CIRCUITASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.CircuitAssemblerUEV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CIRCUIT_ASSEMBLER_UEV.ID,
                 "basicmachine.circuitassembler.tier.10",
                 "Ultimate Circuit Assembling Machine II",
@@ -12101,12 +11643,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CIRCUITASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.CircuitAssemblerUIV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CIRCUIT_ASSEMBLER_UIV.ID,
                 "basicmachine.circuitassembler.tier.11",
                 "Ultimate Circuit Assembling Machine III",
@@ -12117,12 +11659,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CIRCUITASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.CircuitAssemblerUMV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CIRCUIT_ASSEMBLER_UMV.ID,
                 "basicmachine.circuitassembler.tier.12",
                 "Ultimate Circuit Assembling Machine IV",
@@ -12133,12 +11675,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CIRCUITASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.CircuitAssemblerUXV.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CIRCUIT_ASSEMBLER_UXV.ID,
                 "basicmachine.circuitassembler.tier.13",
                 "Ultimate Circuit Assembling Machine V",
@@ -12149,12 +11691,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CIRCUITASSEMBLER",
                 null).getStackForm(1L));
 
         ItemList.CircuitAssemblerMAX.set(
-            new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+            new MTEBasicMachineWithRecipe(
                 CIRCUIT_ASSEMBLER_MAX.ID,
                 "basicmachine.circuitassembler.tier.14",
                 "MAX Circuit Assembling Machine",
@@ -12165,14 +11707,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 1,
                 true,
                 SoundResource.NONE,
-                GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE,
+                MTEBasicMachineWithRecipe.SpecialEffects.NONE,
                 "CIRCUITASSEMBLER",
                 null).getStackForm(1L));
     }
 
     private void registerWetTransformer() {
         ItemList.WetTransformer_LV_ULV.set(
-            new GT_MetaTileEntity_WetTransformer(
+            new MTEWetTransformer(
                 WET_TRANSFORMER_LV_ULV.ID,
                 "wettransformer.tier.00",
                 "Ultra Low Voltage Power Transformer",
@@ -12180,7 +11722,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "LV -> ULV (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.WetTransformer_MV_LV.set(
-            new GT_MetaTileEntity_WetTransformer(
+            new MTEWetTransformer(
                 WET_TRANSFORMER_MV_LV.ID,
                 "wetransformer.tier.01",
                 "Low Voltage Power Transformer",
@@ -12188,7 +11730,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "MV -> LV (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.WetTransformer_HV_MV.set(
-            new GT_MetaTileEntity_WetTransformer(
+            new MTEWetTransformer(
                 WET_TRANSFORMER_HV_MV.ID,
                 "wettransformer.tier.02",
                 "Medium Voltage Power Transformer",
@@ -12196,7 +11738,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "HV -> MV (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.WetTransformer_EV_HV.set(
-            new GT_MetaTileEntity_WetTransformer(
+            new MTEWetTransformer(
                 WET_TRANSFORMER_EV_HV.ID,
                 "wettransformer.tier.03",
                 "High Voltage Power Transformer",
@@ -12204,7 +11746,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "EV -> HV (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.WetTransformer_IV_EV.set(
-            new GT_MetaTileEntity_WetTransformer(
+            new MTEWetTransformer(
                 WET_TRANSFORMER_IV_EV.ID,
                 "wettransformer.tier.04",
                 "Extreme Power Transformer",
@@ -12212,7 +11754,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "IV -> EV (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.WetTransformer_LuV_IV.set(
-            new GT_MetaTileEntity_WetTransformer(
+            new MTEWetTransformer(
                 WET_TRANSFORMER_LuV_IV.ID,
                 "wettransformer.tier.05",
                 "Insane Power Transformer",
@@ -12220,7 +11762,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "LuV -> IV (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.WetTransformer_ZPM_LuV.set(
-            new GT_MetaTileEntity_WetTransformer(
+            new MTEWetTransformer(
                 WET_TRANSFORMER_ZPM_LuV.ID,
                 "wettransformer.tier.06",
                 "Ludicrous Power Transformer",
@@ -12228,7 +11770,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "ZPM -> LuV (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.WetTransformer_UV_ZPM.set(
-            new GT_MetaTileEntity_WetTransformer(
+            new MTEWetTransformer(
                 WET_TRANSFORMER_UV_ZPM.ID,
                 "wettransformer.tier.07",
                 "ZPM Voltage Power Transformer",
@@ -12236,7 +11778,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "UV -> ZPM (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.WetTransformer_UHV_UV.set(
-            new GT_MetaTileEntity_WetTransformer(
+            new MTEWetTransformer(
                 WET_TRANSFORMER_UHV_UV.ID,
                 "wettransformer.tier.08",
                 "Ultimate Power Transformer",
@@ -12244,7 +11786,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "UHV -> UV (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.WetTransformer_UEV_UHV.set(
-            new GT_MetaTileEntity_WetTransformer(
+            new MTEWetTransformer(
                 WET_TRANSFORMER_UEV_UHV.ID,
                 "wettransformer.tier.09",
                 "Highly Ultimate Power Transformer",
@@ -12252,7 +11794,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "UEV -> UHV (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.WetTransformer_UIV_UEV.set(
-            new GT_MetaTileEntity_WetTransformer(
+            new MTEWetTransformer(
                 WET_TRANSFORMER_UIV_UEV.ID,
                 "wettransformer.tier.10",
                 "Extremely Ultimate Power Transformer",
@@ -12260,7 +11802,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "UIV -> UEV (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.WetTransformer_UMV_UIV.set(
-            new GT_MetaTileEntity_WetTransformer(
+            new MTEWetTransformer(
                 WET_TRANSFORMER_UMV_UIV.ID,
                 "wettransformer.tier.11",
                 "Insanely Ultimate Power Transformer",
@@ -12268,7 +11810,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "UMV -> UIV (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.WetTransformer_UXV_UMV.set(
-            new GT_MetaTileEntity_WetTransformer(
+            new MTEWetTransformer(
                 WET_TRANSFORMER_UXV_UMV.ID,
                 "wettransformer.tier.12",
                 "Mega Ultimate Power Transformer",
@@ -12276,7 +11818,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "UXV -> UMV (Use Soft Mallet to invert)").getStackForm(1L));
 
         ItemList.WetTransformer_MAX_UXV.set(
-            new GT_MetaTileEntity_WetTransformer(
+            new MTEWetTransformer(
                 WET_TRANSFORMER_MAX_UXV.ID,
                 "wettransformer.tier.13",
                 "Extended Mega Ultimate Power Transformer",
@@ -12286,35 +11828,35 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerHighAmpTransformer() {
         ItemList.Transformer_HA_UEV_UHV.set(
-            new GregtechMetaTransformerHiAmp(
+            new MTETransformerHiAmp(
                 HIGH_AMP_TRANSFORMER_UEV_UHV.ID,
                 "transformer.ha.tier.09",
                 "Highly Ultimate Hi-Amp Transformer",
                 9,
                 "UEV -> UHV (Use Soft Mallet to invert)").getStackForm(1L));
         ItemList.Transformer_HA_UIV_UEV.set(
-            new GregtechMetaTransformerHiAmp(
+            new MTETransformerHiAmp(
                 HIGH_AMP_TRANSFORMER_UIV_UEV.ID,
                 "transformer.ha.tier.10",
                 "Extremely Ultimate Hi-Amp Transformer",
                 10,
                 "UIV -> UEV (Use Soft Mallet to invert)").getStackForm(1L));
         ItemList.Transformer_HA_UMV_UIV.set(
-            new GregtechMetaTransformerHiAmp(
+            new MTETransformerHiAmp(
                 HIGH_AMP_TRANSFORMER_UMV_UIV.ID,
                 "transformer.ha.tier.11",
                 "Insanely Ultimate Hi-Amp Transformer",
                 11,
                 "UMV -> UIV (Use Soft Mallet to invert)").getStackForm(1L));
         ItemList.Transformer_HA_UXV_UMV.set(
-            new GregtechMetaTransformerHiAmp(
+            new MTETransformerHiAmp(
                 HIGH_AMP_TRANSFORMER_UXV_UMV.ID,
                 "transformer.ha.tier.12",
                 "Mega Ultimate Hi-Amp Transformer",
                 12,
                 "UXV -> UMV (Use Soft Mallet to invert)").getStackForm(1L));
         ItemList.Transformer_HA_MAX_UXV.set(
-            new GregtechMetaTransformerHiAmp(
+            new MTETransformerHiAmp(
                 HIGH_AMP_TRANSFORMER_MAX_UXV.ID,
                 "transformer.ha.tier.13",
                 "Extended Mega Ultimate Hi-Amp Transformer",
@@ -12325,7 +11867,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private void registerTurboCharger4By4() {
         ItemList.Battery_TurboCharger_4by4_ULV.set(
-            new GT_MetaTileEntity_TurboCharger(
+            new MTETurboCharger(
                 TURBO_CHARGER_ULV.ID,
                 "batteryturbocharger.16.tier.00",
                 "Ultra Low Voltage Turbo Charger",
@@ -12334,7 +11876,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_TurboCharger_4by4_LV.set(
-            new GT_MetaTileEntity_TurboCharger(
+            new MTETurboCharger(
                 TURBO_CHARGER_LV.ID,
                 "batteryturbocharger.16.tier.01",
                 "Low Voltage Turbo Charger",
@@ -12343,7 +11885,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_TurboCharger_4by4_MV.set(
-            new GT_MetaTileEntity_TurboCharger(
+            new MTETurboCharger(
                 TURBO_CHARGER_MV.ID,
                 "batteryturbocharger.16.tier.02",
                 "Medium Voltage Turbo Charger",
@@ -12352,7 +11894,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_TurboCharger_4by4_HV.set(
-            new GT_MetaTileEntity_TurboCharger(
+            new MTETurboCharger(
                 TURBO_CHARGER_HV.ID,
                 "batteryturbocharger.16.tier.03",
                 "High Voltage Turbo Charger",
@@ -12361,7 +11903,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_TurboCharger_4by4_EV.set(
-            new GT_MetaTileEntity_TurboCharger(
+            new MTETurboCharger(
                 TURBO_CHARGER_EV.ID,
                 "batteryturbocharger.16.tier.04",
                 "Extreme Voltage Turbo Charger",
@@ -12370,7 +11912,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_TurboCharger_4by4_IV.set(
-            new GT_MetaTileEntity_TurboCharger(
+            new MTETurboCharger(
                 TURBO_CHARGER_IV.ID,
                 "batteryturbocharger.16.tier.05",
                 "Insane Voltage Turbo Charger",
@@ -12379,7 +11921,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_TurboCharger_4by4_LuV.set(
-            new GT_MetaTileEntity_TurboCharger(
+            new MTETurboCharger(
                 TURBO_CHARGER_LuV.ID,
                 "batteryturbocharger.16.tier.06",
                 "Ludicrous Voltage Turbo Charger",
@@ -12388,7 +11930,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_TurboCharger_4by4_ZPM.set(
-            new GT_MetaTileEntity_TurboCharger(
+            new MTETurboCharger(
                 TURBO_CHARGER_ZPM.ID,
                 "batteryturbocharger.16.tier.07",
                 "ZPM Voltage Turbo Charger",
@@ -12397,7 +11939,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_TurboCharger_4by4_UV.set(
-            new GT_MetaTileEntity_TurboCharger(
+            new MTETurboCharger(
                 TURBO_CHARGER_UV.ID,
                 "batteryturbocharger.16.tier.08",
                 "Ultimate Voltage Turbo Charger",
@@ -12406,7 +11948,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4).getStackForm(1L));
 
         ItemList.Battery_TurboCharger_4by4_UHV.set(
-            new GT_MetaTileEntity_TurboCharger(
+            new MTETurboCharger(
                 TURBO_CHARGER_UHV.ID,
                 "batteryturbocharger.16.tier.09",
                 "Highly Ultimate Voltage Turbo Charger",
@@ -12418,91 +11960,91 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerWirelessEnergyHatch() {
         ItemList.Wireless_Hatch_Energy_ULV.set(
-            new GT_MetaTileEntity_Wireless_Hatch(
+            new MTEWirelessEnergy(
                 WIRELESS_HATCH_ENERGY_ULV.ID,
                 "hatch.wireless.receiver.tier.00",
                 "ULV Wireless Energy Hatch",
                 0).getStackForm(1L));
         ItemList.Wireless_Hatch_Energy_LV.set(
-            new GT_MetaTileEntity_Wireless_Hatch(
+            new MTEWirelessEnergy(
                 WIRELESS_HATCH_ENERGY_LV.ID,
                 "hatch.wireless.receiver.tier.01",
                 "LV Wireless Energy Hatch",
                 1).getStackForm(1L));
         ItemList.Wireless_Hatch_Energy_MV.set(
-            new GT_MetaTileEntity_Wireless_Hatch(
+            new MTEWirelessEnergy(
                 WIRELESS_HATCH_ENERGY_MV.ID,
                 "hatch.wireless.receiver.tier.02",
                 "MV Wireless Energy Hatch",
                 2).getStackForm(1L));
         ItemList.Wireless_Hatch_Energy_HV.set(
-            new GT_MetaTileEntity_Wireless_Hatch(
+            new MTEWirelessEnergy(
                 WIRELESS_HATCH_ENERGY_HV.ID,
                 "hatch.wireless.receiver.tier.03",
                 "HV Wireless Energy Hatch",
                 3).getStackForm(1L));
         ItemList.Wireless_Hatch_Energy_EV.set(
-            new GT_MetaTileEntity_Wireless_Hatch(
+            new MTEWirelessEnergy(
                 WIRELESS_HATCH_ENERGY_EV.ID,
                 "hatch.wireless.receiver.tier.04",
                 "EV Wireless Energy Hatch",
                 4).getStackForm(1L));
         ItemList.Wireless_Hatch_Energy_IV.set(
-            new GT_MetaTileEntity_Wireless_Hatch(
+            new MTEWirelessEnergy(
                 WIRELESS_HATCH_ENERGY_IV.ID,
                 "hatch.wireless.receiver.tier.05",
                 "IV Wireless Energy Hatch",
                 5).getStackForm(1L));
         ItemList.Wireless_Hatch_Energy_LuV.set(
-            new GT_MetaTileEntity_Wireless_Hatch(
+            new MTEWirelessEnergy(
                 WIRELESS_HATCH_ENERGY_LuV.ID,
                 "hatch.wireless.receiver.tier.06",
                 "LuV Wireless Energy Hatch",
                 6).getStackForm(1L));
         ItemList.Wireless_Hatch_Energy_ZPM.set(
-            new GT_MetaTileEntity_Wireless_Hatch(
+            new MTEWirelessEnergy(
                 WIRELESS_HATCH_ENERGY_ZPM.ID,
                 "hatch.wireless.receiver.tier.07",
                 "ZPM Wireless Energy Hatch",
                 7).getStackForm(1L));
         ItemList.Wireless_Hatch_Energy_UV.set(
-            new GT_MetaTileEntity_Wireless_Hatch(
+            new MTEWirelessEnergy(
                 WIRELESS_HATCH_ENERGY_UV.ID,
                 "hatch.wireless.receiver.tier.08",
                 "UV Wireless Energy Hatch",
                 8).getStackForm(1L));
         ItemList.Wireless_Hatch_Energy_UHV.set(
-            new GT_MetaTileEntity_Wireless_Hatch(
+            new MTEWirelessEnergy(
                 WIRELESS_HATCH_ENERGY_UHV.ID,
                 "hatch.wireless.receiver.tier.09",
                 "UHV Wireless Energy Hatch",
                 9).getStackForm(1L));
         ItemList.Wireless_Hatch_Energy_UEV.set(
-            new GT_MetaTileEntity_Wireless_Hatch(
+            new MTEWirelessEnergy(
                 WIRELESS_HATCH_ENERGY_UEV.ID,
                 "hatch.wireless.receiver.tier.10",
                 "UEV Wireless Energy Hatch",
                 10).getStackForm(1L));
         ItemList.Wireless_Hatch_Energy_UIV.set(
-            new GT_MetaTileEntity_Wireless_Hatch(
+            new MTEWirelessEnergy(
                 WIRELESS_HATCH_ENERGY_UIV.ID,
                 "hatch.wireless.receiver.tier.11",
                 "UIV Wireless Energy Hatch",
                 11).getStackForm(1L));
         ItemList.Wireless_Hatch_Energy_UMV.set(
-            new GT_MetaTileEntity_Wireless_Hatch(
+            new MTEWirelessEnergy(
                 WIRELESS_HATCH_ENERGY_UMV.ID,
                 "hatch.wireless.receiver.tier.12",
                 "UMV Wireless Energy Hatch",
                 12).getStackForm(1L));
         ItemList.Wireless_Hatch_Energy_UXV.set(
-            new GT_MetaTileEntity_Wireless_Hatch(
+            new MTEWirelessEnergy(
                 WIRELESS_HATCH_ENERGY_UXV.ID,
                 "hatch.wireless.receiver.tier.13",
                 "UXV Wireless Energy Hatch",
                 13).getStackForm(1L));
         ItemList.Wireless_Hatch_Energy_MAX.set(
-            new GT_MetaTileEntity_Wireless_Hatch(
+            new MTEWirelessEnergy(
                 WIRELESS_HATCH_ENERGY_MAX.ID,
                 "hatch.wireless.receiver.tier.14",
                 "MAX Wireless Energy Hatch",
@@ -12511,91 +12053,91 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerWirelessDynamoHatch() {
         ItemList.Wireless_Dynamo_Energy_ULV.set(
-            new GT_MetaTileEntity_Wireless_Dynamo(
+            new MTEWirelessDynamo(
                 WIRELESS_DYNAMO_ENERGY_HATCH_ULV.ID,
                 "hatch.wireless.transmitter.tier.00",
                 "ULV Wireless Energy Dynamo",
                 0).getStackForm(1L));
         ItemList.Wireless_Dynamo_Energy_LV.set(
-            new GT_MetaTileEntity_Wireless_Dynamo(
+            new MTEWirelessDynamo(
                 WIRELESS_DYNAMO_ENERGY_HATCH_LV.ID,
                 "hatch.wireless.transmitter.tier.01",
                 "LV Wireless Energy Dynamo",
                 1).getStackForm(1L));
         ItemList.Wireless_Dynamo_Energy_MV.set(
-            new GT_MetaTileEntity_Wireless_Dynamo(
+            new MTEWirelessDynamo(
                 WIRELESS_DYNAMO_ENERGY_HATCH_MV.ID,
                 "hatch.wireless.transmitter.tier.02",
                 "MV Wireless Energy Dynamo",
                 2).getStackForm(1L));
         ItemList.Wireless_Dynamo_Energy_HV.set(
-            new GT_MetaTileEntity_Wireless_Dynamo(
+            new MTEWirelessDynamo(
                 WIRELESS_DYNAMO_ENERGY_HATCH_HV.ID,
                 "hatch.wireless.transmitter.tier.03",
                 "HV Wireless Energy Dynamo",
                 3).getStackForm(1L));
         ItemList.Wireless_Dynamo_Energy_EV.set(
-            new GT_MetaTileEntity_Wireless_Dynamo(
+            new MTEWirelessDynamo(
                 WIRELESS_DYNAMO_ENERGY_HATCH_EV.ID,
                 "hatch.wireless.transmitter.tier.04",
                 "EV Wireless Energy Dynamo",
                 4).getStackForm(1L));
         ItemList.Wireless_Dynamo_Energy_IV.set(
-            new GT_MetaTileEntity_Wireless_Dynamo(
+            new MTEWirelessDynamo(
                 WIRELESS_DYNAMO_ENERGY_HATCH_IV.ID,
                 "hatch.wireless.transmitter.tier.05",
                 "IV Wireless Energy Dynamo",
                 5).getStackForm(1L));
         ItemList.Wireless_Dynamo_Energy_LuV.set(
-            new GT_MetaTileEntity_Wireless_Dynamo(
+            new MTEWirelessDynamo(
                 WIRELESS_DYNAMO_ENERGY_HATCH_LuV.ID,
                 "hatch.wireless.transmitter.tier.06",
                 "LuV Wireless Energy Dynamo",
                 6).getStackForm(1L));
         ItemList.Wireless_Dynamo_Energy_ZPM.set(
-            new GT_MetaTileEntity_Wireless_Dynamo(
+            new MTEWirelessDynamo(
                 WIRELESS_DYNAMO_ENERGY_HATCH_ZPM.ID,
                 "hatch.wireless.transmitter.tier.07",
                 "ZPM Wireless Energy Dynamo",
                 7).getStackForm(1L));
         ItemList.Wireless_Dynamo_Energy_UV.set(
-            new GT_MetaTileEntity_Wireless_Dynamo(
+            new MTEWirelessDynamo(
                 WIRELESS_DYNAMO_ENERGY_HATCH_UV.ID,
                 "hatch.wireless.transmitter.tier.08",
                 "UV Wireless Energy Dynamo",
                 8).getStackForm(1L));
         ItemList.Wireless_Dynamo_Energy_UHV.set(
-            new GT_MetaTileEntity_Wireless_Dynamo(
+            new MTEWirelessDynamo(
                 WIRELESS_DYNAMO_ENERGY_HATCH_UHV.ID,
                 "hatch.wireless.transmitter.tier.09",
                 "UHV Wireless Energy Dynamo",
                 9).getStackForm(1L));
         ItemList.Wireless_Dynamo_Energy_UEV.set(
-            new GT_MetaTileEntity_Wireless_Dynamo(
+            new MTEWirelessDynamo(
                 WIRELESS_DYNAMO_ENERGY_HATCH_UEV.ID,
                 "hatch.wireless.transmitter.tier.10",
                 "UEV Wireless Energy Dynamo",
                 10).getStackForm(1L));
         ItemList.Wireless_Dynamo_Energy_UIV.set(
-            new GT_MetaTileEntity_Wireless_Dynamo(
+            new MTEWirelessDynamo(
                 WIRELESS_DYNAMO_ENERGY_HATCH_UIV.ID,
                 "hatch.wireless.transmitter.tier.11",
                 "UIV Wireless Energy Dynamo",
                 11).getStackForm(1L));
         ItemList.Wireless_Dynamo_Energy_UMV.set(
-            new GT_MetaTileEntity_Wireless_Dynamo(
+            new MTEWirelessDynamo(
                 WIRELESS_DYNAMO_ENERGY_HATCH_UMV.ID,
                 "hatch.wireless.transmitter.tier.12",
                 "UMV Wireless Energy Dynamo",
                 12).getStackForm(1L));
         ItemList.Wireless_Dynamo_Energy_UXV.set(
-            new GT_MetaTileEntity_Wireless_Dynamo(
+            new MTEWirelessDynamo(
                 WIRELESS_DYNAMO_ENERGY_HATCH_UXV.ID,
                 "hatch.wireless.transmitter.tier.13",
                 "UXV Wireless Energy Dynamo",
                 13).getStackForm(1L));
         ItemList.Wireless_Dynamo_Energy_MAX.set(
-            new GT_MetaTileEntity_Wireless_Dynamo(
+            new MTEWirelessDynamo(
                 WIRELESS_DYNAMO_ENERGY_HATCH_MAX.ID,
                 "hatch.wireless.transmitter.tier.14",
                 "MAX Wireless Energy Dynamo",
@@ -12604,40 +12146,31 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerLightningRods() {
         ItemList.Machine_HV_LightningRod.set(
-            new GT_MetaTileEntity_LightningRod(
-                LIGHTNING_ROD_HV.ID,
-                "basicgenerator.lightningrod.03",
-                "Lightning Rod",
-                3).getStackForm(1));
+            new MTELightningRod(LIGHTNING_ROD_HV.ID, "basicgenerator.lightningrod.03", "Lightning Rod", 3)
+                .getStackForm(1));
         ItemList.Machine_EV_LightningRod.set(
-            new GT_MetaTileEntity_LightningRod(
-                LIGHTNING_ROD_EV.ID,
-                "basicgenerator.lightningrod.04",
-                "Lightning Rod II",
-                4).getStackForm(1));
+            new MTELightningRod(LIGHTNING_ROD_EV.ID, "basicgenerator.lightningrod.04", "Lightning Rod II", 4)
+                .getStackForm(1));
         ItemList.Machine_IV_LightningRod.set(
-            new GT_MetaTileEntity_LightningRod(
-                LIGHTNING_ROD_IV.ID,
-                "basicgenerator.lightningrod.05",
-                "Lightning Rod III",
-                5).getStackForm(1));
+            new MTELightningRod(LIGHTNING_ROD_IV.ID, "basicgenerator.lightningrod.05", "Lightning Rod III", 5)
+                .getStackForm(1));
     }
 
     private static void registerCombustionGenerators() {
         ItemList.Generator_Diesel_LV.set(
-            new GT_MetaTileEntity_DieselGenerator(
+            new MTEDieselGenerator(
                 COMBUSTION_GENERATOR_LV.ID,
                 "basicgenerator.diesel.tier.01",
                 "Basic Combustion Generator",
                 1).getStackForm(1L));
         ItemList.Generator_Diesel_MV.set(
-            new GT_MetaTileEntity_DieselGenerator(
+            new MTEDieselGenerator(
                 COMBUSTION_GENERATOR_MV.ID,
                 "basicgenerator.diesel.tier.02",
                 "Advanced Combustion Generator",
                 2).getStackForm(1L));
         ItemList.Generator_Diesel_HV.set(
-            new GT_MetaTileEntity_DieselGenerator(
+            new MTEDieselGenerator(
                 COMBUSTION_GENERATOR_HV.ID,
                 "basicgenerator.diesel.tier.03",
                 "Turbo Combustion Generator",
@@ -12646,94 +12179,65 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerGasTurbines() {
         ItemList.Generator_Gas_Turbine_LV.set(
-            new GT_MetaTileEntity_GasTurbine(
-                GAS_TURBINE_LV.ID,
-                "basicgenerator.gasturbine.tier.01",
-                "Basic Gas Turbine",
-                1,
-                95).getStackForm(1L));
+            new MTEGasTurbine(GAS_TURBINE_LV.ID, "basicgenerator.gasturbine.tier.01", "Basic Gas Turbine", 1, 95)
+                .getStackForm(1L));
         ItemList.Generator_Gas_Turbine_MV.set(
-            new GT_MetaTileEntity_GasTurbine(
-                GAS_TURBINE_MV.ID,
-                "basicgenerator.gasturbine.tier.02",
-                "Advanced Gas Turbine",
-                2,
-                90).getStackForm(1L));
+            new MTEGasTurbine(GAS_TURBINE_MV.ID, "basicgenerator.gasturbine.tier.02", "Advanced Gas Turbine", 2, 90)
+                .getStackForm(1L));
         ItemList.Generator_Gas_Turbine_HV.set(
-            new GT_MetaTileEntity_GasTurbine(
-                GAS_TURBINE_HV.ID,
-                "basicgenerator.gasturbine.tier.03",
-                "Turbo Gas Turbine",
-                3,
-                85).getStackForm(1L));
+            new MTEGasTurbine(GAS_TURBINE_HV.ID, "basicgenerator.gasturbine.tier.03", "Turbo Gas Turbine", 3, 85)
+                .getStackForm(1L));
         ItemList.Generator_Gas_Turbine_EV.set(
-            new GT_MetaTileEntity_GasTurbine(
-                GAS_TURBINE_EV.ID,
-                "basicgenerator.gasturbine.tier.04",
-                "Turbo Gas Turbine II",
-                4,
-                60).getStackForm(1L));
+            new MTEGasTurbine(GAS_TURBINE_EV.ID, "basicgenerator.gasturbine.tier.04", "Turbo Gas Turbine II", 4, 60)
+                .getStackForm(1L));
         ItemList.Generator_Gas_Turbine_IV.set(
-            new GT_MetaTileEntity_GasTurbine(
-                GAS_TURBINE_IV.ID,
-                "basicgenerator.gasturbine.tier.05",
-                "Turbo Gas Turbine III",
-                5,
-                50).getStackForm(1L));
+            new MTEGasTurbine(GAS_TURBINE_IV.ID, "basicgenerator.gasturbine.tier.05", "Turbo Gas Turbine III", 5, 50)
+                .getStackForm(1L));
     }
 
     private static void registerSteamTurbines() {
         ItemList.Generator_Steam_Turbine_LV.set(
-            new GT_MetaTileEntity_SteamTurbine(
-                STEAM_TURBINE_LV.ID,
-                "basicgenerator.steamturbine.tier.01",
-                "Basic Steam Turbine",
-                1).getStackForm(1L));
+            new MTESteamTurbine(STEAM_TURBINE_LV.ID, "basicgenerator.steamturbine.tier.01", "Basic Steam Turbine", 1)
+                .getStackForm(1L));
         ItemList.Generator_Steam_Turbine_MV.set(
-            new GT_MetaTileEntity_SteamTurbine(
-                STEAM_TURBINE_MV.ID,
-                "basicgenerator.steamturbine.tier.02",
-                "Advanced Steam Turbine",
-                2).getStackForm(1L));
+            new MTESteamTurbine(STEAM_TURBINE_MV.ID, "basicgenerator.steamturbine.tier.02", "Advanced Steam Turbine", 2)
+                .getStackForm(1L));
         ItemList.Generator_Steam_Turbine_HV.set(
-            new GT_MetaTileEntity_SteamTurbine(
-                STEAM_TURBINE_HV.ID,
-                "basicgenerator.steamturbine.tier.03",
-                "Turbo Steam Turbine",
-                3).getStackForm(1L));
+            new MTESteamTurbine(STEAM_TURBINE_HV.ID, "basicgenerator.steamturbine.tier.03", "Turbo Steam Turbine", 3)
+                .getStackForm(1L));
     }
 
     private static void registerNaquadahReactors() {
         ItemList.Generator_Naquadah_Mark_I.set(
-            new GT_MetaTileEntity_NaquadahReactor(
+            new MTENaquadahReactor(
                 NAQUADAH_REACTOR_EV.ID,
                 "basicgenerator.naquadah.tier.04",
                 new String[] { "Requires Enriched Naquadah Bolts" },
                 "Naquadah Reactor Mark I",
                 4).getStackForm(1L));
         ItemList.Generator_Naquadah_Mark_II.set(
-            new GT_MetaTileEntity_NaquadahReactor(
+            new MTENaquadahReactor(
                 NAQUADAH_REACTOR_IV.ID,
                 "basicgenerator.naquadah.tier.05",
                 new String[] { "Requires Enriched Naquadah Rods" },
                 "Naquadah Reactor Mark II",
                 5).getStackForm(1L));
         ItemList.Generator_Naquadah_Mark_III.set(
-            new GT_MetaTileEntity_NaquadahReactor(
+            new MTENaquadahReactor(
                 NAQUADAH_REACTOR_LuV.ID,
                 "basicgenerator.naquadah.tier.06",
                 new String[] { "Requires Enriched Naquadah Long Rods" },
                 "Naquadah Reactor Mark III",
                 6).getStackForm(1L));
         ItemList.Generator_Naquadah_Mark_IV.set(
-            new GT_MetaTileEntity_NaquadahReactor(
+            new MTENaquadahReactor(
                 NAQUADAH_REACTOR_ZPM.ID,
                 "basicgenerator.naquadah.tier.07",
                 new String[] { "Requires Naquadria Bolts" },
                 "Naquadah Reactor Mark IV",
                 7).getStackForm(1L));
         ItemList.Generator_Naquadah_Mark_V.set(
-            new GT_MetaTileEntity_NaquadahReactor(
+            new MTENaquadahReactor(
                 NAQUADAH_REACTOR_UV.ID,
                 "basicgenerator.naquadah.tier.08",
                 new String[] { "Requires Naquadria Rods" },
@@ -12743,19 +12247,19 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerMagicEnergyConverters() {
         ItemList.MagicEnergyConverter_LV.set(
-            new GT_MetaTileEntity_MagicEnergyConverter(
+            new MTEMagicEnergyConverter(
                 MAGIC_ENERGY_CONVERTER_LV.ID,
                 "basicgenerator.magicenergyconverter.tier.01",
                 "Novice Magic Energy Converter",
                 1).getStackForm(1L));
         ItemList.MagicEnergyConverter_MV.set(
-            new GT_MetaTileEntity_MagicEnergyConverter(
+            new MTEMagicEnergyConverter(
                 MAGIC_ENERGY_CONVERTER_MV.ID,
                 "basicgenerator.magicenergyconverter.tier.02",
                 "Adept Magic Energy Converter",
                 2).getStackForm(1L));
         ItemList.MagicEnergyConverter_HV.set(
-            new GT_MetaTileEntity_MagicEnergyConverter(
+            new MTEMagicEnergyConverter(
                 MAGIC_ENERGY_CONVERTER_HV.ID,
                 "basicgenerator.magicenergyconverter.tier.03",
                 "Master Magic Energy Converter",
@@ -12764,25 +12268,25 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerMagicEnergyAbsorbers() {
         ItemList.MagicEnergyAbsorber_LV.set(
-            new GT_MetaTileEntity_MagicalEnergyAbsorber(
+            new MTEMagicalEnergyAbsorber(
                 MAGIC_ENERGY_ABSORBER_LV.ID,
                 "basicgenerator.magicenergyabsorber.tier.01",
                 "Novice Magic Energy Absorber",
                 1).getStackForm(1L));
         ItemList.MagicEnergyAbsorber_MV.set(
-            new GT_MetaTileEntity_MagicalEnergyAbsorber(
+            new MTEMagicalEnergyAbsorber(
                 MAGIC_ENERGY_ABSORBER_MV.ID,
                 "basicgenerator.magicenergyabsorber.tier.02",
                 "Adept Magic Energy Absorber",
                 2).getStackForm(1L));
         ItemList.MagicEnergyAbsorber_HV.set(
-            new GT_MetaTileEntity_MagicalEnergyAbsorber(
+            new MTEMagicalEnergyAbsorber(
                 MAGIC_ENERGY_ABSORBER_HV.ID,
                 "basicgenerator.magicenergyabsorber.tier.03",
                 "Master Magic Energy Absorber",
                 3).getStackForm(1L));
         ItemList.MagicEnergyAbsorber_EV.set(
-            new GT_MetaTileEntity_MagicalEnergyAbsorber(
+            new MTEMagicalEnergyAbsorber(
                 MAGIC_ENERGY_ABSORBER_EV.ID,
                 "basicgenerator.magicenergyabsorber.tier.04",
                 "Grandmaster Magic Energy Absorber",
@@ -12791,33 +12295,33 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void registerPlasmaGenerators() {
         ItemList.Generator_Plasma_EV.set(
-            new GT_MetaTileEntity_PlasmaGenerator(
+            new MTEPlasmaGenerator(
                 PLASMA_GENERATOR_EV.ID,
                 "basicgenerator.plasmagenerator.tier.05",
                 "Plasma Generator Mark I",
                 4).getStackForm(1L));
         ItemList.Generator_Plasma_IV.set(
-            new GT_MetaTileEntity_PlasmaGenerator(
+            new MTEPlasmaGenerator(
                 PLASMA_GENERATOR_IV.ID,
                 "basicgenerator.plasmagenerator.tier.06",
                 "Plasma Generator Mark II",
                 5).getStackForm(1L));
         ItemList.Generator_Plasma_LuV.set(
-            new GT_MetaTileEntity_PlasmaGenerator(
+            new MTEPlasmaGenerator(
                 PLASMA_GENERATOR_LuV.ID,
                 "basicgenerator.plasmagenerator.tier.07",
                 "Plasma Generator Mark III",
                 6).getStackForm(1L));
 
         ItemList.Generator_Plasma_ZPMV.set(
-            new GT_MetaTileEntity_PlasmaGenerator(
+            new MTEPlasmaGenerator(
                 PLASMA_GENERATOR_ZPM.ID,
                 "basicgenerator.plasmagenerator.tier.08",
                 "Plasma Generator Mark IV",
                 7).getStackForm(1L));
 
         ItemList.Generator_Plasma_UV.set(
-            new GT_MetaTileEntity_PlasmaGenerator(
+            new MTEPlasmaGenerator(
                 PLASMA_GENERATOR_UV.ID,
                 "basicgenerator.plasmagenerator.tier.09",
                 "Ultimate Pocket Sun",
@@ -12825,35 +12329,35 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
     }
 
     private static void generateWiresAndPipes() {
-        for (int meta = 0; meta < GregTech_API.sGeneratedMaterials.length; meta++) {
-            Materials material = GregTech_API.sGeneratedMaterials[meta];
+        for (int meta = 0; meta < GregTechAPI.sGeneratedMaterials.length; meta++) {
+            Materials material = GregTechAPI.sGeneratedMaterials[meta];
             // This check is separated out because IntelliJ thinks Materials.Wood can be null.
             if (material == null) continue;
             if ((material.mTypes & 0x2) != 0 || material == Materials.Wood) {
-                new GT_MetaPipeEntity_Frame(
+                new MTEFrame(
                     4096 + meta,
                     "GT_Frame_" + material,
-                    (GT_LanguageManager.i18nPlaceholder ? "%material" : material.mDefaultLocalName)
+                    (GTLanguageManager.i18nPlaceholder ? "%material" : material.mDefaultLocalName)
                         + " Frame Box (TileEntity)",
                     material);
 
                 // Generate recipes for frame box
-                GT_Block_FrameBox block = (GT_Block_FrameBox) GregTech_API.sBlockFrames;
-                GT_OreDictUnificator.registerOre(OrePrefixes.frameGt, material, block.getStackForm(1, meta));
+                BlockFrameBox block = (BlockFrameBox) GregTechAPI.sBlockFrames;
+                GTOreDictUnificator.registerOre(OrePrefixes.frameGt, material, block.getStackForm(1, meta));
                 if (material.getProcessingMaterialTierEU() < TierEU.IV) {
-                    GT_ModHandler.addCraftingRecipe(
+                    GTModHandler.addCraftingRecipe(
                         block.getStackForm(2, meta),
-                        GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED,
+                        GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED,
                         new Object[] { "SSS", "SwS", "SSS", 'S', OrePrefixes.stick.get(material) });
                 }
 
                 if (!material.contains(SubTag.NO_RECIPES)
-                    && GT_OreDictUnificator.get(OrePrefixes.stick, material, 1) != null) {
+                    && GTOreDictUnificator.get(OrePrefixes.stick, material, 1) != null) {
                     // Auto generate frame box recipe in an assembler.
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.stick, material, 4),
-                            GT_Utility.getIntegratedCircuit(4))
+                            GTOreDictUnificator.get(OrePrefixes.stick, material, 4),
+                            GTUtility.getIntegratedCircuit(4))
                         .itemOutputs(block.getStackForm(1, meta))
                         .duration(3 * SECONDS + 4 * TICKS)
                         .eut(calculateRecipeEU(material, 7))
@@ -12862,169 +12366,99 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
             }
         }
 
-        makeWires(Materials.RedAlloy, 2000, 0L, 1L, 1L, gregtech.api.enums.GT_Values.V[0], true, false);
+        makeWires(Materials.RedAlloy, 2000, 0L, 1L, 1L, GTValues.V[0], true, false);
 
-        makeWires(Materials.Cobalt, 1200, 2L, 4L, 2L, gregtech.api.enums.GT_Values.V[1], true, false);
-        makeWires(Materials.Lead, 1220, 2L, 4L, 2L, gregtech.api.enums.GT_Values.V[1], true, false);
-        makeWires(Materials.Tin, 1240, 1L, 2L, 1L, gregtech.api.enums.GT_Values.V[1], true, false);
+        makeWires(Materials.Cobalt, 1200, 2L, 4L, 2L, GTValues.V[1], true, false);
+        makeWires(Materials.Lead, 1220, 2L, 4L, 2L, GTValues.V[1], true, false);
+        makeWires(Materials.Tin, 1240, 1L, 2L, 1L, GTValues.V[1], true, false);
 
-        makeWires(Materials.Zinc, 1260, 1L, 2L, 1L, gregtech.api.enums.GT_Values.V[1], true, false);
-        makeWires(Materials.SolderingAlloy, 1280, 1L, 2L, 1L, gregtech.api.enums.GT_Values.V[1], true, false);
+        makeWires(Materials.Zinc, 1260, 1L, 2L, 1L, GTValues.V[1], true, false);
+        makeWires(Materials.SolderingAlloy, 1280, 1L, 2L, 1L, GTValues.V[1], true, false);
 
-        makeWires(Materials.Iron, 1300, 3L, 6L, 2L, gregtech.api.enums.GT_Values.V[2], true, false);
-        makeWires(Materials.Nickel, 1320, 3L, 6L, 3L, gregtech.api.enums.GT_Values.V[2], true, false);
-        makeWires(Materials.Cupronickel, 1340, 3L, 6L, 2L, gregtech.api.enums.GT_Values.V[2], true, false);
-        makeWires(Materials.Copper, 1360, 2L, 4L, 1L, gregtech.api.enums.GT_Values.V[2], true, false);
-        makeWires(Materials.AnnealedCopper, 1380, 2L, 4L, 1L, gregtech.api.enums.GT_Values.V[2], true, false);
+        makeWires(Materials.Iron, 1300, 3L, 6L, 2L, GTValues.V[2], true, false);
+        makeWires(Materials.Nickel, 1320, 3L, 6L, 3L, GTValues.V[2], true, false);
+        makeWires(Materials.Cupronickel, 1340, 3L, 6L, 2L, GTValues.V[2], true, false);
+        makeWires(Materials.Copper, 1360, 2L, 4L, 1L, GTValues.V[2], true, false);
+        makeWires(Materials.AnnealedCopper, 1380, 2L, 4L, 1L, GTValues.V[2], true, false);
 
-        makeWires(Materials.Kanthal, 1400, 3L, 6L, 4L, gregtech.api.enums.GT_Values.V[3], true, false);
-        makeWires(Materials.Gold, 1420, 2L, 4L, 3L, gregtech.api.enums.GT_Values.V[3], true, false);
-        makeWires(Materials.Electrum, 1440, 2L, 4L, 2L, gregtech.api.enums.GT_Values.V[3], true, false);
-        makeWires(Materials.Silver, 1460, 1L, 2L, 1L, gregtech.api.enums.GT_Values.V[3], true, false);
-        makeWires(Materials.BlueAlloy, 1480, 1L, 2L, 2L, gregtech.api.enums.GT_Values.V[3], true, false);
+        makeWires(Materials.Kanthal, 1400, 3L, 6L, 4L, GTValues.V[3], true, false);
+        makeWires(Materials.Gold, 1420, 2L, 4L, 3L, GTValues.V[3], true, false);
+        makeWires(Materials.Electrum, 1440, 2L, 4L, 2L, GTValues.V[3], true, false);
+        makeWires(Materials.Silver, 1460, 1L, 2L, 1L, GTValues.V[3], true, false);
+        makeWires(Materials.BlueAlloy, 1480, 1L, 2L, 2L, GTValues.V[3], true, false);
 
-        makeWires(Materials.Nichrome, 1500, 4L, 8L, 3L, gregtech.api.enums.GT_Values.V[4], true, false);
-        makeWires(Materials.Steel, 1520, 2L, 4L, 2L, gregtech.api.enums.GT_Values.V[4], true, false);
-        makeWires(Materials.BlackSteel, 1540, 2L, 4L, 3L, gregtech.api.enums.GT_Values.V[4], true, false);
-        makeWires(Materials.Titanium, 1560, 2L, 4L, 4L, gregtech.api.enums.GT_Values.V[4], true, false);
-        makeWires(Materials.Aluminium, 1580, 1L, 2L, 1L, gregtech.api.enums.GT_Values.V[4], true, false);
+        makeWires(Materials.Nichrome, 1500, 4L, 8L, 3L, GTValues.V[4], true, false);
+        makeWires(Materials.Steel, 1520, 2L, 4L, 2L, GTValues.V[4], true, false);
+        makeWires(Materials.BlackSteel, 1540, 2L, 4L, 3L, GTValues.V[4], true, false);
+        makeWires(Materials.Titanium, 1560, 2L, 4L, 4L, GTValues.V[4], true, false);
+        makeWires(Materials.Aluminium, 1580, 1L, 2L, 1L, GTValues.V[4], true, false);
 
-        makeWires(Materials.Graphene, 1600, 1L, 2L, 1L, gregtech.api.enums.GT_Values.V[5], false, true);
-        makeWires(Materials.Osmium, 1620, 2L, 4L, 4L, gregtech.api.enums.GT_Values.V[5], true, false);
-        makeWires(Materials.Platinum, 1640, 1L, 2L, 2L, gregtech.api.enums.GT_Values.V[5], true, false);
-        makeWires(Materials.TungstenSteel, 1660, 2L, 4L, 3L, gregtech.api.enums.GT_Values.V[5], true, false);
-        makeWires(Materials.Tungsten, 1680, 2L, 4L, 2L, gregtech.api.enums.GT_Values.V[5], true, false);
+        makeWires(Materials.Graphene, 1600, 1L, 2L, 1L, GTValues.V[5], false, true);
+        makeWires(Materials.Osmium, 1620, 2L, 4L, 4L, GTValues.V[5], true, false);
+        makeWires(Materials.Platinum, 1640, 1L, 2L, 2L, GTValues.V[5], true, false);
+        makeWires(Materials.TungstenSteel, 1660, 2L, 4L, 3L, GTValues.V[5], true, false);
+        makeWires(Materials.Tungsten, 1680, 2L, 4L, 2L, GTValues.V[5], true, false);
 
-        makeWires(Materials.HSSG, 1700, 2L, 4L, 4L, gregtech.api.enums.GT_Values.V[6], true, false);
-        makeWires(Materials.NiobiumTitanium, 1720, 2L, 4L, 4L, gregtech.api.enums.GT_Values.V[6], true, false);
-        makeWires(Materials.VanadiumGallium, 1740, 2L, 4L, 4L, gregtech.api.enums.GT_Values.V[6], true, false);
-        makeWires(Materials.YttriumBariumCuprate, 1760, 4L, 8L, 4L, gregtech.api.enums.GT_Values.V[6], true, false);
+        makeWires(Materials.HSSG, 1700, 2L, 4L, 4L, GTValues.V[6], true, false);
+        makeWires(Materials.NiobiumTitanium, 1720, 2L, 4L, 4L, GTValues.V[6], true, false);
+        makeWires(Materials.VanadiumGallium, 1740, 2L, 4L, 4L, GTValues.V[6], true, false);
+        makeWires(Materials.YttriumBariumCuprate, 1760, 4L, 8L, 4L, GTValues.V[6], true, false);
 
-        makeWires(Materials.Naquadah, 1780, 2L, 4L, 2L, gregtech.api.enums.GT_Values.V[7], true, false);
+        makeWires(Materials.Naquadah, 1780, 2L, 4L, 2L, GTValues.V[7], true, false);
 
-        makeWires(Materials.NaquadahAlloy, 1800, 4L, 8L, 2L, gregtech.api.enums.GT_Values.V[8], true, false);
-        makeWires(Materials.Duranium, 1820, 8L, 16L, 1L, gregtech.api.enums.GT_Values.V[8], true, false);
-        makeWires(Materials.TPV, 1840, 1L, 2L, 6L, gregtech.api.enums.GT_Values.V[4], true, false);
+        makeWires(Materials.NaquadahAlloy, 1800, 4L, 8L, 2L, GTValues.V[8], true, false);
+        makeWires(Materials.Duranium, 1820, 8L, 16L, 1L, GTValues.V[8], true, false);
+        makeWires(Materials.TPV, 1840, 1L, 2L, 6L, GTValues.V[4], true, false);
 
         // Superconductor base.
-        makeWires(
-            Materials.Pentacadmiummagnesiumhexaoxid,
-            2200,
-            1L,
-            2L,
-            1L,
-            gregtech.api.enums.GT_Values.V[2],
-            false,
-            false);
-        makeWires(
-            Materials.Titaniumonabariumdecacoppereikosaoxid,
-            2220,
-            1L,
-            8L,
-            2L,
-            gregtech.api.enums.GT_Values.V[3],
-            false,
-            false);
-        makeWires(Materials.Uraniumtriplatinid, 2240, 1L, 16L, 3L, gregtech.api.enums.GT_Values.V[4], false, false);
-        makeWires(Materials.Vanadiumtriindinid, 2260, 1L, 64L, 4L, gregtech.api.enums.GT_Values.V[5], false, false);
+        makeWires(Materials.Pentacadmiummagnesiumhexaoxid, 2200, 1L, 2L, 1L, GTValues.V[2], false, false);
+        makeWires(Materials.Titaniumonabariumdecacoppereikosaoxid, 2220, 1L, 8L, 2L, GTValues.V[3], false, false);
+        makeWires(Materials.Uraniumtriplatinid, 2240, 1L, 16L, 3L, GTValues.V[4], false, false);
+        makeWires(Materials.Vanadiumtriindinid, 2260, 1L, 64L, 4L, GTValues.V[5], false, false);
         makeWires(
             Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid,
             2280,
             2L,
             256L,
             6L,
-            gregtech.api.enums.GT_Values.V[6],
-            false,
-            false);
-        makeWires(
-            Materials.Tetranaquadahdiindiumhexaplatiumosminid,
-            2300,
-            2L,
-            1024L,
-            8L,
-            gregtech.api.enums.GT_Values.V[7],
-            false,
-            false);
-        makeWires(
-            Materials.Longasssuperconductornameforuvwire,
-            2500,
-            2L,
-            4096L,
-            12L,
-            gregtech.api.enums.GT_Values.V[8],
+            GTValues.V[6],
             false,
             false);
-        makeWires(
-            Materials.Longasssuperconductornameforuhvwire,
-            2520,
-            2L,
-            16384L,
-            16L,
-            gregtech.api.enums.GT_Values.V[9],
-            false,
-            false);
-        makeWires(
-            Materials.SuperconductorUEVBase,
-            2032,
-            2L,
-            65536L,
-            24L,
-            gregtech.api.enums.GT_Values.V[10],
-            false,
-            false);
-        makeWires(
-            Materials.SuperconductorUIVBase,
-            2052,
-            2L,
-            262144L,
-            32L,
-            gregtech.api.enums.GT_Values.V[11],
-            false,
-            false);
-        makeWires(Materials.SuperconductorUMVBase, 2072, 2L, 1048576L, 32L, GT_Values.V[12], false, false);
+        makeWires(Materials.Tetranaquadahdiindiumhexaplatiumosminid, 2300, 2L, 1024L, 8L, GTValues.V[7], false, false);
+        makeWires(Materials.Longasssuperconductornameforuvwire, 2500, 2L, 4096L, 12L, GTValues.V[8], false, false);
+        makeWires(Materials.Longasssuperconductornameforuhvwire, 2520, 2L, 16384L, 16L, GTValues.V[9], false, false);
+        makeWires(Materials.SuperconductorUEVBase, 2032, 2L, 65536L, 24L, GTValues.V[10], false, false);
+        makeWires(Materials.SuperconductorUIVBase, 2052, 2L, 262144L, 32L, GTValues.V[11], false, false);
+        makeWires(Materials.SuperconductorUMVBase, 2072, 2L, 1048576L, 32L, GTValues.V[12], false, false);
 
         // Actual superconductors.
-        makeWires(Materials.SuperconductorMV, 2320, 0L, 0L, 4L, gregtech.api.enums.GT_Values.V[2], false, true);
-        makeWires(Materials.SuperconductorHV, 2340, 0L, 0L, 6L, gregtech.api.enums.GT_Values.V[3], false, true);
-        makeWires(Materials.SuperconductorEV, 2360, 0L, 0L, 8L, gregtech.api.enums.GT_Values.V[4], false, true);
-        makeWires(Materials.SuperconductorIV, 2380, 0L, 0L, 12L, gregtech.api.enums.GT_Values.V[5], false, true);
-        makeWires(Materials.SuperconductorLuV, 2400, 0L, 0L, 16L, gregtech.api.enums.GT_Values.V[6], false, true);
-        makeWires(Materials.SuperconductorZPM, 2420, 0L, 0L, 24L, gregtech.api.enums.GT_Values.V[7], false, true);
-        makeWires(Materials.SuperconductorUV, 2440, 0L, 0L, 32L, gregtech.api.enums.GT_Values.V[8], false, true);
-        makeWires(Materials.SuperconductorUHV, 2020, 0L, 0L, 48L, gregtech.api.enums.GT_Values.V[9], false, true);
-        makeWires(Materials.SuperconductorUEV, 2026, 0L, 0L, 64L, gregtech.api.enums.GT_Values.V[10], false, true);
-        makeWires(Materials.SuperconductorUIV, 2081, 0L, 0L, 64L, gregtech.api.enums.GT_Values.V[11], false, true);
-        makeWires(Materials.SuperconductorUMV, 2089, 0L, 0L, 64L, gregtech.api.enums.GT_Values.V[12], false, true);
-
-        makeWires(Materials.Ichorium, 2600, 2L, 2L, 12L, GT_Values.V[9], false, true);
-        makeWires(MaterialsUEVplus.SpaceTime, 2606, 0L, 0L, 1_000_000L, GT_Values.V[14], false, true);
-
-        GT_OreDictUnificator.registerOre(
+        makeWires(Materials.SuperconductorMV, 2320, 0L, 0L, 4L, GTValues.V[2], false, true);
+        makeWires(Materials.SuperconductorHV, 2340, 0L, 0L, 6L, GTValues.V[3], false, true);
+        makeWires(Materials.SuperconductorEV, 2360, 0L, 0L, 8L, GTValues.V[4], false, true);
+        makeWires(Materials.SuperconductorIV, 2380, 0L, 0L, 12L, GTValues.V[5], false, true);
+        makeWires(Materials.SuperconductorLuV, 2400, 0L, 0L, 16L, GTValues.V[6], false, true);
+        makeWires(Materials.SuperconductorZPM, 2420, 0L, 0L, 24L, GTValues.V[7], false, true);
+        makeWires(Materials.SuperconductorUV, 2440, 0L, 0L, 32L, GTValues.V[8], false, true);
+        makeWires(Materials.SuperconductorUHV, 2020, 0L, 0L, 48L, GTValues.V[9], false, true);
+        makeWires(Materials.SuperconductorUEV, 2026, 0L, 0L, 64L, GTValues.V[10], false, true);
+        makeWires(Materials.SuperconductorUIV, 2081, 0L, 0L, 64L, GTValues.V[11], false, true);
+        makeWires(Materials.SuperconductorUMV, 2089, 0L, 0L, 64L, GTValues.V[12], false, true);
+
+        makeWires(Materials.Ichorium, 2600, 2L, 2L, 12L, GTValues.V[9], false, true);
+        makeWires(MaterialsUEVplus.SpaceTime, 2606, 0L, 0L, 1_000_000L, GTValues.V[14], false, true);
+
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeSmall.get(Materials.Wood),
-            new GT_MetaPipeEntity_Fluid(
-                5101,
-                "GT_Pipe_Wood_Small",
-                "Small Wooden Fluid Pipe",
-                0.375F,
-                Materials.Wood,
-                10,
-                350,
-                false).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+            new MTEFluid(5101, "GT_Pipe_Wood_Small", "Small Wooden Fluid Pipe", 0.375F, Materials.Wood, 10, 350, false)
+                .getStackForm(1L));
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeMedium.get(Materials.Wood),
-            new GT_MetaPipeEntity_Fluid(5102, "GT_Pipe_Wood", "Wooden Fluid Pipe", 0.5F, Materials.Wood, 30, 350, false)
+            new MTEFluid(5102, "GT_Pipe_Wood", "Wooden Fluid Pipe", 0.5F, Materials.Wood, 30, 350, false)
                 .getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeLarge.get(Materials.Wood),
-            new GT_MetaPipeEntity_Fluid(
-                5103,
-                "GT_Pipe_Wood_Large",
-                "Large Wooden Fluid Pipe",
-                0.75F,
-                Materials.Wood,
-                60,
-                350,
-                false).getStackForm(1L));
+            new MTEFluid(5103, "GT_Pipe_Wood_Large", "Large Wooden Fluid Pipe", 0.75F, Materials.Wood, 60, 350, false)
+                .getStackForm(1L));
 
         generateFluidPipes(Materials.Copper, Materials.Copper.mName, 5110, 20, 1000, true);
         generateFluidMultiPipes(Materials.Copper, Materials.Copper.mName, 5115, 20, 1000, true);
@@ -13054,9 +12488,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
             600,
             1000,
             true);
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeSmall.get(Materials.Ultimate),
-            new GT_MetaPipeEntity_Fluid(
+            new MTEFluid(
                 5165,
                 "GT_Pipe_HighPressure_Small",
                 "Small High Pressure Fluid Pipe",
@@ -13065,9 +12499,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 4800,
                 1500,
                 true).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeMedium.get(Materials.Ultimate),
-            new GT_MetaPipeEntity_Fluid(
+            new MTEFluid(
                 5166,
                 "GT_Pipe_HighPressure",
                 "High Pressure Fluid Pipe",
@@ -13076,9 +12510,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 7200,
                 1500,
                 true).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeLarge.get(Materials.Ultimate),
-            new GT_MetaPipeEntity_Fluid(
+            new MTEFluid(
                 5167,
                 "GT_Pipe_HighPressure_Large",
                 "Large High Pressure Fluid Pipe",
@@ -13180,11 +12614,11 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
     @SuppressWarnings("PointlessArithmeticExpression")
     private static void makeWires(Materials aMaterial, int aStartID, long aLossInsulated, long aLoss, long aAmperage,
         long aVoltage, boolean aInsulatable, boolean aAutoInsulated) {
-        String name = GT_LanguageManager.i18nPlaceholder ? "%material" : aMaterial.mDefaultLocalName;
-        GT_OreDictUnificator.registerOre(
+        String name = GTLanguageManager.i18nPlaceholder ? "%material" : aMaterial.mDefaultLocalName;
+        GTOreDictUnificator.registerOre(
             OrePrefixes.wireGt01,
             aMaterial,
-            new GT_MetaPipeEntity_Cable(
+            new MTECable(
                 aStartID + 0,
                 aTextWire1 + aMaterial.mName.toLowerCase() + ".01",
                 "1x " + name + aTextWire2,
@@ -13195,10 +12629,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 aVoltage,
                 false,
                 !aAutoInsulated).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.wireGt02,
             aMaterial,
-            new GT_MetaPipeEntity_Cable(
+            new MTECable(
                 aStartID + 1,
                 aTextWire1 + aMaterial.mName.toLowerCase() + ".02",
                 "2x " + name + aTextWire2,
@@ -13209,10 +12643,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 aVoltage,
                 false,
                 !aAutoInsulated).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.wireGt04,
             aMaterial,
-            new GT_MetaPipeEntity_Cable(
+            new MTECable(
                 aStartID + 2,
                 aTextWire1 + aMaterial.mName.toLowerCase() + ".04",
                 "4x " + name + aTextWire2,
@@ -13223,10 +12657,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 aVoltage,
                 false,
                 !aAutoInsulated).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.wireGt08,
             aMaterial,
-            new GT_MetaPipeEntity_Cable(
+            new MTECable(
                 aStartID + 3,
                 aTextWire1 + aMaterial.mName.toLowerCase() + ".08",
                 "8x " + name + aTextWire2,
@@ -13237,10 +12671,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 aVoltage,
                 false,
                 !aAutoInsulated).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.wireGt12,
             aMaterial,
-            new GT_MetaPipeEntity_Cable(
+            new MTECable(
                 aStartID + 4,
                 aTextWire1 + aMaterial.mName.toLowerCase() + ".12",
                 "12x " + name + aTextWire2,
@@ -13251,10 +12685,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 aVoltage,
                 false,
                 !aAutoInsulated).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.wireGt16,
             aMaterial,
-            new GT_MetaPipeEntity_Cable(
+            new MTECable(
                 aStartID + 5,
                 aTextWire1 + aMaterial.mName.toLowerCase() + ".16",
                 "16x " + name + aTextWire2,
@@ -13266,10 +12700,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 false,
                 !aAutoInsulated).getStackForm(1L));
         if (aInsulatable) {
-            GT_OreDictUnificator.registerOre(
+            GTOreDictUnificator.registerOre(
                 OrePrefixes.cableGt01,
                 aMaterial,
-                new GT_MetaPipeEntity_Cable(
+                new MTECable(
                     aStartID + 6,
                     aTextCable1 + aMaterial.mName.toLowerCase() + ".01",
                     "1x " + name + aTextCable2,
@@ -13280,10 +12714,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                     aVoltage,
                     true,
                     false).getStackForm(1L));
-            GT_OreDictUnificator.registerOre(
+            GTOreDictUnificator.registerOre(
                 OrePrefixes.cableGt02,
                 aMaterial,
-                new GT_MetaPipeEntity_Cable(
+                new MTECable(
                     aStartID + 7,
                     aTextCable1 + aMaterial.mName.toLowerCase() + ".02",
                     "2x " + name + aTextCable2,
@@ -13294,10 +12728,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                     aVoltage,
                     true,
                     false).getStackForm(1L));
-            GT_OreDictUnificator.registerOre(
+            GTOreDictUnificator.registerOre(
                 OrePrefixes.cableGt04,
                 aMaterial,
-                new GT_MetaPipeEntity_Cable(
+                new MTECable(
                     aStartID + 8,
                     aTextCable1 + aMaterial.mName.toLowerCase() + ".04",
                     "4x " + name + aTextCable2,
@@ -13308,10 +12742,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                     aVoltage,
                     true,
                     false).getStackForm(1L));
-            GT_OreDictUnificator.registerOre(
+            GTOreDictUnificator.registerOre(
                 OrePrefixes.cableGt08,
                 aMaterial,
-                new GT_MetaPipeEntity_Cable(
+                new MTECable(
                     aStartID + 9,
                     aTextCable1 + aMaterial.mName.toLowerCase() + ".08",
                     "8x " + name + aTextCable2,
@@ -13322,10 +12756,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                     aVoltage,
                     true,
                     false).getStackForm(1L));
-            GT_OreDictUnificator.registerOre(
+            GTOreDictUnificator.registerOre(
                 OrePrefixes.cableGt12,
                 aMaterial,
-                new GT_MetaPipeEntity_Cable(
+                new MTECable(
                     aStartID + 10,
                     aTextCable1 + aMaterial.mName.toLowerCase() + ".12",
                     "12x " + name + aTextCable2,
@@ -13336,10 +12770,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                     aVoltage,
                     true,
                     false).getStackForm(1L));
-            GT_OreDictUnificator.registerOre(
+            GTOreDictUnificator.registerOre(
                 OrePrefixes.cableGt16,
                 aMaterial,
-                new GT_MetaPipeEntity_Cable(
+                new MTECable(
                     aStartID + 11,
                     aTextCable1 + aMaterial.mName.toLowerCase() + ".16",
                     "16x " + name + aTextCable2,
@@ -13355,7 +12789,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     @Override
     public void run() {
-        GT_Log.out.println("GT_Mod: Registering MetaTileEntities.");
+        GTLog.out.println("GTMod: Registering MetaTileEntities.");
         registerMachineHull();
         registerTransformer();
         registerDynamoHatch();
@@ -13463,56 +12897,47 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
         registerOven();
 
         ItemList.AdvDebugStructureWriter.set(
-            new GT_MetaTileEntity_AdvDebugStructureWriter(
+            new MTEAdvDebugStructureWriter(
                 ADVANCED_DEBUG_STRUCTURE_WRITTER.ID,
                 "advdebugstructurewriter",
                 "Advanced Debug Structure Writer",
                 5).getStackForm(1L));
         ItemList.Hatch_Maintenance.set(
-            new GT_MetaTileEntity_Hatch_Maintenance(MAINTENANCE_HATCH.ID, "hatch.maintenance", "Maintenance Hatch", 1)
+            new MTEHatchMaintenance(MAINTENANCE_HATCH.ID, "hatch.maintenance", "Maintenance Hatch", 1)
                 .getStackForm(1L));
         ItemList.Hatch_AutoMaintenance.set(
-            new GT_MetaTileEntity_Hatch_Maintenance(
+            new MTEHatchMaintenance(
                 AUTO_MAINTENANCE_HATCH.ID,
                 "hatch.maintenance.auto",
                 "Auto Maintenance Hatch",
                 6,
                 true).getStackForm(1L));
         ItemList.Hatch_DroneDownLink.set(
-            new GT_MetaTileEntity_Hatch_DroneDownLink(
-                DroneDownLink.ID,
-                "hatch.dronedownlink",
-                "Drone DownLink Module",
-                5).getStackForm(1));
+            new MTEHatchDroneDownLink(DroneDownLink.ID, "hatch.dronedownlink", "Drone DownLink Module", 5)
+                .getStackForm(1));
         ItemList.Hatch_DataAccess_EV.set(
-            new GT_MetaTileEntity_Hatch_DataAccess(DATA_ACCESS_HATCH.ID, "hatch.dataaccess", "Data Access Hatch", 4)
-                .getStackForm(1L));
+            new MTEHatchDataAccess(DATA_ACCESS_HATCH.ID, "hatch.dataaccess", "Data Access Hatch", 4).getStackForm(1L));
         ItemList.Hatch_DataAccess_LuV.set(
-            new GT_MetaTileEntity_Hatch_DataAccess(
+            new MTEHatchDataAccess(
                 ADVANCED_DATA_ACCESS_HATCH.ID,
                 "hatch.dataaccess.adv",
                 "Advanced Data Access Hatch",
                 6).getStackForm(1L));
         ItemList.Hatch_DataAccess_UV.set(
-            new GT_MetaTileEntity_Hatch_DataAccess(
+            new MTEHatchDataAccess(
                 AUTOMATABLE_DATA_ACCESS_HATCH.ID,
                 "hatch.dataaccess.auto",
                 "Automatable Data Access Hatch",
                 8).getStackForm(1L));
-        ItemList.Hatch_HeatSensor.set(
-            new GT_MetaTileEntity_HeatSensor(HEAT_DETECTOR_HATCH.ID, "hatch.heatsensor", "Heat Sensor Hatch", 7)
-                .getStackForm(1));
-        ItemList.Hatch_pHSensor.set(
-            new GT_MetaTileEntity_pHSensor(HATCH_PH_SENSOR.ID, "hatch.phsensor", "pH Sensor Hatch", 7).getStackForm(1));
-        ItemList.Hatch_LensHousing.set(
-            new GT_MetaTileEntity_LensHousing(HATCH_LENS_HOUSING.ID, "hatch.lenshousing", "Lens Housing")
-                .getStackForm(1L));
+        ItemList.Hatch_HeatSensor
+            .set(new MTEHeatSensor(HEAT_DETECTOR_HATCH.ID, "hatch.heatsensor", "Heat Sensor Hatch", 7).getStackForm(1));
+        ItemList.Hatch_pHSensor
+            .set(new MTEHatchPHSensor(HATCH_PH_SENSOR.ID, "hatch.phsensor", "pH Sensor Hatch", 7).getStackForm(1));
+        ItemList.Hatch_LensHousing
+            .set(new MTEHatchLensHousing(HATCH_LENS_HOUSING.ID, "hatch.lenshousing", "Lens Housing").getStackForm(1L));
         ItemList.Hatch_LensIndicator.set(
-            new GT_MetaTileEntity_LensIndicator(
-                HATCH_LENS_INDICATOR.ID,
-                "hatch.lensindicator",
-                "Lens Indicator Hatch",
-                8).getStackForm(1L));
+            new MTEHatchLensIndicator(HATCH_LENS_INDICATOR.ID, "hatch.lensindicator", "Lens Indicator Hatch", 8)
+                .getStackForm(1L));
         generateWiresAndPipes();
     }
 
@@ -13520,16 +12945,16 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
         generateItemPipes(
             aMaterial,
             name,
-            GT_LanguageManager.i18nPlaceholder ? "%material" : aMaterial.mDefaultLocalName,
+            GTLanguageManager.i18nPlaceholder ? "%material" : aMaterial.mDefaultLocalName,
             startID,
             baseInvSlots);
     }
 
     private static void generateItemPipes(Materials aMaterial, String name, String displayName, int startID,
         int baseInvSlots) {
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeMedium.get(aMaterial),
-            new GT_MetaPipeEntity_Item(
+            new MTEItem(
                 startID,
                 "GT_Pipe_" + name,
                 displayName + " Item Pipe",
@@ -13538,9 +12963,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 baseInvSlots,
                 32768 / baseInvSlots,
                 false).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeLarge.get(aMaterial),
-            new GT_MetaPipeEntity_Item(
+            new MTEItem(
                 startID + 1,
                 "GT_Pipe_" + name + "_Large",
                 "Large " + displayName + " Item Pipe",
@@ -13549,9 +12974,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 baseInvSlots * 2,
                 16384 / baseInvSlots,
                 false).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeHuge.get(aMaterial),
-            new GT_MetaPipeEntity_Item(
+            new MTEItem(
                 startID + 2,
                 "GT_Pipe_" + name + "_Huge",
                 "Huge " + displayName + " Item Pipe",
@@ -13560,9 +12985,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 baseInvSlots * 4,
                 8192 / baseInvSlots,
                 false).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeRestrictiveMedium.get(aMaterial),
-            new GT_MetaPipeEntity_Item(
+            new MTEItem(
                 startID + 3,
                 "GT_Pipe_Restrictive_" + name,
                 "Restrictive " + displayName + " Item Pipe",
@@ -13571,9 +12996,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 baseInvSlots,
                 3276800 / baseInvSlots,
                 true).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeRestrictiveLarge.get(aMaterial),
-            new GT_MetaPipeEntity_Item(
+            new MTEItem(
                 startID + 4,
                 "GT_Pipe_Restrictive_" + name + "_Large",
                 "Large Restrictive " + displayName + " Item Pipe",
@@ -13582,9 +13007,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 baseInvSlots * 2,
                 1638400 / baseInvSlots,
                 true).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeRestrictiveHuge.get(aMaterial),
-            new GT_MetaPipeEntity_Item(
+            new MTEItem(
                 startID + 5,
                 "GT_Pipe_Restrictive_" + name + "_Huge",
                 "Huge Restrictive " + displayName + " Item Pipe",
@@ -13601,7 +13026,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
         generateFluidPipes(
             aMaterial,
             name,
-            GT_LanguageManager.i18nPlaceholder ? "%material" : aMaterial.mDefaultLocalName,
+            GTLanguageManager.i18nPlaceholder ? "%material" : aMaterial.mDefaultLocalName,
             startID,
             baseCapacity,
             heatCapacity,
@@ -13610,9 +13035,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void generateFluidPipes(Materials aMaterial, String name, String displayName, int startID,
         int baseCapacity, int heatCapacity, boolean gasProof) {
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeTiny.get(aMaterial),
-            new GT_MetaPipeEntity_Fluid(
+            new MTEFluid(
                 startID,
                 "GT_Pipe_" + name + "_Tiny",
                 "Tiny " + displayName + " Fluid Pipe",
@@ -13621,9 +13046,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 baseCapacity / 6,
                 heatCapacity,
                 gasProof).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeSmall.get(aMaterial),
-            new GT_MetaPipeEntity_Fluid(
+            new MTEFluid(
                 startID + 1,
                 "GT_Pipe_" + name + "_Small",
                 "Small " + displayName + " Fluid Pipe",
@@ -13632,9 +13057,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 baseCapacity / 3,
                 heatCapacity,
                 gasProof).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeMedium.get(aMaterial),
-            new GT_MetaPipeEntity_Fluid(
+            new MTEFluid(
                 startID + 2,
                 "GT_Pipe_" + name,
                 displayName + " Fluid Pipe",
@@ -13643,9 +13068,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 baseCapacity,
                 heatCapacity,
                 gasProof).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeLarge.get(aMaterial),
-            new GT_MetaPipeEntity_Fluid(
+            new MTEFluid(
                 startID + 3,
                 "GT_Pipe_" + name + "_Large",
                 "Large " + displayName + " Fluid Pipe",
@@ -13654,9 +13079,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 baseCapacity * 2,
                 heatCapacity,
                 gasProof).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeHuge.get(aMaterial),
-            new GT_MetaPipeEntity_Fluid(
+            new MTEFluid(
                 startID + 4,
                 "GT_Pipe_" + name + "_Huge",
                 "Huge " + displayName + " Fluid Pipe",
@@ -13675,9 +13100,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
 
     private static void generateFluidMultiPipes(Materials aMaterial, String name, String displayName, int startID,
         int baseCapacity, int heatCapacity, boolean gasProof) {
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeQuadruple.get(aMaterial),
-            new GT_MetaPipeEntity_Fluid(
+            new MTEFluid(
                 startID,
                 "GT_Pipe_" + name + "_Quadruple",
                 "Quadruple " + displayName + " Fluid Pipe",
@@ -13687,9 +13112,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 heatCapacity,
                 gasProof,
                 4).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             OrePrefixes.pipeNonuple.get(aMaterial),
-            new GT_MetaPipeEntity_Fluid(
+            new MTEFluid(
                 startID + 1,
                 "GT_Pipe_" + name + "_Nonuple",
                 "Nonuple " + displayName + " Fluid Pipe",
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java b/src/main/java/gregtech/loaders/preload/LoaderOreProcessing.java
index 598d9e882a..f38bbd6b76 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java
+++ b/src/main/java/gregtech/loaders/preload/LoaderOreProcessing.java
@@ -1,6 +1,6 @@
 package gregtech.loaders.preload;
 
-import gregtech.api.util.GT_Log;
+import gregtech.api.util.GTLog;
 import gregtech.loaders.oreprocessing.ProcessingAll;
 import gregtech.loaders.oreprocessing.ProcessingBeans;
 import gregtech.loaders.oreprocessing.ProcessingBlock;
@@ -52,11 +52,11 @@ import gregtech.loaders.oreprocessing.ProcessingTransforming;
 import gregtech.loaders.oreprocessing.ProcessingWax;
 import gregtech.loaders.oreprocessing.ProcessingWire;
 
-public class GT_Loader_OreProcessing implements Runnable {
+public class LoaderOreProcessing implements Runnable {
 
     @Override
     public void run() {
-        GT_Log.out.println("GT_Mod: Register Ore processing.");
+        GTLog.out.println("GTMod: Register Ore processing.");
         new ProcessingAll();
         new ProcessingBeans();
         new ProcessingBlock();
diff --git a/src/main/java/gregtech/mixin/Mixin.java b/src/main/java/gregtech/mixin/Mixin.java
index 3e0ad23f0a..459b69865d 100644
--- a/src/main/java/gregtech/mixin/Mixin.java
+++ b/src/main/java/gregtech/mixin/Mixin.java
@@ -12,8 +12,7 @@ import java.util.function.Supplier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
-
+import bartworks.common.configs.ConfigHandler;
 import cpw.mods.fml.relauncher.FMLLaunchHandler;
 
 public enum Mixin {
diff --git a/src/main/java/gregtech/nei/NEI_GT_Config.java b/src/main/java/gregtech/nei/GTNEIConfig.java
index 198f71fdb0..211f8251dc 100644
--- a/src/main/java/gregtech/nei/NEI_GT_Config.java
+++ b/src/main/java/gregtech/nei/GTNEIConfig.java
@@ -17,18 +17,18 @@ import codechicken.nei.recipe.HandlerInfo;
 import codechicken.nei.recipe.TemplateRecipeHandler;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-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.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.RecipeMapWorkable;
 import gregtech.api.recipe.RecipeCategory;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.common.items.GT_MetaGenerated_Item_01;
-import gregtech.common.items.GT_MetaGenerated_Item_02;
-import gregtech.common.items.GT_MetaGenerated_Item_03;
+import gregtech.api.util.GTModHandler;
+import gregtech.common.items.MetaGeneratedItem01;
+import gregtech.common.items.MetaGeneratedItem02;
+import gregtech.common.items.MetaGeneratedItem03;
 import gregtech.nei.dumper.BatchModeSupportDumper;
 import gregtech.nei.dumper.InputSeparationSupportDumper;
 import gregtech.nei.dumper.MaterialDumper;
@@ -37,7 +37,7 @@ import gregtech.nei.dumper.MetaTileEntityDumper;
 import gregtech.nei.dumper.RecipeLockingSupportDumper;
 import gregtech.nei.dumper.VoidProtectionSupportDumper;
 
-public class NEI_GT_Config implements IConfigureNEI {
+public class GTNEIConfig implements IConfigureNEI {
 
     /**
      * This map determines the order in which NEI handlers will be registered and displayed in tabs.
@@ -52,7 +52,7 @@ public class NEI_GT_Config implements IConfigureNEI {
         .put(RecipeMaps.scannerFakeRecipes, 2)
         .build();
 
-    private static final Comparator<GT_NEI_DefaultHandler> RECIPE_MAP_HANDLER_COMPARATOR = Comparator
+    private static final Comparator<GTNEIDefaultHandler> RECIPE_MAP_HANDLER_COMPARATOR = Comparator
         .comparingInt(handler -> RECIPE_MAP_ORDERING.getOrDefault(handler.getRecipeMap(), 0));
 
     private static ListMultimap<RecipeCategory, RecipeMapWorkable> RECIPE_CATALYST_INDEX;
@@ -61,7 +61,7 @@ public class NEI_GT_Config implements IConfigureNEI {
 
     private static void addHandler(TemplateRecipeHandler handler) {
         FMLInterModComms.sendRuntimeMessage(
-            GT_Values.GT,
+            GTValues.GT,
             "NEIPlugins",
             "register-crafting-handler",
             "gregtech@" + handler.getRecipeName() + "@" + handler.getOverlayIdentifier());
@@ -85,9 +85,9 @@ public class NEI_GT_Config implements IConfigureNEI {
             .filter(
                 recipeCategory -> recipeCategory.recipeMap.getFrontend()
                     .getNEIProperties().registerNEI)
-            .map(GT_NEI_DefaultHandler::new)
+            .map(GTNEIDefaultHandler::new)
             .sorted(RECIPE_MAP_HANDLER_COMPARATOR)
-            .forEach(NEI_GT_Config::addHandler);
+            .forEach(GTNEIConfig::addHandler);
     }
 
     private void registerCatalysts() {
@@ -101,7 +101,7 @@ public class NEI_GT_Config implements IConfigureNEI {
                         recipeMapWorkable.getRecipeCatalystPriority()));
         }
         API.addRecipeCatalyst(
-            GT_ModHandler.getIC2Item("nuclearReactor", 1, null),
+            GTModHandler.getIC2Item("nuclearReactor", 1, null),
             RecipeMaps.ic2NuclearFakeRecipes.unlocalizedName);
     }
 
@@ -112,9 +112,9 @@ public class NEI_GT_Config implements IConfigureNEI {
     private void registerDumpers() {
         API.addOption(new MetaTileEntityDumper());
         API.addOption(new MaterialDumper());
-        API.addOption(new MetaItemDumper(GT_MetaGenerated_Item_01.INSTANCE, "metaitem01"));
-        API.addOption(new MetaItemDumper(GT_MetaGenerated_Item_02.INSTANCE, "metaitem02"));
-        API.addOption(new MetaItemDumper(GT_MetaGenerated_Item_03.INSTANCE, "metaitem03"));
+        API.addOption(new MetaItemDumper(MetaGeneratedItem01.INSTANCE, "metaitem01"));
+        API.addOption(new MetaItemDumper(MetaGeneratedItem02.INSTANCE, "metaitem02"));
+        API.addOption(new MetaItemDumper(MetaGeneratedItem03.INSTANCE, "metaitem03"));
         API.addOption(new VoidProtectionSupportDumper());
         API.addOption(new InputSeparationSupportDumper());
         API.addOption(new BatchModeSupportDumper());
@@ -159,8 +159,8 @@ public class NEI_GT_Config implements IConfigureNEI {
         ImmutableListMultimap.Builder<RecipeCategory, RecipeMapWorkable> builder = new ImmutableListMultimap.Builder<>();
         builder
             .orderValuesBy(Comparator.comparing(recipeMapWorkable -> -recipeMapWorkable.getRecipeCatalystPriority()));
-        for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
-            IMetaTileEntity mte = GregTech_API.METATILEENTITIES[i];
+        for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) {
+            IMetaTileEntity mte = GregTechAPI.METATILEENTITIES[i];
             if (!(mte instanceof RecipeMapWorkable recipeMapWorkable)) continue;
             for (RecipeMap<?> recipeMap : recipeMapWorkable.getAvailableRecipeMaps()) {
                 for (RecipeCategory recipeCategory : recipeMap.getAssociatedCategories()) {
diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GTNEIDefaultHandler.java
index 99e7dc5459..3887ad321b 100644
--- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
+++ b/src/main/java/gregtech/nei/GTNEIDefaultHandler.java
@@ -1,6 +1,6 @@
 package gregtech.nei;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import java.awt.Rectangle;
 import java.lang.ref.SoftReference;
@@ -46,12 +46,12 @@ import codechicken.nei.recipe.ICraftingHandler;
 import codechicken.nei.recipe.IUsageHandler;
 import codechicken.nei.recipe.RecipeCatalysts;
 import codechicken.nei.recipe.TemplateRecipeHandler;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SteamVariant;
-import gregtech.api.gui.GT_GUIColorOverride;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.GUIColorOverride;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IOverclockDescriptionProvider;
 import gregtech.api.objects.ItemData;
@@ -63,14 +63,14 @@ import gregtech.api.recipe.RecipeCategory;
 import gregtech.api.recipe.RecipeCategorySetting;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMapFrontend;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Item_Machines;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.OverclockCalculator;
+import gregtech.common.blocks.ItemMachines;
 import gregtech.common.gui.modularui.UIHelper;
 
-public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
+public class GTNEIDefaultHandler extends TemplateRecipeHandler {
 
     private static final int offsetX = 5;
     private static final int offsetY = 11;
@@ -113,11 +113,11 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
      */
     private NEIHandlerAbsoluteTooltip recipeNameTooltip;
 
-    protected final GT_GUIColorOverride colorOverride = GT_GUIColorOverride
-        .get(GT_UITextures.BACKGROUND_NEI_SINGLE_RECIPE.location);
+    protected final GUIColorOverride colorOverride = GUIColorOverride
+        .get(GTUITextures.BACKGROUND_NEI_SINGLE_RECIPE.location);
     private int neiTextColorOverride = -1;
 
-    public GT_NEI_DefaultHandler(RecipeCategory recipeCategory) {
+    public GTNEIDefaultHandler(RecipeCategory recipeCategory) {
         this.recipeCategory = recipeCategory;
         this.recipeMap = recipeCategory.recipeMap;
         this.frontend = recipeMap.getFrontend();
@@ -152,20 +152,20 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
     public List<CachedDefaultRecipe> getCache() {
         SortedRecipeListCache cacheHolder = getCacheHolder();
         List<CachedDefaultRecipe> cache;
-        if (cacheHolder.getCachedRecipesVersion() != GT_Mod.gregtechproxy.getNEIReloadCount()
+        if (cacheHolder.getCachedRecipesVersion() != GTMod.gregtechproxy.getNEIReloadCount()
             || (cache = cacheHolder.getCachedRecipes()) == null) {
             try {
                 RecipeCategory defaultCategory = recipeMap.getDefaultRecipeCategory();
-                Collection<GT_Recipe> recipes;
+                Collection<GTRecipe> recipes;
                 if (this.recipeCategory == defaultCategory) {
                     // This is main category, so merge categories that are configured as such
-                    Stream<GT_Recipe> recipesToMerge = recipeMap.getBackend()
+                    Stream<GTRecipe> recipesToMerge = recipeMap.getBackend()
                         .getRecipeCategoryMap()
                         .entrySet()
                         .stream()
                         .flatMap(entry -> {
                             boolean merge = entry.getKey() != defaultCategory
-                                && GT_Mod.gregtechproxy.recipeCategorySettings
+                                && GTMod.gregtechproxy.recipeCategorySettings
                                     .getOrDefault(entry.getKey(), RecipeCategorySetting.getDefault())
                                     == RecipeCategorySetting.MERGE;
                             return merge ? entry.getValue()
@@ -179,7 +179,7 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
                         .collect(Collectors.toList());
                 } else {
                     // This is "sub" category
-                    if (GT_Mod.gregtechproxy.recipeCategorySettings
+                    if (GTMod.gregtechproxy.recipeCategorySettings
                         .getOrDefault(recipeCategory, RecipeCategorySetting.getDefault())
                         == RecipeCategorySetting.ENABLE) {
                         recipes = recipeMap.getBackend()
@@ -199,7 +199,7 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
                 // even if it does break, at worst case it's just recreating the cache multiple times, which should be
                 // fine
                 cacheHolder.setCachedRecipes(cache);
-                cacheHolder.setCachedRecipesVersion(GT_Mod.gregtechproxy.getNEIReloadCount());
+                cacheHolder.setCachedRecipesVersion(GTMod.gregtechproxy.getNEIReloadCount());
             } catch (Exception e) {
                 throw new RuntimeException(
                     "Could not construct GT NEI Handler cache for category " + recipeCategory
@@ -213,7 +213,7 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
 
     @Override
     public TemplateRecipeHandler newInstance() {
-        return new GT_NEI_DefaultHandler(recipeCategory);
+        return new GTNEIDefaultHandler(recipeCategory);
     }
 
     @Override
@@ -236,15 +236,15 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
 
     @Override
     public void loadCraftingRecipes(ItemStack aResult) {
-        ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult);
+        ItemData tPrefixMaterial = GTOreDictUnificator.getAssociation(aResult);
 
         ArrayList<ItemStack> tResults = new ArrayList<>();
         tResults.add(aResult);
-        tResults.add(GT_OreDictUnificator.get(true, aResult));
+        tResults.add(GTOreDictUnificator.get(true, aResult));
         if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed)
             && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) {
             for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) {
-                tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L));
+                tResults.add(GTOreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L));
             }
         }
         if (aResult.getUnlocalizedName()
@@ -261,14 +261,14 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
     }
 
     private void addFluidStacks(ItemStack aStack, ArrayList<ItemStack> tResults) {
-        FluidStack tFluid = GT_Utility.getFluidForFilledItem(aStack, true);
+        FluidStack tFluid = GTUtility.getFluidForFilledItem(aStack, true);
         FluidStack tFluidStack;
         if (tFluid != null) {
             tFluidStack = tFluid;
-            tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false));
-        } else tFluidStack = GT_Utility.getFluidFromDisplayStack(aStack);
+            tResults.add(GTUtility.getFluidDisplayStack(tFluid, false));
+        } else tFluidStack = GTUtility.getFluidFromDisplayStack(aStack);
         if (tFluidStack != null) {
-            tResults.addAll(GT_Utility.getContainersFromFluid(tFluidStack));
+            tResults.addAll(GTUtility.getContainersFromFluid(tFluidStack));
         }
     }
 
@@ -301,13 +301,13 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
 
     @Override
     public void loadUsageRecipes(ItemStack aInput) {
-        ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput);
+        ItemData tPrefixMaterial = GTOreDictUnificator.getAssociation(aInput);
         ArrayList<ItemStack> tInputs = new ArrayList<>();
         tInputs.add(aInput);
-        tInputs.add(GT_OreDictUnificator.get(false, aInput));
+        tInputs.add(GTOreDictUnificator.get(false, aInput));
         if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) {
             for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) {
-                tInputs.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L));
+                tInputs.add(GTOreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L));
             }
         }
         addFluidStacks(aInput, tInputs);
@@ -321,9 +321,9 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
     public IUsageHandler getUsageAndCatalystHandler(String inputId, Object... ingredients) {
         if (inputId.equals("item")) {
             ItemStack candidate = (ItemStack) ingredients[0];
-            GT_NEI_DefaultHandler handler = (GT_NEI_DefaultHandler) newInstance();
+            GTNEIDefaultHandler handler = (GTNEIDefaultHandler) newInstance();
             if (RecipeCatalysts.containsCatalyst(handler, candidate)) {
-                IMetaTileEntity metaTile = GT_Item_Machines.getMetaTileEntity(candidate);
+                IMetaTileEntity metaTile = ItemMachines.getMetaTileEntity(candidate);
                 OverclockDescriber overclockDescriber;
                 if (metaTile instanceof IOverclockDescriptionProvider provider) {
                     overclockDescriber = provider.getOverclockDescriber();
@@ -339,7 +339,7 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
 
     @Override
     public ICraftingHandler getRecipeHandler(String outputId, Object... results) {
-        GT_NEI_DefaultHandler handler = (GT_NEI_DefaultHandler) super.getRecipeHandler(outputId, results);
+        GTNEIDefaultHandler handler = (GTNEIDefaultHandler) super.getRecipeHandler(outputId, results);
         if (results.length > 0 && results[0] instanceof OverclockDescriber) {
             handler.overclockDescriber = (OverclockDescriber) results[0];
         }
@@ -453,14 +453,14 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
     }
 
     private void drawDescription(CachedDefaultRecipe cachedRecipe) {
-        GT_Recipe recipe = cachedRecipe.mRecipe;
+        GTRecipe recipe = cachedRecipe.mRecipe;
         if (overclockDescriber == null) {
             // By default, assume generic LV EU with no overclocks
             overclockDescriber = new EUNoOverclockDescriber((byte) 1, uiProperties.amperage);
         }
 
-        GT_OverclockCalculator calculator = overclockDescriber.createCalculator(
-            new GT_OverclockCalculator().setRecipeEUt(recipe.mEUt)
+        OverclockCalculator calculator = overclockDescriber.createCalculator(
+            new OverclockCalculator().setRecipeEUt(recipe.mEUt)
                 .setDuration(recipe.mDuration),
             recipe);
         calculator.calculate();
@@ -528,7 +528,7 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
 
         public FixedPositionedStack(Object object, boolean renderRealStackSize, int x, int y, int aChance,
             boolean aUnificate) {
-            super(aUnificate ? GT_OreDictUnificator.getNonUnifiedStacks(object) : object, x, y, true);
+            super(aUnificate ? GTOreDictUnificator.getNonUnifiedStacks(object) : object, x, y, true);
             this.mChance = aChance;
             realStackSize = item != null ? item.stackSize : 0;
             this.renderRealStackSize = renderRealStackSize;
@@ -558,11 +558,11 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
 
     public class CachedDefaultRecipe extends TemplateRecipeHandler.CachedRecipe {
 
-        public final GT_Recipe mRecipe;
+        public final GTRecipe mRecipe;
         public final List<PositionedStack> mOutputs;
         public final List<PositionedStack> mInputs;
 
-        public CachedDefaultRecipe(GT_Recipe aRecipe) {
+        public CachedDefaultRecipe(GTRecipe aRecipe) {
             super();
             this.mRecipe = aRecipe;
             mOutputs = new ArrayList<>();
@@ -574,14 +574,14 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
                         .getItemHandler() == itemInputsInventory) {
                         int i = widget.getMcSlot()
                             .getSlotIndex();
-                        Object input = aRecipe instanceof GT_Recipe.GT_Recipe_WithAlt
-                            ? ((GT_Recipe.GT_Recipe_WithAlt) aRecipe).getAltRepresentativeInput(i)
+                        Object input = aRecipe instanceof GTRecipe.GTRecipe_WithAlt
+                            ? ((GTRecipe.GTRecipe_WithAlt) aRecipe).getAltRepresentativeInput(i)
                             : aRecipe.getRepresentativeInput(i);
                         if (input != null) {
                             mInputs.add(
                                 new FixedPositionedStack(
                                     input,
-                                    GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                                    GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                                     widget.getPos().x + 1,
                                     widget.getPos().y + 1,
                                     true));
@@ -595,11 +595,11 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
                                 mOutputs.add(
                                     new FixedPositionedStack(
                                         output,
-                                        GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                                        GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                                         widget.getPos().x + 1,
                                         widget.getPos().y + 1,
                                         aRecipe.getOutputChance(i),
-                                        GT_NEI_DefaultHandler.this.neiProperties.unificateOutput));
+                                        GTNEIDefaultHandler.this.neiProperties.unificateOutput));
                             }
                         } else if (widget.getMcSlot()
                             .getItemHandler() == specialSlotInventory) {
@@ -607,7 +607,7 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
                                     mInputs.add(
                                         new FixedPositionedStack(
                                             aRecipe.mSpecialItems,
-                                            GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                                            GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                                             widget.getPos().x + 1,
                                             widget.getPos().y + 1));
                                 }
@@ -620,8 +620,8 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
                                         && aRecipe.mFluidInputs[i].getFluid() != null) {
                                         mInputs.add(
                                             new FixedPositionedStack(
-                                                GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[i], true),
-                                                GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                                                GTUtility.getFluidDisplayStack(aRecipe.mFluidInputs[i], true),
+                                                GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                                                 widget.getPos().x + 1,
                                                 widget.getPos().y + 1));
                                     }
@@ -633,8 +633,8 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
                                             && aRecipe.mFluidOutputs[i].getFluid() != null) {
                                             mOutputs.add(
                                                 new FixedPositionedStack(
-                                                    GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[i], true),
-                                                    GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                                                    GTUtility.getFluidDisplayStack(aRecipe.mFluidOutputs[i], true),
+                                                    GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                                                     widget.getPos().x + 1,
                                                     widget.getPos().y + 1));
                                         }
@@ -644,50 +644,50 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
 
             // items and fluids that exceed usual count
             UIHelper.forEachSlots((i, backgrounds, pos) -> {
-                if (i >= GT_NEI_DefaultHandler.this.uiProperties.maxItemInputs && aRecipe.mInputs[i] != null) {
+                if (i >= GTNEIDefaultHandler.this.uiProperties.maxItemInputs && aRecipe.mInputs[i] != null) {
                     mInputs.add(
                         new FixedPositionedStack(
                             aRecipe.mInputs[i],
-                            GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                            GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                             pos.x + 1,
                             pos.y + 1,
                             true));
                 }
             }, (i, backgrounds, pos) -> {
-                if (i >= GT_NEI_DefaultHandler.this.uiProperties.maxItemOutputs && aRecipe.mOutputs[i] != null) {
+                if (i >= GTNEIDefaultHandler.this.uiProperties.maxItemOutputs && aRecipe.mOutputs[i] != null) {
                     mOutputs.add(
                         new FixedPositionedStack(
                             aRecipe.mOutputs[i],
-                            GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                            GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                             pos.x + 1,
                             pos.y + 1,
                             aRecipe.getOutputChance(i),
-                            GT_NEI_DefaultHandler.this.neiProperties.unificateOutput));
+                            GTNEIDefaultHandler.this.neiProperties.unificateOutput));
                 }
             }, (i, backgrounds, pos) -> {}, (i, backgrounds, pos) -> {
-                if (i >= GT_NEI_DefaultHandler.this.uiProperties.maxFluidInputs && aRecipe.mFluidInputs[i] != null
+                if (i >= GTNEIDefaultHandler.this.uiProperties.maxFluidInputs && aRecipe.mFluidInputs[i] != null
                     && aRecipe.mFluidInputs[i].getFluid() != null) {
                     mInputs.add(
                         new FixedPositionedStack(
-                            GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[i], true),
-                            GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                            GTUtility.getFluidDisplayStack(aRecipe.mFluidInputs[i], true),
+                            GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                             pos.x + 1,
                             pos.y + 1));
                 }
             }, (i, backgrounds, pos) -> {
-                if (i >= GT_NEI_DefaultHandler.this.uiProperties.maxFluidOutputs && aRecipe.mFluidOutputs[i] != null
+                if (i >= GTNEIDefaultHandler.this.uiProperties.maxFluidOutputs && aRecipe.mFluidOutputs[i] != null
                     && aRecipe.mFluidOutputs[i].getFluid() != null) {
                     mOutputs.add(
                         new FixedPositionedStack(
-                            GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[i], true),
-                            GT_NEI_DefaultHandler.this.neiProperties.renderRealStackSizes,
+                            GTUtility.getFluidDisplayStack(aRecipe.mFluidOutputs[i], true),
+                            GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes,
                             pos.x + 1,
                             pos.y + 1));
                 }
             },
                 IDrawable.EMPTY,
                 IDrawable.EMPTY,
-                GT_NEI_DefaultHandler.this.frontend.getUIProperties(),
+                GTNEIDefaultHandler.this.frontend.getUIProperties(),
                 aRecipe.mInputs.length,
                 aRecipe.mOutputs.length,
                 aRecipe.mFluidInputs.length,
@@ -760,8 +760,8 @@ public class GT_NEI_DefaultHandler extends TemplateRecipeHandler {
             byte lowestTier = 0;
             while (iterator.hasNext()) {
                 CachedDefaultRecipe recipe = iterator.next();
-                byte recipeTier = GT_Utility
-                    .getTier(recipe.mRecipe.mEUt / GT_NEI_DefaultHandler.this.recipeMap.getAmperage());
+                byte recipeTier = GTUtility
+                    .getTier(recipe.mRecipe.mEUt / GTNEIDefaultHandler.this.recipeMap.getAmperage());
                 if (recipeTier != previousTier) {
                     if (maxIndex != -1) {
                         mTierIndexes.put(previousTier, Range.between(minIndex, maxIndex));
diff --git a/src/main/java/gregtech/nei/RecipeDisplayInfo.java b/src/main/java/gregtech/nei/RecipeDisplayInfo.java
index f9cc1a9a8c..d9e6b1d65b 100644
--- a/src/main/java/gregtech/nei/RecipeDisplayInfo.java
+++ b/src/main/java/gregtech/nei/RecipeDisplayInfo.java
@@ -1,6 +1,6 @@
 package gregtech.nei;
 
-import static gregtech.api.util.GT_Utility.isStringInvalid;
+import static gregtech.api.util.GTUtility.isStringInvalid;
 
 import java.util.List;
 
@@ -12,9 +12,9 @@ import net.minecraft.client.Minecraft;
 import gregtech.api.objects.overclockdescriber.OverclockDescriber;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.util.FieldsAreNonnullByDefault;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
+import gregtech.api.util.OverclockCalculator;
 
 /**
  * Holds info used for drawing descriptions on NEI.
@@ -27,7 +27,7 @@ public class RecipeDisplayInfo {
     /**
      * Recipe to show description.
      */
-    public final GT_Recipe recipe;
+    public final GTRecipe recipe;
 
     /**
      * RecipeMap the recipe belongs to.
@@ -43,7 +43,7 @@ public class RecipeDisplayInfo {
     /**
      * Pre-built overclock calculator, used for drawing OC information. Do not calculate it again.
      */
-    public final GT_OverclockCalculator calculator;
+    public final OverclockCalculator calculator;
 
     /**
      * Current Y position for drawing description.
@@ -52,8 +52,8 @@ public class RecipeDisplayInfo {
 
     private final int neiTextColorOverride;
 
-    RecipeDisplayInfo(GT_Recipe recipe, RecipeMap<?> recipeMap, OverclockDescriber overclockDescriber,
-        GT_OverclockCalculator calculator, int descriptionYOffset, int neiTextColorOverride) {
+    RecipeDisplayInfo(GTRecipe recipe, RecipeMap<?> recipeMap, OverclockDescriber overclockDescriber,
+        OverclockCalculator calculator, int descriptionYOffset, int neiTextColorOverride) {
         this.recipe = recipe;
         this.recipeMap = recipeMap;
         this.overclockDescriber = overclockDescriber;
diff --git a/src/main/java/gregtech/nei/dumper/BatchModeSupportDumper.java b/src/main/java/gregtech/nei/dumper/BatchModeSupportDumper.java
index ea0168073a..a69a0aa0d6 100644
--- a/src/main/java/gregtech/nei/dumper/BatchModeSupportDumper.java
+++ b/src/main/java/gregtech/nei/dumper/BatchModeSupportDumper.java
@@ -1,10 +1,10 @@
 package gregtech.nei.dumper;
 
-import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures;
+import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures;
 
 public class BatchModeSupportDumper extends MultiBlockFeatureSupportDumper {
 
     public BatchModeSupportDumper() {
-        super("batch_mode", ControllerWithOptionalFeatures::supportsBatchMode);
+        super("batch_mode", IControllerWithOptionalFeatures::supportsBatchMode);
     }
 }
diff --git a/src/main/java/gregtech/nei/dumper/InputSeparationSupportDumper.java b/src/main/java/gregtech/nei/dumper/InputSeparationSupportDumper.java
index 5b0d293827..d0a68d1131 100644
--- a/src/main/java/gregtech/nei/dumper/InputSeparationSupportDumper.java
+++ b/src/main/java/gregtech/nei/dumper/InputSeparationSupportDumper.java
@@ -1,10 +1,10 @@
 package gregtech.nei.dumper;
 
-import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures;
+import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures;
 
 public class InputSeparationSupportDumper extends MultiBlockFeatureSupportDumper {
 
     public InputSeparationSupportDumper() {
-        super("input_separation", ControllerWithOptionalFeatures::supportsInputSeparation);
+        super("input_separation", IControllerWithOptionalFeatures::supportsInputSeparation);
     }
 }
diff --git a/src/main/java/gregtech/nei/dumper/MaterialDumper.java b/src/main/java/gregtech/nei/dumper/MaterialDumper.java
index 3234779de8..197fbba6b3 100644
--- a/src/main/java/gregtech/nei/dumper/MaterialDumper.java
+++ b/src/main/java/gregtech/nei/dumper/MaterialDumper.java
@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 
 public class MaterialDumper extends GregTechIDDumper {
@@ -24,7 +24,7 @@ public class MaterialDumper extends GregTechIDDumper {
     @Override
     protected Iterable<String[]> dump(Mode mode) {
         List<String[]> dump = new ArrayList<>();
-        Map<Integer, Materials> idMap = Arrays.stream(GregTech_API.sGeneratedMaterials)
+        Map<Integer, Materials> idMap = Arrays.stream(GregTechAPI.sGeneratedMaterials)
             .filter(Objects::nonNull)
             .collect(Collectors.toMap(m -> m.mMetaItemSubID, m -> m));
         for (int i = 0; i < 1000; i++) {
diff --git a/src/main/java/gregtech/nei/dumper/MetaItemDumper.java b/src/main/java/gregtech/nei/dumper/MetaItemDumper.java
index 519af48e93..44e2ef8637 100644
--- a/src/main/java/gregtech/nei/dumper/MetaItemDumper.java
+++ b/src/main/java/gregtech/nei/dumper/MetaItemDumper.java
@@ -7,14 +7,14 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentText;
 
 import codechicken.nei.NEIClientUtils;
-import gregtech.api.items.GT_MetaGenerated_Item;
+import gregtech.api.items.MetaGeneratedItem;
 
 public class MetaItemDumper extends GregTechIDDumper {
 
-    private final GT_MetaGenerated_Item item;
+    private final MetaGeneratedItem item;
     private final String nameSuffix;
 
-    public MetaItemDumper(GT_MetaGenerated_Item item, String name) {
+    public MetaItemDumper(MetaGeneratedItem item, String name) {
         super(name);
         this.nameSuffix = name;
         this.item = item;
diff --git a/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java b/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java
index ee30cdfb8a..a3fbd199fd 100644
--- a/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java
+++ b/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java
@@ -3,7 +3,7 @@ package gregtech.nei.dumper;
 import java.util.ArrayList;
 import java.util.List;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 
 public class MetaTileEntityDumper extends GregTechIDDumper {
@@ -20,8 +20,8 @@ public class MetaTileEntityDumper extends GregTechIDDumper {
     @Override
     protected Iterable<String[]> dump(Mode mode) {
         List<String[]> list = new ArrayList<>();
-        for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
-            IMetaTileEntity mte = GregTech_API.METATILEENTITIES[i];
+        for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) {
+            IMetaTileEntity mte = GregTechAPI.METATILEENTITIES[i];
             if (mode == Mode.FREE && mte == null) {
                 list.add(new String[] { String.valueOf(i), "", "", });
             } else if (mode == Mode.USED && mte != null) {
diff --git a/src/main/java/gregtech/nei/dumper/MultiBlockFeatureSupportDumper.java b/src/main/java/gregtech/nei/dumper/MultiBlockFeatureSupportDumper.java
index dc378ff9ad..37045c6b58 100644
--- a/src/main/java/gregtech/nei/dumper/MultiBlockFeatureSupportDumper.java
+++ b/src/main/java/gregtech/nei/dumper/MultiBlockFeatureSupportDumper.java
@@ -5,16 +5,16 @@ import java.util.List;
 import java.util.function.Function;
 
 import codechicken.nei.config.DataDumper;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures;
+import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures;
 
 public abstract class MultiBlockFeatureSupportDumper extends DataDumper {
 
-    private final Function<ControllerWithOptionalFeatures, Boolean> isFeatureSupported;
+    private final Function<IControllerWithOptionalFeatures, Boolean> isFeatureSupported;
 
     public MultiBlockFeatureSupportDumper(String name,
-        Function<ControllerWithOptionalFeatures, Boolean> isFeatureSupported) {
+        Function<IControllerWithOptionalFeatures, Boolean> isFeatureSupported) {
         super("tools.dump.gt5u." + name);
         this.isFeatureSupported = isFeatureSupported;
     }
@@ -27,9 +27,9 @@ public abstract class MultiBlockFeatureSupportDumper extends DataDumper {
     @Override
     public Iterable<String[]> dump(int mode) {
         List<String[]> list = new ArrayList<>();
-        for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
-            IMetaTileEntity mte = GregTech_API.METATILEENTITIES[i];
-            if (!(mte instanceof ControllerWithOptionalFeatures controller)) continue;
+        for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) {
+            IMetaTileEntity mte = GregTechAPI.METATILEENTITIES[i];
+            if (!(mte instanceof IControllerWithOptionalFeatures controller)) continue;
             if (!isFeatureSupported.apply(controller)) {
                 list.add(
                     new String[] { controller.getClass()
diff --git a/src/main/java/gregtech/nei/dumper/RecipeLockingSupportDumper.java b/src/main/java/gregtech/nei/dumper/RecipeLockingSupportDumper.java
index 05deba6c39..0c901e49eb 100644
--- a/src/main/java/gregtech/nei/dumper/RecipeLockingSupportDumper.java
+++ b/src/main/java/gregtech/nei/dumper/RecipeLockingSupportDumper.java
@@ -1,10 +1,10 @@
 package gregtech.nei.dumper;
 
-import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures;
+import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures;
 
 public class RecipeLockingSupportDumper extends MultiBlockFeatureSupportDumper {
 
     public RecipeLockingSupportDumper() {
-        super("recipe_locking", ControllerWithOptionalFeatures::supportsSingleRecipeLocking);
+        super("recipe_locking", IControllerWithOptionalFeatures::supportsSingleRecipeLocking);
     }
 }
diff --git a/src/main/java/gregtech/nei/dumper/VoidProtectionSupportDumper.java b/src/main/java/gregtech/nei/dumper/VoidProtectionSupportDumper.java
index b48efb2cdc..b870d0c984 100644
--- a/src/main/java/gregtech/nei/dumper/VoidProtectionSupportDumper.java
+++ b/src/main/java/gregtech/nei/dumper/VoidProtectionSupportDumper.java
@@ -1,10 +1,10 @@
 package gregtech.nei.dumper;
 
-import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures;
+import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures;
 
 public class VoidProtectionSupportDumper extends MultiBlockFeatureSupportDumper {
 
     public VoidProtectionSupportDumper() {
-        super("void_protection", ControllerWithOptionalFeatures::supportsVoidProtection);
+        super("void_protection", IControllerWithOptionalFeatures::supportsVoidProtection);
     }
 }
diff --git a/src/main/java/gregtech/nei/formatter/DefaultSpecialValueFormatter.java b/src/main/java/gregtech/nei/formatter/DefaultSpecialValueFormatter.java
index 1c4d486319..b190710368 100644
--- a/src/main/java/gregtech/nei/formatter/DefaultSpecialValueFormatter.java
+++ b/src/main/java/gregtech/nei/formatter/DefaultSpecialValueFormatter.java
@@ -1,13 +1,13 @@
 package gregtech.nei.formatter;
 
-import static gregtech.api.util.GT_Utility.trans;
+import static gregtech.api.util.GTUtility.trans;
 
 import java.util.Collections;
 import java.util.List;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.nei.RecipeDisplayInfo;
 
@@ -20,13 +20,13 @@ public class DefaultSpecialValueFormatter implements INEISpecialInfoFormatter {
     @Override
     public List<String> format(RecipeDisplayInfo recipeInfo) {
         int specialValue = recipeInfo.recipe.mSpecialValue;
-        if (specialValue == -100 && GT_Mod.gregtechproxy.mLowGravProcessing) {
+        if (specialValue == -100 && GTMod.gregtechproxy.mLowGravProcessing) {
             return Collections.singletonList(trans("159", "Needs Low Gravity"));
-        } else if (specialValue == -200 && GT_Mod.gregtechproxy.mEnableCleanroom) {
+        } else if (specialValue == -200 && GTMod.gregtechproxy.mEnableCleanroom) {
             return Collections.singletonList(trans("160", "Needs Cleanroom"));
         } else if (specialValue == -201) {
             return Collections.singletonList(trans("206", "Scan for Assembly Line"));
-        } else if (specialValue == -300 && GT_Mod.gregtechproxy.mEnableCleanroom) {
+        } else if (specialValue == -300 && GTMod.gregtechproxy.mEnableCleanroom) {
             return Collections.singletonList(trans("160.1", "Needs Cleanroom & LowGrav"));
         } else if (specialValue == -400) {
             return Collections.singletonList(trans("216", "Deprecated Recipe"));
diff --git a/src/main/java/gregtech/nei/formatter/FuelSpecialValueFormatter.java b/src/main/java/gregtech/nei/formatter/FuelSpecialValueFormatter.java
index dcfe2617dd..a4d53c46dc 100644
--- a/src/main/java/gregtech/nei/formatter/FuelSpecialValueFormatter.java
+++ b/src/main/java/gregtech/nei/formatter/FuelSpecialValueFormatter.java
@@ -7,7 +7,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import net.minecraft.util.StatCollector;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.nei.RecipeDisplayInfo;
 
@@ -22,6 +22,6 @@ public class FuelSpecialValueFormatter implements INEISpecialInfoFormatter {
         return Collections.singletonList(
             StatCollector.translateToLocalFormatted(
                 "GT5U.nei.fuel",
-                GT_Utility.formatNumbers(recipeInfo.recipe.mSpecialValue * 1000L)));
+                GTUtility.formatNumbers(recipeInfo.recipe.mSpecialValue * 1000L)));
     }
 }
diff --git a/src/main/java/gregtech/nei/formatter/FusionSpecialValueFormatter.java b/src/main/java/gregtech/nei/formatter/FusionSpecialValueFormatter.java
index 77cd41b343..eb77fba072 100644
--- a/src/main/java/gregtech/nei/formatter/FusionSpecialValueFormatter.java
+++ b/src/main/java/gregtech/nei/formatter/FusionSpecialValueFormatter.java
@@ -7,8 +7,8 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import net.minecraft.util.StatCollector;
 
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.nei.RecipeDisplayInfo;
 
@@ -26,7 +26,7 @@ public class FusionSpecialValueFormatter implements INEISpecialInfoFormatter {
         int tier = getFusionTier(euToStart, voltage);
 
         return Collections.singletonList(
-            StatCollector.translateToLocalFormatted("GT5U.nei.start_eu", GT_Utility.formatNumbers(euToStart), tier));
+            StatCollector.translateToLocalFormatted("GT5U.nei.start_eu", GTUtility.formatNumbers(euToStart), tier));
     }
 
     public static int getFusionTier(long startupPower, long voltage) {
@@ -43,13 +43,13 @@ public class FusionSpecialValueFormatter implements INEISpecialInfoFormatter {
             tier = 5;
         }
 
-        if (voltage <= GT_Values.V[6]) {
+        if (voltage <= GTValues.V[6]) {
             // no-op
-        } else if (voltage <= GT_Values.V[7]) {
+        } else if (voltage <= GTValues.V[7]) {
             tier = Math.max(tier, 2);
-        } else if (voltage <= GT_Values.V[8]) {
+        } else if (voltage <= GTValues.V[8]) {
             tier = Math.max(tier, 3);
-        } else if (voltage <= GT_Values.V[9]) {
+        } else if (voltage <= GTValues.V[9]) {
             tier = Math.max(tier, 4);
         } else {
             tier = 5;
diff --git a/src/main/java/gregtech/nei/formatter/HeatingCoilSpecialValueFormatter.java b/src/main/java/gregtech/nei/formatter/HeatingCoilSpecialValueFormatter.java
index f5c17a1163..a02efde73c 100644
--- a/src/main/java/gregtech/nei/formatter/HeatingCoilSpecialValueFormatter.java
+++ b/src/main/java/gregtech/nei/formatter/HeatingCoilSpecialValueFormatter.java
@@ -8,7 +8,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import net.minecraft.util.StatCollector;
 
 import gregtech.api.enums.HeatingCoilLevel;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.nei.RecipeDisplayInfo;
 
@@ -24,7 +24,7 @@ public class HeatingCoilSpecialValueFormatter implements INEISpecialInfoFormatte
         return Collections.singletonList(
             StatCollector.translateToLocalFormatted(
                 "GT5U.nei.heat_capacity",
-                GT_Utility.formatNumbers(heat),
+                GTUtility.formatNumbers(heat),
                 HeatingCoilLevel.getDisplayNameFromHeat(heat, false)));
     }
 }
diff --git a/src/main/java/gregtech/nei/formatter/INEISpecialInfoFormatter.java b/src/main/java/gregtech/nei/formatter/INEISpecialInfoFormatter.java
index 21228240d4..c8d2db6928 100644
--- a/src/main/java/gregtech/nei/formatter/INEISpecialInfoFormatter.java
+++ b/src/main/java/gregtech/nei/formatter/INEISpecialInfoFormatter.java
@@ -4,11 +4,12 @@ import java.util.List;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
+import gregtech.api.util.GTRecipe;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.nei.RecipeDisplayInfo;
 
 /**
- * Getter for description for {@link gregtech.api.util.GT_Recipe#mSpecialValue} etc. that will be drawn on NEI.
+ * Getter for description for {@link GTRecipe#mSpecialValue} etc. that will be drawn on NEI.
  */
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
diff --git a/src/main/java/gregtech/nei/formatter/SimpleSpecialValueFormatter.java b/src/main/java/gregtech/nei/formatter/SimpleSpecialValueFormatter.java
index 8f2098c0a9..93b060eacb 100644
--- a/src/main/java/gregtech/nei/formatter/SimpleSpecialValueFormatter.java
+++ b/src/main/java/gregtech/nei/formatter/SimpleSpecialValueFormatter.java
@@ -8,7 +8,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import net.minecraft.util.StatCollector;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
 import gregtech.nei.RecipeDisplayInfo;
 
@@ -44,6 +44,6 @@ public class SimpleSpecialValueFormatter implements INEISpecialInfoFormatter {
         return Collections.singletonList(
             StatCollector.translateToLocalFormatted(
                 translationKey,
-                GT_Utility.formatNumbers((long) recipeInfo.recipe.mSpecialValue * multiplier)));
+                GTUtility.formatNumbers((long) recipeInfo.recipe.mSpecialValue * multiplier)));
     }
 }