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
author: NotAPenguin <michiel.vandeginste@gmail.com> 2024-09-02 23:17:17 +0200
committer: GitHub <noreply@github.com> 2024-09-02 23:17:17 +0200
commit: 1b820de08a05070909a267e17f033fcf58ac8710 (patch)
tree: 02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/gtPlusPlus/core
parent: afd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff)
download: GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz
GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2
GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip
155 files changed, 3876 insertions, 3758 deletions
diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java
index 417b342f7e..6169581257 100644
--- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java
@@ -5,19 +5,19 @@ import net.minecraftforge.fluids.Fluid;
 
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.general.BlockCompressedObsidian;
-import gtPlusPlus.core.block.general.FluidTankInfinite;
-import gtPlusPlus.core.block.general.HellFire;
-import gtPlusPlus.core.block.general.LightGlass;
-import gtPlusPlus.core.block.general.MiningExplosives;
+import gtPlusPlus.core.block.general.BlockFluidTankInfinite;
+import gtPlusPlus.core.block.general.BlockHellFire;
+import gtPlusPlus.core.block.general.BlockLightGlass;
+import gtPlusPlus.core.block.general.BlockMiningExplosives;
 import gtPlusPlus.core.block.general.antigrief.BlockWitherProof;
-import gtPlusPlus.core.block.machine.CircuitProgrammer;
-import gtPlusPlus.core.block.machine.DecayablesChest;
-import gtPlusPlus.core.block.machine.FishTrap;
-import gtPlusPlus.core.block.machine.Machine_PestKiller;
-import gtPlusPlus.core.block.machine.Machine_PooCollector;
-import gtPlusPlus.core.block.machine.Machine_ProjectTable;
-import gtPlusPlus.core.block.machine.Machine_SuperJukebox;
-import gtPlusPlus.core.block.machine.VolumetricFlaskSetter;
+import gtPlusPlus.core.block.machine.BlockCircuitProgrammer;
+import gtPlusPlus.core.block.machine.BlockDecayablesChest;
+import gtPlusPlus.core.block.machine.BlockFishTrap;
+import gtPlusPlus.core.block.machine.BlockFlaskSetter;
+import gtPlusPlus.core.block.machine.BlockPestKiller;
+import gtPlusPlus.core.block.machine.BlockPooCollector;
+import gtPlusPlus.core.block.machine.BlockProjectTable;
+import gtPlusPlus.core.block.machine.BlockSuperJukebox;
 import gtPlusPlus.core.fluids.FluidRegistryHandler;
 
 public final class ModBlocks {
@@ -68,31 +68,31 @@ public final class ModBlocks {
     public static void registerBlocks() {
 
         Logger.INFO("Registering Blocks.");
-        MatterFabricatorEffectBlock = new LightGlass(false);
+        MatterFabricatorEffectBlock = new BlockLightGlass(false);
 
         // Fluids
         FluidRegistryHandler.registerFluids();
 
         // Workbench
-        blockFishTrap = new FishTrap();
-        blockInfiniteFLuidTank = new FluidTankInfinite();
-        blockMiningExplosive = new MiningExplosives();
-        blockHellfire = new HellFire();
-        blockProjectTable = new Machine_ProjectTable();
+        blockFishTrap = new BlockFishTrap();
+        blockInfiniteFLuidTank = new BlockFluidTankInfinite();
+        blockMiningExplosive = new BlockMiningExplosives();
+        blockHellfire = new BlockHellFire();
+        blockProjectTable = new BlockProjectTable();
         blockWitherGuard = new BlockWitherProof();
         blockCompressedObsidian = new BlockCompressedObsidian();
 
-        blockCircuitProgrammer = new CircuitProgrammer();
+        blockCircuitProgrammer = new BlockCircuitProgrammer();
 
-        blockDecayablesChest = new DecayablesChest();
+        blockDecayablesChest = new BlockDecayablesChest();
 
-        blockCustomJukebox = new Machine_SuperJukebox();
+        blockCustomJukebox = new BlockSuperJukebox();
 
-        blockPooCollector = new Machine_PooCollector();
+        blockPooCollector = new BlockPooCollector();
 
-        blockPestKiller = new Machine_PestKiller();
+        blockPestKiller = new BlockPestKiller();
 
-        blockVolumetricFlaskSetter = new VolumetricFlaskSetter();
+        blockVolumetricFlaskSetter = new BlockFlaskSetter();
 
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
index c39565ea41..bace2937fd 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
@@ -30,7 +30,7 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.CubicObject;
 import gtPlusPlus.api.objects.minecraft.SafeTexture;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.InventoryUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -63,7 +63,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
 
     /**
      * Does this {@link Block} require special {@link ItemBlock} handling?
-     * 
+     *
      * @return The {@link Class} that will be used for this {@link Block}.
      */
     public Class<? extends ItemBlock> getItemBlockClass() {
@@ -72,28 +72,28 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
 
     /**
      * A lazy way to declare the unlocal name for the block, makes boilerplating easy.
-     * 
+     *
      * @return The internal name for this block.
      */
     public abstract String getUnlocalBlockName();
 
     /**
      * Lazy Boilerplating.
-     * 
+     *
      * @return Block Hardness.
      */
     protected abstract float initBlockHardness();
 
     /**
      * Lazy Boilerplating.
-     * 
+     *
      * @return Block Resistance.
      */
     protected abstract float initBlockResistance();
 
     /**
      * Lazy Boilerplating.
-     * 
+     *
      * @return The {@link CreativeTab} this Block is shown on.
      */
     protected abstract CreativeTabs initCreativeTab();
@@ -128,7 +128,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
 
     /**
      * The String used for texture pathing.
-     * 
+     *
      * @return Sanitized {@link String}, containing no spaces or illegal characters.
      */
     private String getTileEntityNameForTexturePathing() {
@@ -172,9 +172,9 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
         // Default Path Name, this will make us look inside 'miscutils\textures\blocks'
         final String aPrefixTexPath = GTPlusPlus.ID + ":";
         // Default Path Name, this will make us look in the subdirectory for this Tile Entity.
-        final String aTexPathMid = "TileEntities" + CORE.SEPERATOR
+        final String aTexPathMid = "TileEntities" + GTPPCore.SEPERATOR
             + getTileEntityNameForTexturePathing()
-            + CORE.SEPERATOR;
+            + GTPPCore.SEPERATOR;
         // Construct a full path
         String aTexPathBuilt = aPrefixTexPath + aTexPathMid;
         // File Name Suffixes, without meta tags
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
index b07c6d1529..abd83d7171 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -16,11 +16,11 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TextureSet;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockGtBlock;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -58,7 +58,7 @@ public class BlockBaseModular extends BasicBlock {
         registerComponent();
         sBlockCache.put(material.getUnlocalizedName() + "." + blockType.name(), this);
         thisBlockMaterialTranslatedName = material.getTranslatedName();
-        GT_LanguageManager.addStringLocalization("gtplusplus." + getUnlocalizedName() + ".name", getProperName());
+        GTLanguageManager.addStringLocalization("gtplusplus." + getUnlocalizedName() + ".name", getProperName());
     }
 
     protected BlockBaseModular(final String unlocalizedName, final String blockMaterialString,
@@ -79,13 +79,13 @@ public class BlockBaseModular extends BasicBlock {
             ItemBlockGtBlock.class,
             Utils.sanitizeString(blockType.getTexture() + unlocalizedName));
         if (fx == 0) {
-            GT_OreDictUnificator
+            GTOreDictUnificator
                 .registerOre("block" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this));
         } else if (fx == 1) {
-            GT_OreDictUnificator
+            GTOreDictUnificator
                 .registerOre("frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this));
         } else if (fx == 2) {
-            GT_OreDictUnificator
+            GTOreDictUnificator
                 .registerOre("frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this));
         }
     }
@@ -172,7 +172,7 @@ public class BlockBaseModular extends BasicBlock {
 
     @Override
     public String getLocalizedName() {
-        return GT_LanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name")
+        return GTLanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name")
             .replace("%s", "%temp")
             .replace("%material", this.thisBlockMaterialTranslatedName)
             .replace("%temp", "%s");
@@ -198,7 +198,7 @@ public class BlockBaseModular extends BasicBlock {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister iIcon) {
-        if (!CORE.ConfigSwitches.useGregtechTextures || this.blockMaterial == null
+        if (!GTPPCore.ConfigSwitches.useGregtechTextures || this.blockMaterial == null
             || this.thisBlock == BlockTypes.ORE) {
             this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + this.thisBlock.getTexture());
         }
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
index 1813090810..b0ee1c0c77 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -18,12 +18,12 @@ import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.interfaces.ITexturedBlock;
 import gtPlusPlus.core.client.renderer.CustomOreBlockRenderer;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockOre;
@@ -31,8 +31,8 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_RenderedTexture;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPPRenderedTexture;
 
 public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
 
@@ -60,7 +60,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
                 this,
                 ItemBlockOre.class,
                 Utils.sanitizeString("ore" + Utils.sanitizeString(this.blockMaterial.getLocalizedName())));
-            GT_OreDictUnificator.registerOre(
+            GTOreDictUnificator.registerOre(
                 "ore" + Utils.sanitizeString(this.blockMaterial.getLocalizedName()),
                 ItemUtils.getSimpleStack(this));
         } catch (Throwable t) {
@@ -115,10 +115,10 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
     @Override
     public ITexture[] getTexture(Block block, ForgeDirection side) {
         if (this.blockMaterial != null) {
-            GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture(
+            GTPPRenderedTexture aIconSet = new GTPPRenderedTexture(
                 blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex],
                 this.blockMaterial.getRGBA());
-            return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet };
+            return new ITexture[] { new GTPPCopiedBlockTexture(Blocks.stone, 0, 0), aIconSet };
         }
 
         if (hiddenTextureArray == null) {
@@ -134,7 +134,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
                 hiddenTextureArray = new IIconContainer[6];
             }
         }
-        return new ITexture[] { new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) };
+        return new ITexture[] { new GTPPRenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) };
     }
 
     @Override
@@ -167,7 +167,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
         if (shouldSilkTouch) {
             drops.add(ItemUtils.simpleMetaStack(this, metadata, 1));
         } else {
-            switch (GT_Mod.gregtechproxy.oreDropSystem) {
+            switch (GTMod.gregtechproxy.oreDropSystem) {
                 case Item -> {
                     drops.add(
                         ItemUtils.getItemStackOfAmountFromOreDictNoBroken(
diff --git a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/main/java/gtPlusPlus/core/block/general/BlockFluidTankInfinite.java
index 41a581394b..a300b83577 100644
--- a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockFluidTankInfinite.java
@@ -23,7 +23,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
-public class FluidTankInfinite extends BlockContainer {
+public class BlockFluidTankInfinite extends BlockContainer {
 
     @SideOnly(Side.CLIENT)
     private IIcon textureTop;
@@ -34,7 +34,7 @@ public class FluidTankInfinite extends BlockContainer {
     @SideOnly(Side.CLIENT)
     private IIcon textureFront;
 
-    public FluidTankInfinite() {
+    public BlockFluidTankInfinite() {
         super(Material.iron);
         this.setBlockName("blockInfiniteFluidTank");
         this.setCreativeTab(AddToCreativeTab.tabMachines);
diff --git a/src/main/java/gtPlusPlus/core/block/general/HellFire.java b/src/main/java/gtPlusPlus/core/block/general/BlockHellFire.java
index 4e8d94328d..b18a2d4b86 100644
--- a/src/main/java/gtPlusPlus/core/block/general/HellFire.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockHellFire.java
@@ -33,7 +33,7 @@ import gregtech.api.objects.XSTR;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.math.MathUtils;
 
-public class HellFire extends BlockFire {
+public class BlockHellFire extends BlockFire {
 
     private final int[] field_149849_a = new int[Short.MAX_VALUE];
 
@@ -42,7 +42,7 @@ public class HellFire extends BlockFire {
     @SideOnly(Side.CLIENT)
     private IIcon[] IIconArray;
 
-    public HellFire() {
+    public BlockHellFire() {
         this.setTickRandomly(true);
         this.setLightLevel(1F);
         this.setLightOpacity(0);
diff --git a/src/main/java/gtPlusPlus/core/block/general/LightGlass.java b/src/main/java/gtPlusPlus/core/block/general/BlockLightGlass.java
index b6facce45f..1e4df5c399 100644
--- a/src/main/java/gtPlusPlus/core/block/general/LightGlass.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockLightGlass.java
@@ -20,7 +20,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
 /*
  * public class LightGlass extends BlockBreakable {
  */
-public class LightGlass extends BlockAir {
+public class BlockLightGlass extends BlockAir {
 
     private int state = 0;
     private final int a = 255;
@@ -29,7 +29,7 @@ public class LightGlass extends BlockAir {
     private int b = 0;
     private int hex;
 
-    public LightGlass(final boolean bool) {
+    public BlockLightGlass(final boolean bool) {
         super();
         this.setCreativeTab(AddToCreativeTab.tabBlock);
         this.setBlockName("blockMFEffect");
diff --git a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java b/src/main/java/gtPlusPlus/core/block/general/BlockMiningExplosives.java
index 7579907e9d..20b6fff9e6 100644
--- a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockMiningExplosives.java
@@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
 
-public class MiningExplosives extends BlockTNT {
+public class BlockMiningExplosives extends BlockTNT {
 
     @SideOnly(Side.CLIENT)
     private IIcon textureTop;
@@ -30,7 +30,7 @@ public class MiningExplosives extends BlockTNT {
     @SideOnly(Side.CLIENT)
     private IIcon textureBottom;
 
-    public MiningExplosives() {
+    public BlockMiningExplosives() {
         this.setBlockName("blockMiningExplosives");
         GameRegistry.registerBlock(this, "blockMiningExplosives");
         this.setCreativeTab(AddToCreativeTab.tabMachines);
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
index dc6c92f065..4110c02fe3 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
@@ -177,7 +177,7 @@ public class BlockSuperLight extends BlockContainer {
                                 // Turning Lights off
                                 else if (!enable && aLight > 0) {
                                     aBlocksToUpdate.put(new BlockPos(xOff, yOff, zOff, this.worldObj));
-                                    if (aBlockGet instanceof LightGlass) {
+                                    if (aBlockGet instanceof BlockLightGlass) {
                                         Logger.INFO("Dimmed air.");
                                         this.worldObj.setBlock(xOff, yOff, zOff, Blocks.air, 0, 3);
                                     }
diff --git a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java
index f6cd34aec1..191a2a8f92 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java
@@ -13,7 +13,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gregtech.common.items.MetaGeneratedTool01;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.minecraft.CubicObject;
 import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip;
@@ -22,7 +22,7 @@ import gtPlusPlus.core.handler.GuiHandler;
 import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
-public class CircuitProgrammer extends BasicTileBlockWithTooltip {
+public class BlockCircuitProgrammer extends BasicTileBlockWithTooltip {
 
     /**
      * Determines which tooltip is displayed within the itemblock.
@@ -34,7 +34,7 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip {
         return this.mTooltipID;
     }
 
-    public CircuitProgrammer() {
+    public BlockCircuitProgrammer() {
         super(Material.iron);
     }
 
@@ -53,7 +53,7 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip {
             try {
                 final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName());
                 final Item mHandItem = mHandStack.getItem();
-                if (((mHandItem instanceof GT_MetaGenerated_Tool_01)
+                if (((mHandItem instanceof MetaGeneratedTool01)
                     && ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))) {
                     final TileEntityCircuitProgrammer tile = (TileEntityCircuitProgrammer) world.getTileEntity(x, y, z);
                     if (tile != null) {
diff --git a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java b/src/main/java/gtPlusPlus/core/block/machine/BlockDecayablesChest.java
index 16d038bea9..2bcd9afb5f 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockDecayablesChest.java
@@ -27,7 +27,7 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
 import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
 import gtPlusPlus.core.util.minecraft.InventoryUtils;
 
-public class DecayablesChest extends BlockContainer implements ITileTooltip {
+public class BlockDecayablesChest extends BlockContainer implements ITileTooltip {
 
     @SideOnly(Side.CLIENT)
     private IIcon textureTop;
@@ -48,7 +48,7 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip {
         return this.mTooltipID;
     }
 
-    public DecayablesChest() {
+    public BlockDecayablesChest() {
         super(Material.iron);
         this.setBlockName("blockDecayablesChest");
         this.setCreativeTab(AddToCreativeTab.tabMachines);
diff --git a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java b/src/main/java/gtPlusPlus/core/block/machine/BlockFishTrap.java
index 0ec1ac629a..0a91c76d60 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockFishTrap.java
@@ -25,7 +25,7 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
 import gtPlusPlus.core.util.minecraft.InventoryUtils;
 
-public class FishTrap extends BlockContainer implements ITileTooltip {
+public class BlockFishTrap extends BlockContainer implements ITileTooltip {
 
     @SideOnly(Side.CLIENT)
     private IIcon textureTop;
@@ -46,7 +46,7 @@ public class FishTrap extends BlockContainer implements ITileTooltip {
         return this.mTooltipID;
     }
 
-    public FishTrap() {
+    public BlockFishTrap() {
         super(Material.iron);
         this.setBlockName("blockFishTrap");
         this.setHardness(5f);
diff --git a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java
index 1bca4a5c5f..510caf3e14 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java
@@ -14,7 +14,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gregtech.common.items.MetaGeneratedTool01;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.minecraft.CubicObject;
 import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip;
@@ -24,7 +24,7 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
 import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
-public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip {
+public class BlockFlaskSetter extends BasicTileBlockWithTooltip {
 
     /**
      * Determines which tooltip is displayed within the itemblock.
@@ -41,7 +41,7 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip {
         return ItemBlockBasicTile.class;
     }
 
-    public VolumetricFlaskSetter() {
+    public BlockFlaskSetter() {
         super(Material.iron);
     }
 
@@ -60,7 +60,7 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip {
             try {
                 final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName());
                 final Item mHandItem = mHandStack.getItem();
-                if (((mHandItem instanceof GT_MetaGenerated_Tool_01)
+                if (((mHandItem instanceof MetaGeneratedTool01)
                     && ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))) {
                     final TileEntityVolumetricFlaskSetter tile = (TileEntityVolumetricFlaskSetter) world
                         .getTileEntity(x, y, z);
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java b/src/main/java/gtPlusPlus/core/block/machine/BlockPestKiller.java
index bf98a22500..95e7f3bc56 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockPestKiller.java
@@ -26,7 +26,7 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
 import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
 import gtPlusPlus.core.util.minecraft.InventoryUtils;
 
-public class Machine_PestKiller extends BlockContainer implements ITileTooltip {
+public class BlockPestKiller extends BlockContainer implements ITileTooltip {
 
     @SideOnly(Side.CLIENT)
     private IIcon textureTop;
@@ -47,7 +47,7 @@ public class Machine_PestKiller extends BlockContainer implements ITileTooltip {
         return this.mTooltipID;
     }
 
-    public Machine_PestKiller() {
+    public BlockPestKiller() {
         super(Material.wood);
         this.setBlockName("blockPestKiller");
         this.setHardness(5f);
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java b/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java
index 4f1b679fcf..6a371a3284 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java
@@ -27,7 +27,7 @@ import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
-public class Machine_PooCollector extends BlockContainer {
+public class BlockPooCollector extends BlockContainer {
 
     @SideOnly(Side.CLIENT)
     private IIcon textureTop;
@@ -41,7 +41,7 @@ public class Machine_PooCollector extends BlockContainer {
     @SideOnly(Side.CLIENT)
     private IIcon textureSide2;
 
-    public Machine_PooCollector() {
+    public BlockPooCollector() {
         super(Material.iron);
         this.setHardness(5f);
         this.setResistance(1f);
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java
index 4f0d0d7d60..1537aec736 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java
@@ -31,7 +31,7 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import ic2.core.item.tool.ItemToolWrench;
 
 @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = Mods.Names.ENDER_I_O)
-public class Machine_ProjectTable extends BlockContainer implements ITileTooltip {
+public class BlockProjectTable extends BlockContainer implements ITileTooltip {
 
     @SideOnly(Side.CLIENT)
     private IIcon textureTop;
@@ -52,7 +52,7 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip
         return this.mTooltipID;
     }
 
-    public Machine_ProjectTable() {
+    public BlockProjectTable() {
         super(Material.iron);
         this.setBlockName("blockProjectBench");
         this.setCreativeTab(AddToCreativeTab.tabMachines);
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java b/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java
index 6b3c87fac4..4440d2920a 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java
@@ -22,15 +22,15 @@ 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.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.handler.GuiHandler;
-import gtPlusPlus.core.inventories.Inventory_SuperJukebox;
+import gtPlusPlus.core.inventories.InventorySuperJukebox;
 import gtPlusPlus.core.util.math.MathUtils;
 
-public class Machine_SuperJukebox extends BlockJukebox {
+public class BlockSuperJukebox extends BlockJukebox {
 
     @SideOnly(Side.CLIENT)
     private IIcon mIcon;
@@ -47,7 +47,7 @@ public class Machine_SuperJukebox extends BlockJukebox {
         }
     }
 
-    public Machine_SuperJukebox() {
+    public BlockSuperJukebox() {
         this.setBlockName("blockSuperJukebox");
         this.setCreativeTab(CreativeTabs.tabRedstone);
         setHardness(2.0F);
@@ -184,7 +184,7 @@ public class Machine_SuperJukebox extends BlockJukebox {
         public int numPlayersUsing;
 
         private ItemStack mCurrentlyPlayingStack;
-        private final Inventory_SuperJukebox inventoryContents;
+        private final InventorySuperJukebox inventoryContents;
         private String customName;
 
         /*
@@ -202,7 +202,7 @@ public class Machine_SuperJukebox extends BlockJukebox {
         public boolean a_TEST_BOOL_VAR_4;
 
         public TileEntitySuperJukebox() {
-            this.inventoryContents = new Inventory_SuperJukebox();
+            this.inventoryContents = new InventorySuperJukebox();
         }
 
         @Override
@@ -283,7 +283,7 @@ public class Machine_SuperJukebox extends BlockJukebox {
             this.markDirty();
         }
 
-        public Inventory_SuperJukebox getInventory() {
+        public InventorySuperJukebox getInventory() {
             return this.inventoryContents;
         }
 
@@ -341,13 +341,13 @@ public class Machine_SuperJukebox extends BlockJukebox {
                 .getInventory()) {
                 if (g != null && aSlotCounter <= 17) {
                     Logger.INFO("b3 - " + g.getDisplayName());
-                    if (GT_Utility.areStacksEqual(g, aRecordToPlay, true)) {
+                    if (GTUtility.areStacksEqual(g, aRecordToPlay, true)) {
                         IInventory aThisInv = this.getInventory();
                         if (aThisInv.getStackInSlot(20) != null) {
                             openDiscDrive();
                         }
 
-                        GT_Utility.moveStackFromSlotAToSlotB(
+                        GTUtility.moveStackFromSlotAToSlotB(
                             aThisInv,
                             aThisInv,
                             aSlotCounter,
@@ -417,7 +417,7 @@ public class Machine_SuperJukebox extends BlockJukebox {
                     .getInventory()[i];
                 if (g == null && aSlotCounter >= 0) {
                     IInventory aThisInv = this.getInventory();
-                    GT_Utility
+                    GTUtility
                         .moveStackFromSlotAToSlotB(aThisInv, aThisInv, 20, i, (byte) 1, (byte) 1, (byte) 1, (byte) 1);
                     vanillaStopJukebox();
                     Logger.INFO("b++");
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java
index c691bac144..aa6bfa9288 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java
@@ -14,7 +14,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.client.model.ModelDecayChest;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
 
 @SideOnly(Side.CLIENT)
@@ -71,7 +71,7 @@ public class RenderDecayChest extends TileEntitySpecialRenderer {
 
             f1 = 1.0F - f1;
             f1 = 1.0F - f1 * f1 * f1;
-            mChestModel.chestLid.rotateAngleX = -(f1 * CORE.PI / 2.0F);
+            mChestModel.chestLid.rotateAngleX = -(f1 * GTPPCore.PI / 2.0F);
             mChestModel.renderAll();
             GL11.glDisable(GL12.GL_RESCALE_NORMAL);
             GL11.glPopMatrix();
diff --git a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
index bf42a0792d..56ba05f21f 100644
--- a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
+++ b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
@@ -23,7 +23,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.CORE_Preloader;
+import gtPlusPlus.preloader.PreloaderCore;
 import gtPlusPlus.preloader.asm.AsmConfig;
 
 public class CommandEnableDebugWhileRunning implements ICommand {
@@ -84,8 +84,8 @@ public class CommandEnableDebugWhileRunning implements ICommand {
                 Logger.INFO("Toggling Debug Mode.");
                 final EntityPlayer P = CommandUtils.getPlayer(S);
                 if (PlayerUtils.isPlayerOP(P)) {
-                    CORE_Preloader.DEBUG_MODE = !CORE_Preloader.DEBUG_MODE;
-                    PlayerUtils.messagePlayer(P, "Toggled GT++ Debug Mode - Enabled: " + CORE_Preloader.DEBUG_MODE);
+                    PreloaderCore.DEBUG_MODE = !PreloaderCore.DEBUG_MODE;
+                    PlayerUtils.messagePlayer(P, "Toggled GT++ Debug Mode - Enabled: " + PreloaderCore.DEBUG_MODE);
                 }
             } else if (argString[0].toLowerCase()
                 .equals("logging")) {
diff --git a/src/main/java/gtPlusPlus/core/commands/CommandMath.java b/src/main/java/gtPlusPlus/core/commands/CommandMath.java
index f23e45a359..276e7874e7 100644
--- a/src/main/java/gtPlusPlus/core/commands/CommandMath.java
+++ b/src/main/java/gtPlusPlus/core/commands/CommandMath.java
@@ -10,7 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
 
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.MiningUtils;
 
 public class CommandMath implements ICommand {
@@ -72,7 +72,7 @@ public class CommandMath implements ICommand {
             || P.getCommandSenderName()
                 .toLowerCase()
                 .equals("draknyte1")
-            || CORE.DEVENV) {
+            || GTPPCore.DEVENV) {
             return true;
         }
         return false;
diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
index 90b4c99ed8..b358548e15 100644
--- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
@@ -27,8 +27,8 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.entity.InternalEntityRegistry;
 import gtPlusPlus.core.handler.BookHandler;
 import gtPlusPlus.core.handler.BurnableFuelHandler;
-import gtPlusPlus.core.handler.COMPAT_HANDLER;
-import gtPlusPlus.core.handler.COMPAT_IntermodStaging;
+import gtPlusPlus.core.handler.CompatHandler;
+import gtPlusPlus.core.handler.CompatIntermodStaging;
 import gtPlusPlus.core.handler.GuiHandler;
 import gtPlusPlus.core.handler.events.EnderDragonDeathHandler;
 import gtPlusPlus.core.handler.events.EntityDeathHandler;
@@ -36,14 +36,14 @@ import gtPlusPlus.core.handler.events.GeneralTooltipEventHandler;
 import gtPlusPlus.core.handler.events.PlayerSleepEventHandler;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.bauble.BaseBauble;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.tileentities.ModTileEntities;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.CORE_Preloader;
+import gtPlusPlus.preloader.PreloaderCore;
 import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler;
 import gtPlusPlus.xmod.ic2.CustomInternalName;
 
@@ -56,9 +56,9 @@ public class CommonProxy {
 
     public void preInit(final FMLPreInitializationEvent e) {
         Logger.INFO("Doing some house cleaning.");
-        if (!CORE_Preloader.DEBUG_MODE) {
+        if (!PreloaderCore.DEBUG_MODE) {
             Logger.WARNING("Development mode not enabled.");
-        } else if (CORE_Preloader.DEBUG_MODE) {
+        } else if (PreloaderCore.DEBUG_MODE) {
             Logger.INFO("Development mode enabled.");
         } else {
             Logger.WARNING("Development mode not set.");
@@ -70,7 +70,7 @@ public class CommonProxy {
         ModItems.init();
         ModBlocks.init();
         CI.preInit();
-        COMPAT_IntermodStaging.preInit(e);
+        CompatIntermodStaging.preInit(e);
         BookHandler.run();
         // Registration of entities and renderers
         Logger.INFO("[Proxy] Calling Entity registration.");
@@ -97,15 +97,15 @@ public class CommonProxy {
         Utils.registerEvent(new EntityDeathHandler());
 
         // Compat Handling
-        COMPAT_HANDLER.registerMyModsOreDictEntries();
-        COMPAT_HANDLER.intermodOreDictionarySupport();
-        COMPAT_IntermodStaging.init(e);
+        CompatHandler.registerMyModsOreDictEntries();
+        CompatHandler.intermodOreDictionarySupport();
+        CompatIntermodStaging.init(e);
     }
 
     public void postInit(final FMLPostInitializationEvent e) {
 
         // Make Burnables burnable
-        if (!CORE.burnables.isEmpty()) {
+        if (!GTPPCore.burnables.isEmpty()) {
             BurnableFuelHandler fuelHandler = new BurnableFuelHandler();
             GameRegistry.registerFuelHandler(fuelHandler);
             Logger.INFO(
@@ -115,28 +115,28 @@ public class CommonProxy {
 
         // Compat Handling
         Logger.INFO("Removing recipes from other mods.");
-        COMPAT_HANDLER.RemoveRecipesFromOtherMods();
+        CompatHandler.RemoveRecipesFromOtherMods();
         Logger.INFO("Initialising Handler, Then Adding Recipes");
-        COMPAT_HANDLER.InitialiseHandlerThenAddRecipes();
+        CompatHandler.InitialiseHandlerThenAddRecipes();
         Logger.INFO("Loading Intermod staging.");
-        COMPAT_IntermodStaging.postInit(e);
+        CompatIntermodStaging.postInit(e);
         Logger.INFO("Loading queued recipes.");
-        COMPAT_HANDLER.runQueuedRecipes();
+        CompatHandler.runQueuedRecipes();
         Logger.INFO("Registering custom mob drops.");
         registerCustomMobDrops();
 
         // Moved last, to prevent recipes being generated post initialisation.
         Logger.INFO("Loading Gregtech API recipes.");
-        COMPAT_HANDLER.startLoadingGregAPIBasedRecipes();
+        CompatHandler.startLoadingGregAPIBasedRecipes();
     }
 
     public void serverStarting(final FMLServerStartingEvent e) {
-        COMPAT_HANDLER.InitialiseLateHandlerThenAddRecipes();
+        CompatHandler.InitialiseLateHandlerThenAddRecipes();
     }
 
     public void onLoadComplete(FMLLoadCompleteEvent event) {
-        COMPAT_IntermodStaging.onLoadComplete(event);
-        COMPAT_HANDLER.onLoadComplete(event);
+        CompatIntermodStaging.onLoadComplete(event);
+        CompatHandler.onLoadComplete(event);
     }
 
     public void registerNetworkStuff() {
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/main/java/gtPlusPlus/core/common/compat/CompatBaubles.java
index e90596c876..02b6edf453 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/CompatBaubles.java
@@ -1,16 +1,16 @@
 package gtPlusPlus.core.common.compat;
 
 import static gregtech.api.enums.Mods.Baubles;
-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.MV;
-import static gregtech.client.GT_TooltipHandler.Tier.UHV;
-import static gregtech.client.GT_TooltipHandler.Tier.UV;
-import static gregtech.client.GT_TooltipHandler.Tier.ZPM;
-import static gregtech.client.GT_TooltipHandler.registerTieredTooltip;
+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.MV;
+import static gregtech.client.GTTooltipHandler.Tier.UHV;
+import static gregtech.client.GTTooltipHandler.Tier.UV;
+import static gregtech.client.GTTooltipHandler.Tier.ZPM;
+import static gregtech.client.GTTooltipHandler.registerTieredTooltip;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
@@ -22,7 +22,7 @@ import gtPlusPlus.core.item.bauble.FireProtectionBauble;
 import gtPlusPlus.core.item.general.ItemCloakingDevice;
 import gtPlusPlus.core.item.general.ItemHealingDevice;
 
-public class COMPAT_Baubles {
+public class CompatBaubles {
 
     public static void run() {
         if (Baubles.isModLoaded()) {
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/main/java/gtPlusPlus/core/common/compat/CompatExtraUtils.java
index f61c70ab5b..3d188bd9c0 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/CompatExtraUtils.java
@@ -2,13 +2,13 @@ package gtPlusPlus.core.common.compat;
 
 import net.minecraft.item.ItemStack;
 
-import gtPlusPlus.core.recipe.RECIPES_Tools;
+import gtPlusPlus.core.recipe.RecipesTools;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
-public class COMPAT_ExtraUtils {
+public class CompatExtraUtils {
 
     public static void OreDict() {
-        RECIPES_Tools.RECIPE_DivisionSigil = new ItemStack(ItemUtils.getItemFromFQRN("ExtraUtilities:divisionSigil"));
+        RecipesTools.RECIPE_DivisionSigil = new ItemStack(ItemUtils.getItemFromFQRN("ExtraUtilities:divisionSigil"));
         run();
     }
 
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java b/src/main/java/gtPlusPlus/core/common/compat/CompatHarvestCraft.java
index 9a9557e418..5e4baf5c88 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/CompatHarvestCraft.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.common.compat;
 
 import gtPlusPlus.xmod.pamsharvest.fishtrap.FishTrapHandler;
 
-public class COMPAT_HarvestCraft {
+public class CompatHarvestCraft {
 
     public static void OreDict() {
         run();
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java
index c442251a0e..c6662800b2 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java
@@ -1,14 +1,14 @@
 package gtPlusPlus.core.common.compat;
 
-import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
+import static gtPlusPlus.core.handler.CompatHandler.RemoveRecipeQueue;
 
 import net.minecraft.item.ItemStack;
 
-import gtPlusPlus.core.lib.CORE.ConfigSwitches;
+import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches;
 import gtPlusPlus.core.recipe.ShapedRecipeObject;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
-public class COMPAT_IC2 {
+public class CompatIC2 {
 
     private static ItemStack itemCropnalyzer = ItemUtils.simpleMetaStack("IC2:itemCropnalyzer", 0, 1);
     private static ItemStack itemSolarHelmet = ItemUtils.simpleMetaStack("IC2:itemSolarHelmet", 0, 1);
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/main/java/gtPlusPlus/core/common/compat/CompatThaumcraft.java
index d9c9fec08e..8e06c95c67 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/CompatThaumcraft.java
@@ -2,11 +2,11 @@ package gtPlusPlus.core.common.compat;
 
 import static gregtech.api.enums.Mods.ForbiddenMagic;
 
-import gregtech.api.util.GT_OreDictUnificator;
-import gtPlusPlus.core.lib.CORE.ConfigSwitches;
+import gregtech.api.util.GTOreDictUnificator;
+import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
-public class COMPAT_Thaumcraft {
+public class CompatThaumcraft {
 
     public static void OreDict() {
 
@@ -19,28 +19,27 @@ public class COMPAT_Thaumcraft {
 
         for (int i = 0; i <= 6; i++) {
             ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard " + i, i);
-            GT_OreDictUnificator
-                .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1));
+            GTOreDictUnificator.registerOre("shardAny", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1));
             ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard " + i, i);
-            GT_OreDictUnificator
+            GTOreDictUnificator
                 .registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1));
         }
 
         if (ForbiddenMagic.isModLoaded()) {
             for (int i = 0; i <= 6; i++) {
                 ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard " + i, i);
-                GT_OreDictUnificator
+                GTOreDictUnificator
                     .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1));
                 ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard " + i, i);
-                GT_OreDictUnificator.registerOre(
+                GTOreDictUnificator.registerOre(
                     "gemInfusedAnything",
                     ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1));
             }
             ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0);
-            GT_OreDictUnificator
+            GTOreDictUnificator
                 .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1));
             ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "gemInfusedAnything", "FM Gluttony Shard", 0);
-            GT_OreDictUnificator
+            GTOreDictUnificator
                 .registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1));
         }
     }
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java b/src/main/java/gtPlusPlus/core/common/compat/CompatWitchery.java
index f6fdd87eec..3003749c79 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/CompatWitchery.java
@@ -4,10 +4,10 @@ import static gregtech.api.enums.Mods.Witchery;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
-public class COMPAT_Witchery {
+public class CompatWitchery {
 
     public static void OreDict() {
         run();
@@ -21,8 +21,8 @@ public class COMPAT_Witchery {
             .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Nugget", 149, 1);
         ItemStack aKobolditeIngot = ItemUtils
             .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Ingot", 150, 1);
-        if (aKobolditeDust != null) GT_OreDictUnificator.registerOre("dust" + "Koboldite", aKobolditeDust);
-        if (aKobolditeNugget != null) GT_OreDictUnificator.registerOre("nugget" + "Koboldite", aKobolditeNugget);
-        if (aKobolditeIngot != null) GT_OreDictUnificator.registerOre("ingot" + "Koboldite", aKobolditeIngot);
+        if (aKobolditeDust != null) GTOreDictUnificator.registerOre("dust" + "Koboldite", aKobolditeDust);
+        if (aKobolditeNugget != null) GTOreDictUnificator.registerOre("nugget" + "Koboldite", aKobolditeNugget);
+        if (aKobolditeIngot != null) GTOreDictUnificator.registerOre("ingot" + "Koboldite", aKobolditeIngot);
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
index 22bd775e6d..d214bd8a52 100644
--- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
@@ -1,10 +1,10 @@
 package gtPlusPlus.core.config;
 
 import static gregtech.api.enums.Mods.GregTech;
-import static gtPlusPlus.core.lib.CORE.ConfigSwitches.*;
-import static gtPlusPlus.core.lib.CORE.EVERGLADESBIOME_ID;
-import static gtPlusPlus.core.lib.CORE.EVERGLADES_ID;
-import static gtPlusPlus.core.lib.CORE.turbineCutoffBase;
+import static gtPlusPlus.core.lib.GTPPCore.ConfigSwitches.*;
+import static gtPlusPlus.core.lib.GTPPCore.EVERGLADESBIOME_ID;
+import static gtPlusPlus.core.lib.GTPPCore.EVERGLADES_ID;
+import static gtPlusPlus.core.lib.GTPPCore.turbineCutoffBase;
 
 import java.io.File;
 
diff --git a/src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/container/ContainerCircuitProgrammer.java
index f1e84f439f..9afccfb0f4 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/container/ContainerCircuitProgrammer.java
@@ -14,7 +14,7 @@ import gtPlusPlus.core.slots.SlotIntegratedCircuit;
 import gtPlusPlus.core.slots.SlotNoInput;
 import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
 
-public class Container_CircuitProgrammer extends Container {
+public class ContainerCircuitProgrammer extends Container {
 
     protected TileEntityCircuitProgrammer tile_entity;
     public final InventoryCircuitProgrammer inventoryChest;
@@ -32,7 +32,7 @@ public class Container_CircuitProgrammer extends Container {
     public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All
     // slots
 
-    public Container_CircuitProgrammer(final InventoryPlayer inventory, final TileEntityCircuitProgrammer te) {
+    public ContainerCircuitProgrammer(final InventoryPlayer inventory, final TileEntityCircuitProgrammer te) {
         this.tile_entity = te;
         this.inventoryChest = te.getInventory();
 
diff --git a/src/main/java/gtPlusPlus/core/container/Container_FishTrap.java b/src/main/java/gtPlusPlus/core/container/ContainerFishTrap.java
index 881311897f..1a9344c08c 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_FishTrap.java
+++ b/src/main/java/gtPlusPlus/core/container/ContainerFishTrap.java
@@ -12,7 +12,7 @@ import gtPlusPlus.core.inventories.InventoryFishTrap;
 import gtPlusPlus.core.slots.SlotNoInput;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
 
-public class Container_FishTrap extends Container {
+public class ContainerFishTrap extends Container {
 
     protected TileEntityFishTrap tile_entity;
     public final InventoryFishTrap inventoryChest;
@@ -30,7 +30,7 @@ public class Container_FishTrap extends Container {
 
     private final int[] slotStorage = new int[15];
 
-    public Container_FishTrap(final InventoryPlayer inventory, final TileEntityFishTrap te) {
+    public ContainerFishTrap(final InventoryPlayer inventory, final TileEntityFishTrap te) {
         this.tile_entity = te;
         this.inventoryChest = te.getInventory();
 
diff --git a/src/main/java/gtPlusPlus/core/container/Container_PestKiller.java b/src/main/java/gtPlusPlus/core/container/ContainerPestKiller.java
index 315f34595e..6f63a1d04e 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_PestKiller.java
+++ b/src/main/java/gtPlusPlus/core/container/ContainerPestKiller.java
@@ -18,7 +18,7 @@ import gtPlusPlus.core.slots.SlotGeneric;
 import gtPlusPlus.core.slots.SlotNoInput;
 import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
 
-public class Container_PestKiller extends Container {
+public class ContainerPestKiller extends Container {
 
     public TileEntityPestKiller tile_entity;
     public final InventoryPestKiller inventoryChest;
@@ -34,7 +34,7 @@ public class Container_PestKiller extends Container {
     public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All
     // slots
 
-    public Container_PestKiller(final InventoryPlayer inventory, final TileEntityPestKiller te) {
+    public ContainerPestKiller(final InventoryPlayer inventory, final TileEntityPestKiller te) {
         this.tile_entity = te;
         this.inventoryChest = te.getInventory();
         te.openInventory();
diff --git a/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java b/src/main/java/gtPlusPlus/core/container/ContainerProjectTable.java
index 1702be19ab..306c6f0026 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java
+++ b/src/main/java/gtPlusPlus/core/container/ContainerProjectTable.java
@@ -20,7 +20,7 @@ import gtPlusPlus.core.slots.SlotDataStick;
 import gtPlusPlus.core.slots.SlotNoInput;
 import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
 
-public class Container_ProjectTable extends Container {
+public class ContainerProjectTable extends Container {
 
     /** The crafting matrix inventory (3x3). */
     public InventoryCrafting craftMatrix = new InventoryCrafting(this, 3, 3);
@@ -39,7 +39,7 @@ public class Container_ProjectTable extends Container {
     private final int[] slotOutputs = new int[2];
     private final int[] slotGrid = new int[9];
 
-    public Container_ProjectTable(final InventoryPlayer inventory, final TileEntityProjectTable tile) {
+    public ContainerProjectTable(final InventoryPlayer inventory, final TileEntityProjectTable tile) {
         this.tile_entity = tile;
         this.inventoryGrid = tile.inventoryGrid;
         this.inventoryOutputs = tile.inventoryOutputs;
diff --git a/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java b/src/main/java/gtPlusPlus/core/container/ContainerSuperJukebox.java
index ab7525c897..45782f1384 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java
+++ b/src/main/java/gtPlusPlus/core/container/ContainerSuperJukebox.java
@@ -12,15 +12,15 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox;
-import gtPlusPlus.core.inventories.Inventory_SuperJukebox;
+import gtPlusPlus.core.block.machine.BlockSuperJukebox.TileEntitySuperJukebox;
+import gtPlusPlus.core.inventories.InventorySuperJukebox;
 import gtPlusPlus.core.slots.SlotJukebox;
 import gtPlusPlus.core.slots.SlotNoInput;
 
-public class Container_SuperJukebox extends Container {
+public class ContainerSuperJukebox extends Container {
 
     protected TileEntitySuperJukebox tile_entity;
-    public final Inventory_SuperJukebox inventoryChest;
+    public final InventorySuperJukebox inventoryChest;
 
     private final World worldObj;
     private final int posX;
@@ -37,7 +37,7 @@ public class Container_SuperJukebox extends Container {
     public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All
     // slots
 
-    public Container_SuperJukebox(final InventoryPlayer inventory, final TileEntitySuperJukebox te) {
+    public ContainerSuperJukebox(final InventoryPlayer inventory, final TileEntitySuperJukebox te) {
         this.tile_entity = te;
         this.inventoryChest = te.getInventory();
 
diff --git a/src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/container/ContainerVolumetricFlaskSetter.java
index 0315967263..bf1f8c4133 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/container/ContainerVolumetricFlaskSetter.java
@@ -12,16 +12,16 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.inventories.Inventory_VolumetricFlaskSetter;
+import gtPlusPlus.core.inventories.InventoryVolumetricFlaskSetter;
 import gtPlusPlus.core.slots.SlotNoInput;
 import gtPlusPlus.core.slots.SlotVolumetricFlask;
 import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter;
 import gtPlusPlus.core.util.Utils;
 
-public class Container_VolumetricFlaskSetter extends Container {
+public class ContainerVolumetricFlaskSetter extends Container {
 
     public TileEntityVolumetricFlaskSetter mTileEntity;
-    public final Inventory_VolumetricFlaskSetter inventoryChest;
+    public final InventoryVolumetricFlaskSetter inventoryChest;
 
     public int mCustomValue;
     private int oCustomValue;
@@ -40,7 +40,7 @@ public class Container_VolumetricFlaskSetter extends Container {
     public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All
     // slots
 
-    public Container_VolumetricFlaskSetter(final InventoryPlayer inventory, final TileEntityVolumetricFlaskSetter te) {
+    public ContainerVolumetricFlaskSetter(final InventoryPlayer inventory, final TileEntityVolumetricFlaskSetter te) {
         this.mTileEntity = te;
         this.inventoryChest = te.getInventory();
 
diff --git a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java
index fa0d3844b2..d801bb46ed 100644
--- a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java
+++ b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.creative;
 
 import net.minecraft.creativetab.CreativeTabs;
 
-import gregtech.api.util.GT_CreativeTab;
+import gregtech.api.util.GTCreativeTab;
 
 public class AddToCreativeTab {
 
@@ -15,11 +15,11 @@ public class AddToCreativeTab {
 
     public static void initialiseTabs() {
         // GT_CreativeTab
-        tabBlock = new GT_CreativeTab("GTPP_BLOCKS", "GT++ Blocks");
-        tabMisc = new GT_CreativeTab("GTPP_MISC", "GT++ Misc");
-        tabTools = new GT_CreativeTab("GTPP_TOOLS", "GT++ Tools");
-        tabMachines = new GT_CreativeTab("GTPP_MACHINES", "GT++ Machines");
-        tabOther = new GT_CreativeTab("GTPP_OTHER", "GT++ Other");
-        tabBOP = new GT_CreativeTab("GTPP_OTHER_2", "GT++ Other II");
+        tabBlock = new GTCreativeTab("GTPP_BLOCKS", "GT++ Blocks");
+        tabMisc = new GTCreativeTab("GTPP_MISC", "GT++ Misc");
+        tabTools = new GTCreativeTab("GTPP_TOOLS", "GT++ Tools");
+        tabMachines = new GTCreativeTab("GTPP_MACHINES", "GT++ Machines");
+        tabOther = new GTCreativeTab("GTPP_OTHER", "GT++ Other");
+        tabBOP = new GTCreativeTab("GTPP_OTHER_2", "GT++ Other II");
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/gui/GUI_Base_Tile_Entity.java b/src/main/java/gtPlusPlus/core/gui/GUIBaseTileEntity.java
index 379827a1db..9e4dc6a6cc 100644
--- a/src/main/java/gtPlusPlus/core/gui/GUI_Base_Tile_Entity.java
+++ b/src/main/java/gtPlusPlus/core/gui/GUIBaseTileEntity.java
@@ -3,11 +3,11 @@ package gtPlusPlus.core.gui;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Container;
 
-public abstract class GUI_Base_Tile_Entity extends GuiContainer {
+public abstract class GUIBaseTileEntity extends GuiContainer {
 
     public final Container mContainer;
 
-    public GUI_Base_Tile_Entity(Container aContainer) {
+    public GUIBaseTileEntity(Container aContainer) {
         super(aContainer);
         mContainer = aContainer;
     }
diff --git a/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java b/src/main/java/gtPlusPlus/core/gui/beta/GUIIDRegistry.java
index 7da3d1a35c..f6d899d247 100644
--- a/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
+++ b/src/main/java/gtPlusPlus/core/gui/beta/GUIIDRegistry.java
@@ -6,28 +6,28 @@ import java.util.Map;
 
 import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils;
 
-public class Gui_ID_Registry {
+public class GUIIDRegistry {
 
-    private static final Map<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classMap = new HashMap<>();
-    private static final Map<Integer, MU_GuiId> idMap = new HashMap<>();
+    private static final Map<Class<? extends IGuiManagerMiscUtils>, MUGuild> classMap = new HashMap<>();
+    private static final Map<Integer, MUGuild> idMap = new HashMap<>();
     private static int nextId = 0;
 
     static {}
 
-    private static void registerGuiHandlers(final Gui_Types MU_GuiType,
+    private static void registerGuiHandlers(final GUITypes MU_GuiType,
         final List<Class<? extends IGuiManagerMiscUtils>> guiHandlerClasses) {
         for (final Class<? extends IGuiManagerMiscUtils> tileGuiHandlerClass : guiHandlerClasses) {
-            final MU_GuiId guiId = new MU_GuiId(nextId++, MU_GuiType, tileGuiHandlerClass);
+            final MUGuild guiId = new MUGuild(nextId++, MU_GuiType, tileGuiHandlerClass);
             classMap.put(tileGuiHandlerClass, guiId);
             idMap.put(Integer.valueOf(guiId.getId()), guiId);
         }
     }
 
-    public static MU_GuiId getGuiIdForGuiHandler(final IGuiManagerMiscUtils guiHandler) {
+    public static MUGuild getGuiIdForGuiHandler(final IGuiManagerMiscUtils guiHandler) {
         final Class<? extends IGuiManagerMiscUtils> guiHandlerClass = guiHandler.getClass();
-        MU_GuiId guiId = classMap.get(guiHandlerClass);
+        MUGuild guiId = classMap.get(guiHandlerClass);
         if (guiId == null) {
-            for (final Map.Entry<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classGuiIdEntry : classMap
+            for (final Map.Entry<Class<? extends IGuiManagerMiscUtils>, MUGuild> classGuiIdEntry : classMap
                 .entrySet()) {
                 if (((Class<?>) classGuiIdEntry.getKey()).isAssignableFrom(guiHandlerClass)) {
                     guiId = classGuiIdEntry.getValue();
@@ -41,7 +41,7 @@ public class Gui_ID_Registry {
         return guiId;
     }
 
-    public static MU_GuiId getGuiId(final int id) {
+    public static MUGuild getGuiId(final int id) {
         return idMap.get(Integer.valueOf(id));
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/gui/beta/Gui_Types.java b/src/main/java/gtPlusPlus/core/gui/beta/GUITypes.java
index f0bf946b23..124e2fc276 100644
--- a/src/main/java/gtPlusPlus/core/gui/beta/Gui_Types.java
+++ b/src/main/java/gtPlusPlus/core/gui/beta/GUITypes.java
@@ -1,10 +1,10 @@
 package gtPlusPlus.core.gui.beta;
 
-public enum Gui_Types {
+public enum GUITypes {
 
     Item,
     Tile,
     Entity;
 
-    private Gui_Types() {}
+    private GUITypes() {}
 }
diff --git a/src/main/java/gtPlusPlus/core/gui/beta/MU_GuiId.java b/src/main/java/gtPlusPlus/core/gui/beta/MUGuild.java
index 8b15f5b937..7b599bd716 100644
--- a/src/main/java/gtPlusPlus/core/gui/beta/MU_GuiId.java
+++ b/src/main/java/gtPlusPlus/core/gui/beta/MUGuild.java
@@ -2,19 +2,19 @@ package gtPlusPlus.core.gui.beta;
 
 import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils;
 
-public class MU_GuiId {
+public class MUGuild {
 
     private final int id;
-    private final Gui_Types MU_GuiType;
+    private final GUITypes MU_GuiType;
     private final Class<? extends IGuiManagerMiscUtils> guiHandlerClass;
 
-    MU_GuiId(final int id, final Gui_Types MU_GuiType, final Class<? extends IGuiManagerMiscUtils> guiHandlerClass) {
+    MUGuild(final int id, final GUITypes MU_GuiType, final Class<? extends IGuiManagerMiscUtils> guiHandlerClass) {
         this.id = id;
         this.MU_GuiType = MU_GuiType;
         this.guiHandlerClass = guiHandlerClass;
     }
 
-    public Gui_Types getGuiType() {
+    public GUITypes getGuiType() {
         return this.MU_GuiType;
     }
 
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/gui/machine/GUICircuitProgrammer.java
index 71d3b36470..f429c22af0 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUICircuitProgrammer.java
@@ -10,18 +10,18 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.container.Container_CircuitProgrammer;
+import gtPlusPlus.core.container.ContainerCircuitProgrammer;
 import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
 
 @SideOnly(Side.CLIENT)
-public class GUI_CircuitProgrammer extends GuiContainer {
+public class GUICircuitProgrammer extends GuiContainer {
 
     private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(
         GTPlusPlus.ID,
         "textures/gui/CircuitProgrammer.png");
 
-    public GUI_CircuitProgrammer(final InventoryPlayer player_inventory, final TileEntityCircuitProgrammer te) {
-        super(new Container_CircuitProgrammer(player_inventory, te));
+    public GUICircuitProgrammer(final InventoryPlayer player_inventory, final TileEntityCircuitProgrammer te) {
+        super(new ContainerCircuitProgrammer(player_inventory, te));
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java b/src/main/java/gtPlusPlus/core/gui/machine/GUIFishTrap.java
index d57ef408d0..36146867dd 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUIFishTrap.java
@@ -10,18 +10,18 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.container.Container_FishTrap;
+import gtPlusPlus.core.container.ContainerFishTrap;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
 
 @SideOnly(Side.CLIENT)
-public class GUI_FishTrap extends GuiContainer {
+public class GUIFishTrap extends GuiContainer {
 
     private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(
         GTPlusPlus.ID,
         "textures/gui/FishTrap.png");
 
-    public GUI_FishTrap(final InventoryPlayer player_inventory, final TileEntityFishTrap te) {
-        super(new Container_FishTrap(player_inventory, te));
+    public GUIFishTrap(final InventoryPlayer player_inventory, final TileEntityFishTrap te) {
+        super(new ContainerFishTrap(player_inventory, te));
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java b/src/main/java/gtPlusPlus/core/gui/machine/GUIPestKiller.java
index bed8707fc4..0f3e1fc832 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUIPestKiller.java
@@ -16,21 +16,21 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.container.Container_PestKiller;
-import gtPlusPlus.core.material.MISC_MATERIALS;
+import gtPlusPlus.core.container.ContainerPestKiller;
+import gtPlusPlus.core.material.MaterialMisc;
 import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
 import gtPlusPlus.core.util.math.MathUtils;
 
 @SideOnly(Side.CLIENT)
-public class GUI_PestKiller extends GuiContainer {
+public class GUIPestKiller extends GuiContainer {
 
     private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(
         GTPlusPlus.ID,
         "textures/gui/PestKiller.png");
     private final TileEntityPestKiller mTileKiller;
 
-    public GUI_PestKiller(final InventoryPlayer player_inventory, final TileEntityPestKiller te) {
-        super(new Container_PestKiller(player_inventory, te));
+    public GUIPestKiller(final InventoryPlayer player_inventory, final TileEntityPestKiller te) {
+        super(new ContainerPestKiller(player_inventory, te));
         mTileKiller = te;
     }
 
@@ -60,7 +60,7 @@ public class GUI_PestKiller extends GuiContainer {
     private void drawFluidTank(IFluidTank tank, int x, int y) {
         Color startGrad = new Color(50, 50, 50);
         Color endGrad = new Color(20, 20, 20);
-        Container_PestKiller aCont = (Container_PestKiller) this.inventorySlots;
+        ContainerPestKiller aCont = (ContainerPestKiller) this.inventorySlots;
 
         double aPercentage = 0;
         double aDivisor = (100 / 16);
@@ -119,7 +119,7 @@ public class GUI_PestKiller extends GuiContainer {
                         aFrameHeight = (int) (aPercentage / aDivisor);
                         // Logger.INFO("Frame Height = "+aFrameHeight);
                     }
-                    short[] aRGB = MISC_MATERIALS.HYDROGEN_CYANIDE.getRGB();
+                    short[] aRGB = MaterialMisc.HYDROGEN_CYANIDE.getRGB();
                     startGrad = new Color(aRGB[0], aRGB[1], aRGB[2]);
                     endGrad = new Color(Math.max(aRGB[0], 0), Math.max(aRGB[1], 0), Math.max(aRGB[2], 0));
                     drawGradientRect(x, y + (16 - aFrameHeight), x + 16, y + 16, startGrad.getRGB(), endGrad.getRGB());
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java b/src/main/java/gtPlusPlus/core/gui/machine/GUIProjectTable.java
index 3707855641..2175c033f5 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUIProjectTable.java
@@ -11,18 +11,18 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.container.Container_ProjectTable;
+import gtPlusPlus.core.container.ContainerProjectTable;
 import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
 
 @SideOnly(Side.CLIENT)
-public class GUI_ProjectTable extends GuiContainer {
+public class GUIProjectTable extends GuiContainer {
 
     private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(
         GTPlusPlus.ID,
         "textures/gui/ProjectTable.png");
 
-    public GUI_ProjectTable(final InventoryPlayer player_inventory, final TileEntityProjectTable tile) {
-        super(new Container_ProjectTable(player_inventory, tile));
+    public GUIProjectTable(final InventoryPlayer player_inventory, final TileEntityProjectTable tile) {
+        super(new ContainerProjectTable(player_inventory, tile));
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java b/src/main/java/gtPlusPlus/core/gui/machine/GUISuperJukebox.java
index 9afa2b4ce1..9158667aff 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUISuperJukebox.java
@@ -12,21 +12,21 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox;
-import gtPlusPlus.core.container.Container_SuperJukebox;
-import gtPlusPlus.core.gui.GUI_Base_Tile_Entity;
+import gtPlusPlus.core.block.machine.BlockSuperJukebox.TileEntitySuperJukebox;
+import gtPlusPlus.core.container.ContainerSuperJukebox;
+import gtPlusPlus.core.gui.GUIBaseTileEntity;
 
 @SideOnly(Side.CLIENT)
-public class GUI_SuperJukebox extends GUI_Base_Tile_Entity {
+public class GUISuperJukebox extends GUIBaseTileEntity {
 
     private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(
         GTPlusPlus.ID,
         "textures/gui/SuperJukebox.png");
-    private final Container_SuperJukebox mThisContainer;
+    private final ContainerSuperJukebox mThisContainer;
 
-    public GUI_SuperJukebox(final InventoryPlayer player_inventory, final TileEntitySuperJukebox te) {
-        super(new Container_SuperJukebox(player_inventory, te));
-        mThisContainer = (Container_SuperJukebox) this.mContainer;
+    public GUISuperJukebox(final InventoryPlayer player_inventory, final TileEntitySuperJukebox te) {
+        super(new ContainerSuperJukebox(player_inventory, te));
+        mThisContainer = (ContainerSuperJukebox) this.mContainer;
     }
 
     // This method is called when the Gui is first called!
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/gui/machine/GUIVolumetricFlaskSetter.java
index 6595b510c0..3e1a735f7e 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUIVolumetricFlaskSetter.java
@@ -12,24 +12,24 @@ import org.lwjgl.opengl.GL11;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.container.Container_VolumetricFlaskSetter;
+import gtPlusPlus.core.container.ContainerVolumetricFlaskSetter;
 import gtPlusPlus.core.gui.widget.GuiValueField;
 import gtPlusPlus.core.handler.PacketHandler;
-import gtPlusPlus.core.network.packet.Packet_VolumetricFlaskGui;
+import gtPlusPlus.core.network.packet.PacketVolumetricFlaskGui;
 import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter;
 
 @SideOnly(Side.CLIENT)
-public class GUI_VolumetricFlaskSetter extends GuiContainer {
+public class GUIVolumetricFlaskSetter extends GuiContainer {
 
     private static final ResourceLocation mGuiTextures = new ResourceLocation(
         GTPlusPlus.ID,
         "textures/gui/VolumetricFlaskSetter.png");
-    private Container_VolumetricFlaskSetter mContainer;
+    private ContainerVolumetricFlaskSetter mContainer;
     private boolean mIsOpen = false;
     private GuiValueField mText;
     private TileEntityVolumetricFlaskSetter mTile;
 
-    public GUI_VolumetricFlaskSetter(Container_VolumetricFlaskSetter aContainer) {
+    public GUIVolumetricFlaskSetter(ContainerVolumetricFlaskSetter aContainer) {
         super(aContainer);
         mContainer = aContainer;
         mTile = mContainer.mTileEntity;
@@ -192,7 +192,7 @@ public class GUI_VolumetricFlaskSetter extends GuiContainer {
 
     public void sendUpdateToServer() {
         if (getText().length() > 0) {
-            PacketHandler.sendToServer(new Packet_VolumetricFlaskGui(mTile, parse(getText())));
+            PacketHandler.sendToServer(new PacketVolumetricFlaskGui(mTile, parse(getText())));
         }
     }
 
@@ -213,7 +213,7 @@ public class GUI_VolumetricFlaskSetter extends GuiContainer {
         // Check TextBox Value is correct
         if (getText().length() > 0) {
             int aCustomValue = parse(getText());
-            int aTileValue = ((Container_VolumetricFlaskSetter) mContainer).mCustomValue;
+            int aTileValue = ((ContainerVolumetricFlaskSetter) mContainer).mCustomValue;
             if (mContainer != null) {
                 if (aTileValue != aCustomValue) {
                     setText(aTileValue);
diff --git a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java
index 698aa1951a..26e7d907d3 100644
--- a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java
+++ b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java
@@ -5,19 +5,19 @@ import java.lang.reflect.Field;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiTextField;
 
-import gtPlusPlus.core.gui.machine.GUI_VolumetricFlaskSetter;
+import gtPlusPlus.core.gui.machine.GUIVolumetricFlaskSetter;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.CORE_Preloader;
+import gtPlusPlus.preloader.PreloaderCore;
 
 public class GuiValueField extends GuiTextField {
 
     private final FontRenderer mFontRenderer;
     private final int mScreenLocationX;
     private final int mScreenLocationY;
-    private final GUI_VolumetricFlaskSetter mGUI;
+    private final GUIVolumetricFlaskSetter mGUI;
 
     public GuiValueField(FontRenderer aFontRenderer, int aX, int aY, int aScreenLocationX, int aScreenLocationY,
-        int aWidth, int aHeight, GUI_VolumetricFlaskSetter aGUI) {
+        int aWidth, int aHeight, GUIVolumetricFlaskSetter aGUI) {
         super(aFontRenderer, aX, aY, aWidth, aHeight);
         mFontRenderer = aFontRenderer;
         mScreenLocationX = aScreenLocationX;
@@ -33,7 +33,7 @@ public class GuiValueField extends GuiTextField {
     public boolean isBackgroundDrawingEnabled() {
         Field enableBackgroundDrawing = ReflectionUtils.getField(
             GuiTextField.class,
-            !CORE_Preloader.DEV_ENVIRONMENT ? "field_146215_m" : "enableBackgroundDrawing");
+            !PreloaderCore.DEV_ENVIRONMENT ? "field_146215_m" : "enableBackgroundDrawing");
         if (enableBackgroundDrawing != null) {
             return ReflectionUtils.getFieldValue(enableBackgroundDrawing, this);
         }
@@ -42,7 +42,7 @@ public class GuiValueField extends GuiTextField {
 
     public int getLineScrollOffset() {
         Field lineScrollOffset = ReflectionUtils
-            .getField(GuiTextField.class, !CORE_Preloader.DEV_ENVIRONMENT ? "field_146225_q" : "lineScrollOffset");
+            .getField(GuiTextField.class, !PreloaderCore.DEV_ENVIRONMENT ? "field_146225_q" : "lineScrollOffset");
         if (lineScrollOffset != null) {
             return (int) ReflectionUtils.getFieldValue(lineScrollOffset, this);
         }
diff --git a/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java b/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java
index 41513163a0..0611be5d19 100644
--- a/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java
@@ -17,13 +17,13 @@ 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.api.enums.Materials;
-import gregtech.api.util.GT_Log;
+import gregtech.api.util.GTLog;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.core.material.MaterialsAlloy;
+import gtPlusPlus.core.material.MaterialsElements;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -41,7 +41,7 @@ public class AchievementHandler {
     public AchievementHandler() {
 
         Logger.INFO("Initializing GT++ achievements");
-        GT_Log.out.println("Initializing GT++ achievements");
+        GTLog.out.println("Initializing GT++ achievements");
 
         // register first
         this.registerAchievement(
@@ -74,11 +74,17 @@ public class AchievementHandler {
             true);
 
         // Material Advancement
-        this.registerAchievement("dust.potin", 0, 2, ALLOY.POTIN.getDust(1), aBaseAchievementName, false);
-        this.registerAchievement("dust.eglin", 0, 4, ALLOY.EGLIN_STEEL.getDust(1), "dust.potin", false);
-        this.registerAchievement("dust.staballoy", 0, 6, ALLOY.STABALLOY.getDust(1), "dust.eglin", false);
-        this.registerAchievement("dust.quantum", 0, 8, ALLOY.QUANTUM.getDust(1), "dust.staballoy", true);
-        this.registerAchievement("dust.hypogen", 0, 10, ELEMENT.STANDALONE.HYPOGEN.getDust(1), "dust.quantum", true);
+        this.registerAchievement("dust.potin", 0, 2, MaterialsAlloy.POTIN.getDust(1), aBaseAchievementName, false);
+        this.registerAchievement("dust.eglin", 0, 4, MaterialsAlloy.EGLIN_STEEL.getDust(1), "dust.potin", false);
+        this.registerAchievement("dust.staballoy", 0, 6, MaterialsAlloy.STABALLOY.getDust(1), "dust.eglin", false);
+        this.registerAchievement("dust.quantum", 0, 8, MaterialsAlloy.QUANTUM.getDust(1), "dust.staballoy", true);
+        this.registerAchievement(
+            "dust.hypogen",
+            0,
+            10,
+            MaterialsElements.STANDALONE.HYPOGEN.getDust(1),
+            "dust.quantum",
+            true);
 
         // Blocks
         this.registerAchievement(
@@ -253,9 +259,9 @@ public class AchievementHandler {
         }
 
         achievement.registerStat();
-        if (CORE.DEVENV) {
-            GT_Log.out.println("achievement." + textId + "=");
-            GT_Log.out.println("achievement." + textId + ".desc=");
+        if (GTPPCore.DEVENV) {
+            GTLog.out.println("achievement." + textId + "=");
+            GTLog.out.println("achievement." + textId + ".desc=");
         }
 
         this.achievementList.put(textId, achievement);
@@ -275,7 +281,7 @@ public class AchievementHandler {
     /**
      * A generic handler that will give an achievement for an item. Useful to only write this once, then call it from
      * all handlers.
-     * 
+     *
      * @param aStack  - The Itemstack to check for achievements.
      * @param aPlayer - The player to unlock for.
      */
diff --git a/src/main/java/gtPlusPlus/core/handler/BookHandler.java b/src/main/java/gtPlusPlus/core/handler/BookHandler.java
index 5725c1c710..d030dab591 100644
--- a/src/main/java/gtPlusPlus/core/handler/BookHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/BookHandler.java
@@ -9,9 +9,9 @@ import java.util.Map;
 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_OreDictUnificator;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -250,34 +250,34 @@ public class BookHandler {
                 "Valid Tiered Machine Casings:" + "\n"
                     + "\n"
                     + "1 - "
-                    + GT_Values.VN[0]
+                    + GTValues.VN[0]
                     + "\n"
                     + "2 - "
-                    + GT_Values.VN[1]
+                    + GTValues.VN[1]
                     + "\n"
                     + "3 - "
-                    + GT_Values.VN[2]
+                    + GTValues.VN[2]
                     + "\n"
                     + "4 - "
-                    + GT_Values.VN[3]
+                    + GTValues.VN[3]
                     + "\n"
                     + "5 - "
-                    + GT_Values.VN[4]
+                    + GTValues.VN[4]
                     + "\n"
                     + "6 - "
-                    + GT_Values.VN[5]
+                    + GTValues.VN[5]
                     + "\n"
                     + "7 - "
-                    + GT_Values.VN[6]
+                    + GTValues.VN[6]
                     + "\n"
                     + "8 - "
-                    + GT_Values.VN[7]
+                    + GTValues.VN[7]
                     + "\n"
                     + "9 - "
-                    + GT_Values.VN[8]
+                    + GTValues.VN[8]
                     + "\n"
                     + "10 - "
-                    + GT_Values.VN[9],
+                    + GTValues.VN[9],
 
                 // Pipe Casings
                 """
@@ -430,10 +430,10 @@ public class BookHandler {
             new ItemStack[] { ItemUtils.getSimpleStack(Items.writable_book),
                 ItemUtils.getSimpleStack(Items.lava_bucket) },
             ItemBookWritten_ThermalBoiler);
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemBookWritten_MultiMachineManual,
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE
-                | GT_ModHandler.RecipeBits.BUFFERED,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE
+                | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "Xw", 'X', ItemUtils.getSimpleStack(Items.writable_book) });
         RecipeUtils.addShapelessGregtechRecipe(
             new ItemStack[] { ItemUtils.getSimpleStack(Items.writable_book),
@@ -450,8 +450,8 @@ public class BookHandler {
 
         for (int i = 0; i < mBookKeeperCount; i++) {
             ItemStack bookstack = ItemUtils.simpleMetaStack(ModItems.itemCustomBook, i, 1);
-            GT_OreDictUnificator.registerOre("bookWritten", bookstack);
-            GT_OreDictUnificator.registerOre("craftingBook", bookstack);
+            GTOreDictUnificator.registerOre("bookWritten", bookstack);
+            GTOreDictUnificator.registerOre("craftingBook", bookstack);
         }
     }
 
diff --git a/src/main/java/gtPlusPlus/core/handler/BurnableFuelHandler.java b/src/main/java/gtPlusPlus/core/handler/BurnableFuelHandler.java
index 8e3377b5f9..9228643bfc 100644
--- a/src/main/java/gtPlusPlus/core/handler/BurnableFuelHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/BurnableFuelHandler.java
@@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack;
 
 import cpw.mods.fml.common.IFuelHandler;
 import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class BurnableFuelHandler implements IFuelHandler {
@@ -13,7 +13,7 @@ public class BurnableFuelHandler implements IFuelHandler {
     @Override
     public int getBurnTime(ItemStack aStack) {
         // Iterate over my burnables.
-        for (Pair<Integer, ItemStack> temp : CORE.burnables) {
+        for (Pair<Integer, ItemStack> temp : GTPPCore.burnables) {
             int aStackID = Item.getIdFromItem(aStack.getItem());
             int burnID = Item.getIdFromItem(
                 temp.getValue()
diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
deleted file mode 100644
index af09762c08..0000000000
--- a/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package gtPlusPlus.core.handler;
-
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import gtPlusPlus.recipes.RecipeRemovals;
-import gtPlusPlus.xmod.bartcrops.HANDLER_CropsPlusPlus;
-import gtPlusPlus.xmod.bop.HANDLER_BiomesOPlenty;
-import gtPlusPlus.xmod.forestry.HANDLER_FR;
-import gtPlusPlus.xmod.gregtech.HANDLER_GT;
-import gtPlusPlus.xmod.ic2.HANDLER_IC2;
-import gtPlusPlus.xmod.railcraft.HANDLER_Railcraft;
-import gtPlusPlus.xmod.thermalfoundation.HANDLER_TF;
-import gtPlusPlus.xmod.tinkers.HANDLER_Tinkers;
-
-public class COMPAT_IntermodStaging {
-
-    public static void preInit(FMLPreInitializationEvent preinit) {
-        HANDLER_GT.preInit();
-        HANDLER_TF.preInit();
-        HANDLER_FR.preInit();
-        HANDLER_IC2.preInit();
-        HANDLER_BiomesOPlenty.preInit();
-        HANDLER_CropsPlusPlus.preInit(preinit);
-        HANDLER_Railcraft.preInit();
-    }
-
-    public static void init(FMLInitializationEvent init) {
-        HANDLER_GT.init();
-        HANDLER_TF.init();
-    }
-
-    public static void postInit(FMLPostInitializationEvent postinit) {
-        HANDLER_GT.postInit();
-        HANDLER_TF.postInit();
-        HANDLER_FR.postInit();
-        HANDLER_IC2.postInit();
-        HANDLER_BiomesOPlenty.postInit();
-        HANDLER_Tinkers.postInit();
-        HANDLER_CropsPlusPlus.postInit(postinit);
-        HANDLER_Railcraft.postInit();
-        RecipeRemovals.postInit();
-    }
-
-    public static void onLoadComplete(FMLLoadCompleteEvent event) {
-        HANDLER_GT.onLoadComplete(event);
-        RecipeRemovals.onLoadComplete();
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/CompatHandler.java
index 8e780c724e..83426c18c4 100644
--- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/main/java/gtPlusPlus/core/handler/CompatHandler.java
@@ -12,32 +12,32 @@ import java.util.Set;
 import net.minecraft.item.ItemStack;
 
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
-import gtPlusPlus.core.common.compat.COMPAT_ExtraUtils;
-import gtPlusPlus.core.common.compat.COMPAT_HarvestCraft;
-import gtPlusPlus.core.common.compat.COMPAT_IC2;
-import gtPlusPlus.core.common.compat.COMPAT_Thaumcraft;
-import gtPlusPlus.core.common.compat.COMPAT_Witchery;
+import gtPlusPlus.core.common.compat.CompatExtraUtils;
+import gtPlusPlus.core.common.compat.CompatHarvestCraft;
+import gtPlusPlus.core.common.compat.CompatIC2;
+import gtPlusPlus.core.common.compat.CompatThaumcraft;
+import gtPlusPlus.core.common.compat.CompatWitchery;
 import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler;
 import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
-import gtPlusPlus.core.recipe.RECIPES_GREGTECH;
-import gtPlusPlus.core.recipe.RECIPES_LaserEngraver;
+import gtPlusPlus.core.recipe.RecipesGregTech;
+import gtPlusPlus.core.recipe.RecipesLaserEngraver;
 import gtPlusPlus.core.recipe.ShapedRecipeObject;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling;
-import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_ChemicalSkips;
-import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GTNH;
-import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GlueLine;
-import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_Nuclear;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenFluidCanning;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenRecycling;
+import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoaderChemicalSkips;
+import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoaderGTNH;
+import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoaderGlueLine;
+import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoaderNuclear;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.Gregtech4Content;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAdvancedBoilers;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAlgaeContent;
@@ -102,7 +102,7 @@ import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTreeFarmerTE;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechWaterPump;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechWirelessChargers;
 
-public class COMPAT_HANDLER {
+public class CompatHandler {
 
     public static Queue<Object> RemoveRecipeQueue = new LinkedList<>();
     public static Queue<ShapedRecipeObject> AddRecipeQueue = new LinkedList<>();
@@ -114,8 +114,8 @@ public class COMPAT_HANDLER {
         // In-house
 
         for (int i = 1; i <= 10; i++) {
-            GT_OreDictUnificator.registerOre(
-                "bufferCore_" + GT_Values.VN[i - 1],
+            GTOreDictUnificator.registerOre(
+                "bufferCore_" + GTValues.VN[i - 1],
                 new ItemStack(ItemUtils.getItemFromFQRN("miscutils:item.itemBufferCore" + i)));
         }
     }
@@ -126,7 +126,7 @@ public class COMPAT_HANDLER {
          * --- 859 to 868 --- 911 to 940
          */
 
-        new RECIPES_LaserEngraver();
+        new RecipesLaserEngraver();
         GregtechEnergyBuffer.run();
         GregtechLFTR.run();
         GregtechNuclearSaltProcessingPlant.run();
@@ -195,17 +195,17 @@ public class COMPAT_HANDLER {
     // InterMod
     public static void intermodOreDictionarySupport() {
         if (Thaumcraft.isModLoaded()) {
-            COMPAT_Thaumcraft.OreDict();
+            CompatThaumcraft.OreDict();
         }
         if (ExtraUtilities.isModLoaded()) {
-            COMPAT_ExtraUtils.OreDict();
+            CompatExtraUtils.OreDict();
         }
         if (PamsHarvestCraft.isModLoaded()) {
-            COMPAT_HarvestCraft.OreDict();
+            CompatHarvestCraft.OreDict();
         }
-        COMPAT_IC2.OreDict();
+        CompatIC2.OreDict();
         if (Witchery.isModLoaded()) {
-            COMPAT_Witchery.OreDict();
+            CompatWitchery.OreDict();
         }
     }
 
@@ -226,11 +226,11 @@ public class COMPAT_HANDLER {
 
     public static void startLoadingGregAPIBasedRecipes() {
         // Add hand-made recipes
-        RECIPES_GREGTECH.run();
-        RecipeLoader_GTNH.generate();
-        RecipeLoader_Nuclear.generate();
-        RecipeLoader_GlueLine.generate();
-        RecipeLoader_ChemicalSkips.generate();
+        RecipesGregTech.run();
+        RecipeLoaderGTNH.generate();
+        RecipeLoaderNuclear.generate();
+        RecipeLoaderGlueLine.generate();
+        RecipeLoaderChemicalSkips.generate();
         // Add autogenerated Recipes from Item Components
         for (Set<RunnableWithInfo<Material>> m : MaterialGenerator.mRecipeMapsToGenerate) {
             for (RunnableWithInfo<Material> r : m) {
@@ -247,11 +247,11 @@ public class COMPAT_HANDLER {
                 }
             }
         }
-        RecipeGen_Recycling.executeGenerators();
+        RecipeGenRecycling.executeGenerators();
         runQueuedMisc();
 
         // Do Fluid Canning Last, because they're not executed on demand, but rather queued.
-        RecipeGen_FluidCanning.init();
+        RecipeGenFluidCanning.init();
     }
 
     public static void onLoadComplete(FMLLoadCompleteEvent event) {
diff --git a/src/main/java/gtPlusPlus/core/handler/CompatIntermodStaging.java b/src/main/java/gtPlusPlus/core/handler/CompatIntermodStaging.java
new file mode 100644
index 0000000000..7d08318c55
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/handler/CompatIntermodStaging.java
@@ -0,0 +1,50 @@
+package gtPlusPlus.core.handler;
+
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import gtPlusPlus.recipes.RecipeRemovals;
+import gtPlusPlus.xmod.bartcrops.CropsPlusPlusHandler;
+import gtPlusPlus.xmod.bop.BiomesOPlentyHandler;
+import gtPlusPlus.xmod.forestry.ForestryHandler;
+import gtPlusPlus.xmod.gregtech.HandlerGT;
+import gtPlusPlus.xmod.ic2.HandlerIC2;
+import gtPlusPlus.xmod.railcraft.HandlerRailcraft;
+import gtPlusPlus.xmod.thermalfoundation.HandlerTF;
+import gtPlusPlus.xmod.tinkers.HandlerTinkers;
+
+public class CompatIntermodStaging {
+
+    public static void preInit(FMLPreInitializationEvent preinit) {
+        HandlerGT.preInit();
+        HandlerTF.preInit();
+        ForestryHandler.preInit();
+        HandlerIC2.preInit();
+        BiomesOPlentyHandler.preInit();
+        CropsPlusPlusHandler.preInit(preinit);
+        HandlerRailcraft.preInit();
+    }
+
+    public static void init(FMLInitializationEvent init) {
+        HandlerGT.init();
+        HandlerTF.init();
+    }
+
+    public static void postInit(FMLPostInitializationEvent postinit) {
+        HandlerGT.postInit();
+        HandlerTF.postInit();
+        ForestryHandler.postInit();
+        HandlerIC2.postInit();
+        BiomesOPlentyHandler.postInit();
+        HandlerTinkers.postInit();
+        CropsPlusPlusHandler.postInit(postinit);
+        HandlerRailcraft.postInit();
+        RecipeRemovals.postInit();
+    }
+
+    public static void onLoadComplete(FMLLoadCompleteEvent event) {
+        HandlerGT.onLoadComplete(event);
+        RecipeRemovals.onLoadComplete();
+    }
+}
diff --git a/src/main/java/gtPlusPlus/core/handler/GuiHandler.java b/src/main/java/gtPlusPlus/core/handler/GuiHandler.java
index 4509fbea04..4479fa8add 100644
--- a/src/main/java/gtPlusPlus/core/handler/GuiHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/GuiHandler.java
@@ -9,21 +9,21 @@ import cpw.mods.fml.common.network.IGuiHandler;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox;
-import gtPlusPlus.core.container.Container_CircuitProgrammer;
-import gtPlusPlus.core.container.Container_FishTrap;
-import gtPlusPlus.core.container.Container_PestKiller;
-import gtPlusPlus.core.container.Container_ProjectTable;
-import gtPlusPlus.core.container.Container_SuperJukebox;
-import gtPlusPlus.core.container.Container_VolumetricFlaskSetter;
-import gtPlusPlus.core.gui.beta.Gui_ID_Registry;
-import gtPlusPlus.core.gui.beta.MU_GuiId;
-import gtPlusPlus.core.gui.machine.GUI_CircuitProgrammer;
-import gtPlusPlus.core.gui.machine.GUI_FishTrap;
-import gtPlusPlus.core.gui.machine.GUI_PestKiller;
-import gtPlusPlus.core.gui.machine.GUI_ProjectTable;
-import gtPlusPlus.core.gui.machine.GUI_SuperJukebox;
-import gtPlusPlus.core.gui.machine.GUI_VolumetricFlaskSetter;
+import gtPlusPlus.core.block.machine.BlockSuperJukebox.TileEntitySuperJukebox;
+import gtPlusPlus.core.container.ContainerCircuitProgrammer;
+import gtPlusPlus.core.container.ContainerFishTrap;
+import gtPlusPlus.core.container.ContainerPestKiller;
+import gtPlusPlus.core.container.ContainerProjectTable;
+import gtPlusPlus.core.container.ContainerSuperJukebox;
+import gtPlusPlus.core.container.ContainerVolumetricFlaskSetter;
+import gtPlusPlus.core.gui.beta.GUIIDRegistry;
+import gtPlusPlus.core.gui.beta.MUGuild;
+import gtPlusPlus.core.gui.machine.GUICircuitProgrammer;
+import gtPlusPlus.core.gui.machine.GUIFishTrap;
+import gtPlusPlus.core.gui.machine.GUIPestKiller;
+import gtPlusPlus.core.gui.machine.GUIProjectTable;
+import gtPlusPlus.core.gui.machine.GUISuperJukebox;
+import gtPlusPlus.core.gui.machine.GUIVolumetricFlaskSetter;
 import gtPlusPlus.core.interfaces.IGuiManager;
 import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
@@ -63,7 +63,7 @@ public class GuiHandler implements IGuiHandler {
 
         if (te != null) {
             if (ID == GUI1) {
-                return new Container_ProjectTable(player.inventory, (TileEntityProjectTable) te);
+                return new ContainerProjectTable(player.inventory, (TileEntityProjectTable) te);
             } else if (ID == GUI2) {}
         }
 
@@ -72,15 +72,15 @@ public class GuiHandler implements IGuiHandler {
                 Logger.INFO("sad");
                 // return new Container_WorkbenchAdvanced(player.inventory, (TileEntityWorkbenchAdvanced) te);
             } else if (ID == GUI6) {
-                return new Container_FishTrap(player.inventory, (TileEntityFishTrap) te);
+                return new ContainerFishTrap(player.inventory, (TileEntityFishTrap) te);
             } else if (ID == GUI8) {
-                return new Container_CircuitProgrammer(player.inventory, (TileEntityCircuitProgrammer) te);
+                return new ContainerCircuitProgrammer(player.inventory, (TileEntityCircuitProgrammer) te);
             } else if (ID == GUI14) {
-                return new Container_SuperJukebox(player.inventory, (TileEntitySuperJukebox) te);
+                return new ContainerSuperJukebox(player.inventory, (TileEntitySuperJukebox) te);
             } else if (ID == GUI15) {
-                return new Container_PestKiller(player.inventory, (TileEntityPestKiller) te);
+                return new ContainerPestKiller(player.inventory, (TileEntityPestKiller) te);
             } else if (ID == GUI18) {
-                return new Container_VolumetricFlaskSetter(player.inventory, (TileEntityVolumetricFlaskSetter) te);
+                return new ContainerVolumetricFlaskSetter(player.inventory, (TileEntityVolumetricFlaskSetter) te);
             }
         }
 
@@ -104,22 +104,22 @@ public class GuiHandler implements IGuiHandler {
         final TileEntity te = world.getTileEntity(x, y, z);
         if (te != null) {
             if (ID == GUI1) {
-                return new GUI_ProjectTable(player.inventory, (TileEntityProjectTable) te);
+                return new GUIProjectTable(player.inventory, (TileEntityProjectTable) te);
             }
         }
 
         if (te != null) {
             if (ID == GUI6) {
-                return new GUI_FishTrap(player.inventory, (TileEntityFishTrap) te);
+                return new GUIFishTrap(player.inventory, (TileEntityFishTrap) te);
             } else if (ID == GUI8) {
-                return new GUI_CircuitProgrammer(player.inventory, (TileEntityCircuitProgrammer) te);
+                return new GUICircuitProgrammer(player.inventory, (TileEntityCircuitProgrammer) te);
             } else if (ID == GUI14) {
-                return new GUI_SuperJukebox(player.inventory, (TileEntitySuperJukebox) te);
+                return new GUISuperJukebox(player.inventory, (TileEntitySuperJukebox) te);
             } else if (ID == GUI15) {
-                return new GUI_PestKiller(player.inventory, (TileEntityPestKiller) te);
+                return new GUIPestKiller(player.inventory, (TileEntityPestKiller) te);
             } else if (ID == GUI18) {
-                return new GUI_VolumetricFlaskSetter(
-                    new Container_VolumetricFlaskSetter(player.inventory, (TileEntityVolumetricFlaskSetter) te));
+                return new GUIVolumetricFlaskSetter(
+                    new ContainerVolumetricFlaskSetter(player.inventory, (TileEntityVolumetricFlaskSetter) te));
             }
         }
 
@@ -144,7 +144,7 @@ public class GuiHandler implements IGuiHandler {
     }
 
     private static int encodeGuiData(final IGuiManager guiHandler, final short data) {
-        final MU_GuiId guiId = Gui_ID_Registry.getGuiIdForGuiHandler(guiHandler);
+        final MUGuild guiId = GUIIDRegistry.getGuiIdForGuiHandler(guiHandler);
         return (data << 16) | guiId.getId();
     }
 
diff --git a/src/main/java/gtPlusPlus/core/handler/PacketHandler.java b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java
index af6a376f1a..735d381706 100644
--- a/src/main/java/gtPlusPlus/core/handler/PacketHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java
@@ -12,8 +12,8 @@ import cpw.mods.fml.relauncher.Side;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.network.handler.AbstractClientMessageHandler;
 import gtPlusPlus.core.network.packet.AbstractPacket;
-import gtPlusPlus.core.network.packet.Packet_VolumetricFlaskGui;
-import gtPlusPlus.core.network.packet.Packet_VolumetricFlaskGui2;
+import gtPlusPlus.core.network.packet.PacketVolumetricFlaskGui;
+import gtPlusPlus.core.network.packet.PacketVolumetricFlaskGui2;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
 public class PacketHandler {
@@ -23,8 +23,8 @@ public class PacketHandler {
     private static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(GTPlusPlus.ID);
 
     public static final void init() {
-        registerMessage(Packet_VolumetricFlaskGui.class, Packet_VolumetricFlaskGui.class);
-        registerMessage(Packet_VolumetricFlaskGui2.class, Packet_VolumetricFlaskGui2.class);
+        registerMessage(PacketVolumetricFlaskGui.class, PacketVolumetricFlaskGui.class);
+        registerMessage(PacketVolumetricFlaskGui2.class, PacketVolumetricFlaskGui2.class);
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java
index e50a76d5d5..769973f617 100644
--- a/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java
+++ b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.handler.Recipes;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
@@ -24,8 +24,8 @@ public class DecayableRecipe {
     @Override
     public boolean equals(Object o) {
         if (o instanceof DecayableRecipe i) {
-            if (i.mTime == this.mTime && GT_Utility.areStacksEqual(mInput, i.mInput)
-                && GT_Utility.areStacksEqual(mOutput, i.mOutput)) {
+            if (i.mTime == this.mTime && GTUtility.areStacksEqual(mInput, i.mInput)
+                && GTUtility.areStacksEqual(mOutput, i.mOutput)) {
                 return true;
             }
         }
diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java b/src/main/java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java
index 9eb3a1826e..aa83b3bcca 100644
--- a/src/main/java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.core.handler.Recipes;
 
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.handler.COMPAT_HANDLER;
+import gtPlusPlus.core.handler.CompatHandler;
 import gtPlusPlus.core.recipe.ShapedRecipeObject;
 
 public class LateRegistrationHandler {
@@ -14,7 +14,7 @@ public class LateRegistrationHandler {
     }
 
     private static void init() {
-        for (final ShapedRecipeObject item : COMPAT_HANDLER.AddRecipeQueue) {
+        for (final ShapedRecipeObject item : CompatHandler.AddRecipeQueue) {
             item.buildRecipe();
         }
         try {
diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
index abf7300f7a..437e3ea0c3 100644
--- a/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
@@ -1,10 +1,10 @@
 package gtPlusPlus.core.handler.Recipes;
 
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.handler.COMPAT_HANDLER;
-import gtPlusPlus.core.recipe.RECIPES_General;
-import gtPlusPlus.core.recipe.RECIPES_Machines;
-import gtPlusPlus.core.recipe.RECIPE_Batteries;
+import gtPlusPlus.core.handler.CompatHandler;
+import gtPlusPlus.core.recipe.RecipesBatteries;
+import gtPlusPlus.core.recipe.RecipesGeneral;
+import gtPlusPlus.core.recipe.RecipesMachines;
 
 public class RegistrationHandler {
 
@@ -16,10 +16,10 @@ public class RegistrationHandler {
     }
 
     private static void init() {
-        RECIPES_General.loadRecipes();
-        RECIPES_Machines.loadRecipes();
-        RECIPE_Batteries.loadRecipes();
+        RecipesGeneral.loadRecipes();
+        RecipesMachines.loadRecipes();
+        RecipesBatteries.loadRecipes();
         Logger.INFO("Loaded: " + recipesSuccess + " Failed: " + recipesFailed);
-        COMPAT_HANDLER.areInitItemsLoaded = true;
+        CompatHandler.areInitItemsLoaded = true;
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java b/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java
index 07b027faa1..008f0db0d4 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java
@@ -4,7 +4,7 @@ import net.minecraft.entity.boss.EntityDragon;
 import net.minecraftforge.event.entity.living.LivingDropsEvent;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MaterialsElements;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -34,22 +34,25 @@ public class EnderDragonDeathHandler {
         if (mHEE && mHardcoreDragonClass != null && mHardcoreDragonClass.isInstance(event.entityLiving)) {
             for (int y = 0; y < MathUtils.randInt(100, 250); y++) {
                 int aAmount = MathUtils.randInt(5, 25);
-                event.entityLiving
-                    .entityDropItem(ELEMENT.STANDALONE.DRAGON_METAL.getNugget(aAmount), MathUtils.randFloat(0, 1));
+                event.entityLiving.entityDropItem(
+                    MaterialsElements.STANDALONE.DRAGON_METAL.getNugget(aAmount),
+                    MathUtils.randFloat(0, 1));
                 aCountTotal = +aAmount;
             }
         } else if (mDE && mChaoseDragonClass != null && mChaoseDragonClass.isInstance(event.entityLiving)) {
             for (int y = 0; y < MathUtils.randInt(100, 200); y++) {
                 int aAmount = MathUtils.randInt(1, 5);
-                event.entityLiving
-                    .entityDropItem(ELEMENT.STANDALONE.DRAGON_METAL.getIngot(aAmount), MathUtils.randFloat(0, 1));
+                event.entityLiving.entityDropItem(
+                    MaterialsElements.STANDALONE.DRAGON_METAL.getIngot(aAmount),
+                    MathUtils.randFloat(0, 1));
                 aCountTotal = +aAmount;
             }
         } else if (event.entityLiving instanceof EntityDragon) {
             for (int y = 0; y < MathUtils.randInt(25, 50); y++) {
                 int aAmount = MathUtils.randInt(1, 10);
-                event.entityLiving
-                    .entityDropItem(ELEMENT.STANDALONE.DRAGON_METAL.getNugget(aAmount), MathUtils.randFloat(0, 1));
+                event.entityLiving.entityDropItem(
+                    MaterialsElements.STANDALONE.DRAGON_METAL.getNugget(aAmount),
+                    MathUtils.randFloat(0, 1));
                 aCountTotal = +aAmount;
             }
         }
diff --git a/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java
index 0ca315cc72..b01d9d6190 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java
@@ -18,12 +18,12 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.CORE_Preloader;
+import gtPlusPlus.preloader.PreloaderCore;
 
 public class PlayerSleepEventHandler {
 
     private static Field sEffectDuration = ReflectionUtils
-        .getField(PotionEffect.class, !CORE_Preloader.DEV_ENVIRONMENT ? "field_76460_b" : "duration");
+        .getField(PotionEffect.class, !PreloaderCore.DEV_ENVIRONMENT ? "field_76460_b" : "duration");
     private static ArrayList<Potion> sPositiveEffects = new ArrayList<>();
     private static ArrayList<Potion> sNegativeEffects = new ArrayList<>();
 
diff --git a/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java b/src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java
index 6933c0f82d..1d8b2ed68d 100644
--- a/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java
@@ -15,16 +15,16 @@ import net.minecraft.item.crafting.ShapedRecipes;
 import net.minecraft.item.crafting.ShapelessRecipes;
 import net.minecraft.world.World;
 
-public class Workbench_CraftingHandler {
+public class WorkbenchCraftingHandler {
 
-    private static final Workbench_CraftingHandler instance = new Workbench_CraftingHandler();
+    private static final WorkbenchCraftingHandler instance = new WorkbenchCraftingHandler();
     private final List<IRecipe> recipes = new ArrayList<>();
 
-    public static final Workbench_CraftingHandler getInstance() {
+    public static final WorkbenchCraftingHandler getInstance() {
         return instance;
     }
 
-    public Workbench_CraftingHandler() {
+    public WorkbenchCraftingHandler() {
 
         // just a example recipe so you know how to add them
         this.addRecipe(
diff --git a/src/main/java/gtPlusPlus/core/inventories/Inventory_DecayablesChest.java b/src/main/java/gtPlusPlus/core/inventories/InventoryDecayablesChest.java
index 4817545c27..6466996cc9 100644
--- a/src/main/java/gtPlusPlus/core/inventories/Inventory_DecayablesChest.java
+++ b/src/main/java/gtPlusPlus/core/inventories/InventoryDecayablesChest.java
@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 
-public class Inventory_DecayablesChest implements IInventory {
+public class InventoryDecayablesChest implements IInventory {
 
     private final String name = "DecayablesChest";
 
diff --git a/src/main/java/gtPlusPlus/core/inventories/Inventory_EggBox.java b/src/main/java/gtPlusPlus/core/inventories/InventoryEggBox.java
index 04a95a4f9a..545988347e 100644
--- a/src/main/java/gtPlusPlus/core/inventories/Inventory_EggBox.java
+++ b/src/main/java/gtPlusPlus/core/inventories/InventoryEggBox.java
@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 
-public class Inventory_EggBox implements IInventory {
+public class InventoryEggBox implements IInventory {
 
     private final String name = "EggBox";
 
diff --git a/src/main/java/gtPlusPlus/core/inventories/Inventory_SuperJukebox.java b/src/main/java/gtPlusPlus/core/inventories/InventorySuperJukebox.java
index bd44e89776..89f733f5ac 100644
--- a/src/main/java/gtPlusPlus/core/inventories/Inventory_SuperJukebox.java
+++ b/src/main/java/gtPlusPlus/core/inventories/InventorySuperJukebox.java
@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 
-public class Inventory_SuperJukebox implements IInventory {
+public class InventorySuperJukebox implements IInventory {
 
     private final String name = "Sir Mixalot";
 
diff --git a/src/main/java/gtPlusPlus/core/inventories/Inventory_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/inventories/InventoryVolumetricFlaskSetter.java
index 25a03aa212..0b16011181 100644
--- a/src/main/java/gtPlusPlus/core/inventories/Inventory_VolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/inventories/InventoryVolumetricFlaskSetter.java
@@ -8,7 +8,7 @@ import net.minecraft.nbt.NBTTagList;
 
 import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 
-public class Inventory_VolumetricFlaskSetter implements IInventory {
+public class InventoryVolumetricFlaskSetter implements IInventory {
 
     private final String name = "Volumetric Flask Setter";
 
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index 2253b024a7..cdb61a5e46 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -5,7 +5,7 @@ import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.enums.Mods.GregTech;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
 
 import net.minecraft.item.EnumRarity;
@@ -17,14 +17,14 @@ import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-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;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
 import gtPlusPlus.core.block.base.BlockBaseModular;
-import gtPlusPlus.core.common.compat.COMPAT_Baubles;
+import gtPlusPlus.core.common.compat.CompatBaubles;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes;
 import gtPlusPlus.core.item.base.BaseItemDamageable;
@@ -34,7 +34,7 @@ import gtPlusPlus.core.item.base.dusts.BaseItemDust;
 import gtPlusPlus.core.item.base.foil.BaseItemFoil;
 import gtPlusPlus.core.item.base.gears.BaseItemSmallGear;
 import gtPlusPlus.core.item.base.ingots.BaseItemIngot;
-import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD;
+import gtPlusPlus.core.item.base.ingots.BaseItemIngotOld;
 import gtPlusPlus.core.item.base.plates.BaseItemPlate;
 import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble;
 import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble;
@@ -48,10 +48,10 @@ import gtPlusPlus.core.item.chemistry.RocketFuels;
 import gtPlusPlus.core.item.chemistry.StandardBaseParticles;
 import gtPlusPlus.core.item.crafting.ItemDummyResearch;
 import gtPlusPlus.core.item.food.BaseItemMetaFood;
-import gtPlusPlus.core.item.general.BufferCore;
 import gtPlusPlus.core.item.general.ItemAirFilter;
 import gtPlusPlus.core.item.general.ItemBasicScrubberTurbine;
 import gtPlusPlus.core.item.general.ItemBlueprint;
+import gtPlusPlus.core.item.general.ItemBufferCore;
 import gtPlusPlus.core.item.general.ItemEmpty;
 import gtPlusPlus.core.item.general.ItemGenericToken;
 import gtPlusPlus.core.item.general.ItemHalfCompleteCasings;
@@ -64,17 +64,17 @@ import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoilWire;
 import gtPlusPlus.core.item.general.spawn.ItemCustomSpawnEgg;
 import gtPlusPlus.core.item.init.ItemsFoods;
 import gtPlusPlus.core.item.materials.DustDecayable;
-import gtPlusPlus.core.item.tool.misc.GregtechPump;
+import gtPlusPlus.core.item.tool.misc.ItemGregtechPump;
 import gtPlusPlus.core.item.wearable.WearableLoader;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.MISC_MATERIALS;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
-import gtPlusPlus.core.material.NONMATERIAL;
-import gtPlusPlus.core.material.nuclear.FLUORIDES;
-import gtPlusPlus.core.material.nuclear.NUCLIDE;
+import gtPlusPlus.core.material.MaterialMisc;
+import gtPlusPlus.core.material.MaterialsAlloy;
+import gtPlusPlus.core.material.MaterialsElements;
+import gtPlusPlus.core.material.MaterialsOther;
+import gtPlusPlus.core.material.nuclear.MaterialsFluorides;
+import gtPlusPlus.core.material.nuclear.MaterialsNuclides;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.StringUtils;
@@ -82,7 +82,7 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.everglades.GTplusplus_Everglades;
+import gtPlusPlus.everglades.GTPPEverglades;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
@@ -181,7 +181,7 @@ public final class ModItems {
     public static Item dustRadium226;
     public static Item dustProtactinium233;
 
-    public static GregtechPump toolGregtechPump;
+    public static ItemGregtechPump toolGregtechPump;
 
     public static ItemGenericToken itemGenericToken;
 
@@ -219,11 +219,7 @@ public final class ModItems {
         Logger.INFO("Items!");
         // Default item used when recipes fail, handy for debugging. Let's make sure they exist when this class is
         // called upon.
-        AAA_Broken = new BaseItemIngot_OLD(
-            "AAA_Broken",
-            "Errors - Tell Alkalus",
-            Utils.rgbtoHexValue(128, 128, 128),
-            0);
+        AAA_Broken = new BaseItemIngotOld("AAA_Broken", "Errors - Tell Alkalus", Utils.rgbtoHexValue(128, 128, 128), 0);
         ZZZ_Empty = new ItemEmpty();
     }
 
@@ -277,33 +273,33 @@ public final class ModItems {
 
             // Elements generate first so they can be used in compounds.
             // Missing Elements
-            MaterialGenerator.generate(ELEMENT.getInstance().SELENIUM); // LFTR byproduct
-            MaterialGenerator.generate(ELEMENT.getInstance().BROMINE);
-            MaterialGenerator.generate(ELEMENT.getInstance().KRYPTON); // LFTR byproduct
-            MaterialGenerator.generate(ELEMENT.getInstance().STRONTIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().ZIRCONIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().RUTHENIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().IODINE); // LFTR byproduct
-            MaterialGenerator.generate(ELEMENT.getInstance().HAFNIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().DYSPROSIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().ERBIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().PRASEODYMIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().TELLURIUM); // LFTR byproduct
-            MaterialGenerator.generate(ELEMENT.getInstance().RHODIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().RHENIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().THALLIUM);
-            MaterialGenerator.generate(ELEMENT.getInstance().GERMANIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().SELENIUM); // LFTR byproduct
+            MaterialGenerator.generate(MaterialsElements.getInstance().BROMINE);
+            MaterialGenerator.generate(MaterialsElements.getInstance().KRYPTON); // LFTR byproduct
+            MaterialGenerator.generate(MaterialsElements.getInstance().STRONTIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().ZIRCONIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().RUTHENIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().IODINE); // LFTR byproduct
+            MaterialGenerator.generate(MaterialsElements.getInstance().HAFNIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().DYSPROSIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().ERBIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().PRASEODYMIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().TELLURIUM); // LFTR byproduct
+            MaterialGenerator.generate(MaterialsElements.getInstance().RHODIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().RHENIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().THALLIUM);
+            MaterialGenerator.generate(MaterialsElements.getInstance().GERMANIUM);
 
             // RADIOACTIVE ELEMENTS
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().POLONIUM, false);
             // MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().RADON, false);
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().RADIUM, false);
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PROMETHIUM, false);
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PROTACTINIUM, false);
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().CURIUM, false);
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().CALIFORNIUM, false);
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().NEPTUNIUM, false);
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().FERMIUM, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().RADIUM, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().PROMETHIUM, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().PROTACTINIUM, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().CURIUM, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().CALIFORNIUM, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().NEPTUNIUM, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().FERMIUM, false);
 
             // Nuclear Isotopes
 
@@ -314,168 +310,168 @@ public final class ModItems {
             // neutron cross-section of lithium-7 (about 45 millibarns) makes high separation of lithium-7 from natural
             // lithium a
             // strong requirement for the possible use in lithium fluoride reactors.
-            MaterialGenerator.generate(ELEMENT.getInstance().LITHIUM7, false);
+            MaterialGenerator.generate(MaterialsElements.getInstance().LITHIUM7, false);
             // Thorium-232 is the most stable isotope of Thorium, purified for nuclear fuel use in this case.
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().THORIUM232);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().THORIUM232);
             // Production of 233U (through the neutron irradiation of 232Th) invariably produces small amounts of 232U
             // as an impurity
             // because of parasitic (n,2n) reactions on uranium-233 itself, or on protactinium-233, or on thorium-232:
-            MaterialGenerator.generate(ELEMENT.getInstance().URANIUM232);
+            MaterialGenerator.generate(MaterialsElements.getInstance().URANIUM232);
             // Uranium-233 is a fissile isotope of uranium that is bred from thorium-232 as part of the thorium fuel
             // cycle.
-            MaterialGenerator.generate(ELEMENT.getInstance().URANIUM233);
+            MaterialGenerator.generate(MaterialsElements.getInstance().URANIUM233);
             // Plutonium-238 is a very powerful alpha emitter. This makes the plutonium-238 isotope suitable for usage
             // in radioisotope thermoelectric generators (RTGs)
             // and radioisotope heater units - one gram of plutonium-238 generates approximately 0.5 W of thermal power.
-            MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PLUTONIUM238, false);
+            MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().PLUTONIUM238, false);
 
             // Custom Materials that will have standalone refinery processes
-            MaterialGenerator.generate(ELEMENT.STANDALONE.ADVANCED_NITINOL, false);
-            MaterialGenerator.generate(ELEMENT.STANDALONE.ASTRAL_TITANIUM);
-            MaterialGenerator.generate(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN);
-            MaterialGenerator.generate(ELEMENT.STANDALONE.HYPOGEN);
-            MaterialGenerator.generate(ELEMENT.STANDALONE.CHRONOMATIC_GLASS);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.ADVANCED_NITINOL, false);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.ASTRAL_TITANIUM);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.HYPOGEN);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS);
 
             // Custom Materials that are from Runescape
-            MaterialGenerator.generate(ELEMENT.STANDALONE.BLACK_METAL);
-            MaterialGenerator.generate(ELEMENT.STANDALONE.WHITE_METAL);
-            MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.STANDALONE.GRANITE);
-            MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.STANDALONE.RUNITE);
-            MaterialGenerator.generate(ELEMENT.STANDALONE.DRAGON_METAL);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.BLACK_METAL);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.WHITE_METAL);
+            MaterialGenerator.generateOreMaterialWithAllExcessComponents(MaterialsElements.STANDALONE.GRANITE);
+            MaterialGenerator.generateOreMaterialWithAllExcessComponents(MaterialsElements.STANDALONE.RUNITE);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.DRAGON_METAL);
 
-            MISC_MATERIALS.run();
+            MaterialMisc.run();
 
-            MaterialGenerator.generate(ALLOY.SILICON_CARBIDE);
-            MaterialGenerator.generate(ALLOY.ZIRCONIUM_CARBIDE);
-            MaterialGenerator.generate(ALLOY.TANTALUM_CARBIDE);
-            MaterialGenerator.generate(ALLOY.NIOBIUM_CARBIDE);
-            MaterialGenerator.generate(ALLOY.TUNGSTEN_TITANIUM_CARBIDE);
+            MaterialGenerator.generate(MaterialsAlloy.SILICON_CARBIDE);
+            MaterialGenerator.generate(MaterialsAlloy.ZIRCONIUM_CARBIDE);
+            MaterialGenerator.generate(MaterialsAlloy.TANTALUM_CARBIDE);
+            MaterialGenerator.generate(MaterialsAlloy.NIOBIUM_CARBIDE);
+            MaterialGenerator.generate(MaterialsAlloy.TUNGSTEN_TITANIUM_CARBIDE);
 
             // LFTR Fuel components
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.AMMONIUM_BIFLUORIDE); // LFTR fuel component
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.BERYLLIUM_HYDROXIDE); // LFTR fuel component
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.AMMONIUM_BIFLUORIDE); // LFTR fuel component
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.BERYLLIUM_HYDROXIDE); // LFTR fuel component
             // MaterialGenerator.generateNuclearDusts(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE); // LFTR fuel component
 
             // Generate Fluorides
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.BERYLLIUM_FLUORIDE);
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.LITHIUM_FLUORIDE);
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.THORIUM_TETRAFLUORIDE);
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.THORIUM_HEXAFLUORIDE);
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.URANIUM_TETRAFLUORIDE, false);
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.URANIUM_HEXAFLUORIDE, false);
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.BERYLLIUM_FLUORIDE);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.LITHIUM_FLUORIDE);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.THORIUM_TETRAFLUORIDE);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.THORIUM_HEXAFLUORIDE);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.URANIUM_TETRAFLUORIDE, false);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.URANIUM_HEXAFLUORIDE, false);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE);
             // LFTR Fluoride outputs
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE);
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.TECHNETIUM_HEXAFLUORIDE);
-            MaterialGenerator.generateNuclearDusts(FLUORIDES.SELENIUM_HEXAFLUORIDE);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.NEPTUNIUM_HEXAFLUORIDE);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.TECHNETIUM_HEXAFLUORIDE);
+            MaterialGenerator.generateNuclearDusts(MaterialsFluorides.SELENIUM_HEXAFLUORIDE);
 
             // Generate Reactor Fuel Salts
-            MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ZrF4U235);
-            MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ZrF4UF4);
-            MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ThF4UF4);
+            MaterialGenerator.generateNuclearDusts(MaterialsNuclides.LiFBeF2ZrF4U235);
+            MaterialGenerator.generateNuclearDusts(MaterialsNuclides.LiFBeF2ZrF4UF4);
+            MaterialGenerator.generateNuclearDusts(MaterialsNuclides.LiFBeF2ThF4UF4);
             // MaterialGenerator.generateNuclearMaterial(NUCLIDE.Li2BeF4, false);
 
             // Generate some Alloys
 
             // Misc Alloys
-            MaterialGenerator.generate(ALLOY.ENERGYCRYSTAL);
-            MaterialGenerator.generate(ALLOY.BLOODSTEEL);
+            MaterialGenerator.generate(MaterialsAlloy.ENERGYCRYSTAL);
+            MaterialGenerator.generate(MaterialsAlloy.BLOODSTEEL);
 
-            MaterialGenerator.generate(ALLOY.ZERON_100);
+            MaterialGenerator.generate(MaterialsAlloy.ZERON_100);
             // Tumbaga was the name given by Spaniards to a non-specific alloy of gold and copper
-            MaterialGenerator.generate(ALLOY.TUMBAGA);
+            MaterialGenerator.generate(MaterialsAlloy.TUMBAGA);
             // Potin is traditionally an alloy of bronze, tin and lead, with varying quantities of each possible
-            MaterialGenerator.generate(ALLOY.POTIN);
+            MaterialGenerator.generate(MaterialsAlloy.POTIN);
 
             // Staballoy & Tantalloy
-            MaterialGenerator.generate(ALLOY.STABALLOY);
-            MaterialGenerator.generate(ALLOY.TANTALLOY_60);
-            MaterialGenerator.generate(ALLOY.TANTALLOY_61);
+            MaterialGenerator.generate(MaterialsAlloy.STABALLOY);
+            MaterialGenerator.generate(MaterialsAlloy.TANTALLOY_60);
+            MaterialGenerator.generate(MaterialsAlloy.TANTALLOY_61);
 
             // Inconel
-            MaterialGenerator.generate(ALLOY.INCONEL_625);
-            MaterialGenerator.generate(ALLOY.INCONEL_690);
-            MaterialGenerator.generate(ALLOY.INCONEL_792);
+            MaterialGenerator.generate(MaterialsAlloy.INCONEL_625);
+            MaterialGenerator.generate(MaterialsAlloy.INCONEL_690);
+            MaterialGenerator.generate(MaterialsAlloy.INCONEL_792);
 
             // Steels
-            MaterialGenerator.generateDusts(ALLOY.EGLIN_STEEL_BASE);
-            MaterialGenerator.generate(ALLOY.EGLIN_STEEL);
-            MaterialGenerator.generate(ALLOY.MARAGING250);
-            MaterialGenerator.generate(ALLOY.MARAGING300);
-            MaterialGenerator.generate(ALLOY.MARAGING350);
-            MaterialGenerator.generate(ALLOY.AQUATIC_STEEL);
+            MaterialGenerator.generateDusts(MaterialsAlloy.EGLIN_STEEL_BASE);
+            MaterialGenerator.generate(MaterialsAlloy.EGLIN_STEEL);
+            MaterialGenerator.generate(MaterialsAlloy.MARAGING250);
+            MaterialGenerator.generate(MaterialsAlloy.MARAGING300);
+            MaterialGenerator.generate(MaterialsAlloy.MARAGING350);
+            MaterialGenerator.generate(MaterialsAlloy.AQUATIC_STEEL);
 
-            MaterialGenerator.generate(ALLOY.NITINOL_60, true);
+            MaterialGenerator.generate(MaterialsAlloy.NITINOL_60, true);
 
             // Composite Alloys
-            MaterialGenerator.generate(ALLOY.STELLITE);
-            MaterialGenerator.generate(ALLOY.TALONITE);
+            MaterialGenerator.generate(MaterialsAlloy.STELLITE);
+            MaterialGenerator.generate(MaterialsAlloy.TALONITE);
 
             // Hastelloy
-            MaterialGenerator.generate(ALLOY.HASTELLOY_W);
-            MaterialGenerator.generate(ALLOY.HASTELLOY_X);
-            MaterialGenerator.generate(ALLOY.HASTELLOY_C276);
-            MaterialGenerator.generate(ALLOY.HASTELLOY_N);
+            MaterialGenerator.generate(MaterialsAlloy.HASTELLOY_W);
+            MaterialGenerator.generate(MaterialsAlloy.HASTELLOY_X);
+            MaterialGenerator.generate(MaterialsAlloy.HASTELLOY_C276);
+            MaterialGenerator.generate(MaterialsAlloy.HASTELLOY_N);
 
             // Incoloy
-            MaterialGenerator.generate(ALLOY.INCOLOY_020);
-            MaterialGenerator.generate(ALLOY.INCOLOY_DS);
-            MaterialGenerator.generate(ALLOY.INCOLOY_MA956);
+            MaterialGenerator.generate(MaterialsAlloy.INCOLOY_020);
+            MaterialGenerator.generate(MaterialsAlloy.INCOLOY_DS);
+            MaterialGenerator.generate(MaterialsAlloy.INCOLOY_MA956);
 
             // Leagrisium
-            MaterialGenerator.generate(ALLOY.LEAGRISIUM);
+            MaterialGenerator.generate(MaterialsAlloy.LEAGRISIUM);
 
             // Super Conductor
-            MaterialGenerator.generate(ALLOY.HG1223, false, false);
+            MaterialGenerator.generate(MaterialsAlloy.HG1223, false, false);
 
             // Generate Fictional Materials
-            MaterialGenerator.generate(ALLOY.TRINIUM_TITANIUM);
-            MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH, false);
-            MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH_CARBON);
-            MaterialGenerator.generate(ALLOY.TRINIUM_REINFORCED_STEEL);
+            MaterialGenerator.generate(MaterialsAlloy.TRINIUM_TITANIUM);
+            MaterialGenerator.generate(MaterialsAlloy.TRINIUM_NAQUADAH, false);
+            MaterialGenerator.generate(MaterialsAlloy.TRINIUM_NAQUADAH_CARBON);
+            MaterialGenerator.generate(MaterialsAlloy.TRINIUM_REINFORCED_STEEL);
 
             // Top Tier Alloys
-            MaterialGenerator.generate(ALLOY.HELICOPTER);
-            MaterialGenerator.generate(ALLOY.LAFIUM);
-            MaterialGenerator.generate(ALLOY.CINOBITE);
-            MaterialGenerator.generate(ALLOY.PIKYONIUM);
-            MaterialGenerator.generate(ALLOY.ABYSSAL);
-            MaterialGenerator.generate(ALLOY.LAURENIUM);
+            MaterialGenerator.generate(MaterialsAlloy.HELICOPTER);
+            MaterialGenerator.generate(MaterialsAlloy.LAFIUM);
+            MaterialGenerator.generate(MaterialsAlloy.CINOBITE);
+            MaterialGenerator.generate(MaterialsAlloy.PIKYONIUM);
+            MaterialGenerator.generate(MaterialsAlloy.ABYSSAL);
+            MaterialGenerator.generate(MaterialsAlloy.LAURENIUM);
 
             // abs recipe in RECIPES_GREGTECH.java
-            MaterialGenerator.generate(ALLOY.BOTMIUM, true, false);
+            MaterialGenerator.generate(MaterialsAlloy.BOTMIUM, true, false);
 
-            MaterialGenerator.generate(ALLOY.HS188A);
+            MaterialGenerator.generate(MaterialsAlloy.HS188A);
 
-            MaterialGenerator.generate(ALLOY.TITANSTEEL);
-            MaterialGenerator.generate(ALLOY.ARCANITE);
-            MaterialGenerator.generate(ALLOY.OCTIRON);
+            MaterialGenerator.generate(MaterialsAlloy.TITANSTEEL);
+            MaterialGenerator.generate(MaterialsAlloy.ARCANITE);
+            MaterialGenerator.generate(MaterialsAlloy.OCTIRON);
 
-            MaterialGenerator.generate(ALLOY.BABBIT_ALLOY, false);
-            MaterialGenerator.generate(ALLOY.BLACK_TITANIUM, false);
-            MaterialGenerator.generate(ALLOY.INDALLOY_140, false, false);
+            MaterialGenerator.generate(MaterialsAlloy.BABBIT_ALLOY, false);
+            MaterialGenerator.generate(MaterialsAlloy.BLACK_TITANIUM, false);
+            MaterialGenerator.generate(MaterialsAlloy.INDALLOY_140, false, false);
 
             // High Level Bioplastic
-            MaterialGenerator.generate(ELEMENT.STANDALONE.RHUGNOR, false, false);
+            MaterialGenerator.generate(MaterialsElements.STANDALONE.RHUGNOR, false, false);
 
             // Must be the final Alloy to Generate
-            MaterialGenerator.generate(ALLOY.QUANTUM);
+            MaterialGenerator.generate(MaterialsAlloy.QUANTUM);
 
             // Ores
-            MaterialGenerator.generateOreMaterial(FLUORIDES.FLUORITE);
-            MaterialGenerator.generateOreMaterial(ALLOY.KOBOLDITE);
-            GTplusplus_Everglades.GenerateOreMaterials();
+            MaterialGenerator.generateOreMaterial(MaterialsFluorides.FLUORITE);
+            MaterialGenerator.generateOreMaterial(MaterialsAlloy.KOBOLDITE);
+            GTPPEverglades.GenerateOreMaterials();
 
             // formula override
-            ALLOY.TUNGSTEN_TITANIUM_CARBIDE.vChemicalFormula = StringUtils.subscript("(CW)7Ti3");
-            ALLOY.TITANSTEEL.vChemicalFormula = StringUtils.subscript("((CW)7Ti3)3???");
+            MaterialsAlloy.TUNGSTEN_TITANIUM_CARBIDE.vChemicalFormula = StringUtils.subscript("(CW)7Ti3");
+            MaterialsAlloy.TITANSTEEL.vChemicalFormula = StringUtils.subscript("((CW)7Ti3)3???");
 
             // Werkstoff bridge
-            ELEMENT.getInstance().ZIRCONIUM.setWerkstoffID((short) 3);
-            ELEMENT.getInstance().THORIUM232.setWerkstoffID((short) 30);
-            ELEMENT.getInstance().RUTHENIUM.setWerkstoffID((short) 64);
-            ELEMENT.getInstance().HAFNIUM.setWerkstoffID((short) 11000);
-            ELEMENT.getInstance().IODINE.setWerkstoffID((short) 11012);
+            MaterialsElements.getInstance().ZIRCONIUM.setWerkstoffID((short) 3);
+            MaterialsElements.getInstance().THORIUM232.setWerkstoffID((short) 30);
+            MaterialsElements.getInstance().RUTHENIUM.setWerkstoffID((short) 64);
+            MaterialsElements.getInstance().HAFNIUM.setWerkstoffID((short) 11000);
+            MaterialsElements.getInstance().IODINE.setWerkstoffID((short) 11012);
 
         } catch (final Throwable r) {
             Logger.INFO("Failed to Generated a Material. " + r.getMessage());
@@ -503,13 +499,13 @@ public final class ModItems {
                 .getItem();
         }
         // Generates a set of four special dusts to be used in my recipes.
-        dustAer = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AER, true)[0];
-        dustIgnis = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().IGNIS, true)[0];
-        dustTerra = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().TERRA, true)[0];
-        dustAqua = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AQUA, true)[0];
+        dustAer = ItemUtils.generateSpecialUseDusts(MaterialsElements.getInstance().AER, true)[0];
+        dustIgnis = ItemUtils.generateSpecialUseDusts(MaterialsElements.getInstance().IGNIS, true)[0];
+        dustTerra = ItemUtils.generateSpecialUseDusts(MaterialsElements.getInstance().TERRA, true)[0];
+        dustAqua = ItemUtils.generateSpecialUseDusts(MaterialsElements.getInstance().AQUA, true)[0];
 
-        ItemUtils.generateSpecialUseDusts(MISC_MATERIALS.WOODS_GLASS, false);
-        cellHydrogenChlorideMix = MISC_MATERIALS.HYDROGEN_CHLORIDE_MIX.getCell(1)
+        ItemUtils.generateSpecialUseDusts(MaterialMisc.WOODS_GLASS, false);
+        cellHydrogenChlorideMix = MaterialMisc.HYDROGEN_CHLORIDE_MIX.getCell(1)
             .getItem();
 
         // Nuclear Fuel Dusts
@@ -550,9 +546,9 @@ public final class ModItems {
                 "Calcium Sulfate (Gypsum)",
                 "CaSO4",
                 Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_sulfate
-            GT_OreDictUnificator.registerOre("dustCalciumSulfate", ItemUtils.getSimpleStack(dustCalciumSulfate));
+            GTOreDictUnificator.registerOre("dustCalciumSulfate", ItemUtils.getSimpleStack(dustCalciumSulfate));
         } else {
-            GT_OreDictUnificator
+            GTOreDictUnificator
                 .registerOre("dustCalciumSulfate", ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGypsum", 1));
         }
         dustLi2CO3CaOH2 = ItemUtils.generateSpecialUseDusts(
@@ -560,14 +556,17 @@ public final class ModItems {
             "Li2CO3 + CaO2H2 Compound",
             "Li2CO3CaO2H2",
             Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_carbonate
-        MaterialUtils.generateSpecialDustAndAssignToAMaterial(FLUORIDES.SODIUM_FLUORIDE, false);
+        MaterialUtils.generateSpecialDustAndAssignToAMaterial(MaterialsFluorides.SODIUM_FLUORIDE, false);
         // FLiBe Fuel Compounds
         dustLi2BeF4 = ItemUtils.generateSpecialUseDusts(
             "Li2BeF4",
             "Lithium Tetrafluoroberyllate Fuel Compound",
             "Li2BeF4",
             Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/FLiBe
-        Material.registerComponentForMaterial(NUCLIDE.Li2BeF4, OrePrefixes.dust, ItemUtils.getSimpleStack(dustLi2BeF4));
+        Material.registerComponentForMaterial(
+            MaterialsNuclides.Li2BeF4,
+            OrePrefixes.dust,
+            ItemUtils.getSimpleStack(dustLi2BeF4));
         // fluidFLiBeSalt = ("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100}, 0);
         // fluidFLiBeSalt = FluidUtils.addGTFluidNoPrefix("Li2BeF4", "Lithium Tetrafluoroberyllate", new short[]{255,
         // 255, 255, 100}, 0, 743, null, CI.emptyCells(1), 1000, true);
@@ -608,7 +607,7 @@ public final class ModItems {
             false,
             null);
 
-        if (CORE.ConfigSwitches.enableMachine_Pollution) {
+        if (GTPPCore.ConfigSwitches.enableMachine_Pollution) {
             itemBasicTurbine = new ItemBasicScrubberTurbine();
         }
 
@@ -618,7 +617,7 @@ public final class ModItems {
             "itemZirconiumPellet",
             "Zirconium Pellet [" + StringUtils.subscript("ZrCl4") + "]",
             tabMisc).setTextureName(GTPlusPlus.ID + ":itemShard");
-        GT_OreDictUnificator.registerOre("pelletZirconium", new ItemStack(itemZirconiumChlorideCinterPellet));
+        GTOreDictUnificator.registerOre("pelletZirconium", new ItemStack(itemZirconiumChlorideCinterPellet));
         // Zirconium Chloride
         dustZrCl4 = ItemUtils.generateSpecialUseDusts("ZrCl4", "ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; // http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf
         dustCookedZrCl4 = ItemUtils
@@ -626,9 +625,9 @@ public final class ModItems {
 
         // Zirconium Tetrafluoride
         /*
-         * GT_OreDictUnificator.registerOre("cellZrF4",
+         * GTOreDictUnificator.registerOre("cellZrF4",
          * ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1));
-         * GT_OreDictUnificator.registerOre("dustZrF4",
+         * GTOreDictUnificator.registerOre("dustZrF4",
          * ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1));
          */
         fluidZrF4 = FluidUtils.generateFluidNoPrefix(
@@ -636,7 +635,7 @@ public final class ModItems {
             "Zirconium Tetrafluoride",
             500,
             new short[] { 170, 170, 140, 100 }); // https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
-        FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.setFluid(fluidZrF4);
+        MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE.setFluid(fluidZrF4);
 
         // Coolant Salt
         // NaBF4 - NaF - 621C
@@ -644,7 +643,7 @@ public final class ModItems {
         // //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
 
         // Load Tree Farmer
-        if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { // https://en.wikipedia.org/wiki/UAN
+        if (GTPPCore.ConfigSwitches.enableMultiblock_TreeFarmer) { // https://en.wikipedia.org/wiki/UAN
             dustFertUN18 = ItemUtils
                 .generateSpecialUseDusts("UN18Fertiliser", "UN-18 Fertiliser", Utils.rgbtoHexValue(60, 155, 60))[0];
             dustFertUN32 = ItemUtils
@@ -665,7 +664,7 @@ public final class ModItems {
                     temp1,
                     null,
                     true);
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(temp2)
                     .fluidOutputs(new FluidStack(fluidFertBasic, 36))
                     .duration(5 * TICKS)
@@ -708,7 +707,7 @@ public final class ModItems {
             true);
 
         // Test items
-        toolGregtechPump = new GregtechPump();
+        toolGregtechPump = new ItemGregtechPump();
         toolGregtechPump.registerPumpType(0, "Simple Hand Pump", 0, 0);
         toolGregtechPump.registerPumpType(1, "Advanced Hand Pump", 32000, 1);
         toolGregtechPump.registerPumpType(2, "Super Hand Pump", 128000, 2);
@@ -725,17 +724,17 @@ public final class ModItems {
             50640,
             new String[] { StringUtils.superscript("238Np"),
                 "Result: Plutonium 238 (" + StringUtils.superscript("238Pu") + ")" },
-            ELEMENT.getInstance().PLUTONIUM238.getDust(1)
+            MaterialsElements.getInstance().PLUTONIUM238.getDust(1)
                 .getItem(),
             5);
         dustDecayedRadium226 = ItemUtils.generateSpecialUseDusts(
             "DecayedRadium226",
             "Decayed Radium-226",
             "Contains Radon (" + StringUtils.superscript("222Rn") + ")",
-            ELEMENT.getInstance().RADIUM.getRgbAsHex())[0];
+            MaterialsElements.getInstance().RADIUM.getRgbAsHex())[0];
         dustRadium226 = new DustDecayable(
             "dustRadium226",
-            ELEMENT.getInstance().RADIUM.getRgbAsHex(),
+            MaterialsElements.getInstance().RADIUM.getRgbAsHex(),
             90000,
             new String[] { StringUtils.superscript("226Ra"),
                 "Result: Radon (" + StringUtils.superscript("222Rn") + ")" },
@@ -744,16 +743,16 @@ public final class ModItems {
             5);
         dustProtactinium233 = new DustDecayable(
             "dustProtactinium233",
-            ELEMENT.getInstance().PROTACTINIUM.getRgbAsHex(),
+            MaterialsElements.getInstance().PROTACTINIUM.getRgbAsHex(),
             32000,
             new String[] { StringUtils.superscript("233Pa"),
                 "Result: Uranium 233(" + StringUtils.superscript("233U") + ")" },
-            ELEMENT.getInstance().URANIUM233.getDust(1)
+            MaterialsElements.getInstance().URANIUM233.getDust(1)
                 .getItem(),
             6);
         dustMolybdenum99 = new DustDecayable(
             "dustMolybdenum99",
-            ELEMENT.getInstance().MOLYBDENUM.getRgbAsHex(),
+            MaterialsElements.getInstance().MOLYBDENUM.getRgbAsHex(),
             16450,
             new String[] { StringUtils.superscript("99Mo"),
                 "Result: Technicium 99ᵐ (" + StringUtils.superscript("99ᵐTc") + ")" },
@@ -799,7 +798,7 @@ public final class ModItems {
         try {
             final Class<?> baublesTest = ReflectionUtils.getClass("baubles.api.IBauble");
             if (baublesTest != null) {
-                COMPAT_Baubles.run();
+                CompatBaubles.run();
             } else {
                 Logger.INFO("Baubles Not Found - Skipping Resources.");
             }
@@ -810,7 +809,7 @@ public final class ModItems {
         // Buffer Cores!
         Item itemBufferCore;
         for (int i = 1; i <= 10; i++) {
-            itemBufferCore = new BufferCore("itemBufferCore", i).setCreativeTab(AddToCreativeTab.tabMachines);
+            itemBufferCore = new ItemBufferCore("itemBufferCore", i).setCreativeTab(AddToCreativeTab.tabMachines);
             GameRegistry.registerItem(itemBufferCore, itemBufferCore.getUnlocalizedName());
         }
 
@@ -866,92 +865,106 @@ public final class ModItems {
 
         // Just an unusual plate needed for some black magic.
         if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateClay", 1) == null) {
-            itemPlateClay = new BaseItemPlate(NONMATERIAL.CLAY);
+            itemPlateClay = new BaseItemPlate(MaterialsOther.CLAY);
         }
         if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleClay", 1) == null) {
-            itemDoublePlateClay = new BaseItemPlateDouble(NONMATERIAL.CLAY);
+            itemDoublePlateClay = new BaseItemPlateDouble(MaterialsOther.CLAY);
         }
 
         // Need this for Mutagenic Frames
         if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilUranium235", 1) == null) {
-            itemFoilUranium235 = new BaseItemFoil(ELEMENT.getInstance().URANIUM235);
+            itemFoilUranium235 = new BaseItemFoil(MaterialsElements.getInstance().URANIUM235);
         }
 
         // A small gear needed for wizardry.
         if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("gearGtSmallWroughtIron", 1) == null) {
-            itemSmallWroughtIronGear = new BaseItemSmallGear(NONMATERIAL.WROUGHT_IRON);
+            itemSmallWroughtIronGear = new BaseItemSmallGear(MaterialsOther.WROUGHT_IRON);
         }
         // Krypton Processing
         if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotHotTitanium", 1) == null) {
             itemHotTitaniumIngot = ItemUtils
-                .getSimpleStack(new BaseItemIngot(ELEMENT.getInstance().TITANIUM, ComponentTypes.HOTINGOT));
+                .getSimpleStack(new BaseItemIngot(MaterialsElements.getInstance().TITANIUM, ComponentTypes.HOTINGOT));
         } else {
             itemHotTitaniumIngot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotHotTitanium", 1);
         }
 
         // Need this for Laurenium
         if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIndium", 1) == null) {
-            itemDustIndium = new BaseItemDust(ELEMENT.getInstance().INDIUM);
+            itemDustIndium = new BaseItemDust(MaterialsElements.getInstance().INDIUM);
         }
 
         // Springs
+        MaterialUtils.generateComponentAndAssignToAMaterial(
+            ComponentTypes.SPRING,
+            MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN);
         MaterialUtils
-            .generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ELEMENT.STANDALONE.WHITE_METAL);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ALLOY.NITINOL_60);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ALLOY.AQUATIC_STEEL);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ALLOY.EGLIN_STEEL);
+            .generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, MaterialsElements.STANDALONE.WHITE_METAL);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, MaterialsAlloy.NITINOL_60);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, MaterialsAlloy.AQUATIC_STEEL);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, MaterialsAlloy.EGLIN_STEEL);
 
         // Small Springs
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, ALLOY.MARAGING250);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, ALLOY.NICHROME);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, ALLOY.STABALLOY);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, ALLOY.STEEL_BLACK);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, ALLOY.BLACK_TITANIUM);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.MARAGING250);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.NICHROME);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.STABALLOY);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.STEEL_BLACK);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.BLACK_TITANIUM);
 
         // Fine Wire
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.STANDALONE.WHITE_METAL);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.getInstance().PALLADIUM);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.getInstance().ZIRCONIUM);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ALLOY.LEAGRISIUM);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ALLOY.BABBIT_ALLOY);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ALLOY.KOBOLDITE);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ALLOY.HG1223);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ALLOY.QUANTUM);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.STANDALONE.HYPOGEN);
         MaterialUtils
-            .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.STANDALONE.CHRONOMATIC_GLASS);
+            .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.STANDALONE.WHITE_METAL);
+        MaterialUtils
+            .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.getInstance().PALLADIUM);
+        MaterialUtils
+            .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.getInstance().ZIRCONIUM);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.LEAGRISIUM);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.BABBIT_ALLOY);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.KOBOLDITE);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.HG1223);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.QUANTUM);
+        MaterialUtils
+            .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.STANDALONE.HYPOGEN);
+        MaterialUtils.generateComponentAndAssignToAMaterial(
+            ComponentTypes.FINEWIRE,
+            MaterialsElements.STANDALONE.CHRONOMATIC_GLASS);
 
         // Foil
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.BLACK_TITANIUM);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.BOTMIUM);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.TITANSTEEL);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.NITINOL_60);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.QUANTUM);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.LAURENIUM);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.HYPOGEN);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.ASTRAL_TITANIUM);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.RHUGNOR);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.WHITE_METAL);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.ADVANCED_NITINOL);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.PIKYONIUM);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.CINOBITE);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.LAFIUM);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.TRINIUM_REINFORCED_STEEL);
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.CHRONOMATIC_GLASS);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.BLACK_TITANIUM);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.BOTMIUM);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.TITANSTEEL);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.NITINOL_60);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.QUANTUM);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.LAURENIUM);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.HYPOGEN);
+        MaterialUtils.generateComponentAndAssignToAMaterial(
+            ComponentTypes.FOIL,
+            MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN);
+        MaterialUtils
+            .generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.ASTRAL_TITANIUM);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.RHUGNOR);
+        MaterialUtils
+            .generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.WHITE_METAL);
+        MaterialUtils
+            .generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.ADVANCED_NITINOL);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.PIKYONIUM);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.CINOBITE);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.LAFIUM);
+        MaterialUtils
+            .generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.TRINIUM_REINFORCED_STEEL);
+        MaterialUtils
+            .generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.CHRONOMATIC_GLASS);
 
         // Gear
-        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.GEAR, ELEMENT.STANDALONE.RHUGNOR);
+        MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.GEAR, MaterialsElements.STANDALONE.RHUGNOR);
 
         // Special Sillyness
         if (true) {
 
             if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateSodium", 1) == null) {
-                new BaseItemPlate(ELEMENT.getInstance().SODIUM);
+                new BaseItemPlate(MaterialsElements.getInstance().SODIUM);
             }
 
-            Material meatRaw = NONMATERIAL.MEAT;
+            Material meatRaw = MaterialsOther.MEAT;
             // A plate of Meat.
             if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateMeatRaw", 1) == null) {
                 itemPlateRawMeat = new BaseItemPlate(meatRaw);
@@ -966,22 +979,22 @@ public final class ModItems {
 
         // A plate of Vanadium.
         if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateVanadium", 1) == null) {
-            itemPlateVanadium = new BaseItemPlate(ELEMENT.getInstance().VANADIUM);
+            itemPlateVanadium = new BaseItemPlate(MaterialsElements.getInstance().VANADIUM);
         }
 
         // A plate of Lithium.
         if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateLithium", 1) == null) {
-            itemPlateLithium = new BaseItemPlate(ELEMENT.getInstance().LITHIUM);
+            itemPlateLithium = new BaseItemPlate(MaterialsElements.getInstance().LITHIUM);
         }
 
         // A plate of Europium.
         if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateEuropium", 1) == null)
-            && CORE.ConfigSwitches.enableCustom_Pipes) {
-            itemPlateEuropium = new BaseItemPlate(ELEMENT.getInstance().EUROPIUM);
+            && GTPPCore.ConfigSwitches.enableCustom_Pipes) {
+            itemPlateEuropium = new BaseItemPlate(MaterialsElements.getInstance().EUROPIUM);
         }
         if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleEuropium", 1) == null)
-            && CORE.ConfigSwitches.enableCustom_Pipes) {
-            itemDoublePlateEuropium = new BaseItemPlateDouble(ELEMENT.getInstance().EUROPIUM);
+            && GTPPCore.ConfigSwitches.enableCustom_Pipes) {
+            itemDoublePlateEuropium = new BaseItemPlateDouble(MaterialsElements.getInstance().EUROPIUM);
         }
 
         // Tumbaga Mix (For Simple Crafting)
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java
index 8bbc5a3b08..3ce461ffab 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java
@@ -4,7 +4,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 
 import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class BaseItemBurnable extends CoreItem {
@@ -23,7 +23,7 @@ public class BaseItemBurnable extends CoreItem {
     }
 
     public void registerFuel(int burn) {
-        CORE.burnables.add(new Pair<>(burn, ItemUtils.getSimpleStack(this, 1)));
+        GTPPCore.burnables.add(new Pair<>(burn, ItemUtils.getSimpleStack(this, 1)));
     }
 
     public final void registerOrdictionary(String name) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java
index d391207a56..6a224ddc87 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java
@@ -14,7 +14,7 @@ import net.minecraft.util.EnumChatFormatting;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 public class BaseItemColourable extends Item {
 
@@ -42,7 +42,7 @@ public class BaseItemColourable extends Item {
         this.setMaxDamage(maxDmg);
         this.setHasSubtypes(true);
         this.rarity = regRarity;
-        GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip", description);
+        GTLanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip", description);
         this.descColour = colour;
         this.hasEffect = Effect;
         this.componentColour = rgb;
@@ -57,13 +57,13 @@ public class BaseItemColourable extends Item {
         final int stackSize, final int maxDmg, final String description, final EnumRarity regRarity,
         final EnumChatFormatting colour, final boolean Effect, int rgb) {
         this.setUnlocalizedName(unlocalizedName);
-        GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", displayName);
+        GTLanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", displayName);
         this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName);
         this.setCreativeTab(creativeTab);
         this.setMaxStackSize(stackSize);
         this.setMaxDamage(maxDmg);
         this.rarity = regRarity;
-        GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip", description);
+        GTLanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip", description);
         this.descColour = colour;
         this.hasEffect = Effect;
         this.componentColour = rgb;
@@ -74,8 +74,7 @@ public class BaseItemColourable extends Item {
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
         list.add(
-            this.descColour
-                + GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip"));
+            this.descColour + GTLanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip"));
         // super.addInformation(stack, aPlayer, list, bool);
     }
 
@@ -93,8 +92,8 @@ public class BaseItemColourable extends Item {
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
         if (!("gtplusplus." + this.getUnlocalizedName() + ".name")
-            .equals(GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name"))) {
-            return GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name");
+            .equals(GTLanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name"))) {
+            return GTLanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name");
         } else return super.getItemStackDisplayName(tItem);
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 6846f8febb..5a7bc4fa45 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -20,15 +20,15 @@ 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.OrePrefixes;
 import gregtech.api.enums.TextureSet;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.StringUtils;
@@ -71,15 +71,15 @@ public class BaseItemComponent extends Item {
 
         // if (componentType != ComponentTypes.DUST)
 
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             componentType.getOreDictName() + material.getUnlocalizedName(),
             ItemUtils.getSimpleStack(this));
         if (componentType == ComponentTypes.GEAR) {
-            GT_OreDictUnificator.registerOre("gear" + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this));
+            GTOreDictUnificator.registerOre("gear" + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this));
         }
         registerComponent();
 
-        GT_LanguageManager.addStringLocalization("gtplusplus.item." + unlocalName + ".name", getFormattedLangName());
+        GTLanguageManager.addStringLocalization("gtplusplus.item." + unlocalName + ".name", getFormattedLangName());
     }
 
     // For Cell Generation
@@ -109,12 +109,12 @@ public class BaseItemComponent extends Item {
 
         this.setTextureName(GTPlusPlus.ID + ":" + "item" + ComponentTypes.CELL.COMPONENT_NAME);
         GameRegistry.registerItem(this, aFormattedNameForFluids);
-        GT_OreDictUnificator.registerOre(
+        GTOreDictUnificator.registerOre(
             ComponentTypes.CELL.getOreDictName() + Utils.sanitizeStringKeepBrackets(localName),
             ItemUtils.getSimpleStack(this));
         registerComponent();
 
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization("gtplusplus.item." + this.unlocalName + ".name", getFormattedLangName());
     }
 
@@ -144,17 +144,17 @@ public class BaseItemComponent extends Item {
                     + "]");
             Material.mComponentMap.put(componentMaterial.getUnlocalizedName(), aMap);
             if (componentType == ComponentTypes.PLATE) {
-                GregTech_API.registerCover(
+                GregTechAPI.registerCover(
                     componentMaterial.getPlate(1),
-                    new GT_RenderedTexture(
+                    new GTRenderedTexture(
                         componentMaterial.getTextureSet().mTextures[71],
                         componentMaterial.getRGBA(),
                         false),
                     null);
             } else if (componentType == ComponentTypes.PLATEDOUBLE) {
-                GregTech_API.registerCover(
+                GregTechAPI.registerCover(
                     componentMaterial.getPlateDouble(1),
-                    new GT_RenderedTexture(
+                    new GTRenderedTexture(
                         componentMaterial.getTextureSet().mTextures[72],
                         componentMaterial.getRGBA(),
                         false),
@@ -169,7 +169,7 @@ public class BaseItemComponent extends Item {
     }
 
     public String getCorrectTextures() {
-        if (!CORE.ConfigSwitches.useGregtechTextures) {
+        if (!GTPPCore.ConfigSwitches.useGregtechTextures) {
             return GTPlusPlus.ID + ":" + "item" + this.componentType.COMPONENT_NAME;
         }
         String metType = "9j4852jyo3rjmh3owlhw9oe";
@@ -198,12 +198,12 @@ public class BaseItemComponent extends Item {
 
     public String getFluidName(String aKey) {
         String trans;
-        trans = GT_LanguageManager.getTranslation(aKey);
+        trans = GTLanguageManager.getTranslation(aKey);
         if (!trans.equals(aKey)) return trans;
         aKey = "fluid." + aKey;
-        trans = GT_LanguageManager.getTranslation(aKey);
+        trans = GTLanguageManager.getTranslation(aKey);
         if (!trans.equals(aKey)) return trans;
-        return GT_LanguageManager.addStringLocalization(
+        return GTLanguageManager.addStringLocalization(
             "gtplusplus.fluid." + this.materialName.toLowerCase()
                 .replace(" ", ""),
             this.materialName);
@@ -211,7 +211,7 @@ public class BaseItemComponent extends Item {
 
     @Override
     public String getItemStackDisplayName(ItemStack stack) {
-        return GT_LanguageManager.getTranslation("gtplusplus.item." + unlocalName + ".name")
+        return GTLanguageManager.getTranslation("gtplusplus.item." + unlocalName + ".name")
             .replace("%s", "%temp")
             .replace("%material", translatedMaterialName)
             .replace("%temp", "%s");
@@ -250,7 +250,7 @@ public class BaseItemComponent extends Item {
                     }
 
                     if (this.componentMaterial.isRadioactive) {
-                        list.add(CORE.GT_Tooltip_Radioactive.get());
+                        list.add(GTPPCore.GT_Tooltip_Radioactive.get());
                     }
 
                     if (this.componentType == ComponentTypes.INGOT || this.componentType == ComponentTypes.HOTINGOT) {
@@ -324,7 +324,7 @@ public class BaseItemComponent extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public boolean requiresMultipleRenderPasses() {
-        return (CORE.ConfigSwitches.useGregtechTextures ? true : false);
+        return (GTPPCore.ConfigSwitches.useGregtechTextures ? true : false);
     }
 
     @SuppressWarnings("unchecked")
@@ -332,10 +332,10 @@ public class BaseItemComponent extends Item {
     public int getColorFromItemStack(final ItemStack stack, final int renderPass) {
 
         if (this.componentType == ComponentTypes.CELL || this.componentType == ComponentTypes.PLASMACELL) {
-            if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures) {
+            if (renderPass == 0 && !GTPPCore.ConfigSwitches.useGregtechTextures) {
                 return Utils.rgbtoHexValue(255, 255, 255);
             }
-            if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures) {
+            if (renderPass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) {
                 return Utils.rgbtoHexValue(255, 255, 255);
             }
         }
@@ -380,7 +380,7 @@ public class BaseItemComponent extends Item {
 
     @Override
     public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
-        if (CORE.ConfigSwitches.useGregtechTextures) {
+        if (GTPPCore.ConfigSwitches.useGregtechTextures) {
             if (pass == 0) {
                 return this.base;
             }
@@ -392,7 +392,7 @@ public class BaseItemComponent extends Item {
     @Override
     public void registerIcons(final IIconRegister i) {
 
-        if (CORE.ConfigSwitches.useGregtechTextures) {
+        if (GTPPCore.ConfigSwitches.useGregtechTextures) {
             this.base = i.registerIcon(getCorrectTextures());
             this.overlay = i.registerIcon(getCorrectTextures() + "_OVERLAY");
         } else {
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java
index 3ecb6960d6..a5792e236a 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java
@@ -11,8 +11,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -35,22 +35,22 @@ public class BaseItemTCShard extends Item {
         this.setUnlocalizedName(this.unlocalName);
         if (Description != null) {
             for (int i = 0; i < Description.length; i++) {
-                GT_LanguageManager
+                GTLanguageManager
                     .addStringLocalization("gtplusplus." + getUnlocalizedName() + ".tooltip." + i, Description[i]);
             }
         }
         this.setMaxStackSize(64);
         this.setTextureName(GTPlusPlus.ID + ":" + "itemShard");
         GameRegistry.registerItem(this, this.unlocalName);
-        GT_OreDictUnificator.registerOre("shard" + DisplayName, ItemUtils.getSimpleStack(this));
-        GT_OreDictUnificator.registerOre("gemInfused" + DisplayName, ItemUtils.getSimpleStack(this));
+        GTOreDictUnificator.registerOre("shard" + DisplayName, ItemUtils.getSimpleStack(this));
+        GTOreDictUnificator.registerOre("gemInfused" + DisplayName, ItemUtils.getSimpleStack(this));
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
         for (int i = 0;; i++) {
-            String tooltip = GT_LanguageManager
+            String tooltip = GTLanguageManager
                 .getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i);
             if (!("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i).equals(tooltip)) {
                 list.add(tooltip);
diff --git a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java
index 4745fda281..89e9c4b038 100644
--- a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java
+++ b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java
@@ -16,7 +16,7 @@ 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.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
@@ -215,7 +215,7 @@ public class CoreItem extends Item {
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
         for (int i = 0;; i++) {
-            String tooltip = GT_LanguageManager
+            String tooltip = GTLanguageManager
                 .getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i);
             if (!("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i).equals(tooltip)) {
                 list.add(tooltip);
@@ -274,7 +274,7 @@ public class CoreItem extends Item {
 
     public void setItemDescription(String[] description) {
         for (int i = 0; i < description.length; i++) {
-            GT_LanguageManager.addStringLocalization(
+            GTLanguageManager.addStringLocalization(
                 "gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i,
                 description[i]);
         }
diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
index 1140390375..228c1803eb 100644
--- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
+++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
@@ -10,7 +10,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
 import gtPlusPlus.core.item.base.BaseItemComponent;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
@@ -47,7 +47,7 @@ public class BaseItemCell extends BaseItemComponent {
     @Override
     public void registerIcons(final IIconRegister i) {
 
-        if (CORE.ConfigSwitches.useGregtechTextures) {
+        if (GTPPCore.ConfigSwitches.useGregtechTextures) {
             this.base = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "cell");
             this.overlay = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "cell_OVERLAY");
         } else {
@@ -62,10 +62,10 @@ public class BaseItemCell extends BaseItemComponent {
 
     @Override
     public int getColorFromItemStack(final ItemStack stack, final int renderPass) {
-        if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures) {
+        if (renderPass == 0 && !GTPPCore.ConfigSwitches.useGregtechTextures) {
             return Utils.rgbtoHexValue(230, 230, 230);
         }
-        if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures) {
+        if (renderPass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) {
             return Utils.rgbtoHexValue(230, 230, 230);
         }
         return this.componentColour;
diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
index 2592fe3cf7..a451bfc77b 100644
--- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
+++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
@@ -14,10 +14,10 @@ import net.minecraft.item.ItemStack;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.data.StringUtils;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -61,7 +61,7 @@ public class BaseItemDustUnique extends Item {
             } else {
                 type = "%material Dust";
             }
-        GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", type);
+        GTLanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", type);
 
         String temp = "";
         Logger.WARNING("Unlocalized name for OreDict nameGen: " + this.getUnlocalizedName());
@@ -84,7 +84,7 @@ public class BaseItemDustUnique extends Item {
             Logger.WARNING("Generating OreDict Name: " + temp);
         }
         if ((temp != null) && !temp.equals("")) {
-            GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
+            GTOreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
         }
         registerComponent();
     }
@@ -115,12 +115,12 @@ public class BaseItemDustUnique extends Item {
 
     @Override
     public String getItemStackDisplayName(final ItemStack iStack) {
-        return GT_LanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name")
-            .replace("%material", GT_LanguageManager.getTranslation("gtplusplus.material." + materialName));
+        return GTLanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name")
+            .replace("%material", GTLanguageManager.getTranslation("gtplusplus.material." + materialName));
     }
 
     private String getCorrectTexture(final String pileSize) {
-        if (!CORE.ConfigSwitches.useGregtechTextures) {
+        if (!GTPPCore.ConfigSwitches.useGregtechTextures) {
             if ((pileSize.equals("dust")) || (pileSize.equals("Dust"))) {
                 this.setTextureName(GTPlusPlus.ID + ":" + "dust");
             } else {
@@ -141,7 +141,7 @@ public class BaseItemDustUnique extends Item {
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
         if (this.sRadiation > 0) {
-            list.add(CORE.GT_Tooltip_Radioactive.get());
+            list.add(GTPPCore.GT_Tooltip_Radioactive.get());
         }
         if (this.chemicalNotation.length() > 0 && !chemicalNotation.equals("")
             && !chemicalNotation.equals("NullFormula")) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
index 9d22c0faf8..82020229f0 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.item.base.ingots;
 import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.enums.Mods.GregTech;
 import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
@@ -14,10 +14,10 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.base.BaseItemComponent;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
@@ -54,7 +54,7 @@ public class BaseItemIngotHot extends BaseItemIngot {
 
     private void generateRecipe() {
         Logger.WARNING("Adding Vacuum Freezer recipe for a Hot Ingot of " + this.materialName + ".");
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemUtils.getSimpleStack(this))
             .itemOutputs(this.outputIngot.copy())
             .duration(Math.max(this.componentMaterial.getMass() * 3L, 1L) * TICKS)
@@ -78,7 +78,7 @@ public class BaseItemIngotHot extends BaseItemIngot {
     @Override
     @SideOnly(Side.CLIENT)
     public boolean requiresMultipleRenderPasses() {
-        if (CORE.ConfigSwitches.useGregtechTextures) {
+        if (GTPPCore.ConfigSwitches.useGregtechTextures) {
             return true;
         } else {
             return false;
@@ -88,7 +88,7 @@ public class BaseItemIngotHot extends BaseItemIngot {
     @Override
     public void registerIcons(final IIconRegister i) {
 
-        if (CORE.ConfigSwitches.useGregtechTextures) {
+        if (GTPPCore.ConfigSwitches.useGregtechTextures) {
             this.base = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "ingotHot");
             this.overlay = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "ingotHot_OVERLAY");
         } else {
@@ -100,9 +100,9 @@ public class BaseItemIngotHot extends BaseItemIngot {
 
     @Override
     public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
-        if (pass == 0 && CORE.ConfigSwitches.useGregtechTextures) {
+        if (pass == 0 && GTPPCore.ConfigSwitches.useGregtechTextures) {
             return this.base;
-        } else if (pass == 1 && CORE.ConfigSwitches.useGregtechTextures) {
+        } else if (pass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) {
             return this.overlay;
         } else {
             return this.overlay;
diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOld.java
index 6335820c9a..28407a4557 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOld.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.item.base.ingots;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
@@ -10,21 +10,21 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
-public class BaseItemIngot_OLD extends Item {
+public class BaseItemIngotOld extends Item {
 
     protected int colour;
     protected String materialName;
     protected String unlocalName;
 
-    public BaseItemIngot_OLD(final String unlocalizedName, final String materialName, final int colour,
+    public BaseItemIngotOld(final String unlocalizedName, final String materialName, final int colour,
         final int sRadioactivity) {
         this.setUnlocalizedName(unlocalizedName);
         this.setCreativeTab(AddToCreativeTab.tabMisc);
@@ -42,7 +42,7 @@ public class BaseItemIngot_OLD extends Item {
             temp = this.unlocalName.replace("itemHotIngot", "ingotHot");
         }
         if ((temp != null) && !temp.equals("")) {
-            GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
+            GTOreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
         }
         // this.generateCompressorRecipe();
     }
@@ -83,7 +83,7 @@ public class BaseItemIngot_OLD extends Item {
             if ((temp != null) && !temp.equals("")) {
                 tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1);
                 if (tempOutput != null) {
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(tempStack)
                         .itemOutputs(tempOutput)
                         .duration(15 * SECONDS)
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
index 98c652a1ba..92876663f0 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
@@ -14,7 +14,7 @@ import net.minecraft.world.World;
 import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
 import gtPlusPlus.core.block.base.BlockBaseModular;
 import gtPlusPlus.core.block.base.BlockBaseOre;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
@@ -149,7 +149,7 @@ public class ItemBlockGtBlock extends ItemBlock {
 
         if (this.mMaterial != null) {
             if (this.mMaterial.vRadiationLevel > 0) {
-                list.add(CORE.GT_Tooltip_Radioactive.get());
+                list.add(GTPPCore.GT_Tooltip_Radioactive.get());
             }
         }
 
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
index 0cee16b3f6..45d0e4f60e 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
@@ -14,7 +14,7 @@ import net.minecraft.world.World;
 
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.block.base.BlockBaseOre;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
@@ -76,7 +76,7 @@ public class ItemBlockOre extends ItemBlock {
 
         // Radioactive?
         if (this.mThisRadiation > 0) {
-            list.add(CORE.GT_Tooltip_Radioactive.get());
+            list.add(GTPPCore.GT_Tooltip_Radioactive.get());
         }
 
         if (this.mThisMaterial != null) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
index 020becc687..6c8e0ce81a 100644
--- a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
+++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
@@ -16,8 +16,8 @@ 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.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -48,12 +48,12 @@ public class BaseItemMisc extends Item {
         }
         if (description != null) {
             for (int i = 0; i < description.length; i++) {
-                GT_LanguageManager
+                GTLanguageManager
                     .addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip." + i, description[i]);
             }
         }
         GameRegistry.registerItem(this, this.unlocalName);
-        GT_OreDictUnificator.registerOre(miscType.getOreDictPrefix() + unlocalName, ItemUtils.getSimpleStack(this));
+        GTOreDictUnificator.registerOre(miscType.getOreDictPrefix() + unlocalName, ItemUtils.getSimpleStack(this));
     }
 
     private String getCorrectTextures() {
@@ -95,7 +95,7 @@ public class BaseItemMisc extends Item {
     public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list,
         final boolean bool) {
         for (int i = 0;; i++) {
-            String tooltip = GT_LanguageManager
+            String tooltip = GTLanguageManager
                 .getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i);
             if (!("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i).equals(tooltip)) {
                 list.add(tooltip);
diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java
index b7d07e5ef0..52cada6e01 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java
@@ -1,15 +1,15 @@
 package gtPlusPlus.core.item.base.ore;
 
-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 static gtPlusPlus.api.recipe.GTPPRecipeMaps.millingRecipes;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -30,26 +30,26 @@ public class BaseItemMilledOre extends BaseOreComponent {
         ItemStack millingBall_Alumina = GregtechItemList.Milling_Ball_Alumina.get(0);
         ItemStack millingBall_Soapstone = GregtechItemList.Milling_Ball_Soapstone.get(0);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(10), oreStack, millingBall_Alumina)
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(10), oreStack, millingBall_Alumina)
             .itemOutputs(milledStackOres1)
             .duration(2 * MINUTES)
             .eut(materialEU)
             .addTo(millingRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(11), oreStack, millingBall_Soapstone)
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(11), oreStack, millingBall_Soapstone)
             .itemOutputs(milledStackOres2)
             .duration(2 * MINUTES + 30 * SECONDS)
             .eut(materialEU)
             .addTo(millingRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(10), crushedStack, millingBall_Alumina)
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(10), crushedStack, millingBall_Alumina)
             .itemOutputs(milledStackCrushed1)
             .duration(1 * MINUTES)
             .eut(materialEU)
             .addTo(millingRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(11), crushedStack, millingBall_Soapstone)
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(11), crushedStack, millingBall_Soapstone)
             .itemOutputs(milledStackCrushed2)
             .duration(1 * MINUTES + 15 * SECONDS)
             .eut(materialEU)
diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
index 2074bb2ede..dd4ad12df8 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
@@ -19,10 +19,10 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
@@ -54,7 +54,7 @@ public class BaseOreComponent extends Item {
         this.componentColour = material.getRgbAsHex();
         GameRegistry.registerItem(this, this.unlocalName);
         registerComponent();
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .registerOre(componentType.getComponent() + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this));
     }
 
@@ -127,7 +127,8 @@ public class BaseOreComponent extends Item {
                     list.add(temp);
                 }
                 if (this.componentMaterial.isRadioactive) {
-                    list.add(CORE.GT_Tooltip_Radioactive.get() + " | Level: " + this.componentMaterial.vRadiationLevel);
+                    list.add(
+                        GTPPCore.GT_Tooltip_Radioactive.get() + " | Level: " + this.componentMaterial.vRadiationLevel);
                 }
             } else {
                 String aChemicalFormula = Material.sChemicalFormula.get(materialName.toLowerCase());
@@ -157,7 +158,7 @@ public class BaseOreComponent extends Item {
 
     /**
      * Rendering Related
-     * 
+     *
      * @author Alkalus
      *
      */
@@ -179,7 +180,7 @@ public class BaseOreComponent extends Item {
                 this.overlay = par1IconRegister
                     .registerIcon(GTPlusPlus.ID + ":" + "processing/MilledOre/milled_OVERLAY");
             }
-        } else if (CORE.ConfigSwitches.useGregtechTextures) {
+        } else if (GTPPCore.ConfigSwitches.useGregtechTextures) {
             // Logger.MATERIALS(this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME+"
             // is using `"+GregTech.ID + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME+"' as the
             // layer 0 texture path.");
@@ -209,10 +210,10 @@ public class BaseOreComponent extends Item {
             }
             return this.componentColour;
         } else {
-            if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures) {
+            if (renderPass == 0 && !GTPPCore.ConfigSwitches.useGregtechTextures) {
                 return this.componentColour;
             }
-            if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures) {
+            if (renderPass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) {
                 return Utils.rgbtoHexValue(230, 230, 230);
             }
             return this.componentColour;
diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java
index 168d5236c6..0279a396de 100644
--- a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java
+++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java
@@ -11,9 +11,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.data.StringUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
@@ -54,7 +54,7 @@ public class BaseItemPlate_OLD extends Item {
             .contains("itemplate")) {
             temp = this.unlocalName.replace("itemP", "p");
             if ((temp != null) && !temp.equals("")) {
-                GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
+                GTOreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
             }
         }
     }
@@ -81,7 +81,7 @@ public class BaseItemPlate_OLD extends Item {
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
         if (this.sRadiation > 0) {
-            list.add(CORE.GT_Tooltip_Radioactive.get());
+            list.add(GTPPCore.GT_Tooltip_Radioactive.get());
         }
         if (StringUtils.containsSuperOrSubScript(this.chemicalNotation)) {
             list.add(this.chemicalNotation);
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java
index 76121ef266..f1184fb5bb 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java
@@ -17,7 +17,7 @@ import baubles.api.BaubleType;
 import baubles.api.IBauble;
 import cpw.mods.fml.common.Optional;
 import gregtech.api.enums.Mods;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
 
@@ -47,10 +47,10 @@ public class BaseBauble extends Item implements IBauble {
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
         String key = "gtplusplus." + getUnlocalizedName() + ".name";
-        if (key.equals(GT_LanguageManager.getTranslation(key))) {
+        if (key.equals(GTLanguageManager.getTranslation(key))) {
             return super.getItemStackDisplayName(tItem).replaceAll(".name", "");
         }
-        return GT_LanguageManager.getTranslation(key);
+        return GTLanguageManager.getTranslation(key);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
index 881146b15d..01cd0ec0c1 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
@@ -19,7 +19,7 @@ import baubles.api.BaubleType;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
@@ -29,7 +29,7 @@ import ic2.api.item.IElectricItem;
 public class BatteryPackBaseBauble extends ElectricBaseBauble {
 
     public BatteryPackBaseBauble(int tier) {
-        super(BaubleType.BELT, tier, GT_Values.V[tier] * 20 * 300, "GTPP.BattPack.0" + tier + ".name");
+        super(BaubleType.BELT, tier, GTValues.V[tier] * 20 * 300, "GTPP.BattPack.0" + tier + ".name");
         String aUnlocalName = "GTPP.BattPack.0" + tier + ".name";
         this.setCreativeTab(AddToCreativeTab.tabMachines);
         if (GameRegistry.findItem(GTPlusPlus.ID, aUnlocalName) == null) {
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java
index ab17e91232..5717a1e926 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java
@@ -20,9 +20,9 @@ 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.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Mods;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.math.MathUtils;
 import ic2.api.item.ElectricItem;
@@ -112,7 +112,7 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric
 
     @Override
     public final double getTransferLimit(final ItemStack itemStack) {
-        return GT_Values.V[mTier];
+        return GTValues.V[mTier];
     }
 
     @Override
@@ -141,13 +141,13 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric
             EnumChatFormatting.GRAY + aTier
                 + ": ["
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(this.getTier(stack))
+                + GTUtility.formatNumbers(this.getTier(stack))
                 + EnumChatFormatting.GRAY
                 + "] "
                 + aInputLimit
                 + ": ["
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(this.getTransferLimit(stack))
+                + GTUtility.formatNumbers(this.getTransferLimit(stack))
                 + EnumChatFormatting.GRAY
                 + aEUT
                 + "]");
@@ -155,12 +155,12 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric
             EnumChatFormatting.GRAY + aCurrentPower
                 + ": ["
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(this.getCharge(stack))
+                + GTUtility.formatNumbers(this.getCharge(stack))
                 + EnumChatFormatting.GRAY
                 + aEU
                 + "] ["
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)))
+                + GTUtility.formatNumbers(MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)))
                 + EnumChatFormatting.GRAY
                 + "%]");
         super.addInformation(stack, aPlayer, list, bool);
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
index c3c371ae35..35adc35e96 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
@@ -18,7 +18,7 @@ import baubles.api.BaubleType;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.CORE_Preloader;
+import gtPlusPlus.preloader.PreloaderCore;
 
 public class FireProtectionBauble extends BaseBauble {
 
@@ -26,7 +26,7 @@ public class FireProtectionBauble extends BaseBauble {
 
     static {
         isImmuneToFire = ReflectionUtils
-            .getField(Entity.class, !CORE_Preloader.DEV_ENVIRONMENT ? "func_70045_F" : "isImmuneToFire");
+            .getField(Entity.class, !PreloaderCore.DEV_ENVIRONMENT ? "func_70045_F" : "isImmuneToFire");
     }
 
     public static boolean fireImmune(Entity aEntity) {
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index 2459e08bfc..4bbf29c88f 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -6,9 +6,9 @@ import static gregtech.api.enums.Mods.TinkerConstruct;
 import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
 import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
 import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
-import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
+import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.semiFluidFuels;
 
@@ -23,16 +23,16 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-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_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
-import gtPlusPlus.core.item.circuit.GTPP_IntegratedCircuit_Item;
+import gtPlusPlus.core.item.circuit.GTPPIntegratedCircuitItem;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
@@ -152,7 +152,7 @@ public class AgriculturalChem extends ItemPackage {
 
         mAlgae = new ItemAlgaeBase();
         mAgrichemItem1 = new ItemAgrichemBase();
-        mBioCircuit = new GTPP_IntegratedCircuit_Item("BioRecipeSelector", "bioscience/BioCircuit");
+        mBioCircuit = new GTPPIntegratedCircuitItem("BioRecipeSelector", "bioscience/BioCircuit");
         GregtechItemList.Circuit_BioRecipeSelector.set(mBioCircuit);
 
         mAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 0, 1);
@@ -422,8 +422,8 @@ public class AgriculturalChem extends ItemPackage {
         ItemStack aDirtDust = ItemUtils.getSimpleStack(dustDirt, 1);
 
         // Poop Juice to Basic Slurry
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(10))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(10))
             .itemOutputs(aDirtDust, aDirtDust, aManureByprod1, aManureByprod1, aManureByprod1, aManureByprod1)
             .outputChances(2000, 2000, 500, 500, 250, 250)
             .fluidInputs(FluidUtils.getFluidStack(PoopJuice, 1000))
@@ -433,8 +433,8 @@ public class AgriculturalChem extends ItemPackage {
             .addTo(centrifugeRecipes);
 
         // More Efficient way to get byproducts, less Slurry
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(20))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(20))
             .itemOutputs(aDirtDust, aDirtDust, aManureByprod1, aManureByprod1, aManureByprod2, aManureByprod2)
             .outputChances(4000, 3000, 1250, 1250, 675, 675)
             .fluidInputs(FluidUtils.getFluidStack(PoopJuice, 1000))
@@ -446,7 +446,7 @@ public class AgriculturalChem extends ItemPackage {
 
     private static void addAdvancedSlurryRecipes() {
 
-        ItemStack aCircuit = GT_Utility.getIntegratedCircuit(10);
+        ItemStack aCircuit = GTUtility.getIntegratedCircuit(10);
         ItemStack aBone;
         ItemStack aMeat;
         ItemStack aEmptyCells = Materials.Empty.getCells(2);
@@ -459,7 +459,7 @@ public class AgriculturalChem extends ItemPackage {
                 for (ItemStack aMeatStack : mList_Master_Meats) {
                     aMeat = ItemUtils.getSimpleStack(aMeatStack, 5);
                     // Poop Juice to Fertile Slurry
-                    GT_Values.RA.stdBuilder()
+                    GTValues.RA.stdBuilder()
                         .itemInputs(aCircuit, aBone, aMeat, aInputCells)
                         .itemOutputs(aEmptyCells)
                         .fluidInputs(aBloodStack)
@@ -481,7 +481,7 @@ public class AgriculturalChem extends ItemPackage {
             aPeat = ItemUtils.getSimpleStack(aPeatStack, 3);
             for (ItemStack aMeatStack : mList_Master_Meats) {
                 aMeat = ItemUtils.getSimpleStack(aMeatStack, 5);
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(aPeat, aMeat)
                     .itemOutputs(aOutputDust)
                     .fluidInputs(aInputFluid)
@@ -492,7 +492,7 @@ public class AgriculturalChem extends ItemPackage {
             aPeat = ItemUtils.getSimpleStack(aPeatStack, 2);
             for (ItemStack aMeatStack : mList_Master_FruitVege) {
                 aMeat = ItemUtils.getSimpleStack(aMeatStack, 9);
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(aPeat, aMeat)
                     .itemOutputs(aOutputDust)
                     .fluidInputs(aInputFluid)
@@ -512,7 +512,7 @@ public class AgriculturalChem extends ItemPackage {
             aPeat = ItemUtils.getSimpleStack(aPeatStack, 5);
             for (ItemStack aMeatStack : mList_Master_Meats) {
                 aMeat = ItemUtils.getSimpleStack(aMeatStack, 7);
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(aPeat, aMeat)
                     .itemOutputs(aOutputDust)
                     .fluidInputs(aInputFluid)
@@ -523,7 +523,7 @@ public class AgriculturalChem extends ItemPackage {
             aPeat = ItemUtils.getSimpleStack(aPeatStack, 3);
             for (ItemStack aMeatStack : mList_Master_FruitVege) {
                 aMeat = ItemUtils.getSimpleStack(aMeatStack, 12);
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(aPeat, aMeat)
                     .itemOutputs(aOutputDust)
                     .fluidInputs(aInputFluid)
@@ -558,9 +558,9 @@ public class AgriculturalChem extends ItemPackage {
                     if (aItemInstance instanceof Item aForestryFert) {
                         aFertForestry = ItemUtils.getSimpleStack((Item) aItemInstance);
 
-                        GT_Values.RA.stdBuilder()
+                        GTValues.RA.stdBuilder()
                             .itemInputs(
-                                GT_Utility.getIntegratedCircuit(11),
+                                GTUtility.getIntegratedCircuit(11),
                                 ItemUtils.getSimpleStack(aDustOrganicFert, 4))
                             .itemOutputs(ItemUtils.getSimpleStack(aForestryFert, 3), aManureByprod, aManureByprod)
                             .outputChances(100_00, 20_00, 20_00)
@@ -578,8 +578,8 @@ public class AgriculturalChem extends ItemPackage {
          * IC2 Support
          */
         aFertIC2 = ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 1);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4))
             .itemOutputs(ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod, aManureByprod)
             .outputChances(100_00, 20_00, 20_00)
             .eut(240)
@@ -587,7 +587,7 @@ public class AgriculturalChem extends ItemPackage {
             .addTo(chemicalDehydratorRecipes);
 
         // Dirt Production
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemUtils.getSimpleStack(dustDirt, 9))
             .itemOutputs(ItemUtils.getSimpleStack(Blocks.dirt))
             .duration(2 * SECONDS)
@@ -597,13 +597,13 @@ public class AgriculturalChem extends ItemPackage {
         // Centrifuge Byproducts
 
         // Ammonium Nitrate, Phosphates, Calcium, Copper, Carbon
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemUtils.getSimpleStack(aManureByprod, 4), GT_Utility.getIntegratedCircuit(20))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemUtils.getSimpleStack(aManureByprod, 4), GTUtility.getIntegratedCircuit(20))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Calcium, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Copper, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Calcium, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Copper, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L),
                 ItemUtils.getSimpleStack(dustDirt, 1),
                 ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAmmoniumNitrate", 1))
             .outputChances(2500, 2500, 750, 1000, 5000, 250)
@@ -614,21 +614,21 @@ public class AgriculturalChem extends ItemPackage {
             .addTo(centrifugeRecipes);
 
         // Add Fuel Usages
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(FluidUtils.getFluidStack(PoopJuice, 1000))
             .duration(0)
             .eut(0)
             .metadata(FUEL_VALUE, 12)
             .addTo(semiFluidFuels);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(FluidUtils.getFluidStack(ManureSlurry, 1000))
             .duration(0)
             .eut(0)
             .metadata(FUEL_VALUE, 24)
             .addTo(semiFluidFuels);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(FluidUtils.getFluidStack(FertileManureSlurry, 1000))
             .duration(0)
             .eut(0)
@@ -636,15 +636,15 @@ public class AgriculturalChem extends ItemPackage {
             .addTo(semiFluidFuels);
 
         // Red Slurry / Tailings Processing
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(CI.getNumberedBioCircuit(10))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Copper, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Tin, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Sulfur, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Nickel, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lead, 1L))
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Copper, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Tin, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Sulfur, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Nickel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lead, 1L))
             .outputChances(3000, 3000, 2000, 2000, 1000, 1000)
             .fluidInputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 1000))
             .fluidOutputs(Materials.Water.getFluid(500))
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
index b9f5e58eef..87e5a7b22f 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -3,11 +3,11 @@ package gtPlusPlus.core.item.chemistry;
 import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes;
 import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
 import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
-import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE;
+import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
+import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.semiFluidFuels;
 
@@ -15,13 +15,13 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 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.enums.TierEU;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeConstants;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeConstants;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
@@ -48,7 +48,7 @@ public class CoalTar extends ItemPackage {
 
         // C2H6O = C2H4 + H2O
         if (bioEth1 != null) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(CI.getNumberedBioCircuit(17), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1))
                 .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1))
                 .fluidInputs(bioEth1)
@@ -59,7 +59,7 @@ public class CoalTar extends ItemPackage {
         }
 
         if (bioEth2 != null) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(CI.getNumberedBioCircuit(18), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1))
                 .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1))
                 .fluidInputs(bioEth2)
@@ -72,7 +72,7 @@ public class CoalTar extends ItemPackage {
 
     public static void recipeCreateBenzene() {
         // C7H8 + 2H = CH4 + C6H6
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Toluene.getCells(1))
             .itemOutputs(Materials.Benzene.getCells(1))
             .fluidInputs(Materials.Hydrogen.getGas(2000))
@@ -85,10 +85,8 @@ public class CoalTar extends ItemPackage {
 
     public static void recipeCreateEthylbenzene() {
         // C2H4 + C6H6 = C8H10
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 2),
-                GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2))
             .fluidInputs(FluidUtils.getFluidStack("benzene", 2000))
             .fluidOutputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 2000))
@@ -96,8 +94,8 @@ public class CoalTar extends ItemPackage {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 2), GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 2), GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2))
             .fluidInputs(FluidUtils.getFluidStack("ethylene", 2000))
             .fluidOutputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 2000))
@@ -108,10 +106,10 @@ public class CoalTar extends ItemPackage {
 
     public static void recipeCoalToCoalTar() {
         // Charcoal
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(8),
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 32L))
+                GTUtility.getIntegratedCircuit(8),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 32L))
             .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDirt", 2))
             .fluidOutputs(FluidUtils.getFluidStack("fluid.coaltar", 800))
             .duration(18 * SECONDS)
@@ -119,10 +117,10 @@ public class CoalTar extends ItemPackage {
             .addTo(pyrolyseRecipes);
 
         // Lignite
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(8),
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L))
+                GTUtility.getIntegratedCircuit(8),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L))
             .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2))
             .fluidOutputs(FluidUtils.getFluidStack("fluid.coaltar", 800))
             .duration(54 * SECONDS)
@@ -130,10 +128,10 @@ public class CoalTar extends ItemPackage {
             .addTo(pyrolyseRecipes);
 
         // Coal
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(8),
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L))
+                GTUtility.getIntegratedCircuit(8),
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L))
             .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2))
             .fluidOutputs(FluidUtils.getFluidStack("fluid.coaltar", 2200))
             .duration(36 * SECONDS)
@@ -141,8 +139,8 @@ public class CoalTar extends ItemPackage {
             .addTo(pyrolyseRecipes);
 
         // Coke
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(8), ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(8), ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 8))
             .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3))
             .fluidOutputs(FluidUtils.getFluidStack("fluid.coaltar", 3400))
             .duration(18 * SECONDS)
@@ -158,15 +156,15 @@ public class CoalTar extends ItemPackage {
             FluidUtils.getFluidStack("liquid_naphtha", 150), FluidUtils.getFluidStack("fluid.ethylbenzene", 200),
             FluidUtils.getFluidStack("fluid.anthracene", 50), FluidUtils.getFluidStack("fluid.kerosene", 600) };
         for (int i = 0; i < distOutputs.length; i++) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(i + 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(i + 1))
                 .fluidInputs(FluidUtils.getFluidStack("fluid.coaltar", 1000))
                 .fluidOutputs(distOutputs[i])
                 .duration(30 * SECONDS)
                 .eut(64)
                 .addTo(distilleryRecipes);
         }
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(FluidUtils.getFluidStack("fluid.coaltar", 1000))
             .fluidOutputs(distOutputs)
             .duration(15 * SECONDS)
@@ -176,7 +174,7 @@ public class CoalTar extends ItemPackage {
 
     private static void recipeCoalTarOilToSulfuricOilToNaphthalene() {
         // SulfuricCoalTarOil
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTarOil", 8),
                 ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 8))
@@ -185,8 +183,8 @@ public class CoalTar extends ItemPackage {
             .eut(TierEU.RECIPE_LV)
             .addTo(UniversalChemical);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(6))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(6))
             .fluidInputs(FluidUtils.getFluidStack("fluid.sulfuriccoaltaroil", 1000))
             .fluidOutputs(FluidUtils.getFluidStack("fluid.naphthalene", 1000))
             .eut(TierEU.RECIPE_LV)
@@ -196,7 +194,7 @@ public class CoalTar extends ItemPackage {
 
     private static void recipeNaphthaleneToPhthalicAcid() {
         // SulfuricCoalTarOil
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(Materials.Lithium.getDust(5))
             .fluidInputs(FluidUtils.getFluidStack(Naphthalene, 2000))
             .fluidOutputs(Materials.PhthalicAcid.getFluid(2500))
@@ -207,7 +205,7 @@ public class CoalTar extends ItemPackage {
     }
 
     private static void recipePhthalicAcidToPhthalicAnhydride() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(CI.getNumberedBioCircuit(15))
             .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 15))
             .fluidInputs(Materials.PhthalicAcid.getFluid(1000))
@@ -234,15 +232,15 @@ public class CoalTar extends ItemPackage {
         recipePhthalicAcidToPhthalicAnhydride();
 
         // Burn the coal gas!
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalGas", 1))
             .metadata(FUEL_VALUE, 96)
-            .metadata(FUEL_TYPE, GT_RecipeConstants.FuelType.GasTurbine.ordinal())
+            .metadata(FUEL_TYPE, GTRecipeConstants.FuelType.GasTurbine.ordinal())
             .duration(0)
             .eut(0)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(
                 FluidContainerRegistry
                     .getFluidForFilledItem(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricCoalTarOil", 1)))
@@ -251,7 +249,7 @@ public class CoalTar extends ItemPackage {
             .metadata(FUEL_VALUE, 64)
             .addTo(semiFluidFuels);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(
                 FluidContainerRegistry
                     .getFluidForFilledItem(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTarOil", 1)))
@@ -260,7 +258,7 @@ public class CoalTar extends ItemPackage {
             .metadata(FUEL_VALUE, 32)
             .addTo(semiFluidFuels);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .fluidInputs(
                 FluidContainerRegistry
                     .getFluidForFilledItem(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTar", 1)))
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 65bc52739d..99885d77e8 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -2,12 +2,12 @@ package gtPlusPlus.core.item.chemistry;
 
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER;
-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.GTRecipeConstants.CHEMPLANT_CASING_TIER;
+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 static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes;
 
@@ -17,25 +17,25 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 
-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.TextureSet;
 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.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeConstants;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
-import gtPlusPlus.core.item.circuit.GTPP_IntegratedCircuit_Item;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.MISC_MATERIALS;
+import gtPlusPlus.core.item.circuit.GTPPIntegratedCircuitItem;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
+import gtPlusPlus.core.material.MaterialMisc;
 import gtPlusPlus.core.material.MaterialStack;
-import gtPlusPlus.core.material.NONMATERIAL;
+import gtPlusPlus.core.material.MaterialsElements;
+import gtPlusPlus.core.material.MaterialsOther;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
@@ -63,10 +63,10 @@ public class GenericChem extends ItemPackage {
         false,
         null,
         0,
-        new MaterialStack(NONMATERIAL.PTFE, 75),
-        new MaterialStack(NONMATERIAL.PLASTIC, 15),
-        new MaterialStack(ELEMENT.getInstance().CARBON, 5),
-        new MaterialStack(ELEMENT.getInstance().SODIUM, 5));
+        new MaterialStack(MaterialsOther.PTFE, 75),
+        new MaterialStack(MaterialsOther.PLASTIC, 15),
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 5),
+        new MaterialStack(MaterialsElements.getInstance().SODIUM, 5));
 
     /**
      * Fluids
@@ -146,7 +146,7 @@ public class GenericChem extends ItemPackage {
         MaterialGenerator.generate(TEFLON, false);
 
         mGenericChemItem1 = new ItemGenericChemBase();
-        mAdvancedCircuit = new GTPP_IntegratedCircuit_Item("T3RecipeSelector", "science/general/AdvancedCircuit");
+        mAdvancedCircuit = new GTPPIntegratedCircuitItem("T3RecipeSelector", "science/general/AdvancedCircuit");
         GregtechItemList.Circuit_T3RecipeSelector.set(mAdvancedCircuit);
 
         registerItemStacks();
@@ -382,11 +382,11 @@ public class GenericChem extends ItemPackage {
 
     private void recipeSodiumEthoxide() {
         // C2H5OH + Na → C2H5ONa + H
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(16), ELEMENT.getInstance().SODIUM.getDust(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(16), MaterialsElements.getInstance().SODIUM.getDust(1))
             .itemOutputs(ItemUtils.getSimpleStack(mSodiumEthoxide, 9))
             .fluidInputs(Materials.Ethanol.getFluid(1000))
-            .fluidOutputs(ELEMENT.getInstance().HYDROGEN.getFluidStack(1000))
+            .fluidOutputs(MaterialsElements.getInstance().HYDROGEN.getFluidStack(1000))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .metadata(CHEMPLANT_CASING_TIER, 2)
@@ -395,9 +395,9 @@ public class GenericChem extends ItemPackage {
 
     private void recipePotassiumHydroxide() {
         // Ca(OH)2 + K2O + CO2 → CaCO3 + 2 KOH
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(18),
+                GTUtility.getIntegratedCircuit(18),
                 Materials.Potash.getDust(3),
                 ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5))
             .itemOutputs(
@@ -414,8 +414,8 @@ public class GenericChem extends ItemPackage {
     private void recipeEthylXanthates() {
 
         // Potassium ethyl xanthate - CH3CH2OH + CS2 + KOH → C3H5KOS2 + H2O
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(17), ItemUtils.getSimpleStack(mPotassiumHydroxide, 3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(17), ItemUtils.getSimpleStack(mPotassiumHydroxide, 3))
             .itemOutputs(ItemUtils.getSimpleStack(mPotassiumEthylXanthate, 12))
             .fluidInputs(Materials.Ethanol.getFluid(1000), FluidUtils.getFluidStack(Carbon_Disulfide, 1000))
             .fluidOutputs(FluidUtils.getWater(1000))
@@ -425,8 +425,8 @@ public class GenericChem extends ItemPackage {
             .addTo(chemicalPlantRecipes);
 
         // Sodium ethyl xanthate - CH3CH2ONa + CS2 → CH3CH2OCS2Na
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(17), ItemUtils.getSimpleStack(mSodiumEthoxide, 9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(17), ItemUtils.getSimpleStack(mSodiumEthoxide, 9))
             .itemOutputs(ItemUtils.getSimpleStack(mSodiumEthylXanthate, 12))
             .fluidInputs(FluidUtils.getFluidStack(Carbon_Disulfide, 1000))
             .duration(60 * SECONDS)
@@ -437,20 +437,20 @@ public class GenericChem extends ItemPackage {
 
     private void recipeCarbonDisulfide() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 8),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 16L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 16L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1L))
             .fluidOutputs(FluidUtils.getFluidStack(Carbon_Disulfide, 4000))
             .duration(10 * MINUTES)
             .eut(TierEU.RECIPE_LV)
             .metadata(COIL_HEAT, 1500)
             .addTo(blastFurnaceRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(20),
+                GTUtility.getIntegratedCircuit(20),
                 ItemUtils.getSimpleStack(mBrownCatalyst, 0),
                 ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 4))
             .fluidInputs(FluidUtils.getFluidStack(CoalTar.Coal_Gas, 1000))
@@ -465,7 +465,7 @@ public class GenericChem extends ItemPackage {
     private void recipeMutatedLivingSolder() {
 
         // Endgame soldering alloy meant for the bioware circuit line and beyond.
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(GenericChem.mInfiniteMutationCatalyst, 0),
                 ItemList.Circuit_Chip_Biocell.get(64),
@@ -475,7 +475,7 @@ public class GenericChem extends ItemPackage {
                 FluidUtils.getFluidStack("plasma.tin", 18000),
                 FluidUtils.getFluidStack("plasma.bismuth", 18000),
                 FluidUtils.getFluidStack("cryotheum", 4000))
-            .fluidOutputs(MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 280))
+            .fluidOutputs(MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(144 * 280))
             .duration(13 * MINUTES + 20 * SECONDS)
             .eut(3842160)
             .metadata(CHEMPLANT_CASING_TIER, 7)
@@ -488,18 +488,18 @@ public class GenericChem extends ItemPackage {
         // Burnables
 
         // Gas Fuels
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellNitrobenzene", 1))
             .metadata(FUEL_VALUE, 1600)
             .metadata(FUEL_TYPE, 1)
             .duration(0)
             .eut(0)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
     }
 
     private void recipeGrindingBallAlumina() {
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 64), GT_Utility.getIntegratedCircuit(10))
+        GTValues.RA.stdBuilder()
+            .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 64), GTUtility.getIntegratedCircuit(10))
             .itemOutputs(ItemUtils.getSimpleStack(mMillingBallAlumina, 8))
             .fluidInputs(FluidUtils.getFluidStack(GenericChem.Aniline, 4000))
             .duration(3 * MINUTES)
@@ -508,10 +508,10 @@ public class GenericChem extends ItemPackage {
     }
 
     private void recipeGrindingBallSoapstone() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 32L),
-                GT_Utility.getIntegratedCircuit(10))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 32L),
+                GTUtility.getIntegratedCircuit(10))
             .itemOutputs(ItemUtils.getSimpleStack(mMillingBallSoapstone, 8))
             .fluidInputs(FluidUtils.getFluidStack(AgrichemFluids.mLiquidResin, 2500))
             .duration(2 * MINUTES)
@@ -522,7 +522,7 @@ public class GenericChem extends ItemPackage {
     private void recipeCyclohexane() {
 
         // C6H6 + 6H = C6H12
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getTierTwoChip(), ItemUtils.getSimpleStack(mBrownCatalyst, 0))
             .fluidInputs(FluidUtils.getFluidStack(Benzene, 1000), FluidUtils.getFluidStack("hydrogen", 6000))
             .fluidOutputs(FluidUtils.getFluidStack(Cyclohexane, 1000))
@@ -536,7 +536,7 @@ public class GenericChem extends ItemPackage {
     private void recipeCyclohexanone() {
 
         // C6H12 + 2O(Air) = C6H10O + H2O
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getTierTwoChip(), ItemUtils.getSimpleStack(mBlueCatalyst, 0))
             .fluidInputs(FluidUtils.getFluidStack(Cyclohexane, 1000), FluidUtils.getFluidStack("air", 4000))
             .fluidOutputs(FluidUtils.getFluidStack(Cyclohexanone, 1000))
@@ -544,7 +544,7 @@ public class GenericChem extends ItemPackage {
             .eut(TierEU.RECIPE_MV)
             .metadata(CHEMPLANT_CASING_TIER, 2)
             .addTo(chemicalPlantRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getTierTwoChip())
             .fluidInputs(FluidUtils.getFluidStack(Cyclohexane, 1000), FluidUtils.getFluidStack("oxygen", 2000))
             .fluidOutputs(FluidUtils.getFluidStack(Cyclohexanone, 1000))
@@ -557,12 +557,12 @@ public class GenericChem extends ItemPackage {
 
     private void recipeCatalystRed() {
         // Assembler Recipe
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getTierOneChip(),
                 CI.getEmptyCatalyst(10),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 2L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 2L))
             .itemOutputs(ItemUtils.getSimpleStack(mRedCatalyst, 10))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_LV)
@@ -571,12 +571,12 @@ public class GenericChem extends ItemPackage {
 
     private void recipeCatalystYellow() {
         // Assembler Recipe
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getTierThreeChip(),
                 CI.getEmptyCatalyst(10),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 4L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 4L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L))
             .itemOutputs(ItemUtils.getSimpleStack(mYellowCatalyst, 10))
             .duration(1 * MINUTES)
             .eut(TierEU.RECIPE_EV)
@@ -585,12 +585,12 @@ public class GenericChem extends ItemPackage {
 
     private void recipeCatalystBlue() {
         // Assembler Recipe
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getTierTwoChip(),
                 CI.getEmptyCatalyst(10),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 3L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 3L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 3L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 3L))
             .itemOutputs(ItemUtils.getSimpleStack(mBlueCatalyst, 10))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_HV)
@@ -599,12 +599,12 @@ public class GenericChem extends ItemPackage {
 
     private void recipeCatalystOrange() {
         // Assembler Recipe
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getTierTwoChip(),
                 CI.getEmptyCatalyst(10),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 5L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 5L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 5L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 5L))
             .itemOutputs(ItemUtils.getSimpleStack(mOrangeCatalyst, 10))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_HV)
@@ -613,12 +613,12 @@ public class GenericChem extends ItemPackage {
 
     private void recipeCatalystPurple() {
         // Assembler Recipe
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getTierFourChip(),
                 CI.getEmptyCatalyst(10),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 6L),
-                ELEMENT.getInstance().RUTHENIUM.getDust(6))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 6L),
+                MaterialsElements.getInstance().RUTHENIUM.getDust(6))
             .itemOutputs(ItemUtils.getSimpleStack(mPurpleCatalyst, 10))
             .duration(2 * MINUTES)
             .eut(TierEU.RECIPE_IV)
@@ -627,12 +627,12 @@ public class GenericChem extends ItemPackage {
 
     private void recipeCatalystBrown() {
         // Assembler Recipe
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getTierOneChip(),
                 CI.getEmptyCatalyst(10),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L))
             .itemOutputs(ItemUtils.getSimpleStack(mBrownCatalyst, 10))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_LV)
@@ -641,12 +641,12 @@ public class GenericChem extends ItemPackage {
 
     private void recipeCatalystPink() {
         // Assembler Recipe
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getTierThreeChip(),
                 CI.getEmptyCatalyst(10),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L),
-                ELEMENT.getInstance().RHODIUM.getDust(4))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L),
+                MaterialsElements.getInstance().RHODIUM.getDust(4))
             .itemOutputs(ItemUtils.getSimpleStack(mPinkCatalyst, 10))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_EV)
@@ -655,7 +655,7 @@ public class GenericChem extends ItemPackage {
 
     private void recipeCatalystFormaldehyde() {
         // Assembler Recipe
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getTierThreeChip(),
                 CI.getEmptyCatalyst(4),
@@ -668,13 +668,13 @@ public class GenericChem extends ItemPackage {
 
     private void recipeCatalystSolidAcid() {
         // Assembler Recipe
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getTierThreeChip(),
                 CI.getEmptyCatalyst(5),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 2L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 2L))
             .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 5))
-            .fluidInputs(MISC_MATERIALS.SOLID_ACID_MIXTURE.getFluidStack(1000))
+            .fluidInputs(MaterialMisc.SOLID_ACID_MIXTURE.getFluidStack(1000))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
@@ -682,12 +682,12 @@ public class GenericChem extends ItemPackage {
 
     private void recipeCatalystInfiniteMutation() {
         // Assembler Recipe
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getTierThreeChip(),
                 CI.getEmptyCatalyst(5),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 10L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 10L))
             .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mInfiniteMutationCatalyst, 5))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_UHV)
@@ -697,7 +697,7 @@ public class GenericChem extends ItemPackage {
     private void recipeCadaverineAndPutrescine() {
 
         // Basic Recipe
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getTierOneChip(), ItemUtils.getSimpleStack(Items.rotten_flesh, 64))
             .fluidInputs(FluidUtils.getHotWater(2000))
             .fluidOutputs(FluidUtils.getFluidStack(Cadaverine, 250), FluidUtils.getFluidStack(Putrescine, 250))
@@ -706,7 +706,7 @@ public class GenericChem extends ItemPackage {
             .metadata(CHEMPLANT_CASING_TIER, 1)
             .addTo(chemicalPlantRecipes);
         // Advanced Recipe
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 getTierTwoChip(),
                 ItemUtils.getSimpleStack(Items.rotten_flesh, 128),
@@ -723,7 +723,7 @@ public class GenericChem extends ItemPackage {
     private void recipeAniline() {
 
         // C6H5NO2 + 6H = C6H7N + 2H2O
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getTierThreeChip(), ItemUtils.getSimpleStack(mBlueCatalyst, 0))
             .fluidInputs(FluidUtils.getFluidStack(NitroBenzene, 1000), FluidUtils.getFluidStack("hydrogen", 6000))
             .fluidOutputs(FluidUtils.getFluidStack(Aniline, 1000))
@@ -737,7 +737,7 @@ public class GenericChem extends ItemPackage {
     private void recipeNitroBenzene() {
 
         // C6H6 + HNO3 =H2SO4= C6H5NO2 +H2O
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(getTierThreeChip())
             .fluidInputs(
                 FluidUtils.getFluidStack(Benzene, 5000),
@@ -755,9 +755,9 @@ public class GenericChem extends ItemPackage {
     private void recipe2Ethylanthraquinone() {
 
         // C6H4(CO)2O + C6H5CH2CH3 = C6H4(CO)2C6H3CH2CH3 + H2O
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(4),
+                GTUtility.getIntegratedCircuit(4),
                 ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 15))
             .fluidInputs(FluidUtils.getFluidStack(CoalTar.Ethylbenzene, 1000))
             .fluidOutputs(FluidUtils.getFluidStack(Ethylanthraquinone2, 1000))
@@ -771,8 +771,8 @@ public class GenericChem extends ItemPackage {
     private void recipe2Ethylanthrahydroquinone() {
 
         // C6H4(CO)2C6H3CH2CH3 + 2H = C6H4(COH)2C6H3CH2CH3
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(4), ItemUtils.getSimpleStack(mOrangeCatalyst, 0))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(4), ItemUtils.getSimpleStack(mOrangeCatalyst, 0))
             .fluidInputs(
                 FluidUtils.getFluidStack(Ethylanthraquinone2, 1000),
                 FluidUtils.getFluidStack("hydrogen", 2000))
@@ -786,7 +786,7 @@ public class GenericChem extends ItemPackage {
 
     private void recipeLithiumPeroxide() {
         // 2HLiO2 = Li2O2 + H2O2
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 8))
             .fluidOutputs(FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000))
             .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumPeroxide", 4))
@@ -799,9 +799,9 @@ public class GenericChem extends ItemPackage {
     private void recipeLithiumHydroperoxide() {
 
         // LiOH + H2O2 = HLiO2 + H2O
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(4),
+                GTUtility.getIntegratedCircuit(4),
                 ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 3))
             .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 4))
             .fluidInputs(FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000))
@@ -815,8 +815,8 @@ public class GenericChem extends ItemPackage {
     private void recipeHydrogenPeroxide() {
 
         // C6H4(COH)2C6H3CH2CH3 + 2O =(C6H4CH)2= H2O2 + C6H4(CO)2C6H3CH2CH3
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(4))
             .fluidInputs(
                 FluidUtils.getFluidStack("air", 20000),
                 FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000),
@@ -828,8 +828,8 @@ public class GenericChem extends ItemPackage {
             .eut(240)
             .metadata(CHEMPLANT_CASING_TIER, 1)
             .addTo(chemicalPlantRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(4))
             .fluidInputs(
                 Materials.Oxygen.getGas(10000),
                 FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000),
@@ -861,7 +861,7 @@ public class GenericChem extends ItemPackage {
     }
 
     private static void recipeAdvancedChip() {
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 0L),
             0,
             new Object[] { OrePrefixes.circuit.get(Materials.HV) });
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java
index d4f5e832f6..c7738751c2 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java
@@ -15,7 +15,7 @@ import net.minecraft.util.IIcon;
 
 import gregtech.api.enums.Materials;
 import gtPlusPlus.core.item.base.misc.BaseItemParticle;
-import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MaterialsElements;
 import gtPlusPlus.core.util.Utils;
 
 public class IonParticles extends BaseItemParticle {
@@ -24,16 +24,16 @@ public class IonParticles extends BaseItemParticle {
     public static HashMap<Integer, String> MetaToNameMap = new HashMap<>();
 
     public IonParticles() {
-        super("Ion", ELEMENT.NAMES.length, EnumRarity.rare);
+        super("Ion", MaterialsElements.NAMES.length, EnumRarity.rare);
     }
 
-    public static IIcon[] overlays = new IIcon[ELEMENT.NAMES.length];
+    public static IIcon[] overlays = new IIcon[MaterialsElements.NAMES.length];
     public static IIcon baseTexture;
 
     static {
         // Generate Ions
         int key = 0;
-        for (String s : ELEMENT.NAMES) {
+        for (String s : MaterialsElements.NAMES) {
             // Map names to Meta
             NameToMetaMap.put(Utils.sanitizeString(s.toLowerCase()), key);
             MetaToNameMap.put(key, Utils.sanitizeString(s.toLowerCase()));
@@ -60,7 +60,7 @@ public class IonParticles extends BaseItemParticle {
 
     @Override
     public String getUnlocalizedName(final ItemStack itemStack) {
-        return "item.particle.ion" + "." + ELEMENT.NAMES[itemStack.getItemDamage()];
+        return "item.particle.ion" + "." + MaterialsElements.NAMES[itemStack.getItemDamage()];
     }
 
     private static boolean createNBT(ItemStack rStack) {
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
index 5979fc76ef..078dcdee88 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
@@ -2,10 +2,10 @@ package gtPlusPlus.core.item.chemistry;
 
 import static gregtech.api.enums.Mods.BiomesOPlenty;
 import static gregtech.api.enums.Mods.Forestry;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER;
-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.GTRecipeConstants.CHEMPLANT_CASING_TIER;
+import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.*;
 
 import java.util.HashMap;
@@ -14,27 +14,27 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 
-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_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.api.objects.data.Quad;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.base.ore.BaseItemMilledOre;
-import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.material.NONMATERIAL;
+import gtPlusPlus.core.material.MaterialsElements;
+import gtPlusPlus.core.material.MaterialsOther;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
-import gtPlusPlus.xmod.bop.HANDLER_BiomesOPlenty;
-import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
+import gtPlusPlus.xmod.bop.BiomesOPlentyHandler;
+import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator;
 import gtPlusPlus.xmod.gregtech.common.helpers.FlotationRecipeHandler;
 
 public class MilledOreProcessing extends ItemPackage {
@@ -217,57 +217,57 @@ public class MilledOreProcessing extends ItemPackage {
         // milledSphalerite
         registerOreDataForMilledType(
             SphaleriteFlotationFroth,
-            ELEMENT.getInstance().ZINC,
+            MaterialsElements.getInstance().ZINC,
             180,
-            ELEMENT.getInstance().IRON,
+            MaterialsElements.getInstance().IRON,
             120,
-            ELEMENT.getInstance().INDIUM,
+            MaterialsElements.getInstance().INDIUM,
             64,
-            ELEMENT.getInstance().GERMANIUM,
+            MaterialsElements.getInstance().GERMANIUM,
             15);
         // milledChalcopyrite
         registerOreDataForMilledType(
             ChalcopyriteFlotationFroth,
-            ELEMENT.getInstance().COPPER,
+            MaterialsElements.getInstance().COPPER,
             180,
-            ELEMENT.getInstance().IRON,
+            MaterialsElements.getInstance().IRON,
             120,
-            ELEMENT.getInstance().CADMIUM,
+            MaterialsElements.getInstance().CADMIUM,
             50,
-            ELEMENT.getInstance().INDIUM,
+            MaterialsElements.getInstance().INDIUM,
             10);
         // milledNickel
         registerOreDataForMilledType(
             NickelFlotationFroth,
-            ELEMENT.getInstance().NICKEL,
+            MaterialsElements.getInstance().NICKEL,
             150,
-            ELEMENT.getInstance().COBALT,
+            MaterialsElements.getInstance().COBALT,
             120,
-            ELEMENT.getInstance().RHODIUM,
+            MaterialsElements.getInstance().RHODIUM,
             32,
-            ELEMENT.getInstance().RUTHENIUM,
+            MaterialsElements.getInstance().RUTHENIUM,
             16);
         // milledPlatinum
         registerOreDataForMilledType(
             PlatinumFlotationFroth,
-            ELEMENT.getInstance().PLATINUM,
+            MaterialsElements.getInstance().PLATINUM,
             120,
-            ELEMENT.getInstance().RHODIUM,
+            MaterialsElements.getInstance().RHODIUM,
             60,
-            ELEMENT.getInstance().SELENIUM,
+            MaterialsElements.getInstance().SELENIUM,
             40,
-            ELEMENT.getInstance().TELLURIUM,
+            MaterialsElements.getInstance().TELLURIUM,
             10);
         // milledPentlandite
         registerOreDataForMilledType(
             PentlanditeFlotationFroth,
-            ELEMENT.getInstance().IRON,
+            MaterialsElements.getInstance().IRON,
             150,
-            ELEMENT.getInstance().NICKEL,
+            MaterialsElements.getInstance().NICKEL,
             100,
-            ELEMENT.getInstance().PROMETHIUM,
+            MaterialsElements.getInstance().PROMETHIUM,
             20,
-            ELEMENT.getInstance().HAFNIUM,
+            MaterialsElements.getInstance().HAFNIUM,
             10);
 
         /*
@@ -276,68 +276,68 @@ public class MilledOreProcessing extends ItemPackage {
         // milledRedstone
         registerOreDataForMilledType(
             RedstoneFlotationFroth,
-            NONMATERIAL.REDSTONE,
+            MaterialsOther.REDSTONE,
             300,
-            ELEMENT.getInstance().CHROMIUM,
+            MaterialsElements.getInstance().CHROMIUM,
             60,
             MaterialUtils.generateMaterialFromGtENUM(Materials.Firestone),
             45,
-            ELEMENT.getInstance().DYSPROSIUM,
+            MaterialsElements.getInstance().DYSPROSIUM,
             16);
         // milledSpessartine
         registerOreDataForMilledType(
             SpessartineFlotationFroth,
-            ELEMENT.getInstance().MANGANESE,
+            MaterialsElements.getInstance().MANGANESE,
             150,
-            ELEMENT.getInstance().ALUMINIUM,
+            MaterialsElements.getInstance().ALUMINIUM,
             90,
-            ELEMENT.getInstance().OSMIUM,
+            MaterialsElements.getInstance().OSMIUM,
             30,
-            ELEMENT.getInstance().STRONTIUM,
+            MaterialsElements.getInstance().STRONTIUM,
             20);
         // milledGrossular
         registerOreDataForMilledType(
             GrossularFlotationFroth,
-            ELEMENT.getInstance().CALCIUM,
+            MaterialsElements.getInstance().CALCIUM,
             180,
-            ELEMENT.getInstance().ALUMINIUM,
+            MaterialsElements.getInstance().ALUMINIUM,
             110,
-            ELEMENT.getInstance().TUNGSTEN,
+            MaterialsElements.getInstance().TUNGSTEN,
             60,
-            ELEMENT.getInstance().THALLIUM,
+            MaterialsElements.getInstance().THALLIUM,
             15);
         // milledAlmandine
         registerOreDataForMilledType(
             AlmandineFlotationFroth,
-            ELEMENT.getInstance().ALUMINIUM,
+            MaterialsElements.getInstance().ALUMINIUM,
             150,
-            ELEMENT.getInstance().MAGNESIUM,
+            MaterialsElements.getInstance().MAGNESIUM,
             75,
-            ELEMENT.getInstance().YTTRIUM,
+            MaterialsElements.getInstance().YTTRIUM,
             25,
-            ELEMENT.getInstance().YTTERBIUM,
+            MaterialsElements.getInstance().YTTERBIUM,
             15);
         // milledPyrope
         registerOreDataForMilledType(
             PyropeFlotationFroth,
-            ELEMENT.getInstance().MAGNESIUM,
+            MaterialsElements.getInstance().MAGNESIUM,
             110,
-            ELEMENT.getInstance().MANGANESE,
+            MaterialsElements.getInstance().MANGANESE,
             70,
             MaterialUtils.generateMaterialFromGtENUM(Materials.Borax),
             60,
-            ELEMENT.getInstance().RHENIUM,
+            MaterialsElements.getInstance().RHENIUM,
             20);
         // milledMonazite TODO
         registerOreDataForMilledType(
             MonaziteFlotationFroth,
-            ELEMENT.getInstance().ERBIUM,
+            MaterialsElements.getInstance().ERBIUM,
             64,
-            ELEMENT.getInstance().LANTHANUM,
+            MaterialsElements.getInstance().LANTHANUM,
             32,
-            ELEMENT.getInstance().LUTETIUM,
+            MaterialsElements.getInstance().LUTETIUM,
             16,
-            ELEMENT.getInstance().EUROPIUM,
+            MaterialsElements.getInstance().EUROPIUM,
             8);
     }
 
@@ -358,8 +358,8 @@ public class MilledOreProcessing extends ItemPackage {
     private void addVacuumFurnaceRecipes() {
         int aCircuitID = 1;
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++))
             .itemOutputs(getOutputsFromMap(SphaleriteFlotationFroth))
             .fluidInputs(FluidUtils.getFluidStack(SphaleriteFlotationFroth, 4000))
             .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000))
@@ -367,8 +367,8 @@ public class MilledOreProcessing extends ItemPackage {
             .metadata(COIL_HEAT, 5500)
             .duration(2 * MINUTES)
             .addTo(vacuumFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++))
             .itemOutputs(getOutputsFromMap(ChalcopyriteFlotationFroth))
             .fluidInputs(FluidUtils.getFluidStack(ChalcopyriteFlotationFroth, 4000))
             .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000))
@@ -376,8 +376,8 @@ public class MilledOreProcessing extends ItemPackage {
             .metadata(COIL_HEAT, 4500)
             .duration(2 * MINUTES)
             .addTo(vacuumFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++))
             .itemOutputs(getOutputsFromMap(NickelFlotationFroth))
             .fluidInputs(FluidUtils.getFluidStack(NickelFlotationFroth, 4000))
             .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000))
@@ -385,8 +385,8 @@ public class MilledOreProcessing extends ItemPackage {
             .metadata(COIL_HEAT, 4500)
             .duration(2 * MINUTES)
             .addTo(vacuumFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++))
             .itemOutputs(getOutputsFromMap(PlatinumFlotationFroth))
             .fluidInputs(FluidUtils.getFluidStack(PlatinumFlotationFroth, 4000))
             .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000))
@@ -394,8 +394,8 @@ public class MilledOreProcessing extends ItemPackage {
             .metadata(COIL_HEAT, 5500)
             .duration(2 * MINUTES)
             .addTo(vacuumFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++))
             .itemOutputs(getOutputsFromMap(PentlanditeFlotationFroth))
             .fluidInputs(FluidUtils.getFluidStack(PentlanditeFlotationFroth, 4000))
             .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000))
@@ -403,8 +403,8 @@ public class MilledOreProcessing extends ItemPackage {
             .metadata(COIL_HEAT, 5500)
             .duration(2 * MINUTES)
             .addTo(vacuumFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++))
             .itemOutputs(getOutputsFromMap(RedstoneFlotationFroth))
             .fluidInputs(FluidUtils.getFluidStack(RedstoneFlotationFroth, 4000))
             .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000))
@@ -412,8 +412,8 @@ public class MilledOreProcessing extends ItemPackage {
             .metadata(COIL_HEAT, 4500)
             .duration(2 * MINUTES)
             .addTo(vacuumFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++))
             .itemOutputs(getOutputsFromMap(SpessartineFlotationFroth))
             .fluidInputs(FluidUtils.getFluidStack(SpessartineFlotationFroth, 4000))
             .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000))
@@ -421,8 +421,8 @@ public class MilledOreProcessing extends ItemPackage {
             .metadata(COIL_HEAT, 5500)
             .duration(2 * MINUTES)
             .addTo(vacuumFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++))
             .itemOutputs(getOutputsFromMap(GrossularFlotationFroth))
             .fluidInputs(FluidUtils.getFluidStack(GrossularFlotationFroth, 4000))
             .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000))
@@ -430,8 +430,8 @@ public class MilledOreProcessing extends ItemPackage {
             .metadata(COIL_HEAT, 5500)
             .duration(2 * MINUTES)
             .addTo(vacuumFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++))
             .itemOutputs(getOutputsFromMap(AlmandineFlotationFroth))
             .fluidInputs(FluidUtils.getFluidStack(AlmandineFlotationFroth, 4000))
             .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000))
@@ -439,8 +439,8 @@ public class MilledOreProcessing extends ItemPackage {
             .metadata(COIL_HEAT, 5500)
             .duration(2 * MINUTES)
             .addTo(vacuumFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++))
             .itemOutputs(getOutputsFromMap(PyropeFlotationFroth))
             .fluidInputs(FluidUtils.getFluidStack(PyropeFlotationFroth, 4000))
             .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000))
@@ -448,8 +448,8 @@ public class MilledOreProcessing extends ItemPackage {
             .metadata(COIL_HEAT, 3500)
             .duration(2 * MINUTES)
             .addTo(vacuumFurnaceRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++))
             .itemOutputs(getOutputsFromMap(MonaziteFlotationFroth))
             .fluidInputs(FluidUtils.getFluidStack(MonaziteFlotationFroth, 4000))
             .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000))
@@ -466,7 +466,7 @@ public class MilledOreProcessing extends ItemPackage {
         // Sphalerite
         Material aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Sphalerite);
         FlotationRecipeHandler.registerOreType(aMat);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32),
                 aMat.getMilled(64),
@@ -482,7 +482,7 @@ public class MilledOreProcessing extends ItemPackage {
         // Chalcopyrite
         aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite);
         FlotationRecipeHandler.registerOreType(aMat);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32),
                 aMat.getMilled(64),
@@ -498,7 +498,7 @@ public class MilledOreProcessing extends ItemPackage {
         // Nickel
         aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Nickel);
         FlotationRecipeHandler.registerOreType(aMat);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 32),
                 aMat.getMilled(64),
@@ -514,7 +514,7 @@ public class MilledOreProcessing extends ItemPackage {
         // Platinum
         aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Platinum);
         FlotationRecipeHandler.registerOreType(aMat);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 32),
                 aMat.getMilled(64),
@@ -530,7 +530,7 @@ public class MilledOreProcessing extends ItemPackage {
         // Pentlandite
         aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Pentlandite);
         FlotationRecipeHandler.registerOreType(aMat);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32),
                 aMat.getMilled(64),
@@ -546,7 +546,7 @@ public class MilledOreProcessing extends ItemPackage {
         // Redstone
         aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Redstone);
         FlotationRecipeHandler.registerOreType(aMat);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32),
                 aMat.getMilled(64),
@@ -562,7 +562,7 @@ public class MilledOreProcessing extends ItemPackage {
         // Spessartine
         aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Spessartine);
         FlotationRecipeHandler.registerOreType(aMat);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 32),
                 aMat.getMilled(64),
@@ -578,7 +578,7 @@ public class MilledOreProcessing extends ItemPackage {
         // Grossular
         aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Grossular);
         FlotationRecipeHandler.registerOreType(aMat);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 32),
                 aMat.getMilled(64),
@@ -594,7 +594,7 @@ public class MilledOreProcessing extends ItemPackage {
         // Almandine
         aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Almandine);
         FlotationRecipeHandler.registerOreType(aMat);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32),
                 aMat.getMilled(64),
@@ -610,7 +610,7 @@ public class MilledOreProcessing extends ItemPackage {
         // Pyrope
         aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Pyrope);
         FlotationRecipeHandler.registerOreType(aMat);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32),
                 aMat.getMilled(64),
@@ -626,7 +626,7 @@ public class MilledOreProcessing extends ItemPackage {
         // Monazite
         aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Monazite);
         FlotationRecipeHandler.registerOreType(aMat);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 32),
                 aMat.getMilled(64),
@@ -648,16 +648,16 @@ public class MilledOreProcessing extends ItemPackage {
 
         ItemStack aCrushedPine = ItemUtils.getSimpleStack(AgriculturalChem.mCrushedPine, 1);
 
-        aLogs.add(ItemUtils.getSimpleStack(BOP_Block_Registrator.log_Pine));
-        aLeaves.add(ItemUtils.getSimpleStack(BOP_Block_Registrator.leaves_Pine));
-        aSaplings.add(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Pine));
+        aLogs.add(ItemUtils.getSimpleStack(BOPBlockRegistrator.log_Pine));
+        aLeaves.add(ItemUtils.getSimpleStack(BOPBlockRegistrator.leaves_Pine));
+        aSaplings.add(ItemUtils.getSimpleStack(BOPBlockRegistrator.sapling_Pine));
         aPinecones.add(ItemUtils.getSimpleStack(AgriculturalChem.mPinecone, 1));
 
         if (BiomesOPlenty.isModLoaded()) {
-            aLogs.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.logs4, 0, 1));
-            aLeaves.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.colorizedLeaves2, 1, 1));
-            aSaplings.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.colorizedSaplings, 5, 1));
-            aPinecones.add(ItemUtils.simpleMetaStack(HANDLER_BiomesOPlenty.mPineCone, 13, 1));
+            aLogs.add(BiomesOPlentyHandler.getStack(BiomesOPlentyHandler.logs4, 0, 1));
+            aLeaves.add(BiomesOPlentyHandler.getStack(BiomesOPlentyHandler.colorizedLeaves2, 1, 1));
+            aSaplings.add(BiomesOPlentyHandler.getStack(BiomesOPlentyHandler.colorizedSaplings, 5, 1));
+            aPinecones.add(ItemUtils.simpleMetaStack(BiomesOPlentyHandler.mPineCone, 13, 1));
         }
         if (Forestry.isModLoaded()) {
             ItemStack aForestryLog = ItemUtils.getItemStackFromFQRN("Forestry:logs", 1);
@@ -690,7 +690,7 @@ public class MilledOreProcessing extends ItemPackage {
             addRecipe(aCone, ItemUtils.getSimpleStack(aCrushedPine, 1), new int[] { 7500, 7500, 5000, 2500 }, 10, 60);
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(CI.getNumberedAdvancedCircuit(16), ItemUtils.getSimpleStack(aCrushedPine, 64))
             .itemOutputs(
                 ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5),
@@ -703,7 +703,7 @@ public class MilledOreProcessing extends ItemPackage {
             .eut(TierEU.RECIPE_MV)
             .metadata(CHEMPLANT_CASING_TIER, 3)
             .addTo(chemicalPlantRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(CI.getNumberedAdvancedCircuit(18), ItemUtils.getSimpleStack(aCrushedPine, 64))
             .itemOutputs(
                 ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5),
@@ -720,18 +720,18 @@ public class MilledOreProcessing extends ItemPackage {
     }
 
     public boolean addRecipe(ItemStack aInput, ItemStack aOutput1, int[] aChances, int aTime, int aEU) {
-        aOutput1 = GT_OreDictUnificator.get(true, aOutput1);
+        aOutput1 = GTOreDictUnificator.get(true, aOutput1);
         ItemStack aOutputs[] = new ItemStack[4];
         for (int i = 0; i < aChances.length; i++) {
             aOutputs[i] = aOutput1;
         }
         aOutputs = cleanArray(aOutputs);
-        if ((GT_Utility.isStackInvalid(aInput))
-            || (GT_Utility.isStackInvalid(aOutput1) || (GT_Utility.getContainerItem(aInput, false) != null))) {
+        if ((GTUtility.isStackInvalid(aInput))
+            || (GTUtility.isStackInvalid(aOutput1) || (GTUtility.getContainerItem(aInput, false) != null))) {
             return false;
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(CI.getNumberedAdvancedCircuit(14), aInput)
             .itemOutputs(aOutputs)
             .duration(aTime * 20)
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java
index d83b5a7cea..db408721fc 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java
@@ -1,17 +1,17 @@
 package gtPlusPlus.core.item.chemistry;
 
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
 
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 
-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_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 
@@ -92,10 +92,10 @@ public class NuclearChem extends ItemPackage {
     }
 
     private static void chemReactor_CreateMutagen() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 2),
-                GT_Utility.getIntegratedCircuit(20))
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 2),
+                GTUtility.getIntegratedCircuit(20))
             .fluidInputs(FluidRegistry.getFluidStack("mobessence", 5000))
             .fluidOutputs(FluidUtils.getFluidStack(GeneticMutagen, 8000))
             .duration(30 * SECONDS)
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index 6cf0dcd09b..4a7291bb21 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -3,9 +3,9 @@ package gtPlusPlus.core.item.chemistry;
 import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
 import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
 import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes;
 
@@ -19,13 +19,13 @@ 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.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
-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 gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.item.base.BaseItemComponent;
@@ -74,8 +74,8 @@ public class RocketFuels extends ItemPackage {
         FluidStack fuelB = FluidUtils.getFluidStack("fuel", 3000);
 
         if (fuelA != null) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(23))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(23))
                 .fluidInputs(fuelA)
                 .fluidOutputs(FluidUtils.getFluidStack(Kerosene, 1800))
                 .duration(10 * SECONDS)
@@ -83,8 +83,8 @@ public class RocketFuels extends ItemPackage {
                 .addTo(distilleryRecipes);
         }
         if (fuelA == null && fuelB != null) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(23))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(23))
                 .fluidInputs(fuelB)
                 .fluidOutputs(FluidUtils.getFluidStack(Kerosene, 1800))
                 .duration(10 * SECONDS)
@@ -96,8 +96,8 @@ public class RocketFuels extends ItemPackage {
     public static void createRP1() {
         FluidStack fuelA = FluidUtils.getFluidStack(Kerosene, 1000);
         if (fuelA != null) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(23))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(23))
                 .fluidInputs(fuelA)
                 .fluidOutputs(FluidUtils.getFluidStack(RP1, 750))
                 .duration(40 * SECONDS)
@@ -108,7 +108,7 @@ public class RocketFuels extends ItemPackage {
 
     public static void createNitrogenTetroxide() {
         // 2HNO3 + Cu = N2O4 + H2O + CuO
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1),
                 ItemUtils.getSimpleStack(GenericChem.mOrangeCatalyst, 0))
@@ -125,8 +125,8 @@ public class RocketFuels extends ItemPackage {
     public static void createHydrazine() {
 
         // H2O2 + 2NH3 = N2H4 + 2H2O
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(21))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(21))
             .fluidInputs(
                 FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000),
                 FluidUtils.getFluidStack("ammonia", 2000))
@@ -141,8 +141,8 @@ public class RocketFuels extends ItemPackage {
     public static void createMonomethylhydrazine() {
 
         // C + 2H + N2H4 = CH6N2
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(21), ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(21), ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1))
             .fluidInputs(FluidUtils.getFluidStack("hydrogen", 2000), FluidUtils.getFluidStack(Hydrazine, 1000))
             .fluidOutputs(FluidUtils.getFluidStack(Monomethylhydrazine, 1000))
             .duration(48 * SECONDS)
@@ -153,7 +153,7 @@ public class RocketFuels extends ItemPackage {
     }
 
     private static void createLOH() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1))
             .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidHydrogen", 1))
             .duration(16 * SECONDS)
@@ -164,7 +164,7 @@ public class RocketFuels extends ItemPackage {
     private static void createHydratedAmmoniumNitrateSlurry() {
 
         // NH3 + HNO3 = NH4NO3
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(CI.getNumberedAdvancedCircuit(21))
             .fluidInputs(FluidUtils.getFluidStack("ammonia", 4000), FluidUtils.getFluidStack("nitricacid", 4000))
             .fluidOutputs(FluidUtils.getFluidStack(Hydrated_Ammonium_Nitrate_Slurry, 5184))
@@ -176,8 +176,8 @@ public class RocketFuels extends ItemPackage {
     }
 
     private static void createAmmoniumNitrateDust() {
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(8))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(8))
             .itemOutputs(ItemUtils.getSimpleStack(Ammonium_Nitrate_Dust, 8))
             .fluidInputs(FluidUtils.getFluidStack(Hydrated_Ammonium_Nitrate_Slurry, 8 * 144))
             .fluidOutputs(FluidUtils.getWater(2000))
@@ -189,7 +189,7 @@ public class RocketFuels extends ItemPackage {
     private static void createFormaldehyde() {
 
         // O + CH4O = CH2O + H2O
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(21),
                 ItemUtils.getSimpleStack(GenericChem.mFormaldehydeCatalyst, 0))
@@ -203,11 +203,11 @@ public class RocketFuels extends ItemPackage {
     }
 
     private static void createFormaldehydeCatalyst() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 16L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1L),
-                GT_Utility.getIntegratedCircuit(18))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 16L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1L),
+                GTUtility.getIntegratedCircuit(18))
             .itemOutputs(ItemUtils.getSimpleStack(Formaldehyde_Catalyst_Dust, 4))
             .duration(8 * SECONDS)
             .eut(TierEU.RECIPE_LV)
@@ -216,7 +216,7 @@ public class RocketFuels extends ItemPackage {
 
     private static void createUnsymmetricalDimethylhydrazine() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(21),
                 ItemUtils.getSimpleStack(GenericChem.mFormaldehydeCatalyst, 0))
@@ -233,10 +233,10 @@ public class RocketFuels extends ItemPackage {
     }
 
     private static void addRocketFuelsToMap() {
-        HashMap<Integer, GT_Recipe> mRocketFuels = new LinkedHashMap<>();
+        HashMap<Integer, GTRecipe> mRocketFuels = new LinkedHashMap<>();
         mRocketFuels.put(
             0,
-            new GT_Recipe(
+            new GTRecipe(
                 true,
                 new ItemStack[] {},
                 new ItemStack[] {},
@@ -250,7 +250,7 @@ public class RocketFuels extends ItemPackage {
 
         mRocketFuels.put(
             1,
-            new GT_Recipe(
+            new GTRecipe(
                 true,
                 new ItemStack[] {},
                 new ItemStack[] {},
@@ -264,7 +264,7 @@ public class RocketFuels extends ItemPackage {
 
         mRocketFuels.put(
             2,
-            new GT_Recipe(
+            new GTRecipe(
                 true,
                 new ItemStack[] {},
                 new ItemStack[] {},
@@ -278,7 +278,7 @@ public class RocketFuels extends ItemPackage {
 
         mRocketFuels.put(
             3,
-            new GT_Recipe(
+            new GTRecipe(
                 true,
                 new ItemStack[] {},
                 new ItemStack[] {},
@@ -296,7 +296,7 @@ public class RocketFuels extends ItemPackage {
 
         mValidRocketFuelNames.add(FluidRegistry.getFluidName(Diesel));
         for (int mID : mRocketFuels.keySet()) {
-            GT_Recipe aFuelRecipe = mRocketFuels.get(mID);
+            GTRecipe aFuelRecipe = mRocketFuels.get(mID);
             if (aFuelRecipe != null) {
                 mValidRocketFuelNames.add(FluidRegistry.getFluidName(aFuelRecipe.mFluidInputs[0].getFluid()));
                 mValidRocketFuels.put(mID, aFuelRecipe.mFluidInputs[0].getFluid());
@@ -308,8 +308,8 @@ public class RocketFuels extends ItemPackage {
     private static void createRocketFuels() {
 
         // RP1_Plus_Liquid_Oxygen
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .fluidInputs(FluidUtils.getFluidStack(Liquid_Oxygen, 2000), FluidUtils.getFluidStack(RP1, 500))
             .fluidOutputs(FluidUtils.getFluidStack(RP1_Plus_Liquid_Oxygen, 1500))
             .duration(15 * SECONDS)
@@ -317,8 +317,8 @@ public class RocketFuels extends ItemPackage {
             .metadata(CHEMPLANT_CASING_TIER, 3)
             .addTo(chemicalPlantRecipes);
         // Dense_Hydrazine_Mix
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(2))
             .fluidInputs(FluidUtils.getFluidStack(Hydrazine, 4000), FluidUtils.getFluidStack("methanol", 6000))
             .fluidOutputs(FluidUtils.getFluidStack(Dense_Hydrazine_Mix, 10000))
             .duration(30 * SECONDS)
@@ -326,8 +326,8 @@ public class RocketFuels extends ItemPackage {
             .metadata(CHEMPLANT_CASING_TIER, 4)
             .addTo(chemicalPlantRecipes);
         // Monomethylhydrazine_Plus_Nitric_Acid
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(3))
             .fluidInputs(
                 FluidUtils.getFluidStack(Monomethylhydrazine, 2000),
                 FluidUtils.getFluidStack("nitricacid", 1000))
@@ -337,8 +337,8 @@ public class RocketFuels extends ItemPackage {
             .metadata(CHEMPLANT_CASING_TIER, 5)
             .addTo(chemicalPlantRecipes);
         // Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(4))
             .fluidInputs(
                 FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine, 2000),
                 FluidUtils.getFluidStack(Nitrogen_Tetroxide, 2000))
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
index 8ef674ac19..038a1ea8ce 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
@@ -17,7 +17,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
@@ -270,10 +270,10 @@ public class ItemGenericChemBase extends Item {
     }
 
     public static int getMaxBallDurability(ItemStack aStack) {
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mMillingBallAlumina, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mMillingBallAlumina, true)) {
             return 100;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mMillingBallSoapstone, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mMillingBallSoapstone, true)) {
             return 50;
         }
         return 0;
diff --git a/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java b/src/main/java/gtPlusPlus/core/item/circuit/GTPPIntegratedCircuitItem.java
index 11bbac53a3..e616004ec1 100644
--- a/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java
+++ b/src/main/java/gtPlusPlus/core/item/circuit/GTPPIntegratedCircuitItem.java
@@ -29,25 +29,25 @@ import org.apache.commons.lang3.tuple.Pair;
 import com.gtnewhorizons.modularui.api.UIInfos;
 
 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.interfaces.INetworkUpdatableItem;
-import gregtech.api.net.GT_Packet_UpdateItem;
+import gregtech.api.net.GTPacketUpdateItem;
 import gregtech.api.objects.XSTR;
-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.uifactory.SelectItemUIFactory;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
-public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatableItem {
+public class GTPPIntegratedCircuitItem extends Item implements INetworkUpdatableItem {
 
     private final List<ItemStack> ALL_VARIANTS = new ArrayList<>();
 
     private final String iconLocation;
     protected final IIcon[] iconDamage = new IIcon[25];
 
-    public GTPP_IntegratedCircuit_Item(String unlocalizedName, String iconLocation) {
+    public GTPPIntegratedCircuitItem(String unlocalizedName, String iconLocation) {
         this.setHasSubtypes(true);
         this.setNoRepair();
         this.setMaxStackSize(64);
@@ -72,13 +72,13 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab
         try {
             aList.add("Configuration == " + aStack.getItemDamage());
             aList.add(
-                GT_LanguageManager.addStringLocalization(
+                GTLanguageManager.addStringLocalization(
                     new StringBuilder().append(getUnlocalizedName())
                         .append(".tooltip.0")
                         .toString(),
                     "Right click to reconfigure"));
             aList.add(
-                GT_LanguageManager.addStringLocalization(
+                GTLanguageManager.addStringLocalization(
                     new StringBuilder().append(getUnlocalizedName())
                         .append(".tooltip.1")
                         .toString(),
@@ -183,7 +183,7 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab
             buildContext -> new SelectItemUIFactory(
                 StatCollector.translateToLocal("GT5U.item.programmed_circuit.select.header"),
                 configurator,
-                GTPP_IntegratedCircuit_Item::onConfigured,
+                GTPPIntegratedCircuitItem::onConfigured,
                 ALL_VARIANTS,
                 meta,
                 true).createWindow(buildContext));
@@ -192,7 +192,7 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab
     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(
@@ -201,9 +201,9 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab
         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/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java
index 07bf082903..01f2b1b263 100644
--- a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java
+++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java
@@ -23,7 +23,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.Materials;
 import gregtech.api.objects.ItemData;
 import gregtech.api.objects.MaterialStack;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.ModItems;
@@ -199,11 +199,11 @@ public class BaseItemMetaFood extends ItemFood {
         }
         mOreDictNames.put(aMetaID, aOreDictNames);
         if (aOreDictNames.contains("listAllmeatraw")) {
-            GT_OreDictUnificator.addItemData(
+            GTOreDictUnificator.addItemData(
                 new ItemStack(ModItems.itemMetaFood, 1, aMetaID),
                 new ItemData(Materials.MeatRaw, 3628800L, new MaterialStack(Materials.Bone, 403200L)));
         } else if (aOreDictNames.contains("listAllmeatcooked")) {
-            GT_OreDictUnificator.addItemData(
+            GTOreDictUnificator.addItemData(
                 new ItemStack(ModItems.itemMetaFood, 1, aMetaID),
                 new ItemData(Materials.MeatCooked, 3628800L, new MaterialStack(Materials.Bone, 403200L)));
         }
diff --git a/src/main/java/gtPlusPlus/core/item/general/BufferCore.java b/src/main/java/gtPlusPlus/core/item/general/ItemBufferCore.java
index 69257afb0e..e99b4ca7a0 100644
--- a/src/main/java/gtPlusPlus/core/item/general/BufferCore.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemBufferCore.java
@@ -10,16 +10,16 @@ import net.minecraft.util.EnumChatFormatting;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gtPlusPlus.core.item.base.BaseItemWithDamageValue;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 
-public class BufferCore extends BaseItemWithDamageValue {
+public class ItemBufferCore extends BaseItemWithDamageValue {
 
     public int coreTier = 0;
 
-    public BufferCore(final String unlocalizedName, final int i) {
+    public ItemBufferCore(final String unlocalizedName, final int i) {
         super(unlocalizedName + i);
         this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName);
         this.setMaxStackSize(32);
@@ -42,7 +42,7 @@ public class BufferCore extends BaseItemWithDamageValue {
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
         list.add(
             EnumChatFormatting.GRAY + "A key crafting component for "
-                + GT_Values.VN[this.coreTier - 1]
+                + GTValues.VN[this.coreTier - 1]
                 + " Applicances");
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
index 9e5cf0a69d..f1f70b6cbd 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
@@ -19,7 +19,7 @@ import baubles.api.BaubleType;
 import baubles.api.IBauble;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -135,17 +135,17 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric
         list.add(
             StatCollector.translateToLocalFormatted(
                 "item.personalCloakingDevice.tooltip.3",
-                GT_Utility.formatNumbers(this.getTier(this.thisStack)),
-                GT_Utility.formatNumbers(this.getTransferLimit(this.thisStack))));
+                GTUtility.formatNumbers(this.getTier(this.thisStack)),
+                GTUtility.formatNumbers(this.getTransferLimit(this.thisStack))));
         list.add(
             StatCollector.translateToLocalFormatted(
                 "item.personalCloakingDevice.tooltip.4",
-                GT_Utility.formatNumbers(this.getCharge(stack)),
+                GTUtility.formatNumbers(this.getCharge(stack)),
                 MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))));
         list.add(
             StatCollector.translateToLocalFormatted(
                 "item.personalCloakingDevice.tooltip.5",
-                GT_Utility.formatNumbers(this.secondsLeft(stack))));
+                GTUtility.formatNumbers(this.secondsLeft(stack))));
         super.addInformation(stack, aPlayer, list, bool);
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java
index c1bea0b81d..7a0cbe3312 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java
@@ -16,7 +16,7 @@ import net.minecraft.util.IIcon;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.CoreItem;
 
@@ -74,12 +74,12 @@ public class ItemGenericToken extends CoreItem {
         sizes[0][4] = mCustomNameColours.size();
         // sizes[0][5] = mIcons.size();
         mLocalNames.put(id, aLocalName);
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization("gtplusplus." + this.getUnlocalizedName() + "." + id + ".name", aLocalName);
         mMaxStackSizes.put(id, aMaxStack);
         mDescriptionArrays.put(id, aDescript);
         for (int i = 0; i < aDescript.length; i++) {
-            GT_LanguageManager.addStringLocalization(
+            GTLanguageManager.addStringLocalization(
                 "gtplusplus." + this.getUnlocalizedName() + "." + id + ".tooltip." + i,
                 aDescript[i]);
         }
@@ -113,7 +113,7 @@ public class ItemGenericToken extends CoreItem {
     public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
         super.addInformation(stack, aPlayer, list, bool);
         for (int i = 0;; i++) {
-            String tooltip = GT_LanguageManager.getTranslation(
+            String tooltip = GTLanguageManager.getTranslation(
                 "gtplusplus." + this
                     .getUnlocalizedNameInefficiently(stack) + "." + stack.getItemDamage() + ".tooltip." + i);
             if (!("gtplusplus." + this
@@ -126,7 +126,7 @@ public class ItemGenericToken extends CoreItem {
 
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
-        String ret = GT_LanguageManager.getTranslation(
+        String ret = GTLanguageManager.getTranslation(
             "gtplusplus." + this.getUnlocalizedNameInefficiently(tItem) + "." + tItem.getItemDamage() + ".name");
         EnumChatFormatting format = mCustomNameColours.get(tItem.getItemDamage());
         if (format != null) {
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java
index d80238b99a..ed9bddfd18 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java
@@ -19,9 +19,9 @@ import baubles.api.BaubleType;
 import baubles.api.IBauble;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Mods;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -89,7 +89,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
 
     @Override
     public double getTransferLimit(final ItemStack itemStack) {
-        return GT_Values.V[7];
+        return GTValues.V[7];
     }
 
     @Override
@@ -138,7 +138,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
         list.add(EnumChatFormatting.GREEN + aString1 + EnumChatFormatting.GRAY);
         list.add(
             EnumChatFormatting.GREEN + aString2
-                + GT_Utility.formatNumbers(EUPerOperation)
+                + GTUtility.formatNumbers(EUPerOperation)
                 + aString3
                 + EnumChatFormatting.GRAY);
         list.add(EnumChatFormatting.GREEN + aString4 + EnumChatFormatting.GRAY);
@@ -151,13 +151,13 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
             EnumChatFormatting.GRAY + aTier
                 + ": ["
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(this.getTier(stack))
+                + GTUtility.formatNumbers(this.getTier(stack))
                 + EnumChatFormatting.GRAY
                 + "] "
                 + aInputLimit
                 + ": ["
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(this.getTransferLimit(stack))
+                + GTUtility.formatNumbers(this.getTransferLimit(stack))
                 + EnumChatFormatting.GRAY
                 + aEUT
                 + "]");
@@ -165,12 +165,12 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
             EnumChatFormatting.GRAY + aCurrentPower
                 + ": ["
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(this.getCharge(stack))
+                + GTUtility.formatNumbers(this.getCharge(stack))
                 + EnumChatFormatting.GRAY
                 + aEU
                 + "] ["
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)))
+                + GTUtility.formatNumbers(MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)))
                 + EnumChatFormatting.GRAY
                 + "%]");
         list.add(EnumChatFormatting.GOLD + aString6 + EnumChatFormatting.GRAY);
@@ -332,18 +332,18 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
                         .messagePlayer((EntityPlayer) arg1, "Your NanoBooster Whirs! Leaving you feeling stronger.");
 
                     if (hp > 0) PlayerUtils
-                        .messagePlayer((EntityPlayer) arg1, "Healed " + GT_Utility.formatNumbers(hp) + " hp.");
+                        .messagePlayer((EntityPlayer) arg1, "Healed " + GTUtility.formatNumbers(hp) + " hp.");
 
                     if (hunger > 0) PlayerUtils
-                        .messagePlayer((EntityPlayer) arg1, "Healed " + GT_Utility.formatNumbers(hunger) + " hunger.");
+                        .messagePlayer((EntityPlayer) arg1, "Healed " + GTUtility.formatNumbers(hunger) + " hunger.");
 
                     if (saturation > 0) PlayerUtils.messagePlayer(
                         (EntityPlayer) arg1,
-                        "Satured Hunger by " + GT_Utility.formatNumbers(saturation) + ".");
+                        "Satured Hunger by " + GTUtility.formatNumbers(saturation) + ".");
 
                     if (hp > 0 || hunger > 0 || saturation > 0) PlayerUtils.messagePlayer(
                         (EntityPlayer) arg1,
-                        "You check it's remaining uses, it has " + GT_Utility.formatNumbers(secondsLeft(baubleStack))
+                        "You check it's remaining uses, it has " + GTUtility.formatNumbers(secondsLeft(baubleStack))
                             + " seconds left.");
                 }
             }
diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
index 24759808ab..f23f4c8dce 100644
--- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
+++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
@@ -12,7 +12,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.StatCollector;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 
 public class ItemDehydratorCoil extends Item {
@@ -56,7 +56,7 @@ public class ItemDehydratorCoil extends Item {
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
         return StatCollector
-            .translateToLocalFormatted("item.itemDehydratorCoil.name", GT_Values.VN[tItem.getItemDamage() + 4]);
+            .translateToLocalFormatted("item.itemDehydratorCoil.name", GTValues.VN[tItem.getItemDamage() + 4]);
     }
 
     /*
diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
index b050e4c65c..820486b742 100644
--- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
+++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
@@ -12,7 +12,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.StatCollector;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 
 public class ItemDehydratorCoilWire extends Item {
@@ -56,7 +56,7 @@ public class ItemDehydratorCoilWire extends Item {
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
         return StatCollector
-            .translateToLocalFormatted("item.itemDehydratorCoilWire.name", GT_Values.VN[tItem.getItemDamage() + 4]);
+            .translateToLocalFormatted("item.itemDehydratorCoilWire.name", GTValues.VN[tItem.getItemDamage() + 4]);
     }
 
     /*
diff --git a/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java
index eaf8c2c9da..1524418038 100644
--- a/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java
+++ b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java
@@ -12,10 +12,10 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.core.handler.Recipes.DecayableRecipe;
 import gtPlusPlus.core.item.base.BaseItemTickable;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
@@ -28,7 +28,7 @@ public class DustDecayable extends BaseItemTickable {
         super(true, true, unlocal, colour, (maxTicks / 1), desc1);
         this.turnsIntoItem = turnsInto;
         this.radLevel = radLevel;
-        GT_OreDictUnificator.registerOre(unlocal, ItemUtils.getSimpleStack(this));
+        GTOreDictUnificator.registerOre(unlocal, ItemUtils.getSimpleStack(this));
         new DecayableRecipe(maxTicks, getSimpleStack(this), getSimpleStack(turnsInto));
     }
 
@@ -45,7 +45,7 @@ public class DustDecayable extends BaseItemTickable {
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
         super.addInformation(stack, player, list, bool);
         if (this.radLevel > 0) {
-            list.add(CORE.GT_Tooltip_Radioactive.get());
+            list.add(GTPPCore.GT_Tooltip_Radioactive.get());
         }
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java
index 5ba3aa1531..082f74ad2b 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java
@@ -1,8 +1,8 @@
 package gtPlusPlus.core.item.tool.misc;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Mods.GTPlusPlus;
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.util.GTUtility.formatNumbers;
 
 import java.util.ArrayList;
 import java.util.BitSet;
@@ -35,21 +35,21 @@ import net.minecraftforge.fluids.IFluidTank;
 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.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.SubTag;
-import gregtech.api.enums.TC_Aspects.TC_AspectStack;
+import gregtech.api.enums.TCAspects.TC_AspectStack;
 import gregtech.api.interfaces.IItemBehaviour;
 import gregtech.api.interfaces.IItemContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_MultiInput;
+import gregtech.api.metatileentity.implementations.MTEBasicTank;
+import gregtech.api.metatileentity.implementations.MTEHatchMultiInput;
 import gregtech.api.objects.ItemData;
-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.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.creative.AddToCreativeTab;
@@ -62,7 +62,7 @@ import ic2.api.item.IElectricItem;
 import ic2.api.item.IElectricItemManager;
 import ic2.api.item.ISpecialElectricItem;
 
-public class GregtechPump extends Item implements ISpecialElectricItem, IElectricItemManager, IFluidContainerItem {
+public class ItemGregtechPump extends Item implements ISpecialElectricItem, IElectricItemManager, IFluidContainerItem {
 
     /**
      * Right Click Functions
@@ -91,7 +91,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
      */
 
     /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */
-    private final HashMap<Short, ArrayList<IItemBehaviour<GregtechPump>>> mItemBehaviors = new HashMap<>();
+    private final HashMap<Short, ArrayList<IItemBehaviour<ItemGregtechPump>>> mItemBehaviors = new HashMap<>();
 
     public final short mOffset, mItemAmount;
     public final BitSet mEnabledItems;
@@ -120,11 +120,11 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
         );
     }
 
-    public GregtechPump() {
+    public ItemGregtechPump() {
         this("MU-metatool.01", AddToCreativeTab.tabTools, (short) 1000, (short) 31766);
     }
 
-    public GregtechPump(final String unlocalizedName, final CreativeTabs creativeTab, final short aOffset,
+    public ItemGregtechPump(final String unlocalizedName, final CreativeTabs creativeTab, final short aOffset,
         final short aItemAmount) {
         this.mEnabledItems = new BitSet(aItemAmount);
         this.mVisibleItems = new BitSet(aItemAmount);
@@ -157,7 +157,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
             localizedName,
             EnumChatFormatting.GRAY + "Can be used to remove fluids from GT machine input & output slots");
         if (euStorage > 0 && tier > 0)
-            this.setElectricStats(this.mOffset + id, euStorage, GT_Values.V[tier], tier, -3L, true);
+            this.setElectricStats(this.mOffset + id, euStorage, GTValues.V[tier], tier, -3L, true);
         this.rarity.put(id, regRarity);
         this.itemName.put(id, localizedName);
         this.hasEffect.put(id, Effect);
@@ -188,7 +188,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
         // aList.add("Meta: "+(aStack.getItemDamage()-mOffset));
         int aOffsetMeta = getCorrectMetaForItemstack(aStack);
         aList.add(
-            GT_LanguageManager
+            GTLanguageManager
                 .getTranslation("gtplusplus." + this.getUnlocalizedName(aStack) + "." + aOffsetMeta + ".tooltip"));
 
         if (aOffsetMeta <= 3) {
@@ -234,9 +234,10 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
             }
         }
 
-        final ArrayList<IItemBehaviour<GregtechPump>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack));
+        final ArrayList<IItemBehaviour<ItemGregtechPump>> tList = this.mItemBehaviors
+            .get((short) this.getDamage(aStack));
         if (tList != null) {
-            for (final IItemBehaviour<GregtechPump> tBehavior : tList) {
+            for (final IItemBehaviour<ItemGregtechPump> tBehavior : tList) {
                 aList = tBehavior.getAdditionalToolTips(this, aList, aStack);
             }
         }
@@ -366,7 +367,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
         }
         for (int i = 1; i < 5; i++) {
             final ItemStack tArmor = aPlayer.getEquipmentInSlot(i);
-            if (GT_ModHandler.isElectricItem(tArmor)) {
+            if (GTModHandler.isElectricItem(tArmor)) {
                 final IElectricItem tArmorItem = (IElectricItem) tArmor.getItem();
                 if (tArmorItem.canProvideEnergy(tArmor) && (tArmorItem.getTier(tArmor) >= this.getTier(aStack))) {
                     final double tCharge = ElectricItem.manager.discharge(
@@ -437,9 +438,10 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
     }
 
     public boolean isItemStackUsable(final ItemStack aStack) {
-        final ArrayList<IItemBehaviour<GregtechPump>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack));
+        final ArrayList<IItemBehaviour<ItemGregtechPump>> tList = this.mItemBehaviors
+            .get((short) this.getDamage(aStack));
         if (tList != null) {
-            for (final IItemBehaviour<GregtechPump> tBehavior : tList) {
+            for (final IItemBehaviour<ItemGregtechPump> tBehavior : tList) {
                 if (!tBehavior.isItemStackUsable(this, aStack)) {
                     return false;
                 }
@@ -466,7 +468,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
      * @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 GregtechPump setBurnValue(final int aMetaValue, final int aValue) {
+    public final ItemGregtechPump setBurnValue(final int aMetaValue, final int aValue) {
         if ((aMetaValue < 0) || (aValue < 0)) {
             return this;
         }
@@ -489,8 +491,8 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
      *                       this Battery charge/discharge-able.
      * @return the Item itself for convenience in constructing.
      */
-    public final GregtechPump setElectricStats(final int aMetaValue, final long aMaxCharge, final long aTransferLimit,
-        final long aTier, final long aSpecialData, final boolean aUseAnimations) {
+    public final ItemGregtechPump setElectricStats(final int aMetaValue, final long aMaxCharge,
+        final long aTransferLimit, final long aTier, final long aSpecialData, final boolean aUseAnimations) {
         if (aMetaValue < 0) {
             return this;
         }
@@ -509,7 +511,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
     @SideOnly(Side.CLIENT)
     public void getSubItems(final Item var1, final CreativeTabs aCreativeTab, final List aList) {
         for (int i = 0, j = this.mEnabledItems.length(); i < j; i++) {
-            if (this.mVisibleItems.get(i) || (GT_Values.D1 && this.mEnabledItems.get(i))) {
+            if (this.mVisibleItems.get(i) || (GTValues.D1 && this.mEnabledItems.get(i))) {
                 final Long[] tStats = this.mElectricStats.get((short) (this.mOffset + i));
                 if ((tStats != null) && (tStats[3] < 0)) {
                     final ItemStack tStack = new ItemStack(this, 1, this.mOffset + i);
@@ -598,11 +600,12 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
      * @param aBehavior  the Click Behavior you want to add.
      * @return the Item itself for convenience in constructing.
      */
-    public final GregtechPump addItemBehavior(final int aMetaValue, final IItemBehaviour<GregtechPump> aBehavior) {
+    public final ItemGregtechPump addItemBehavior(final int aMetaValue,
+        final IItemBehaviour<ItemGregtechPump> aBehavior) {
         if ((aMetaValue < 0) || (aMetaValue >= 32766) || (aBehavior == null)) {
             return this;
         }
-        ArrayList<IItemBehaviour<GregtechPump>> tList = this.mItemBehaviors.get((short) aMetaValue);
+        ArrayList<IItemBehaviour<ItemGregtechPump>> tList = this.mItemBehaviors.get((short) aMetaValue);
         if (tList == null) {
             tList = new ArrayList<>(1);
             this.mItemBehaviors.put((short) aMetaValue, tList);
@@ -628,12 +631,12 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
         }
         if ((aID >= 0) && (aID < this.mItemAmount)) {
             final ItemStack rStack = new ItemStack(this, 1, this.mOffset + aID);
-            GT_ModHandler.registerBoxableItemToToolBox(rStack);
+            GTModHandler.registerBoxableItemToToolBox(rStack);
             this.mEnabledItems.set(aID);
             this.mVisibleItems.set(aID);
-            GT_LanguageManager
+            GTLanguageManager
                 .addStringLocalization("gtplusplus." + this.getUnlocalizedName(rStack) + "." + aID + ".name", aEnglish);
-            GT_LanguageManager.addStringLocalization(
+            GTLanguageManager.addStringLocalization(
                 "gtplusplus." + this.getUnlocalizedName(rStack) + "." + aID + ".tooltip",
                 aToolTip);
             final List<TC_AspectStack> tAspects = new ArrayList<>();
@@ -645,7 +648,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
                         continue;
                     }
                     if (tRandomData == SubTag.NO_UNIFICATION) {
-                        GT_OreDictUnificator.addToBlacklist(rStack);
+                        GTOreDictUnificator.addToBlacklist(rStack);
                         continue;
                     }
                 }
@@ -655,7 +658,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
                 if (tRandomData != null) {
                     boolean tUseOreDict = true;
                     if (tRandomData instanceof IItemBehaviour) {
-                        this.addItemBehavior(this.mOffset + aID, (IItemBehaviour<GregtechPump>) tRandomData);
+                        this.addItemBehavior(this.mOffset + aID, (IItemBehaviour<ItemGregtechPump>) tRandomData);
                         tUseOreDict = false;
                     }
                     if (tRandomData instanceof IItemContainer) {
@@ -670,21 +673,21 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
                         continue;
                     }
                     if (tRandomData instanceof ItemData) {
-                        if (GT_Utility.isStringValid(tRandomData)) {
-                            GT_OreDictUnificator.registerOre(tRandomData, rStack);
+                        if (GTUtility.isStringValid(tRandomData)) {
+                            GTOreDictUnificator.registerOre(tRandomData, rStack);
                         } else {
-                            GT_OreDictUnificator.addItemData(rStack, (ItemData) tRandomData);
+                            GTOreDictUnificator.addItemData(rStack, (ItemData) tRandomData);
                         }
                         continue;
                     }
                     if (tUseOreDict) {
-                        GT_OreDictUnificator.registerOre(tRandomData, rStack);
+                        GTOreDictUnificator.registerOre(tRandomData, rStack);
                         continue;
                     }
                 }
             }
-            if (GregTech_API.sThaumcraftCompat != null) {
-                GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false);
+            if (GregTechAPI.sThaumcraftCompat != null) {
+                GregTechAPI.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false);
             }
             return rStack;
         }
@@ -697,7 +700,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
         if (keyValue < 0 || keyValue > 3) {
             keyValue = 0;
         }
-        return GT_LanguageManager
+        return GTLanguageManager
             .getTranslation("gtplusplus." + this.getUnlocalizedName(aStack) + "." + keyValue + ".name");
     }
 
@@ -1236,19 +1239,19 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
             return null;
         }
         final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();;
-        if (aMetaTileEntity == null || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_MultiInput) {
+        if (aMetaTileEntity == null || aMetaTileEntity instanceof MTEHatchMultiInput) {
             // blacklist multiinput hatch as it's too complex
             return null;
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank) {
+        if (aMetaTileEntity instanceof MTEBasicTank) {
             Logger.INFO("Tile Was Instanceof BasicTank.");
-            return getStoredFluidOfGTMachine((GT_MetaTileEntity_BasicTank) aMetaTileEntity);
+            return getStoredFluidOfGTMachine((MTEBasicTank) aMetaTileEntity);
         } else {
             return null;
         }
     }
 
-    public FluidStack getStoredFluidOfGTMachine(GT_MetaTileEntity_BasicTank aTileEntity) {
+    public FluidStack getStoredFluidOfGTMachine(MTEBasicTank aTileEntity) {
         FluidStack f = aTileEntity.mFluid;
 
         // Let's see if this machine has output fluid too
@@ -1278,15 +1281,15 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
         if (aMetaTileEntity == null) {
             return false;
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank) {
+        if (aMetaTileEntity instanceof MTEBasicTank) {
             Logger.INFO("Trying to clear Tile's tank. - Behaviour Class. [2]");
-            return setStoredFluidOfGTMachine((GT_MetaTileEntity_BasicTank) aMetaTileEntity, aSetFluid);
+            return setStoredFluidOfGTMachine((MTEBasicTank) aMetaTileEntity, aSetFluid);
         } else {
             return false;
         }
     }
 
-    public boolean setStoredFluidOfGTMachine(GT_MetaTileEntity_BasicTank aTileEntity, FluidStack aSetFluid) {
+    public boolean setStoredFluidOfGTMachine(MTEBasicTank aTileEntity, FluidStack aSetFluid) {
         try {
 
             // Try Handle Outputs First
diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java
index e929d6cb7f..4c4330af75 100644
--- a/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java
+++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java
@@ -7,7 +7,7 @@ import net.minecraft.item.ItemArmor.ArmorMaterial;
 import net.minecraftforge.common.util.EnumHelper;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.item.wearable.armour.tinfoil.ArmourTinFoilHat;
+import gtPlusPlus.core.item.wearable.armour.tinfoil.ItemArmourTinFoilHat;
 
 public class ArmourLoader {
 
@@ -32,7 +32,7 @@ public class ArmourLoader {
     private static void glassArmour() {}
 
     private static void tinfoilArmour() {
-        TinFoilHat = new ArmourTinFoilHat().setUnlocalizedName("itemHatTinFoil");
+        TinFoilHat = new ItemArmourTinFoilHat().setUnlocalizedName("itemHatTinFoil");
         GameRegistry.registerItem(TinFoilHat, "itemHatTinFoil", GTPlusPlus.ID);
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ItemArmourTinFoilHat.java
index 0703ac3b93..7df52a176a 100644
--- a/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java
+++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ItemArmourTinFoilHat.java
@@ -28,15 +28,15 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.item.wearable.armour.ArmourLoader;
 import gtPlusPlus.core.item.wearable.armour.base.BaseArmourHelm;
 
-public class ArmourTinFoilHat extends BaseArmourHelm {
+public class ItemArmourTinFoilHat extends BaseArmourHelm {
 
     public IIcon iconHelm;
 
-    public ArmourTinFoilHat() {
+    public ItemArmourTinFoilHat() {
         super(ArmourLoader.TinFoilArmour, 0);
     }
 
@@ -122,7 +122,7 @@ public class ArmourTinFoilHat extends BaseArmourHelm {
             if (player instanceof EntityPlayer) {
 
                 // Apply Slow
-                if (!GT_Utility.getPotion(player, Potion.moveSlowdown.id)) {
+                if (!GTUtility.getPotion(player, Potion.moveSlowdown.id)) {
                     player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 2, 1, true));
                 }
 
diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/GTPPCore.java
index 535a3f0821..985e942f52 100644
--- a/src/main/java/gtPlusPlus/core/lib/CORE.java
+++ b/src/main/java/gtPlusPlus/core/lib/GTPPCore.java
@@ -23,12 +23,12 @@ import gregtech.api.objects.XSTR;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.CORE_Preloader;
+import gtPlusPlus.preloader.PreloaderCore;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator;
-import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal;
+import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractGenerator;
+import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractTerminal;
 
-public class CORE {
+public class GTPPCore {
 
     public static Map PlayerCache;
 
@@ -70,8 +70,8 @@ public class CORE {
     public static List<Pair<Integer, ItemStack>> burnables = new ArrayList<>();
 
     // TesseractMaps
-    public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> sTesseractGeneratorOwnershipMap = new HashMap<>();
-    public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> sTesseractTerminalOwnershipMap = new HashMap<>();
+    public static final Map<UUID, Map<Integer, MTETesseractGenerator>> sTesseractGeneratorOwnershipMap = new HashMap<>();
+    public static final Map<UUID, Map<Integer, MTETesseractTerminal>> sTesseractTerminalOwnershipMap = new HashMap<>();
 
     // BookMap
     public static final Map<String, ItemStack> sBookList = new ConcurrentHashMap<>();
@@ -92,7 +92,7 @@ public class CORE {
 
         // Feature Related
         public static boolean enableCustomCapes = false;
-        public static int enableWatchdogBGM = CORE_Preloader.enableWatchdogBGM;
+        public static int enableWatchdogBGM = PreloaderCore.enableWatchdogBGM;
         public static boolean hideUniversalCells = true;
 
         // Single Block Machines
diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java
index 95088535ce..836ccfa504 100644
--- a/src/main/java/gtPlusPlus/core/material/Material.java
+++ b/src/main/java/gtPlusPlus/core/material/Material.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.core.material;
 
-import static gregtech.api.enums.GT_Values.M;
+import static gregtech.api.enums.GTValues.M;
 import static gregtech.api.enums.Mods.TinkerConstruct;
 import static gtPlusPlus.core.util.math.MathUtils.safeCast_LongToInt;
 
@@ -20,7 +20,7 @@ import net.minecraftforge.fluids.FluidStack;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TextureSet;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes;
@@ -381,7 +381,7 @@ public class Material {
         try {
             this.unlocalizedName = Utils.sanitizeString(materialName);
             this.localizedName = materialName;
-            this.translatedName = GT_LanguageManager
+            this.translatedName = GTLanguageManager
                 .addStringLocalization("gtplusplus.material." + unlocalizedName, localizedName);
             mMaterialCache.put(getLocalizedName().toLowerCase(), this);
             Logger.INFO("Stored " + getLocalizedName() + " to cache with key: " + getLocalizedName().toLowerCase());
@@ -759,37 +759,37 @@ public class Material {
         for (MaterialStack m : this.getComposites()) {
 
             // Gems
-            if (m.getStackMaterial() == ELEMENT.getInstance().AER) {
+            if (m.getStackMaterial() == MaterialsElements.getInstance().AER) {
                 aGem++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().AQUA) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().AQUA) {
                 aGem++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().IGNIS) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().IGNIS) {
                 aGem++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().TERRA) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().TERRA) {
                 aGem++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().MAGIC) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().MAGIC) {
                 aGem++;
             }
             // Shiny Materials
-            if (m.getStackMaterial() == ELEMENT.getInstance().GOLD) {
+            if (m.getStackMaterial() == MaterialsElements.getInstance().GOLD) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().SILVER) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().SILVER) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().PLATINUM) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().PLATINUM) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().TITANIUM) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().TITANIUM) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().GERMANIUM) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().GERMANIUM) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().GALLIUM) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().GALLIUM) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().MERCURY) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().MERCURY) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().MAGIC) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().MAGIC) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().SAMARIUM) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().SAMARIUM) {
                 aShiny++;
-            } else if (m.getStackMaterial() == ELEMENT.getInstance().TANTALUM) {
+            } else if (m.getStackMaterial() == MaterialsElements.getInstance().TANTALUM) {
                 aShiny++;
             }
         }
@@ -831,7 +831,7 @@ public class Material {
                 if (r.getStackMaterial()
                     .getTextureSet().mSetName.toLowerCase()
                         .contains("fluid")) {
-                    sets.put(ELEMENT.getInstance().GOLD);
+                    sets.put(MaterialsElements.getInstance().GOLD);
                 } else {
                     sets.put(r.getStackMaterial());
                 }
diff --git a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
index 8b07e29a52..1dce894309 100644
--- a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -9,8 +9,8 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
@@ -40,26 +40,26 @@ import gtPlusPlus.core.item.base.rods.BaseItemRod;
 import gtPlusPlus.core.item.base.rods.BaseItemRodLong;
 import gtPlusPlus.core.item.base.rotors.BaseItemRotor;
 import gtPlusPlus.core.item.base.screws.BaseItemScrew;
-import gtPlusPlus.core.material.nuclear.FLUORIDES;
+import gtPlusPlus.core.material.nuclear.MaterialsFluorides;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_AlloySmelter;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Assembler;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelter;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_DustGeneration;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Extruder;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Fluids;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Fluorite;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MaterialProcessing;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MetalRecipe;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Ore;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plasma;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plates;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_ShapedCrafting;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenAlloySmelter;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenAssembler;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenBlastSmelter;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenDustGeneration;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenExtruder;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenFluidCanning;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenFluids;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenFluorite;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenMaterialProcessing;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenMetalRecipe;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenOre;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenPlasma;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenPlates;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenRecycling;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenShapedCrafting;
 
 public class MaterialGenerator {
 
@@ -81,7 +81,7 @@ public class MaterialGenerator {
     public static boolean addFluidCannerRecipe(ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn,
         FluidStack rFluidOut, Integer aTime, Integer aEu) {
 
-        RecipeGen_FluidCanning g = new RecipeGen_FluidCanning(false, aEmpty, aFullContainer, aFluidIn, null, null, 0);
+        RecipeGenFluidCanning g = new RecipeGenFluidCanning(false, aEmpty, aFullContainer, aFluidIn, null, null, 0);
         if (g != null && g.valid()) {
             return true;
         }
@@ -178,21 +178,21 @@ public class MaterialGenerator {
             }
 
             // Add A jillion Recipes - old code
-            new RecipeGen_AlloySmelter(matInfo);
-            new RecipeGen_Assembler(matInfo);
+            new RecipeGenAlloySmelter(matInfo);
+            new RecipeGenAssembler(matInfo);
             if (generateBlastSmelterRecipes) {
-                new RecipeGen_BlastSmelter(matInfo);
+                new RecipeGenBlastSmelter(matInfo);
             }
-            new RecipeGen_MetalRecipe(matInfo);
-            new RecipeGen_Extruder(matInfo);
-            new RecipeGen_Fluids(matInfo);
-            new RecipeGen_Plates(matInfo);
-            new RecipeGen_ShapedCrafting(matInfo);
-            new RecipeGen_MaterialProcessing(matInfo);
+            new RecipeGenMetalRecipe(matInfo);
+            new RecipeGenExtruder(matInfo);
+            new RecipeGenFluids(matInfo);
+            new RecipeGenPlates(matInfo);
+            new RecipeGenShapedCrafting(matInfo);
+            new RecipeGenMaterialProcessing(matInfo);
 
-            new RecipeGen_DustGeneration(matInfo);
-            new RecipeGen_Recycling(matInfo);
-            new RecipeGen_Plasma(matInfo);
+            new RecipeGenDustGeneration(matInfo);
+            new RecipeGenRecycling(matInfo);
+            new RecipeGenPlasma(matInfo);
 
             return true;
 
@@ -225,9 +225,9 @@ public class MaterialGenerator {
 
         // Add A jillion Recipes - old code
         try {
-            RecipeGen_DustGeneration.addMixerRecipe_Standalone(matInfo);
-            new RecipeGen_Fluids(matInfo);
-            new RecipeGen_MaterialProcessing(matInfo);
+            RecipeGenDustGeneration.addMixerRecipe_Standalone(matInfo);
+            new RecipeGenFluids(matInfo);
+            new RecipeGenMaterialProcessing(matInfo);
         } catch (Throwable t) {
             Logger.MATERIALS("Failed to generate some recipes for " + materialName);
             Logger.ERROR("Failed to generate some recipes for " + materialName);
@@ -247,8 +247,8 @@ public class MaterialGenerator {
     public static void generateNuclearDusts(final Material matInfo, boolean generateDehydratorRecipe) {
         generateNuclearMaterial(matInfo, false, true, false, false, true);
         if (generateDehydratorRecipe && matInfo.getFluid() != null && matInfo.getDust(0) != null) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(20))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(20))
                 .itemOutputs(matInfo.getDust(1))
                 .fluidInputs(matInfo.getFluidStack(144))
                 .eut(matInfo.vVoltageMultiplier)
@@ -287,21 +287,21 @@ public class MaterialGenerator {
             if (generatePlates) {
                 temp = new BaseItemPlate(matInfo);
                 temp = new BaseItemPlateDouble(matInfo);
-                new RecipeGen_Plates(matInfo);
-                new RecipeGen_Extruder(matInfo);
-                new RecipeGen_Assembler(matInfo);
+                new RecipeGenPlates(matInfo);
+                new RecipeGenExtruder(matInfo);
+                new RecipeGenAssembler(matInfo);
             }
 
             if (!disableOptionalRecipes) {
-                new RecipeGen_ShapedCrafting(matInfo);
-                new RecipeGen_Fluids(matInfo);
-                new RecipeGen_MaterialProcessing(matInfo);
-                new RecipeGen_Recycling(matInfo);
+                new RecipeGenShapedCrafting(matInfo);
+                new RecipeGenFluids(matInfo);
+                new RecipeGenMaterialProcessing(matInfo);
+                new RecipeGenRecycling(matInfo);
             }
 
-            new RecipeGen_MetalRecipe(matInfo);
-            new RecipeGen_DustGeneration(matInfo, disableOptionalRecipes);
-            new RecipeGen_Plasma(matInfo);
+            new RecipeGenMetalRecipe(matInfo);
+            new RecipeGenDustGeneration(matInfo, disableOptionalRecipes);
+            new RecipeGenPlasma(matInfo);
 
         } catch (final Throwable t) {
             Logger.MATERIALS("" + matInfo.getLocalizedName() + " failed to generate.");
@@ -365,10 +365,10 @@ public class MaterialGenerator {
                 "Generated all ore components for " + matInfo.getLocalizedName()
                     + ", now generating processing recipes.");
 
-            if (matInfo == FLUORIDES.FLUORITE) {
-                new RecipeGen_Fluorite(matInfo);
+            if (matInfo == MaterialsFluorides.FLUORITE) {
+                new RecipeGenFluorite(matInfo);
             } else {
-                new RecipeGen_Ore(matInfo);
+                new RecipeGenOre(matInfo);
             }
 
         } catch (final Throwable t) {
@@ -406,19 +406,19 @@ public class MaterialGenerator {
                 "Generated all ore & base components for " + matInfo.getLocalizedName()
                     + ", now generating processing recipes.");
 
-            new RecipeGen_Ore(matInfo, true);
-            new RecipeGen_AlloySmelter(matInfo);
-            new RecipeGen_Assembler(matInfo);
-            new RecipeGen_BlastSmelter(matInfo);
-            new RecipeGen_MetalRecipe(matInfo);
-            new RecipeGen_Extruder(matInfo);
-            new RecipeGen_Fluids(matInfo);
-            new RecipeGen_Plates(matInfo);
-            new RecipeGen_ShapedCrafting(matInfo);
-            new RecipeGen_MaterialProcessing(matInfo);
-            new RecipeGen_DustGeneration(matInfo);
-            new RecipeGen_Recycling(matInfo);
-            new RecipeGen_Plasma(matInfo);
+            new RecipeGenOre(matInfo, true);
+            new RecipeGenAlloySmelter(matInfo);
+            new RecipeGenAssembler(matInfo);
+            new RecipeGenBlastSmelter(matInfo);
+            new RecipeGenMetalRecipe(matInfo);
+            new RecipeGenExtruder(matInfo);
+            new RecipeGenFluids(matInfo);
+            new RecipeGenPlates(matInfo);
+            new RecipeGenShapedCrafting(matInfo);
+            new RecipeGenMaterialProcessing(matInfo);
+            new RecipeGenDustGeneration(matInfo);
+            new RecipeGenRecycling(matInfo);
+            new RecipeGenPlasma(matInfo);
             return true;
         } catch (final Throwable t) {
             Logger.MATERIALS("" + matInfo.getLocalizedName() + " failed to generate.");
diff --git a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/main/java/gtPlusPlus/core/material/MaterialMisc.java
index c46b05fbb8..d00529d044 100644
--- a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialMisc.java
@@ -7,7 +7,7 @@ import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 
-public final class MISC_MATERIALS {
+public final class MaterialMisc {
 
     /*
      * Some of these materials purely exist as data objects, items will most likely be assigned separately. Most are
@@ -40,9 +40,9 @@ public final class MISC_MATERIALS {
         "KNO3",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().POTASSIUM, 1),
-        new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 3));
+        new MaterialStack(MaterialsElements.getInstance().POTASSIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3));
     public static final Material SODIUM_NITRATE = new Material(
         "Sodium Nitrate",
         MaterialState.SOLID, // State
@@ -56,9 +56,9 @@ public final class MISC_MATERIALS {
         "NaNO3",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
-        new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 3));
+        new MaterialStack(MaterialsElements.getInstance().SODIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3));
 
     public static final Material SOLAR_SALT_COLD = new Material(
         "Solar Salt (Cold)",
@@ -99,8 +99,8 @@ public final class MISC_MATERIALS {
         "SrO",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 1));
+        new MaterialStack(MaterialsElements.getInstance().STRONTIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1));
 
     public static final Material SELENIUM_DIOXIDE = new Material(
         "Selenium Dioxide",
@@ -112,8 +112,8 @@ public final class MISC_MATERIALS {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().SELENIUM, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 2));
+        new MaterialStack(MaterialsElements.getInstance().SELENIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2));
 
     public static final Material SELENIOUS_ACID = new Material(
         "Selenious Acid",
@@ -126,8 +126,8 @@ public final class MISC_MATERIALS {
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
         new MaterialStack(SELENIUM_DIOXIDE, 1),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 8),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 4));
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 8),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 4));
 
     public static final Material HYDROGEN_CYANIDE = new Material(
         "Hydrogen Cyanide",
@@ -139,9 +139,9 @@ public final class MISC_MATERIALS {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().CARBON, 1),
-        new MaterialStack(ELEMENT.getInstance().NITROGEN, 1));
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 1),
+        new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1));
 
     public static final Material CARBON_MONOXIDE = new Material(
         "Carbon Monoxide",
@@ -153,8 +153,8 @@ public final class MISC_MATERIALS {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().CARBON, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 1));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1));
 
     public static final Material CARBON_DIOXIDE = new Material(
         "Carbon Dioxide",
@@ -166,8 +166,8 @@ public final class MISC_MATERIALS {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().CARBON, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 2));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2));
 
     public static final Material WOODS_GLASS = new Material(
         "Wood's Glass", // Material Name
@@ -182,10 +182,10 @@ public final class MISC_MATERIALS {
         "Si4Ba3Na2Ni",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().SILICON, 40),
-        new MaterialStack(ELEMENT.getInstance().BARIUM, 30),
-        new MaterialStack(ELEMENT.getInstance().SODIUM, 20),
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 10));
+        new MaterialStack(MaterialsElements.getInstance().SILICON, 40),
+        new MaterialStack(MaterialsElements.getInstance().BARIUM, 30),
+        new MaterialStack(MaterialsElements.getInstance().SODIUM, 20),
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 10));
 
     /*
      * Rare Earth Materials
@@ -201,12 +201,14 @@ public final class MISC_MATERIALS {
         -1,
         -1,
         -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ORES.GREENOCKITE, 1), new MaterialStack(ORES.LANTHANITE_CE, 1),
-            new MaterialStack(ORES.AGARDITE_CD, 1), new MaterialStack(ORES.YTTRIALITE, 1),
+        new MaterialStack[] { new MaterialStack(MaterialsOres.GREENOCKITE, 1),
+            new MaterialStack(MaterialsOres.LANTHANITE_CE, 1), new MaterialStack(MaterialsOres.AGARDITE_CD, 1),
+            new MaterialStack(MaterialsOres.YTTRIALITE, 1),
             new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.NetherQuartz), 1),
             new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 1),
             new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite), 1),
-            new MaterialStack(ORES.CRYOLITE, 1), new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1) });
+            new MaterialStack(MaterialsOres.CRYOLITE, 1),
+            new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 1) });
 
     public static final Material RARE_EARTH_MID = new Material(
         "Rare Earth (II)", // Material Name
@@ -218,11 +220,12 @@ public final class MISC_MATERIALS {
         -1,
         -1,
         -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ORES.LANTHANITE_ND, 1), new MaterialStack(ORES.AGARDITE_ND, 1),
-            new MaterialStack(ORES.YTTRIAITE, 1), new MaterialStack(ORES.CROCROITE, 1),
-            new MaterialStack(ORES.NICHROMITE, 1), new MaterialStack(ORES.ZIRCON, 1),
-            new MaterialStack(ELEMENT.STANDALONE.GRANITE, 1), new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1),
-            new MaterialStack(ELEMENT.STANDALONE.RUNITE, 1) });
+        new MaterialStack[] { new MaterialStack(MaterialsOres.LANTHANITE_ND, 1),
+            new MaterialStack(MaterialsOres.AGARDITE_ND, 1), new MaterialStack(MaterialsOres.YTTRIAITE, 1),
+            new MaterialStack(MaterialsOres.CROCROITE, 1), new MaterialStack(MaterialsOres.NICHROMITE, 1),
+            new MaterialStack(MaterialsOres.ZIRCON, 1), new MaterialStack(MaterialsElements.STANDALONE.GRANITE, 1),
+            new MaterialStack(MaterialsElements.STANDALONE.BLACK_METAL, 1),
+            new MaterialStack(MaterialsElements.STANDALONE.RUNITE, 1) });
 
     public static final Material RARE_EARTH_HIGH = new Material(
         "Rare Earth (III)", // Material Name
@@ -234,17 +237,17 @@ public final class MISC_MATERIALS {
         -1,
         -1,
         -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ORES.GADOLINITE_Y, 1), new MaterialStack(ORES.LEPERSONNITE, 1),
-            new MaterialStack(ORES.FLORENCITE, 1), new MaterialStack(ORES.FLUORCAPHITE, 1),
-            new MaterialStack(ORES.LAUTARITE, 1), new MaterialStack(ORES.DEMICHELEITE_BR, 1),
-            new MaterialStack(ORES.ALBURNITE, 1), new MaterialStack(ORES.SAMARSKITE_Y, 1),
-            new MaterialStack(ORES.AGARDITE_LA, 1), });
+        new MaterialStack[] { new MaterialStack(MaterialsOres.GADOLINITE_Y, 1),
+            new MaterialStack(MaterialsOres.LEPERSONNITE, 1), new MaterialStack(MaterialsOres.FLORENCITE, 1),
+            new MaterialStack(MaterialsOres.FLUORCAPHITE, 1), new MaterialStack(MaterialsOres.LAUTARITE, 1),
+            new MaterialStack(MaterialsOres.DEMICHELEITE_BR, 1), new MaterialStack(MaterialsOres.ALBURNITE, 1),
+            new MaterialStack(MaterialsOres.SAMARSKITE_Y, 1), new MaterialStack(MaterialsOres.AGARDITE_LA, 1), });
 
     public static final Material WATER = new Material(
         "Water",
         MaterialState.PURE_LIQUID,
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 1));
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 2),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1));
 
     // OH
     public static final Material HYDROXIDE = new Material(
@@ -257,8 +260,8 @@ public final class MISC_MATERIALS {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1));
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1));
 
     // NH3
     public static final Material AMMONIA = new Material(
@@ -271,8 +274,8 @@ public final class MISC_MATERIALS {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3));
+        new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 3));
 
     // NH4
     public static final Material AMMONIUM = new Material(
@@ -285,14 +288,14 @@ public final class MISC_MATERIALS {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4));
+        new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 4));
 
     public static final Material HYDROGEN_CHLORIDE = new Material(
         "Hydrogen Chloride",
         MaterialState.PURE_GAS,
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 1));
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 1));
 
     public static final Material HYDROGEN_CHLORIDE_MIX = new Material(
         "Hydrogen Chloride Mix",
@@ -304,14 +307,14 @@ public final class MISC_MATERIALS {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 1));
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 1));
 
     public static final Material SODIUM_CHLORIDE = new Material(
         "Sodium Chloride",
         MaterialState.PURE_GAS,
-        new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 1));
+        new MaterialStack(MaterialsElements.getInstance().SODIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 1));
 
     public static final Material SALT_WATER = new Material(
         "Salt Water",
@@ -338,8 +341,8 @@ public final class MISC_MATERIALS {
         "Sr(OH)2",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1),
-        new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2));
+        new MaterialStack(MaterialsElements.getInstance().STRONTIUM, 1),
+        new MaterialStack(MaterialMisc.HYDROXIDE, 2));
 
     // Glue Chemicals
 
@@ -355,9 +358,9 @@ public final class MISC_MATERIALS {
         "(CH3CO)2O",
         0,
         true,
-        new MaterialStack(ELEMENT.getInstance().CARBON, 4),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 3));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 4),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 6),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3));
 
     public static final Material CHLOROACETIC_ACID = new Material(
         "Chloroacetic Acid",
@@ -371,10 +374,10 @@ public final class MISC_MATERIALS {
         "ClCH2-COOH",
         0,
         true,
-        new MaterialStack(ELEMENT.getInstance().CARBON, 2),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 2),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 1));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 2),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 3),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 1));
 
     public static final Material DICHLOROACETIC_ACID = new Material(
         "Dichloroacetic Acid",
@@ -388,10 +391,10 @@ public final class MISC_MATERIALS {
         "Cl2CH-COOH",
         0,
         true,
-        new MaterialStack(ELEMENT.getInstance().CARBON, 2),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 2),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 2));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 2),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 2),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 2));
 
     public static final Material TRICHLOROACETIC_ACID = new Material(
         "Trichloroacetic Acid",
@@ -405,10 +408,10 @@ public final class MISC_MATERIALS {
         "Cl3C-COOH",
         0,
         true,
-        new MaterialStack(ELEMENT.getInstance().CARBON, 2),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 2),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 3));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 2),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 3));
 
     public static final Material CHLOROACETIC_MIXTURE = new Material(
         "Chloroacetic Mixture",
@@ -423,10 +426,10 @@ public final class MISC_MATERIALS {
         "Cl?H?C-COOH",
         0,
         true,
-        new MaterialStack(ELEMENT.getInstance().CARBON, 6),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 6),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 6));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 6),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 6),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 6),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 6));
 
     public static final Material SODIUM_CYANIDE = new Material(
         "Sodium Cyanide",
@@ -440,9 +443,9 @@ public final class MISC_MATERIALS {
         "NaCN",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
-        new MaterialStack(ELEMENT.getInstance().CARBON, 1),
-        new MaterialStack(ELEMENT.getInstance().NITROGEN, 1));
+        new MaterialStack(MaterialsElements.getInstance().SODIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 1),
+        new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1));
 
     public static final Material CALCIUM_CHLORIDE = new Material(
         "Calcium Chloride",
@@ -456,8 +459,8 @@ public final class MISC_MATERIALS {
         "CaCl2",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 2));
+        new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 2));
 
     public static final Material CYANOACETIC_ACID = new Material(
         "Cyanoacetic Acid",
@@ -471,10 +474,10 @@ public final class MISC_MATERIALS {
         "C3H3NO2",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().CARBON, 3),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3),
-        new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 2));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 3),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 3),
+        new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2));
 
     public static final Material SOLID_ACID_MIXTURE = new Material(
         "Solid Acid Catalyst Mixture",
@@ -488,9 +491,9 @@ public final class MISC_MATERIALS {
         "?H2SO4?",
         0,
         true,
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
-        new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 4));
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 2),
+        new MaterialStack(MaterialsElements.getInstance().SULFUR, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 4));
 
     public static final Material COPPER_SULFATE = new Material(
         "Copper(II) Sulfate",
@@ -504,9 +507,9 @@ public final class MISC_MATERIALS {
         "CuSO4",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().COPPER, 1),
-        new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 4));
+        new MaterialStack(MaterialsElements.getInstance().COPPER, 1),
+        new MaterialStack(MaterialsElements.getInstance().SULFUR, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 4));
 
     public static final Material COPPER_SULFATE_HYDRATED = new Material(
         "Copper(II) Sulfate Pentahydrate",
@@ -520,9 +523,9 @@ public final class MISC_MATERIALS {
         "CuSO4∙(H2O)5",
         0,
         false,
-        new MaterialStack(ELEMENT.getInstance().COPPER, 1),
-        new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 4));
+        new MaterialStack(MaterialsElements.getInstance().COPPER, 1),
+        new MaterialStack(MaterialsElements.getInstance().SULFUR, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 4));
 
     public static final Material ETHYL_CYANOACETATE = new Material(
         "Ethyl Cyanoacetate",
@@ -536,10 +539,10 @@ public final class MISC_MATERIALS {
         "C5H7NO2",
         0,
         true,
-        new MaterialStack(ELEMENT.getInstance().CARBON, 2),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 2),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 3));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 2),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 3));
 
     public static final Material CYANOACRYLATE_POLYMER = new Material(
         "Cyanoacrylate Polymer",
@@ -553,10 +556,10 @@ public final class MISC_MATERIALS {
         "(-C6H7NO2-)n",
         0,
         true,
-        new MaterialStack(ELEMENT.getInstance().CARBON, 2),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 2),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 3));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 2),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 3));
 
     public static final Material ETHYL_CYANOACRYLATE = new Material(
         "Ethyl Cyanoacrylate (Super Glue)",
@@ -570,10 +573,10 @@ public final class MISC_MATERIALS {
         "C6H7NO2",
         0,
         true,
-        new MaterialStack(ELEMENT.getInstance().CARBON, 2),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 2),
-        new MaterialStack(ELEMENT.getInstance().CHLORINE, 3));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 2),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2),
+        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 3));
 
     public static final Material MUTATED_LIVING_SOLDER = new Material(
         "Mutated Living Solder",
@@ -587,6 +590,6 @@ public final class MISC_MATERIALS {
         "?Sn?Bi?",
         0,
         true,
-        new MaterialStack(ELEMENT.getInstance().TIN, 1),
-        new MaterialStack(ELEMENT.getInstance().BISMUTH, 1));
+        new MaterialStack(MaterialsElements.getInstance().TIN, 1),
+        new MaterialStack(MaterialsElements.getInstance().BISMUTH, 1));
 }
diff --git a/src/main/java/gtPlusPlus/core/material/MaterialStack.java b/src/main/java/gtPlusPlus/core/material/MaterialStack.java
index 37070a35ec..d4d11781c5 100644
--- a/src/main/java/gtPlusPlus/core/material/MaterialStack.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialStack.java
@@ -9,7 +9,7 @@ import gregtech.api.enums.OrePrefixes;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.bartworks.BW_Utils;
+import gtPlusPlus.xmod.bartworks.BWUtils;
 
 public class MaterialStack {
 
@@ -58,7 +58,7 @@ public class MaterialStack {
 
     public ItemStack getUnificatedDustStack(final int amount) {
         if (this.stackMaterial.werkstoffID != 0) {
-            ItemStack stack = BW_Utils
+            ItemStack stack = BWUtils
                 .getCorrespondingItemStack(OrePrefixes.dust, this.stackMaterial.werkstoffID, amount);
             if (stack != null) {
                 return stack;
diff --git a/src/main/java/gtPlusPlus/core/material/ALLOY.java b/src/main/java/gtPlusPlus/core/material/MaterialsAlloy.java
index 8df8d54f12..53017a4d29 100644
--- a/src/main/java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialsAlloy.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.Materials;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 
-public final class ALLOY {
+public final class MaterialsAlloy {
 
     // Just some GT Alloys that I need within mine.
     public static final Material BRONZE = MaterialUtils.generateMaterialFromGtENUM(Materials.Bronze);
@@ -30,10 +30,10 @@ public final class ALLOY {
         true, // Uses Blast furnace?
         "⬟ ⯂ ⬢ ⬣ ⯃ ⯄",
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().AER, 5),
-        new MaterialStack(ELEMENT.getInstance().IGNIS, 5),
-        new MaterialStack(ELEMENT.getInstance().TERRA, 5),
-        new MaterialStack(ELEMENT.getInstance().AQUA, 5));
+        new MaterialStack(MaterialsElements.getInstance().AER, 5),
+        new MaterialStack(MaterialsElements.getInstance().IGNIS, 5),
+        new MaterialStack(MaterialsElements.getInstance().TERRA, 5),
+        new MaterialStack(MaterialsElements.getInstance().AQUA, 5));
 
     public static final Material BLOODSTEEL = new Material(
         "Blood Steel", // Material Name
@@ -45,8 +45,8 @@ public final class ALLOY {
         100, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ALLOY.STEEL, 5),
-        new MaterialStack(ELEMENT.getInstance().IGNIS, 5));
+        new MaterialStack(MaterialsAlloy.STEEL, 5),
+        new MaterialStack(MaterialsElements.getInstance().IGNIS, 5));
 
     public static final Material STABALLOY = new Material(
         "Staballoy", // Material Name
@@ -58,8 +58,8 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().URANIUM238, 9),
-        new MaterialStack(ELEMENT.getInstance().TITANIUM, 1));
+        new MaterialStack(MaterialsElements.getInstance().URANIUM238, 9),
+        new MaterialStack(MaterialsElements.getInstance().TITANIUM, 1));
 
     public static final Material TANTALLOY_60 = new Material(
         "Tantalloy-60", // Material Name
@@ -71,8 +71,8 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
-        new MaterialStack(ELEMENT.getInstance().TANTALUM, 46));
+        new MaterialStack(MaterialsElements.getInstance().TUNGSTEN, 4),
+        new MaterialStack(MaterialsElements.getInstance().TANTALUM, 46));
 
     public static final Material TANTALLOY_61 = new Material(
         "Tantalloy-61", // Material Name
@@ -84,9 +84,9 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ALLOY.TANTALLOY_60, 2),
-        new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
-        new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8));
+        new MaterialStack(MaterialsAlloy.TANTALLOY_60, 2),
+        new MaterialStack(MaterialsElements.getInstance().TITANIUM, 12),
+        new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 8));
 
     public static final Material TUMBAGA = new Material(
         "Tumbaga", // Material Name
@@ -98,8 +98,8 @@ public final class ALLOY {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().GOLD, 70),
-        new MaterialStack(ELEMENT.getInstance().COPPER, 30));
+        new MaterialStack(MaterialsElements.getInstance().GOLD, 70),
+        new MaterialStack(MaterialsElements.getInstance().COPPER, 30));
 
     public static final Material POTIN = new Material(
         "Potin", // Material Name
@@ -111,9 +111,9 @@ public final class ALLOY {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().LEAD, 40),
-        new MaterialStack(ALLOY.BRONZE, 40),
-        new MaterialStack(ELEMENT.getInstance().TIN, 20));
+        new MaterialStack(MaterialsElements.getInstance().LEAD, 40),
+        new MaterialStack(MaterialsAlloy.BRONZE, 40),
+        new MaterialStack(MaterialsElements.getInstance().TIN, 20));
 
     /*
      * public static final Material BEDROCKIUM = new Material( "Bedrockium", //Material Name new short[]{32, 32, 32, 0},
@@ -131,9 +131,9 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 3),
-        new MaterialStack(ELEMENT.getInstance().CHROMIUM, 7),
-        new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10),
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 3),
+        new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 7),
+        new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 10),
         new MaterialStack(INVAR, 10),
         new MaterialStack(NICHROME, 13));
 
@@ -147,9 +147,9 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().CHROMIUM, 5),
-        new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10),
-        new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10),
+        new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 5),
+        new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 10),
+        new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 10),
         new MaterialStack(NICHROME, 15));
 
     public static final Material INCONEL_792 = new Material(
@@ -162,9 +162,9 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 20),
-        new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10),
-        new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 20),
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 20),
+        new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 10),
+        new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 20),
         new MaterialStack(NICHROME, 10));
 
     public static final Material NITINOL_60 = new Material(
@@ -177,8 +177,8 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 40),
-        new MaterialStack(ELEMENT.getInstance().TITANIUM, 60));
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 40),
+        new MaterialStack(MaterialsElements.getInstance().TITANIUM, 60));
 
     public static final Material ZERON_100 = new Material(
         "Zeron-100", // Material Name
@@ -190,12 +190,12 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().CHROMIUM, 26),
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 6),
-        new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
-        new MaterialStack(ELEMENT.getInstance().COPPER, 20),
-        new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
-        new MaterialStack(ALLOY.STEEL, 40));
+        new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 26),
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 6),
+        new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 4),
+        new MaterialStack(MaterialsElements.getInstance().COPPER, 20),
+        new MaterialStack(MaterialsElements.getInstance().TUNGSTEN, 4),
+        new MaterialStack(MaterialsAlloy.STEEL, 40));
 
     public static final Material MARAGING250 = new Material(
         "Maraging Steel 250", // Material Name
@@ -207,11 +207,11 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ALLOY.STEEL, 64),
-        new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
-        new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
-        new MaterialStack(ELEMENT.getInstance().COBALT, 8));
+        new MaterialStack(MaterialsAlloy.STEEL, 64),
+        new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 4),
+        new MaterialStack(MaterialsElements.getInstance().TITANIUM, 4),
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 16),
+        new MaterialStack(MaterialsElements.getInstance().COBALT, 8));
 
     public static final Material MARAGING300 = new Material(
         "Maraging Steel 300", // Material Name
@@ -223,11 +223,11 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ALLOY.STEEL, 64),
-        new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
-        new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
-        new MaterialStack(ELEMENT.getInstance().COBALT, 8));
+        new MaterialStack(MaterialsAlloy.STEEL, 64),
+        new MaterialStack(MaterialsElements.getInstance().TITANIUM, 4),
+        new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 4),
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 16),
+        new MaterialStack(MaterialsElements.getInstance().COBALT, 8));
 
     public static final Material MARAGING350 = new Material(
         "Maraging Steel 350", // Material Name
@@ -239,11 +239,11 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ALLOY.STEEL, 64),
-        new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
-        new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
-        new MaterialStack(ELEMENT.getInstance().COBALT, 8));
+        new MaterialStack(MaterialsAlloy.STEEL, 64),
+        new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 4),
+        new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 4),
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 16),
+        new MaterialStack(MaterialsElements.getInstance().COBALT, 8));
 
     public static final Material AQUATIC_STEEL = new Material(
         "Watertight Steel", // Material Name
@@ -255,13 +255,13 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ALLOY.STEEL, 60),
-        new MaterialStack(ELEMENT.getInstance().CARBON, 10),
-        new MaterialStack(ELEMENT.getInstance().MANGANESE, 5),
-        new MaterialStack(ELEMENT.getInstance().SILICON, 10),
-        new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 5),
-        new MaterialStack(ELEMENT.getInstance().SULFUR, 5),
-        new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 5));
+        new MaterialStack(MaterialsAlloy.STEEL, 60),
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 10),
+        new MaterialStack(MaterialsElements.getInstance().MANGANESE, 5),
+        new MaterialStack(MaterialsElements.getInstance().SILICON, 10),
+        new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 5),
+        new MaterialStack(MaterialsElements.getInstance().SULFUR, 5),
+        new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 5));
 
     public static final Material STELLITE = new Material(
         "Stellite", // Material Name
@@ -273,10 +273,10 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().COBALT, 35),
-        new MaterialStack(ELEMENT.getInstance().CHROMIUM, 35),
-        new MaterialStack(ELEMENT.getInstance().MANGANESE, 20),
-        new MaterialStack(ELEMENT.getInstance().TITANIUM, 10));
+        new MaterialStack(MaterialsElements.getInstance().COBALT, 35),
+        new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 35),
+        new MaterialStack(MaterialsElements.getInstance().MANGANESE, 20),
+        new MaterialStack(MaterialsElements.getInstance().TITANIUM, 10));
 
     public static final Material TALONITE = new Material(
         "Talonite", // Material Name
@@ -288,10 +288,10 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().COBALT, 40),
-        new MaterialStack(ELEMENT.getInstance().CHROMIUM, 30),
-        new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 20),
-        new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10));
+        new MaterialStack(MaterialsElements.getInstance().COBALT, 40),
+        new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 30),
+        new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 20),
+        new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 10));
 
     public static final Material HASTELLOY_W = new Material(
         "Hastelloy-W", // Material Name
@@ -303,11 +303,11 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().IRON, 06),
-        new MaterialStack(ELEMENT.getInstance().COBALT, 2),
-        new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 24),
-        new MaterialStack(ELEMENT.getInstance().CHROMIUM, 6),
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 62));
+        new MaterialStack(MaterialsElements.getInstance().IRON, 06),
+        new MaterialStack(MaterialsElements.getInstance().COBALT, 2),
+        new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 24),
+        new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 6),
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 62));
 
     public static final Material HASTELLOY_X = new Material(
         "Hastelloy-X", // Material Name
@@ -319,12 +319,12 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().IRON, 18),
-        new MaterialStack(ELEMENT.getInstance().MANGANESE, 2),
-        new MaterialStack(ELEMENT.getInstance().SILICON, 2),
-        new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 8),
-        new MaterialStack(ELEMENT.getInstance().CHROMIUM, 22),
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 48));
+        new MaterialStack(MaterialsElements.getInstance().IRON, 18),
+        new MaterialStack(MaterialsElements.getInstance().MANGANESE, 2),
+        new MaterialStack(MaterialsElements.getInstance().SILICON, 2),
+        new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 8),
+        new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 22),
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 48));
 
     public static final Material HASTELLOY_N = new Material(
         "Hastelloy-N", // Material Name
@@ -336,11 +336,11 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8),
-        new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16),
-        new MaterialStack(ELEMENT.getInstance().CHROMIUM, 8),
-        new MaterialStack(ELEMENT.getInstance().TITANIUM, 8),
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 60));
+        new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 8),
+        new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 16),
+        new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 8),
+        new MaterialStack(MaterialsElements.getInstance().TITANIUM, 8),
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 60));
 
     public static final Material HASTELLOY_C276 = new Material(
         "Hastelloy-C276", // Material Name
@@ -352,12 +352,12 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().COBALT, 2),
-        new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16),
-        new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 2),
-        new MaterialStack(ELEMENT.getInstance().COPPER, 2),
-        new MaterialStack(ELEMENT.getInstance().CHROMIUM, 14),
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 64));
+        new MaterialStack(MaterialsElements.getInstance().COBALT, 2),
+        new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 16),
+        new MaterialStack(MaterialsElements.getInstance().TUNGSTEN, 2),
+        new MaterialStack(MaterialsElements.getInstance().COPPER, 2),
+        new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 14),
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 64));
 
     public static final Material INCOLOY_020 = new Material(
         "Incoloy-020", // Material Name
@@ -369,10 +369,10 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().IRON, 40),
-        new MaterialStack(ELEMENT.getInstance().COPPER, 4),
-        new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 36));
+        new MaterialStack(MaterialsElements.getInstance().IRON, 40),
+        new MaterialStack(MaterialsElements.getInstance().COPPER, 4),
+        new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 20),
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 36));
 
     public static final Material INCOLOY_DS = new Material(
         "Incoloy-DS", // Material Name
@@ -384,10 +384,10 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().IRON, 46),
-        new MaterialStack(ELEMENT.getInstance().COBALT, 18),
-        new MaterialStack(ELEMENT.getInstance().CHROMIUM, 18),
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 18));
+        new MaterialStack(MaterialsElements.getInstance().IRON, 46),
+        new MaterialStack(MaterialsElements.getInstance().COBALT, 18),
+        new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 18),
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 18));
 
     public static final Material INCOLOY_MA956 = new Material(
         "Incoloy-MA956", // Material Name
@@ -399,10 +399,10 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().IRON, 64),
-        new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12),
-        new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
-        new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4));
+        new MaterialStack(MaterialsElements.getInstance().IRON, 64),
+        new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 12),
+        new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 20),
+        new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 4));
 
     public static final Material TUNGSTEN_CARBIDE = new Material(
         "Tungsten Carbide", // Material Name
@@ -415,8 +415,8 @@ public final class ALLOY {
         true, // Uses Blast furnace?
         false, // Generate cells
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().CARBON, 50),
-        new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 50));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 50),
+        new MaterialStack(MaterialsElements.getInstance().TUNGSTEN, 50));
 
     public static final Material TUNGSTEN_TITANIUM_CARBIDE = new Material(
         "Tungsten Titanium Carbide", // Material Name
@@ -429,7 +429,7 @@ public final class ALLOY {
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
         new MaterialStack(TUNGSTEN_CARBIDE, 70),
-        new MaterialStack(ELEMENT.getInstance().TITANIUM, 30));
+        new MaterialStack(MaterialsElements.getInstance().TITANIUM, 30));
 
     public static final Material SILICON_CARBIDE = new Material(
         "Silicon Carbide", // Material Name
@@ -441,8 +441,8 @@ public final class ALLOY {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().SILICON, 50),
-        new MaterialStack(ELEMENT.getInstance().CARBON, 50));
+        new MaterialStack(MaterialsElements.getInstance().SILICON, 50),
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 50));
 
     public static final Material TANTALUM_CARBIDE = new Material(
         "Tantalum Carbide", // Material Name
@@ -454,8 +454,8 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().TANTALUM, 50),
-        new MaterialStack(ELEMENT.getInstance().CARBON, 50));
+        new MaterialStack(MaterialsElements.getInstance().TANTALUM, 50),
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 50));
 
     public static final Material ZIRCONIUM_CARBIDE = new Material(
         "Zirconium Carbide", // Material Name
@@ -467,8 +467,8 @@ public final class ALLOY {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 50),
-        new MaterialStack(ELEMENT.getInstance().CARBON, 50));
+        new MaterialStack(MaterialsElements.getInstance().ZIRCONIUM, 50),
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 50));
 
     public static final Material NIOBIUM_CARBIDE = new Material(
         "Niobium Carbide", // Material Name
@@ -480,8 +480,8 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().NIOBIUM, 50),
-        new MaterialStack(ELEMENT.getInstance().CARBON, 50));
+        new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 50),
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 50));
 
     public static final Material ARCANITE = new Material(
         "Arcanite", // Material Name
@@ -493,10 +493,10 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().THORIUM232, 40),
+        new MaterialStack(MaterialsElements.getInstance().THORIUM232, 40),
         new MaterialStack(ENERGYCRYSTAL, 40),
-        new MaterialStack(ELEMENT.getInstance().ORDO, 10),
-        new MaterialStack(ELEMENT.getInstance().PERDITIO, 10));
+        new MaterialStack(MaterialsElements.getInstance().ORDO, 10),
+        new MaterialStack(MaterialsElements.getInstance().PERDITIO, 10));
 
     public static final Material LEAGRISIUM = new Material(
         "Grisium", // Material Name
@@ -507,13 +507,13 @@ public final class ALLOY {
         96, // Protons
         128, // Neutrons
         true, // Uses Blast furnace?
-        new MaterialStack(ELEMENT.getInstance().TITANIUM, 18),
-        new MaterialStack(ELEMENT.getInstance().CARBON, 18),
-        new MaterialStack(ELEMENT.getInstance().POTASSIUM, 18),
-        new MaterialStack(ELEMENT.getInstance().LITHIUM, 18),
-        new MaterialStack(ELEMENT.getInstance().SULFUR, 18),
-        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10)); // Material Stacks with Percentage of
-                                                                // required elements.
+        new MaterialStack(MaterialsElements.getInstance().TITANIUM, 18),
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 18),
+        new MaterialStack(MaterialsElements.getInstance().POTASSIUM, 18),
+        new MaterialStack(MaterialsElements.getInstance().LITHIUM, 18),
+        new MaterialStack(MaterialsElements.getInstance().SULFUR, 18),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 10)); // Material Stacks with Percentage of
+    // required elements.
 
     public static final Material EGLIN_STEEL_BASE = new Material(
         "Eglin Steel Base Compound", // Material Name
@@ -525,7 +525,7 @@ public final class ALLOY {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().IRON, 12),
+        new MaterialStack(MaterialsElements.getInstance().IRON, 12),
         new MaterialStack(KANTHAL, 3),
         new MaterialStack(INVAR, 15));
 
@@ -539,10 +539,10 @@ public final class ALLOY {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ALLOY.EGLIN_STEEL_BASE, 10),
-        new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
-        new MaterialStack(ELEMENT.getInstance().SILICON, 4),
-        new MaterialStack(ELEMENT.getInstance().CARBON, 1));
+        new MaterialStack(MaterialsAlloy.EGLIN_STEEL_BASE, 10),
+        new MaterialStack(MaterialsElements.getInstance().SULFUR, 1),
+        new MaterialStack(MaterialsElements.getInstance().SILICON, 4),
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 1));
 
     public static final Material HG1223 = new Material(
         "HG-1223", // Material Name
@@ -553,11 +553,11 @@ public final class ALLOY {
         -1,
         -1,
         false, // Uses Blast furnace?
-        new MaterialStack(ELEMENT.getInstance().MERCURY, 1),
-        new MaterialStack(ELEMENT.getInstance().BARIUM, 2),
-        new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
-        new MaterialStack(ELEMENT.getInstance().COPPER, 3),
-        new MaterialStack(ELEMENT.getInstance().OXYGEN, 8));
+        new MaterialStack(MaterialsElements.getInstance().MERCURY, 1),
+        new MaterialStack(MaterialsElements.getInstance().BARIUM, 2),
+        new MaterialStack(MaterialsElements.getInstance().CALCIUM, 2),
+        new MaterialStack(MaterialsElements.getInstance().COPPER, 3),
+        new MaterialStack(MaterialsElements.getInstance().OXYGEN, 8));
 
     public static final Material HS188A = new Material(
         "HS188-A", // Material Name
@@ -568,10 +568,10 @@ public final class ALLOY {
         -1, // Protons
         -1, // Neutrons
         true, // Uses Blast furnace?
-        new MaterialStack(ELEMENT.getInstance().COBALT, 20),
-        new MaterialStack(ELEMENT.getInstance().HAFNIUM, 20),
+        new MaterialStack(MaterialsElements.getInstance().COBALT, 20),
+        new MaterialStack(MaterialsElements.getInstance().HAFNIUM, 20),
         new MaterialStack(TALONITE, 16),
-        new MaterialStack(ELEMENT.getInstance().RHENIUM, 10),
+        new MaterialStack(MaterialsElements.getInstance().RHENIUM, 10),
         new MaterialStack(NIOBIUM_CARBIDE, 10),
         new MaterialStack(HASTELLOY_X, 8),
         new MaterialStack(TUNGSTENSTEEL, 8),
@@ -590,8 +590,8 @@ public final class ALLOY {
         -1,
         -1,
         true, // Uses Blast furnace?
-        new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 3),
-        new MaterialStack(ELEMENT.getInstance().TITANIUM, 7));
+        new MaterialStack(MaterialsElements.getInstance().TRINIUM_REFINED, 3),
+        new MaterialStack(MaterialsElements.getInstance().TITANIUM, 7));
 
     public static final Material TRINIUM_NAQUADAH = new Material(
         "Trinium Naquadah Alloy", // Material Name
@@ -602,8 +602,8 @@ public final class ALLOY {
         -1,
         -1,
         false, // Uses Blast furnace?
-        new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 5),
-        new MaterialStack(ELEMENT.getInstance().NAQUADAH, 9));
+        new MaterialStack(MaterialsElements.getInstance().TRINIUM_REFINED, 5),
+        new MaterialStack(MaterialsElements.getInstance().NAQUADAH, 9));
     public static final Material TRINIUM_NAQUADAH_CARBON = new Material(
         "Trinium Naquadah Carbonite", // Material Name
         MaterialState.SOLID, // State
@@ -614,7 +614,7 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         new MaterialStack(TRINIUM_NAQUADAH, 9),
-        new MaterialStack(ELEMENT.getInstance().CARBON, 1));
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 1));
 
     public static final Material TRINIUM_REINFORCED_STEEL = new Material(
         "Arceus Alloy 2B", // Material Name
@@ -626,11 +626,11 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 30),
-        new MaterialStack(ALLOY.MARAGING350, 40),
-        new MaterialStack(ALLOY.TUNGSTENSTEEL, 20),
-        new MaterialStack(ALLOY.OSMIRIDIUM, 10),
-        new MaterialStack(ELEMENT.getInstance().STRONTIUM, 10));
+        new MaterialStack(MaterialsElements.getInstance().TRINIUM_REFINED, 30),
+        new MaterialStack(MaterialsAlloy.MARAGING350, 40),
+        new MaterialStack(MaterialsAlloy.TUNGSTENSTEEL, 20),
+        new MaterialStack(MaterialsAlloy.OSMIRIDIUM, 10),
+        new MaterialStack(MaterialsElements.getInstance().STRONTIUM, 10));
 
     /*
      * Witchery Material
@@ -646,9 +646,9 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 35),
-        new MaterialStack(ELEMENT.getInstance().THAUMIUM, 30),
-        new MaterialStack(ELEMENT.getInstance().IRON, 35));
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 35),
+        new MaterialStack(MaterialsElements.getInstance().THAUMIUM, 30),
+        new MaterialStack(MaterialsElements.getInstance().IRON, 35));
 
     /*
      * Top Tier Alloys
@@ -664,11 +664,11 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().HELIUM, 20),
-        new MaterialStack(ELEMENT.getInstance().LITHIUM, 20),
-        new MaterialStack(ELEMENT.getInstance().COBALT, 20),
-        new MaterialStack(ELEMENT.getInstance().PLATINUM, 20),
-        new MaterialStack(ELEMENT.getInstance().ERBIUM, 20));
+        new MaterialStack(MaterialsElements.getInstance().HELIUM, 20),
+        new MaterialStack(MaterialsElements.getInstance().LITHIUM, 20),
+        new MaterialStack(MaterialsElements.getInstance().COBALT, 20),
+        new MaterialStack(MaterialsElements.getInstance().PLATINUM, 20),
+        new MaterialStack(MaterialsElements.getInstance().ERBIUM, 20));
 
     // 0lafe Compound
     public static final Material LAFIUM = new Material(
@@ -681,14 +681,14 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ALLOY.HASTELLOY_N, 8),
-        new MaterialStack(ELEMENT.getInstance().NAQUADAH, 4),
-        new MaterialStack(ELEMENT.getInstance().SAMARIUM, 2),
-        new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
-        new MaterialStack(ELEMENT.getInstance().ARGON, 2),
-        new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 6),
-        new MaterialStack(ELEMENT.getInstance().NICKEL, 8),
-        new MaterialStack(ELEMENT.getInstance().CARBON, 2));
+        new MaterialStack(MaterialsAlloy.HASTELLOY_N, 8),
+        new MaterialStack(MaterialsElements.getInstance().NAQUADAH, 4),
+        new MaterialStack(MaterialsElements.getInstance().SAMARIUM, 2),
+        new MaterialStack(MaterialsElements.getInstance().TUNGSTEN, 4),
+        new MaterialStack(MaterialsElements.getInstance().ARGON, 2),
+        new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 6),
+        new MaterialStack(MaterialsElements.getInstance().NICKEL, 8),
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 2));
 
     // Cinobi Alloy
     public static final Material CINOBITE = new Material(
@@ -701,14 +701,14 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ALLOY.ZERON_100, 16),
-        new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 7),
-        new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 5),
-        new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3),
-        new MaterialStack(ELEMENT.getInstance().MERCURY, 2),
-        new MaterialStack(ELEMENT.getInstance().TIN, 2),
-        new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
-        new MaterialStack(ALLOY.OSMIRIDIUM, 6));
+        new MaterialStack(MaterialsAlloy.ZERON_100, 16),
+        new MaterialStack(MaterialsElements.getInstance().NAQUADRIA, 7),
+        new MaterialStack(MaterialsElements.getInstance().GADOLINIUM, 5),
+        new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 3),
+        new MaterialStack(MaterialsElements.getInstance().MERCURY, 2),
+        new MaterialStack(MaterialsElements.getInstance().TIN, 2),
+        new MaterialStack(MaterialsElements.getInstance().TITANIUM, 12),
+        new MaterialStack(MaterialsAlloy.OSMIRIDIUM, 6));
 
     // Piky Alloy
     public static final Material PIKYONIUM = new Material(
@@ -721,14 +721,14 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ALLOY.INCONEL_792, 16),
-        new MaterialStack(ALLOY.EGLIN_STEEL, 10),
-        new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 8),
-        new MaterialStack(ELEMENT.getInstance().CERIUM, 6),
-        new MaterialStack(ELEMENT.getInstance().ANTIMONY, 4),
-        new MaterialStack(ELEMENT.getInstance().PLATINUM, 4),
-        new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2),
-        new MaterialStack(ALLOY.TUNGSTENSTEEL, 8));
+        new MaterialStack(MaterialsAlloy.INCONEL_792, 16),
+        new MaterialStack(MaterialsAlloy.EGLIN_STEEL, 10),
+        new MaterialStack(MaterialsElements.getInstance().NAQUADAH_ENRICHED, 8),
+        new MaterialStack(MaterialsElements.getInstance().CERIUM, 6),
+        new MaterialStack(MaterialsElements.getInstance().ANTIMONY, 4),
+        new MaterialStack(MaterialsElements.getInstance().PLATINUM, 4),
+        new MaterialStack(MaterialsElements.getInstance().YTTERBIUM, 2),
+        new MaterialStack(MaterialsAlloy.TUNGSTENSTEEL, 8));
 
     // Piky Alloy
     public static final Material ABYSSAL = new Material(
@@ -741,14 +741,14 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ALLOY.STAINLESS_STEEL, 10),
-        new MaterialStack(ALLOY.TUNGSTEN_CARBIDE, 10),
-        new MaterialStack(ALLOY.NICHROME, 10),
-        new MaterialStack(ALLOY.BRONZE, 10),
-        new MaterialStack(ALLOY.INCOLOY_MA956, 10),
-        new MaterialStack(ELEMENT.getInstance().IODINE, 2),
-        new MaterialStack(ELEMENT.getInstance().RADON, 2),
-        new MaterialStack(ELEMENT.getInstance().GERMANIUM, 2));
+        new MaterialStack(MaterialsAlloy.STAINLESS_STEEL, 10),
+        new MaterialStack(MaterialsAlloy.TUNGSTEN_CARBIDE, 10),
+        new MaterialStack(MaterialsAlloy.NICHROME, 10),
+        new MaterialStack(MaterialsAlloy.BRONZE, 10),
+        new MaterialStack(MaterialsAlloy.INCOLOY_MA956, 10),
+        new MaterialStack(MaterialsElements.getInstance().IODINE, 2),
+        new MaterialStack(MaterialsElements.getInstance().RADON, 2),
+        new MaterialStack(MaterialsElements.getInstance().GERMANIUM, 2));
 
     // Alkalus Alloy
     public static final Material LAURENIUM = new Material(
@@ -761,11 +761,11 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ALLOY.EGLIN_STEEL, 40),
-        new MaterialStack(ELEMENT.getInstance().INDIUM, 10),
-        new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
-        new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 5),
-        new MaterialStack(ELEMENT.getInstance().RHENIUM, 5));
+        new MaterialStack(MaterialsAlloy.EGLIN_STEEL, 40),
+        new MaterialStack(MaterialsElements.getInstance().INDIUM, 10),
+        new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 20),
+        new MaterialStack(MaterialsElements.getInstance().DYSPROSIUM, 5),
+        new MaterialStack(MaterialsElements.getInstance().RHENIUM, 5));
 
     // Bot Alloy
     public static final Material BOTMIUM = new Material(
@@ -778,10 +778,10 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ALLOY.NITINOL_60, 2),
-        new MaterialStack(ELEMENT.getInstance().OSMIUM, 12),
-        new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 12),
-        new MaterialStack(ELEMENT.getInstance().THALLIUM, 6));
+        new MaterialStack(MaterialsAlloy.NITINOL_60, 2),
+        new MaterialStack(MaterialsElements.getInstance().OSMIUM, 12),
+        new MaterialStack(MaterialsElements.getInstance().RUTHENIUM, 12),
+        new MaterialStack(MaterialsElements.getInstance().THALLIUM, 6));
 
     // Titansteel
     public static final Material TITANSTEEL = new Material(
@@ -794,10 +794,10 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ALLOY.TUNGSTEN_TITANIUM_CARBIDE, 3),
-        new MaterialStack(ELEMENT.getInstance().IGNIS, 1),
-        new MaterialStack(ELEMENT.getInstance().TERRA, 1),
-        new MaterialStack(ELEMENT.getInstance().PERDITIO, 1));
+        new MaterialStack(MaterialsAlloy.TUNGSTEN_TITANIUM_CARBIDE, 3),
+        new MaterialStack(MaterialsElements.getInstance().IGNIS, 1),
+        new MaterialStack(MaterialsElements.getInstance().TERRA, 1),
+        new MaterialStack(MaterialsElements.getInstance().PERDITIO, 1));
 
     public static final Material OCTIRON = new Material(
         "Octiron", // Material Name
@@ -813,7 +813,7 @@ public final class ALLOY {
         new MaterialStack(TITANSTEEL, 30),
         new MaterialStack(ENERGYCRYSTAL, 5),
         new MaterialStack(STEEL_BLACK, 10),
-        new MaterialStack(ELEMENT.getInstance().THAUMIUM, 25));
+        new MaterialStack(MaterialsElements.getInstance().THAUMIUM, 25));
 
     public static final Material BLACK_TITANIUM = new Material(
         "Black Titanium", // Material Name
@@ -825,15 +825,15 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().TITANIUM, 55),
-        new MaterialStack(ELEMENT.getInstance().LANTHANUM, 12),
-        new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 8),
-        new MaterialStack(ELEMENT.getInstance().COBALT, 6),
-        new MaterialStack(ELEMENT.getInstance().MANGANESE, 4),
-        new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 4),
-        new MaterialStack(ELEMENT.getInstance().PALLADIUM, 4),
-        new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
-        new MaterialStack(ELEMENT.getInstance().ARGON, 5));
+        new MaterialStack(MaterialsElements.getInstance().TITANIUM, 55),
+        new MaterialStack(MaterialsElements.getInstance().LANTHANUM, 12),
+        new MaterialStack(MaterialsElements.getInstance().TUNGSTEN, 8),
+        new MaterialStack(MaterialsElements.getInstance().COBALT, 6),
+        new MaterialStack(MaterialsElements.getInstance().MANGANESE, 4),
+        new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 4),
+        new MaterialStack(MaterialsElements.getInstance().PALLADIUM, 4),
+        new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 2),
+        new MaterialStack(MaterialsElements.getInstance().ARGON, 5));
 
     public static final Material BABBIT_ALLOY = new Material(
         "Babbit Alloy", // Material Name
@@ -845,10 +845,10 @@ public final class ALLOY {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().TIN, 10),
-        new MaterialStack(ELEMENT.getInstance().LEAD, 72),
-        new MaterialStack(ELEMENT.getInstance().ANTIMONY, 16),
-        new MaterialStack(ELEMENT.getInstance().ARSENIC, 2));
+        new MaterialStack(MaterialsElements.getInstance().TIN, 10),
+        new MaterialStack(MaterialsElements.getInstance().LEAD, 72),
+        new MaterialStack(MaterialsElements.getInstance().ANTIMONY, 16),
+        new MaterialStack(MaterialsElements.getInstance().ARSENIC, 2));
 
     public static final Material INDALLOY_140 = new Material(
         "Indalloy 140", // Material Name
@@ -860,11 +860,11 @@ public final class ALLOY {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ELEMENT.getInstance().BISMUTH, 47),
-        new MaterialStack(ELEMENT.getInstance().LEAD, 25),
-        new MaterialStack(ELEMENT.getInstance().TIN, 13),
-        new MaterialStack(ELEMENT.getInstance().CADMIUM, 10),
-        new MaterialStack(ELEMENT.getInstance().INDIUM, 5));
+        new MaterialStack(MaterialsElements.getInstance().BISMUTH, 47),
+        new MaterialStack(MaterialsElements.getInstance().LEAD, 25),
+        new MaterialStack(MaterialsElements.getInstance().TIN, 13),
+        new MaterialStack(MaterialsElements.getInstance().CADMIUM, 10),
+        new MaterialStack(MaterialsElements.getInstance().INDIUM, 5));
 
     // Quantum
     public static final Material QUANTUM = new Material(
@@ -877,12 +877,12 @@ public final class ALLOY {
         200, // Neutrons
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(ALLOY.STELLITE, 15),
-        new MaterialStack(ALLOY.ENERGYCRYSTAL, 5),
-        new MaterialStack(ALLOY.SILICON_CARBIDE, 5),
-        new MaterialStack(ELEMENT.getInstance().GALLIUM, 5),
-        new MaterialStack(ELEMENT.getInstance().AMERICIUM, 5),
-        new MaterialStack(ELEMENT.getInstance().PALLADIUM, 5),
-        new MaterialStack(ELEMENT.getInstance().BISMUTH, 5),
-        new MaterialStack(ELEMENT.getInstance().GERMANIUM, 5));
+        new MaterialStack(MaterialsAlloy.STELLITE, 15),
+        new MaterialStack(MaterialsAlloy.ENERGYCRYSTAL, 5),
+        new MaterialStack(MaterialsAlloy.SILICON_CARBIDE, 5),
+        new MaterialStack(MaterialsElements.getInstance().GALLIUM, 5),
+        new MaterialStack(MaterialsElements.getInstance().AMERICIUM, 5),
+        new MaterialStack(MaterialsElements.getInstance().PALLADIUM, 5),
+        new MaterialStack(MaterialsElements.getInstance().BISMUTH, 5),
+        new MaterialStack(MaterialsElements.getInstance().GERMANIUM, 5));
 }
diff --git a/src/main/java/gtPlusPlus/core/material/ELEMENT.java b/src/main/java/gtPlusPlus/core/material/MaterialsElements.java
index 9bcea2a47b..d1fcf3f5c5 100644
--- a/src/main/java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialsElements.java
@@ -8,7 +8,7 @@ import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.data.StringUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 
-public final class ELEMENT {
+public final class MaterialsElements {
 
     public static final String[] NAMES = new String[] { "Hydrogen", "Helium" };
 
@@ -467,15 +467,15 @@ public final class ELEMENT {
         Logger.MATERIALS("Initialising Base Elements.");
     }
 
-    private static final ELEMENT INSTANCE = new ELEMENT();
+    private static final MaterialsElements INSTANCE = new MaterialsElements();
 
-    public ELEMENT() {
+    public MaterialsElements() {
         // GTNH Trinium Handling
         TRINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Trinium);
         TRINIUM_REFINED = TRINIUM;
     }
 
-    public static ELEMENT getInstance() {
+    public static MaterialsElements getInstance() {
         return INSTANCE;
     }
 
@@ -520,7 +520,7 @@ public final class ELEMENT {
             "Advanced Nitinol",
             MaterialState.SOLID,
             TextureSets.ENRICHED.get(),
-            ALLOY.NITINOL_60.getRGB(),
+            MaterialsAlloy.NITINOL_60.getRGB(),
             8400,
             14377,
             40,
diff --git a/src/main/java/gtPlusPlus/core/material/MaterialsOres.java b/src/main/java/gtPlusPlus/core/material/MaterialsOres.java
new file mode 100644
index 0000000000..d78b88d1c7
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/material/MaterialsOres.java
@@ -0,0 +1,778 @@
+package gtPlusPlus.core.material;
+
+import gregtech.api.enums.TextureSet;
+import gtPlusPlus.core.client.CustomTextureSet.TextureSets;
+import gtPlusPlus.core.material.state.MaterialState;
+
+public final class MaterialsOres {
+
+    public static final Material AGARDITE_CD = new Material(
+        "Agardite (Cd)", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_METALLIC, // Texture Set
+        new short[] { 170, 188, 33, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { // (CdCa)Cu7(AsO2)4(O2H)5·3H2O
+            new MaterialStack(MaterialsElements.getInstance().CADMIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().COPPER, 7),
+            new MaterialStack(MaterialsElements.getInstance().ARSENIC, 4),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 21),
+            new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 11) });
+
+    public static final Material AGARDITE_LA = new Material(
+        "Agardite (La)", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_FINE, // Texture Set
+        new short[] { 206, 232, 9, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { // (LaCa)Cu5(AsO6)2(OH)4·3H2O
+            new MaterialStack(MaterialsElements.getInstance().LANTHANUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().COPPER, 5),
+            new MaterialStack(MaterialsElements.getInstance().ARSENIC, 2),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 19),
+            new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 10) });
+
+    public static final Material AGARDITE_ND = new Material(
+        "Agardite (Nd)", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_METALLIC, // Texture Set
+        new short[] { 225, 244, 78, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { // (NdCa)Cu6(As3O3)2(O2H)6·3H2O
+            new MaterialStack(MaterialsElements.getInstance().NEODYMIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().COPPER, 6),
+            new MaterialStack(MaterialsElements.getInstance().ARSENIC, 6),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 21),
+            new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 12) });
+
+    public static final Material AGARDITE_Y = new Material(
+        "Agardite (Y)", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_METALLIC, // Texture Set
+        new short[] { 210, 232, 44, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { // (YCa)Cu5(As2O4)3(OH)6·3H2O
+            new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().COPPER, 5),
+            new MaterialStack(MaterialsElements.getInstance().ARSENIC, 6),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 21),
+            new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 12) });
+
+    // Alburnite
+    // Ag8GeTe2S4
+    public static final Material ALBURNITE = new Material(
+        "Alburnite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_METALLIC, // Texture Set
+        new short[] { 16, 5, 105, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        0, // Radiation
+        new MaterialStack[] { // Na3AlF6
+            new MaterialStack(MaterialsElements.getInstance().GOLD, 8),
+            new MaterialStack(MaterialsElements.getInstance().GERMANIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().TELLURIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().SULFUR, 4) });
+
+    public static final Material CERITE = new Material(
+        "Cerite", // Material Name
+        MaterialState.ORE, // State
+        TextureSets.REFINED.get(), // Texture Set
+        new short[] { 68, 13, 0, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { // (Ce,La,Ca)9(Mg,Fe+3)(SiO4)6(SiO3OH)(OH)3
+            new MaterialStack(MaterialsElements.getInstance().CERIUM, 9),
+            new MaterialStack(MaterialsElements.getInstance().LANTHANUM, 9),
+            new MaterialStack(MaterialsElements.getInstance().CALCIUM, 9),
+            new MaterialStack(MaterialsElements.getInstance().MAGNESIUM, 3),
+            new MaterialStack(MaterialsElements.getInstance().IRON, 3),
+            new MaterialStack(MaterialsElements.getInstance().SILICON, 7),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 20),
+            new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 4) });
+
+    // Comancheite
+    // Hg55N24(NH2,OH)4(Cl,Br)34
+    public static final Material COMANCHEITE = new Material(
+        "Comancheite", // Material Name
+        MaterialState.ORE, // State
+        TextureSets.REFINED.get(), // Texture Set
+        new short[] { 65, 205, 105, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        0, // Radiation
+        new MaterialStack[] { // Na3AlF6
+            new MaterialStack(MaterialsElements.getInstance().MERCURY, 54 / 4),
+            new MaterialStack(MaterialsElements.getInstance().NITROGEN, 28 / 4),
+            new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 12 / 4),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 8 / 4),
+            new MaterialStack(MaterialsElements.getInstance().CHLORINE, 34 / 4),
+            new MaterialStack(MaterialsElements.getInstance().BROMINE, 34 / 4) });
+
+    public static final Material CROCROITE = new Material(
+        "Crocoite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_GEM_VERTICAL, // Texture Set
+        new short[] { 255, 143, 84, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().LEAD, 2),
+            new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3),
+            new MaterialStack(MaterialsElements.getInstance().CAESIUM, 1), });
+
+    public static final Material CRYOLITE = new Material(
+        "Cryolite (F)", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_SHINY, // Texture Set
+        new short[] { 205, 205, 255, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { // Na3AlF6
+            new MaterialStack(MaterialsElements.getInstance().SODIUM, 3),
+            new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6) });
+
+    // Demicheleite-(Br)
+    // BiSBr
+    public static final Material DEMICHELEITE_BR = new Material(
+        "Demicheleite (Br)", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_SHINY, // Texture Set
+        new short[] { 165, 75, 75, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { // Na3AlF6
+            new MaterialStack(MaterialsElements.getInstance().BISMUTH, 13),
+            new MaterialStack(MaterialsElements.getInstance().SULFUR, 11),
+            new MaterialStack(MaterialsElements.getInstance().BROMINE, 1) });
+
+    public static final Material FLORENCITE = new Material(
+        "Florencite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_METALLIC, // Texture Set
+        new short[] { 249, 249, 124, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { // SmAl3(PO4)2(OH)6
+            new MaterialStack(MaterialsElements.getInstance().SAMARIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 3),
+            new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 1),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 10),
+            new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 6) });
+
+    public static final Material FLUORCAPHITE = new Material(
+        "Fluorcaphite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_FINE, // Texture Set
+        new short[] { 255, 255, 30, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { // (Ca,Sr,Ce,Na)5(PO4)3F
+            new MaterialStack(MaterialsElements.getInstance().CALCIUM, 5),
+            new MaterialStack(MaterialMisc.STRONTIUM_OXIDE, 5),
+            new MaterialStack(MaterialsElements.getInstance().CERIUM, 5),
+            new MaterialStack(MaterialsElements.getInstance().SODIUM, 5),
+            new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 3),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 12),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6), });
+
+    // Gadolinite_Ce
+    public static final Material GADOLINITE_CE = new Material(
+        "Gadolinite (Ce)", // Material Name
+        MaterialState.ORE, // State
+        TextureSets.REFINED.get(), // Texture Set
+        new short[] { 15, 159, 59, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CERIUM, 4),
+            new MaterialStack(MaterialsElements.getInstance().ERBIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().LANTHANUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().NEODYMIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().GADOLINIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().SILICON, 7),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 14), });
+
+    // Gadolinite_Y
+    public static final Material GADOLINITE_Y = new Material(
+        "Gadolinite (Y)", // Material Name
+        MaterialState.ORE, // State
+        TextureSets.REFINED.get(), // Texture Set
+        new short[] { 35, 189, 99, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CERIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().ERBIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().LANTHANUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().NEODYMIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 4),
+            new MaterialStack(MaterialsElements.getInstance().GADOLINIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 3),
+            new MaterialStack(MaterialsElements.getInstance().SILICON, 4),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 9), });
+
+    public static final Material GEIKIELITE = new Material(
+        "Geikielite", // Material Name
+        MaterialState.ORE, // State
+        TextureSets.GEM_A.get(), // Texture Set
+        new short[] { 187, 193, 204, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().MAGNESIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().TITANIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3) });
+
+    public static final Material GREENOCKITE = new Material(
+        "Greenockite", // Material Name
+        MaterialState.ORE, // State
+        TextureSets.GEM_A.get(), // Texture Set
+        new short[] { 110, 193, 25, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CADMIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().SULFUR, 1), });
+
+    public static final Material HIBONITE = new Material(
+        "Hibonite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_METALLIC, // Texture Set
+        new short[] { 58, 31, 0, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { // ((Ca,Ce)(Al,Ti,Mg)12O19)
+            new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().CERIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 12),
+            new MaterialStack(MaterialsElements.getInstance().TITANIUM, 12),
+            new MaterialStack(MaterialsElements.getInstance().MAGNESIUM, 12),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 19), });
+
+    // Honeaite
+    // Au3TlTe2
+    public static final Material HONEAITE = new Material(
+        "Honeaite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_FINE, // Texture Set
+        new short[] { 165, 165, 5, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        0, // Radiation
+        new MaterialStack[] { // Na3AlF6
+            new MaterialStack(MaterialsElements.getInstance().GOLD, 3),
+            new MaterialStack(MaterialsElements.getInstance().THALLIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().TELLURIUM, 2) });
+
+    // Irarsite
+    // (Ir,Ru,Rh,Pt)AsS
+    public static final Material IRARSITE = new Material(
+        "Irarsite", // Material Name
+        MaterialState.ORE, // State
+        TextureSets.ENRICHED.get(), // Texture Set
+        new short[] { 125, 105, 105, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        0, // Radiation
+        new MaterialStack[] { // Na3AlF6
+            new MaterialStack(MaterialsElements.getInstance().IRIDIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().RUTHENIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().RHODIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().PLATINUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().ARSENIC, 1),
+            new MaterialStack(MaterialsElements.getInstance().SULFUR, 1),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1) });
+
+    // Kashinite
+    // (Ir,Rh)2S3
+    public static final Material KASHINITE = new Material(
+        "Kashinite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_SHINY, // Texture Set
+        new short[] { 75, 105, 75, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        0, // Radiation
+        new MaterialStack[] { // Na3AlF6
+            new MaterialStack(MaterialsElements.getInstance().IRIDIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().RHODIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().SULFUR, 3) });
+
+    // Tl(Cl,Br)
+    public static final Material LAFOSSAITE = new Material(
+        "Lafossaite", // Material Name
+        MaterialState.ORE, // State
+        TextureSets.REFINED.get(), // Texture Set
+        new short[] { 165, 105, 205, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { // Na3AlF6
+            new MaterialStack(MaterialsElements.getInstance().CHLORINE, 1),
+            new MaterialStack(MaterialsElements.getInstance().BROMINE, 1),
+            new MaterialStack(MaterialsElements.getInstance().THALLIUM, 1) });
+
+    public static final Material LANTHANITE_CE = new Material(
+        "Lanthanite (Ce)", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_METALLIC, // Texture Set
+        new short[] { 186, 113, 179, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { // (Ce)2(CO3)3·8(H2O)
+            new MaterialStack(MaterialsElements.getInstance().CERIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3),
+            new MaterialStack(MaterialsElements.getInstance().CALCIUM, 3),
+            new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 2),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1), });
+
+    public static final Material LANTHANITE_LA = new Material(
+        "Lanthanite (La)", // Material Name
+        MaterialState.ORE, // State
+        TextureSets.REFINED.get(), // Texture Set
+        new short[] { 219, 160, 214, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { // (La)2(CO3)3·8(H2O)
+            new MaterialStack(MaterialsElements.getInstance().LANTHANUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3),
+            new MaterialStack(MaterialsElements.getInstance().CALCIUM, 3),
+            new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 2),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1), });
+
+    public static final Material LANTHANITE_ND = new Material(
+        "Lanthanite (Nd)", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_METALLIC, // Texture Set
+        new short[] { 153, 76, 145, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { // (Nd)2(CO3)3·8(H2O)
+            new MaterialStack(MaterialsElements.getInstance().NEODYMIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3),
+            new MaterialStack(MaterialsElements.getInstance().CALCIUM, 3),
+            new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 2),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1), });
+
+    // Iodine Source
+    public static final Material LAUTARITE = new Material(
+        "Lautarite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_FINE, // Texture Set
+        new short[] { 165, 105, 205, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { // Na3AlF6
+            new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().IODINE, 2),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 6) });
+
+    public static final Material LEPERSONNITE = new Material(
+        "Lepersonnite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_EMERALD, // Texture Set
+        new short[] { 175, 175, 20, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().YTTERBIUM, 3),
+            new MaterialStack(MaterialsElements.getInstance().GADOLINIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().DYSPROSIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().URANIUM235, 2),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 29),
+            new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 24) });
+
+    // Miessiite
+    // Pd11Te2Se2
+    public static final Material MIESSIITE = new Material(
+        "Miessiite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_FINE, // Texture Set
+        new short[] { 75, 75, 75, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        0, // Radiation
+        new MaterialStack[] { // Na3AlF6
+            new MaterialStack(MaterialsElements.getInstance().PALLADIUM, 11),
+            new MaterialStack(MaterialsElements.getInstance().TELLURIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().SELENIUM, 2) });
+
+    public static final Material NICHROMITE = new Material(
+        "Nichromite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_METALLIC, // Texture Set
+        new short[] { 22, 19, 19, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().NICKEL, 1),
+            new MaterialStack(MaterialsElements.getInstance().COBALT, 1),
+            new MaterialStack(MaterialsElements.getInstance().IRON, 3),
+            new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 8) });
+
+    // Perroudite
+    // Hg5Ag4S5(I,Br)2Cl2
+    public static final Material PERROUDITE = new Material(
+        "Perroudite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_METALLIC, // Texture Set
+        new short[] { 77, 165, 174, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        0, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().SULFUR, 5),
+            new MaterialStack(MaterialsElements.getInstance().SILVER, 4),
+            new MaterialStack(MaterialsElements.getInstance().IODINE, 2),
+            new MaterialStack(MaterialsElements.getInstance().MERCURY, 5),
+            new MaterialStack(MaterialsElements.getInstance().BROMINE, 2),
+            new MaterialStack(MaterialsElements.getInstance().CHLORINE, 2) });
+
+    public static final Material POLYCRASE = new Material(
+        "Polycrase", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_ROUGH, // Texture Set
+        new short[] { 51, 0, 11, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().CERIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().URANIUM235, 1),
+            new MaterialStack(MaterialsElements.getInstance().THORIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().TITANIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().TANTALUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 6) });
+
+    // Radiobarite
+    // Radium, Barium, Barite?
+    public static final Material RADIOBARITE = new Material(
+        "Barite (Ra)", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_FLINT, // Texture Set
+        new short[] { 205, 205, 205, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        0, // Radiation
+        new MaterialStack[] { // Na3AlF6
+            new MaterialStack(MaterialsElements.getInstance().BARIUM, 32),
+            new MaterialStack(MaterialsElements.getInstance().RADIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().SULFUR, 16),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 15) });
+
+    // Samarskite_Y
+    public static final Material SAMARSKITE_Y = new Material(
+        "Samarskite (Y)", // Material Name
+        MaterialState.ORE, // State
+        TextureSets.ENRICHED.get(), // Texture Set
+        new short[] { 65, 163, 164, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 2), // Y not YT/YB
+            new MaterialStack(MaterialsElements.getInstance().IRON, 10),
+            new MaterialStack(MaterialsElements.getInstance().URANIUM235, 2),
+            new MaterialStack(MaterialsElements.getInstance().THORIUM, 3),
+            new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().TANTALUM, 3) });
+
+    // Samarskite_YB
+    public static final Material SAMARSKITE_YB = new Material(
+        "Samarskite (Yb)", // Material Name
+        MaterialState.ORE, // State
+        TextureSets.ENRICHED.get(), // Texture Set
+        new short[] { 95, 193, 194, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().YTTERBIUM, 2), // Y not YT/YB
+            new MaterialStack(MaterialsElements.getInstance().IRON, 9),
+            new MaterialStack(MaterialsElements.getInstance().URANIUM235, 3),
+            new MaterialStack(MaterialsElements.getInstance().THORIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 3),
+            new MaterialStack(MaterialsElements.getInstance().TANTALUM, 2) });
+
+    public static final Material TITANITE = new Material(
+        "Titanite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_METALLIC, // Texture Set
+        new short[] { 184, 198, 105, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CALCIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().TITANIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().SILICON, 2),
+            new MaterialStack(MaterialsElements.getInstance().THORIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 10) });
+
+    public static final Material XENOTIME = new Material(
+        "Xenotime", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_OPAL, // Texture Set
+        new short[] { 235, 89, 199, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().YTTERBIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().ERBIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().EUROPIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 2),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 8) });
+
+    public static final Material YTTRIAITE = new Material( // TODO
+        "Yttriaite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_METALLIC, // Texture Set
+        new short[] { 255, 143, 84, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 1), // Y not YT/YB
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3),
+            new MaterialStack(MaterialsElements.getInstance().IRON, 4),
+            new MaterialStack(MaterialsElements.getInstance().TIN, 1),
+            new MaterialStack(MaterialsElements.getInstance().NITROGEN, 2) });
+
+    public static final Material YTTRIALITE = new Material(
+        "Yttrialite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_RUBY, // Texture Set
+        new short[] { 35, 189, 99, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().THORIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().SILICON, 2),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 7), });
+
+    public static final Material YTTROCERITE = new Material(
+        "Yttrocerite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_DIAMOND, // Texture Set
+        new short[] { 35, 19, 199, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CERIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 5),
+            new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 1), });
+
+    public static final Material ZIMBABWEITE = new Material(
+        "Zimbabweite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_FINE, // Texture Set
+        new short[] { 193, 187, 131, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CALCIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().POTASSIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().LEAD, 1),
+            new MaterialStack(MaterialsElements.getInstance().ARSENIC, 4),
+            new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 4),
+            new MaterialStack(MaterialsElements.getInstance().TANTALUM, 4),
+            new MaterialStack(MaterialsElements.getInstance().TITANIUM, 4),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 18) });
+
+    public static final Material ZIRCON = new Material(
+        "Zircon", // Material Name
+        MaterialState.ORE, // State
+        TextureSets.GEM_A.get(), // Texture Set
+        new short[] { 195, 19, 19, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().ZIRCONIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().SILICON, 1),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 4), });
+
+    public static final Material ZIRCONILITE = new Material(
+        "Zirconolite", // Material Name
+        MaterialState.ORE, // State
+        TextureSet.SET_FINE, // Texture Set
+        new short[] { 45, 26, 0, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CALCIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().ZIRCONIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().TITANIUM, 4),
+            new MaterialStack(MaterialsElements.getInstance().CERIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 14) });
+
+    public static final Material ZIRCOPHYLLITE = new Material(
+        "Zircophyllite", // Material Name
+        MaterialState.ORE, // State
+        TextureSets.REFINED.get(), // Texture Set
+        new short[] { 30, 0, 6, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().POTASSIUM, 3),
+            new MaterialStack(MaterialsElements.getInstance().SODIUM, 3),
+            new MaterialStack(MaterialsElements.getInstance().MANGANESE, 7),
+            new MaterialStack(MaterialsElements.getInstance().IRON, 7),
+            new MaterialStack(MaterialsElements.getInstance().ZIRCONIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().TITANIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().SILICON, 8),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 13),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 7), });
+
+    public static final Material ZIRKELITE = new Material(
+        "Zirkelite", // Material Name
+        MaterialState.ORE, // State
+        TextureSets.GEM_A.get(), // Texture Set
+        new short[] { 229, 208, 48, 0 }, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        -1, // Radiation
+        new MaterialStack[] { // (Ca,Th,Ce)Zr(Ti,Nb)2O7
+            new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().THORIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().CERIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().ZIRCONIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().TITANIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().OXYGEN, 7) });
+
+    public static final Material DEEP_EARTH_REACTOR_FUEL_DEPOSIT = new Material(
+        "Radioactive Mineral Mix", // Material Name
+        MaterialState.ORE, // State
+        TextureSets.NUCLEAR.get(), // Texture Set
+        null, // Material Colour
+        -1,
+        -1,
+        -1,
+        -1,
+        4, // Radiation
+        new MaterialStack[] { // Na3AlF6
+            new MaterialStack(MaterialsElements.getInstance().RADON, 2),
+            new MaterialStack(MaterialsElements.getInstance().RADIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().URANIUM235, 1),
+            new MaterialStack(MaterialsElements.getInstance().URANIUM238, 10),
+            new MaterialStack(MaterialsElements.getInstance().THORIUM, 25),
+            new MaterialStack(MaterialsElements.getInstance().THORIUM232, 4), new MaterialStack(FLUORCAPHITE, 6),
+            new MaterialStack(SAMARSKITE_Y, 8), new MaterialStack(TITANITE, 4) });
+}
diff --git a/src/main/java/gtPlusPlus/core/material/NONMATERIAL.java b/src/main/java/gtPlusPlus/core/material/MaterialsOther.java
index 5e084b84bf..38a2ce73c1 100644
--- a/src/main/java/gtPlusPlus/core/material/NONMATERIAL.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialsOther.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.TextureSet;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 
-public class NONMATERIAL {
+public class MaterialsOther {
 
     // Soul Sand
     public static final Material SOULSAND = MaterialUtils.generateMaterialFromGtENUM(Materials.SoulSand);
diff --git a/src/main/java/gtPlusPlus/core/material/ORES.java b/src/main/java/gtPlusPlus/core/material/ORES.java
deleted file mode 100644
index 420c553d49..0000000000
--- a/src/main/java/gtPlusPlus/core/material/ORES.java
+++ /dev/null
@@ -1,701 +0,0 @@
-package gtPlusPlus.core.material;
-
-import gregtech.api.enums.TextureSet;
-import gtPlusPlus.core.client.CustomTextureSet.TextureSets;
-import gtPlusPlus.core.material.state.MaterialState;
-
-public final class ORES {
-
-    public static final Material AGARDITE_CD = new Material(
-        "Agardite (Cd)", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_METALLIC, // Texture Set
-        new short[] { 170, 188, 33, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { // (CdCa)Cu7(AsO2)4(O2H)5·3H2O
-            new MaterialStack(ELEMENT.getInstance().CADMIUM, 1), new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().COPPER, 7), new MaterialStack(ELEMENT.getInstance().ARSENIC, 4),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
-            new MaterialStack(ELEMENT.getInstance().HYDROGEN, 11) });
-
-    public static final Material AGARDITE_LA = new Material(
-        "Agardite (La)", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_FINE, // Texture Set
-        new short[] { 206, 232, 9, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { // (LaCa)Cu5(AsO6)2(OH)4·3H2O
-            new MaterialStack(ELEMENT.getInstance().LANTHANUM, 1), new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().COPPER, 5), new MaterialStack(ELEMENT.getInstance().ARSENIC, 2),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 19),
-            new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10) });
-
-    public static final Material AGARDITE_ND = new Material(
-        "Agardite (Nd)", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_METALLIC, // Texture Set
-        new short[] { 225, 244, 78, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { // (NdCa)Cu6(As3O3)2(O2H)6·3H2O
-            new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 1), new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().COPPER, 6), new MaterialStack(ELEMENT.getInstance().ARSENIC, 6),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
-            new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12) });
-
-    public static final Material AGARDITE_Y = new Material(
-        "Agardite (Y)", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_METALLIC, // Texture Set
-        new short[] { 210, 232, 44, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { // (YCa)Cu5(As2O4)3(OH)6·3H2O
-            new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().COPPER, 5), new MaterialStack(ELEMENT.getInstance().ARSENIC, 6),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
-            new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12) });
-
-    // Alburnite
-    // Ag8GeTe2S4
-    public static final Material ALBURNITE = new Material(
-        "Alburnite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_METALLIC, // Texture Set
-        new short[] { 16, 5, 105, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        0, // Radiation
-        new MaterialStack[] { // Na3AlF6
-            new MaterialStack(ELEMENT.getInstance().GOLD, 8), new MaterialStack(ELEMENT.getInstance().GERMANIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().SULFUR, 4) });
-
-    public static final Material CERITE = new Material(
-        "Cerite", // Material Name
-        MaterialState.ORE, // State
-        TextureSets.REFINED.get(), // Texture Set
-        new short[] { 68, 13, 0, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { // (Ce,La,Ca)9(Mg,Fe+3)(SiO4)6(SiO3OH)(OH)3
-            new MaterialStack(ELEMENT.getInstance().CERIUM, 9), new MaterialStack(ELEMENT.getInstance().LANTHANUM, 9),
-            new MaterialStack(ELEMENT.getInstance().CALCIUM, 9), new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 3),
-            new MaterialStack(ELEMENT.getInstance().IRON, 3), new MaterialStack(ELEMENT.getInstance().SILICON, 7),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 20),
-            new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4) });
-
-    // Comancheite
-    // Hg55N24(NH2,OH)4(Cl,Br)34
-    public static final Material COMANCHEITE = new Material(
-        "Comancheite", // Material Name
-        MaterialState.ORE, // State
-        TextureSets.REFINED.get(), // Texture Set
-        new short[] { 65, 205, 105, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        0, // Radiation
-        new MaterialStack[] { // Na3AlF6
-            new MaterialStack(ELEMENT.getInstance().MERCURY, 54 / 4),
-            new MaterialStack(ELEMENT.getInstance().NITROGEN, 28 / 4),
-            new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12 / 4),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 8 / 4),
-            new MaterialStack(ELEMENT.getInstance().CHLORINE, 34 / 4),
-            new MaterialStack(ELEMENT.getInstance().BROMINE, 34 / 4) });
-
-    public static final Material CROCROITE = new Material(
-        "Crocoite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_GEM_VERTICAL, // Texture Set
-        new short[] { 255, 143, 84, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LEAD, 2),
-            new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
-            new MaterialStack(ELEMENT.getInstance().CAESIUM, 1), });
-
-    public static final Material CRYOLITE = new Material(
-        "Cryolite (F)", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_SHINY, // Texture Set
-        new short[] { 205, 205, 255, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { // Na3AlF6
-            new MaterialStack(ELEMENT.getInstance().SODIUM, 3), new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) });
-
-    // Demicheleite-(Br)
-    // BiSBr
-    public static final Material DEMICHELEITE_BR = new Material(
-        "Demicheleite (Br)", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_SHINY, // Texture Set
-        new short[] { 165, 75, 75, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { // Na3AlF6
-            new MaterialStack(ELEMENT.getInstance().BISMUTH, 13), new MaterialStack(ELEMENT.getInstance().SULFUR, 11),
-            new MaterialStack(ELEMENT.getInstance().BROMINE, 1) });
-
-    public static final Material FLORENCITE = new Material(
-        "Florencite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_METALLIC, // Texture Set
-        new short[] { 249, 249, 124, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { // SmAl3(PO4)2(OH)6
-            new MaterialStack(ELEMENT.getInstance().SAMARIUM, 1), new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3),
-            new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1), new MaterialStack(ELEMENT.getInstance().OXYGEN, 10),
-            new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6) });
-
-    public static final Material FLUORCAPHITE = new Material(
-        "Fluorcaphite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_FINE, // Texture Set
-        new short[] { 255, 255, 30, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { // (Ca,Sr,Ce,Na)5(PO4)3F
-            new MaterialStack(ELEMENT.getInstance().CALCIUM, 5), new MaterialStack(MISC_MATERIALS.STRONTIUM_OXIDE, 5),
-            new MaterialStack(ELEMENT.getInstance().CERIUM, 5), new MaterialStack(ELEMENT.getInstance().SODIUM, 5),
-            new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 3), new MaterialStack(ELEMENT.getInstance().OXYGEN, 12),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 6), });
-
-    // Gadolinite_Ce
-    public static final Material GADOLINITE_CE = new Material(
-        "Gadolinite (Ce)", // Material Name
-        MaterialState.ORE, // State
-        TextureSets.REFINED.get(), // Texture Set
-        new short[] { 15, 159, 59, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CERIUM, 4),
-            new MaterialStack(ELEMENT.getInstance().ERBIUM, 2), new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
-            new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2), new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 2), new MaterialStack(ELEMENT.getInstance().SILICON, 7),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 14), });
-
-    // Gadolinite_Y
-    public static final Material GADOLINITE_Y = new Material(
-        "Gadolinite (Y)", // Material Name
-        MaterialState.ORE, // State
-        TextureSets.REFINED.get(), // Texture Set
-        new short[] { 35, 189, 99, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CERIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().ERBIUM, 2), new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
-            new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2), new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4),
-            new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 3), new MaterialStack(ELEMENT.getInstance().SILICON, 4),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 9), });
-
-    public static final Material GEIKIELITE = new Material(
-        "Geikielite", // Material Name
-        MaterialState.ORE, // State
-        TextureSets.GEM_A.get(), // Texture Set
-        new short[] { 187, 193, 204, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().TITANIUM, 1), new MaterialStack(ELEMENT.getInstance().OXYGEN, 3) });
-
-    public static final Material GREENOCKITE = new Material(
-        "Greenockite", // Material Name
-        MaterialState.ORE, // State
-        TextureSets.GEM_A.get(), // Texture Set
-        new short[] { 110, 193, 25, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CADMIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().SULFUR, 1), });
-
-    public static final Material HIBONITE = new Material(
-        "Hibonite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_METALLIC, // Texture Set
-        new short[] { 58, 31, 0, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { // ((Ca,Ce)(Al,Ti,Mg)12O19)
-            new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12),
-            new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
-            new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 12),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 19), });
-
-    // Honeaite
-    // Au3TlTe2
-    public static final Material HONEAITE = new Material(
-        "Honeaite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_FINE, // Texture Set
-        new short[] { 165, 165, 5, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        0, // Radiation
-        new MaterialStack[] { // Na3AlF6
-            new MaterialStack(ELEMENT.getInstance().GOLD, 3), new MaterialStack(ELEMENT.getInstance().THALLIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2) });
-
-    // Irarsite
-    // (Ir,Ru,Rh,Pt)AsS
-    public static final Material IRARSITE = new Material(
-        "Irarsite", // Material Name
-        MaterialState.ORE, // State
-        TextureSets.ENRICHED.get(), // Texture Set
-        new short[] { 125, 105, 105, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        0, // Radiation
-        new MaterialStack[] { // Na3AlF6
-            new MaterialStack(ELEMENT.getInstance().IRIDIUM, 1), new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().RHODIUM, 1), new MaterialStack(ELEMENT.getInstance().PLATINUM, 1),
-            new MaterialStack(ELEMENT.getInstance().ARSENIC, 1), new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 1) });
-
-    // Kashinite
-    // (Ir,Rh)2S3
-    public static final Material KASHINITE = new Material(
-        "Kashinite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_SHINY, // Texture Set
-        new short[] { 75, 105, 75, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        0, // Radiation
-        new MaterialStack[] { // Na3AlF6
-            new MaterialStack(ELEMENT.getInstance().IRIDIUM, 2), new MaterialStack(ELEMENT.getInstance().RHODIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().SULFUR, 3) });
-
-    // Tl(Cl,Br)
-    public static final Material LAFOSSAITE = new Material(
-        "Lafossaite", // Material Name
-        MaterialState.ORE, // State
-        TextureSets.REFINED.get(), // Texture Set
-        new short[] { 165, 105, 205, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { // Na3AlF6
-            new MaterialStack(ELEMENT.getInstance().CHLORINE, 1), new MaterialStack(ELEMENT.getInstance().BROMINE, 1),
-            new MaterialStack(ELEMENT.getInstance().THALLIUM, 1) });
-
-    public static final Material LANTHANITE_CE = new Material(
-        "Lanthanite (Ce)", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_METALLIC, // Texture Set
-        new short[] { 186, 113, 179, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { // (Ce)2(CO3)3·8(H2O)
-            new MaterialStack(ELEMENT.getInstance().CERIUM, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
-            new MaterialStack(ELEMENT.getInstance().CALCIUM, 3), new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), });
-
-    public static final Material LANTHANITE_LA = new Material(
-        "Lanthanite (La)", // Material Name
-        MaterialState.ORE, // State
-        TextureSets.REFINED.get(), // Texture Set
-        new short[] { 219, 160, 214, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { // (La)2(CO3)3·8(H2O)
-            new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
-            new MaterialStack(ELEMENT.getInstance().CALCIUM, 3), new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), });
-
-    public static final Material LANTHANITE_ND = new Material(
-        "Lanthanite (Nd)", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_METALLIC, // Texture Set
-        new short[] { 153, 76, 145, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { // (Nd)2(CO3)3·8(H2O)
-            new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
-            new MaterialStack(ELEMENT.getInstance().CALCIUM, 3), new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), });
-
-    // Iodine Source
-    public static final Material LAUTARITE = new Material(
-        "Lautarite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_FINE, // Texture Set
-        new short[] { 165, 105, 205, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { // Na3AlF6
-            new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), new MaterialStack(ELEMENT.getInstance().IODINE, 2),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 6) });
-
-    public static final Material LEPERSONNITE = new Material(
-        "Lepersonnite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_EMERALD, // Texture Set
-        new short[] { 175, 175, 20, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 3),
-            new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().URANIUM235, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 29),
-            new MaterialStack(ELEMENT.getInstance().HYDROGEN, 24) });
-
-    // Miessiite
-    // Pd11Te2Se2
-    public static final Material MIESSIITE = new Material(
-        "Miessiite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_FINE, // Texture Set
-        new short[] { 75, 75, 75, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        0, // Radiation
-        new MaterialStack[] { // Na3AlF6
-            new MaterialStack(ELEMENT.getInstance().PALLADIUM, 11),
-            new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().SELENIUM, 2) });
-
-    public static final Material NICHROMITE = new Material(
-        "Nichromite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_METALLIC, // Texture Set
-        new short[] { 22, 19, 19, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NICKEL, 1),
-            new MaterialStack(ELEMENT.getInstance().COBALT, 1), new MaterialStack(ELEMENT.getInstance().IRON, 3),
-            new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 2), new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 8) });
-
-    // Perroudite
-    // Hg5Ag4S5(I,Br)2Cl2
-    public static final Material PERROUDITE = new Material(
-        "Perroudite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_METALLIC, // Texture Set
-        new short[] { 77, 165, 174, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        0, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SULFUR, 5),
-            new MaterialStack(ELEMENT.getInstance().SILVER, 4), new MaterialStack(ELEMENT.getInstance().IODINE, 2),
-            new MaterialStack(ELEMENT.getInstance().MERCURY, 5), new MaterialStack(ELEMENT.getInstance().BROMINE, 2),
-            new MaterialStack(ELEMENT.getInstance().CHLORINE, 2) });
-
-    public static final Material POLYCRASE = new Material(
-        "Polycrase", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_ROUGH, // Texture Set
-        new short[] { 51, 0, 11, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().URANIUM235, 1), new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().TANTALUM, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 6) });
-
-    // Radiobarite
-    // Radium, Barium, Barite?
-    public static final Material RADIOBARITE = new Material(
-        "Barite (Ra)", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_FLINT, // Texture Set
-        new short[] { 205, 205, 205, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        0, // Radiation
-        new MaterialStack[] { // Na3AlF6
-            new MaterialStack(ELEMENT.getInstance().BARIUM, 32), new MaterialStack(ELEMENT.getInstance().RADIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().SULFUR, 16), new MaterialStack(ELEMENT.getInstance().OXYGEN, 15) });
-
-    // Samarskite_Y
-    public static final Material SAMARSKITE_Y = new Material(
-        "Samarskite (Y)", // Material Name
-        MaterialState.ORE, // State
-        TextureSets.ENRICHED.get(), // Texture Set
-        new short[] { 65, 163, 164, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), // Y not YT/YB
-            new MaterialStack(ELEMENT.getInstance().IRON, 10), new MaterialStack(ELEMENT.getInstance().URANIUM235, 2),
-            new MaterialStack(ELEMENT.getInstance().THORIUM, 3), new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().TANTALUM, 3) });
-
-    // Samarskite_YB
-    public static final Material SAMARSKITE_YB = new Material(
-        "Samarskite (Yb)", // Material Name
-        MaterialState.ORE, // State
-        TextureSets.ENRICHED.get(), // Texture Set
-        new short[] { 95, 193, 194, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), // Y not YT/YB
-            new MaterialStack(ELEMENT.getInstance().IRON, 9), new MaterialStack(ELEMENT.getInstance().URANIUM235, 3),
-            new MaterialStack(ELEMENT.getInstance().THORIUM, 2), new MaterialStack(ELEMENT.getInstance().NIOBIUM, 3),
-            new MaterialStack(ELEMENT.getInstance().TANTALUM, 2) });
-
-    public static final Material TITANITE = new Material(
-        "Titanite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_METALLIC, // Texture Set
-        new short[] { 184, 198, 105, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), new MaterialStack(ELEMENT.getInstance().SILICON, 2),
-            new MaterialStack(ELEMENT.getInstance().THORIUM, 1), new MaterialStack(ELEMENT.getInstance().OXYGEN, 10) });
-
-    public static final Material XENOTIME = new Material(
-        "Xenotime", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_OPAL, // Texture Set
-        new short[] { 235, 89, 199, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().EUROPIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 2),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 8) });
-
-    public static final Material YTTRIAITE = new Material( // TODO
-        "Yttriaite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_METALLIC, // Texture Set
-        new short[] { 255, 143, 84, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), // Y not YT/YB
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 3), new MaterialStack(ELEMENT.getInstance().IRON, 4),
-            new MaterialStack(ELEMENT.getInstance().TIN, 1), new MaterialStack(ELEMENT.getInstance().NITROGEN, 2) });
-
-    public static final Material YTTRIALITE = new Material(
-        "Yttrialite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_RUBY, // Texture Set
-        new short[] { 35, 189, 99, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().THORIUM, 2), new MaterialStack(ELEMENT.getInstance().SILICON, 2),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 7), });
-
-    public static final Material YTTROCERITE = new Material(
-        "Yttrocerite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_DIAMOND, // Texture Set
-        new short[] { 35, 19, 199, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), new MaterialStack(ELEMENT.getInstance().FLUORINE, 5),
-            new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), });
-
-    public static final Material ZIMBABWEITE = new Material(
-        "Zimbabweite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_FINE, // Texture Set
-        new short[] { 193, 187, 131, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().POTASSIUM, 2), new MaterialStack(ELEMENT.getInstance().LEAD, 1),
-            new MaterialStack(ELEMENT.getInstance().ARSENIC, 4), new MaterialStack(ELEMENT.getInstance().NIOBIUM, 4),
-            new MaterialStack(ELEMENT.getInstance().TANTALUM, 4), new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 18) });
-
-    public static final Material ZIRCON = new Material(
-        "Zircon", // Material Name
-        MaterialState.ORE, // State
-        TextureSets.GEM_A.get(), // Texture Set
-        new short[] { 195, 19, 19, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().SILICON, 1), new MaterialStack(ELEMENT.getInstance().OXYGEN, 4), });
-
-    public static final Material ZIRCONILITE = new Material(
-        "Zirconolite", // Material Name
-        MaterialState.ORE, // State
-        TextureSet.SET_FINE, // Texture Set
-        new short[] { 45, 26, 0, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2), new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
-            new MaterialStack(ELEMENT.getInstance().CERIUM, 1), new MaterialStack(ELEMENT.getInstance().OXYGEN, 14) });
-
-    public static final Material ZIRCOPHYLLITE = new Material(
-        "Zircophyllite", // Material Name
-        MaterialState.ORE, // State
-        TextureSets.REFINED.get(), // Texture Set
-        new short[] { 30, 0, 6, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().POTASSIUM, 3),
-            new MaterialStack(ELEMENT.getInstance().SODIUM, 3), new MaterialStack(ELEMENT.getInstance().MANGANESE, 7),
-            new MaterialStack(ELEMENT.getInstance().IRON, 7), new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().SILICON, 8), new MaterialStack(ELEMENT.getInstance().OXYGEN, 13),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 7), });
-
-    public static final Material ZIRKELITE = new Material(
-        "Zirkelite", // Material Name
-        MaterialState.ORE, // State
-        TextureSets.GEM_A.get(), // Texture Set
-        new short[] { 229, 208, 48, 0 }, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        -1, // Radiation
-        new MaterialStack[] { // (Ca,Th,Ce)Zr(Ti,Nb)2O7
-            new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().CERIUM, 1), new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().OXYGEN, 7) });
-
-    public static final Material DEEP_EARTH_REACTOR_FUEL_DEPOSIT = new Material(
-        "Radioactive Mineral Mix", // Material Name
-        MaterialState.ORE, // State
-        TextureSets.NUCLEAR.get(), // Texture Set
-        null, // Material Colour
-        -1,
-        -1,
-        -1,
-        -1,
-        4, // Radiation
-        new MaterialStack[] { // Na3AlF6
-            new MaterialStack(ELEMENT.getInstance().RADON, 2), new MaterialStack(ELEMENT.getInstance().RADIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().URANIUM235, 1),
-            new MaterialStack(ELEMENT.getInstance().URANIUM238, 10),
-            new MaterialStack(ELEMENT.getInstance().THORIUM, 25),
-            new MaterialStack(ELEMENT.getInstance().THORIUM232, 4), new MaterialStack(FLUORCAPHITE, 6),
-            new MaterialStack(SAMARSKITE_Y, 8), new MaterialStack(TITANITE, 4) });
-}
diff --git a/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsFluorides.java
index 5a50a604da..f3ae16c644 100644
--- a/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
+++ b/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsFluorides.java
@@ -1,13 +1,13 @@
 package gtPlusPlus.core.material.nuclear;
 
 import gregtech.api.enums.Materials;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.MaterialMisc;
 import gtPlusPlus.core.material.MaterialStack;
+import gtPlusPlus.core.material.MaterialsElements;
 import gtPlusPlus.core.material.state.MaterialState;
 
-public class FLUORIDES {
+public class MaterialsFluorides {
 
     public static final Material FLUORITE = new Material(
         "Fluorite (F)", // Material Name
@@ -20,9 +20,10 @@ public class FLUORIDES {
         false, // Uses Blast furnace?
         false, // Generate cells
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 16),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 32), new MaterialStack(ELEMENT.getInstance().IRON, 4),
-            new MaterialStack(ELEMENT.getInstance().CARBON, 2) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CALCIUM, 16),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 32),
+            new MaterialStack(MaterialsElements.getInstance().IRON, 4),
+            new MaterialStack(MaterialsElements.getInstance().CARBON, 2) });
 
     // ThF4
     public static final Material THORIUM_TETRAFLUORIDE = new Material(
@@ -35,8 +36,8 @@ public class FLUORIDES {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().THORIUM232, 1),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().THORIUM232, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) });
 
     // ThF6
     public static final Material THORIUM_HEXAFLUORIDE = new Material(
@@ -49,9 +50,9 @@ public class FLUORIDES {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().THORIUM232, 1),
-            new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 12) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().THORIUM232, 1),
+            new MaterialStack(MaterialsElements.getInstance().THORIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 12) });
 
     // UF4
     public static final Material URANIUM_TETRAFLUORIDE = new Material(
@@ -64,8 +65,8 @@ public class FLUORIDES {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().URANIUM233, 1),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().URANIUM233, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) });
 
     // UF6
     public static final Material URANIUM_HEXAFLUORIDE = new Material(
@@ -78,8 +79,8 @@ public class FLUORIDES {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) });
+        new MaterialStack[] { new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2) });
 
     // ZrF4
 
@@ -98,15 +99,15 @@ public class FLUORIDES {
         -1,
         true,
         false,
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().ZIRCONIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) });
 
     /*
      * public static final Material ZIRCONIUM_TETRAFLUORIDE = new Material( "Zirconium Tetrafluoride", //Material Name
      * MaterialState.LIQUID, //State null, //Material Colour -1, //Melting Point in C -1, //Boiling Point in C -1,
      * //Protons -1, //Neutrons false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new
      * MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1), new
-     * MaterialStack(ELEMENT.getInstance().FLUORINE, 4) });
+     * MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) });
      */
 
     // BeF2
@@ -120,8 +121,8 @@ public class FLUORIDES {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2) });
 
     // LiF
     public static final Material LITHIUM_FLUORIDE = new Material(
@@ -134,8 +135,8 @@ public class FLUORIDES {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LITHIUM7, 1),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 1) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().LITHIUM7, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 1) });
 
     // LFTR sub components
 
@@ -150,9 +151,9 @@ public class FLUORIDES {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MISC_MATERIALS.AMMONIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) });
+        new MaterialStack[] { new MaterialStack(MaterialMisc.AMMONIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2) });
 
     // Be(OH)2
     public static final Material BERYLLIUM_HYDROXIDE = new Material(
@@ -165,8 +166,8 @@ public class FLUORIDES {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1),
-            new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1),
+            new MaterialStack(MaterialMisc.HYDROXIDE, 2) });
 
     // (NH4)2BeF4
     public static final Material AMMONIUM_TETRAFLUOROBERYLLATE = new Material(
@@ -179,9 +180,9 @@ public class FLUORIDES {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MISC_MATERIALS.AMMONIUM, 2),
-            new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) });
+        new MaterialStack[] { new MaterialStack(MaterialMisc.AMMONIUM, 2),
+            new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) });
 
     // LFTR Output
     public static final Material NEPTUNIUM_HEXAFLUORIDE = new Material(
@@ -194,8 +195,8 @@ public class FLUORIDES {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NEPTUNIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().NEPTUNIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6) });
 
     public static final Material TECHNETIUM_HEXAFLUORIDE = new Material(
         "Technetium Hexafluoride", // Material Name
@@ -207,8 +208,8 @@ public class FLUORIDES {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TECHNETIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().TECHNETIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6) });
 
     public static final Material SELENIUM_HEXAFLUORIDE = new Material(
         "Selenium Hexafluoride", // Material Name
@@ -220,8 +221,8 @@ public class FLUORIDES {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SELENIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().SELENIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6) });
 
     public static final Material SODIUM_FLUORIDE = new Material(
         "Sodium Fluoride", // Material Name
@@ -233,12 +234,12 @@ public class FLUORIDES {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 1) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().SODIUM, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 1) });
 
-    private static final FLUORIDES INSTANCE = new FLUORIDES();
+    private static final MaterialsFluorides INSTANCE = new MaterialsFluorides();
 
-    public static FLUORIDES getInstance() {
+    public static MaterialsFluorides getInstance() {
         return INSTANCE;
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsNuclides.java
index ebd24bad07..8d74ef9ab8 100644
--- a/src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
+++ b/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsNuclides.java
@@ -1,13 +1,13 @@
 package gtPlusPlus.core.material.nuclear;
 
 import gtPlusPlus.core.client.CustomTextureSet.TextureSets;
-import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
+import gtPlusPlus.core.material.MaterialsElements;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.data.StringUtils;
 
-public final class NUCLIDE {
+public final class MaterialsNuclides {
 
     public static final Material Li2BeF4 = new Material(
         "Lithium Tetrafluoroberyllate (LFTB)", // Material Name
@@ -22,8 +22,8 @@ public final class NUCLIDE {
         StringUtils.subscript(StringUtils.superscript("7") + "Li2BeF4"), // Chemical Formula
         4, // Radioactivity Level
            // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 2),
-            new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1) });
+        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 2),
+            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1) });
 
     public static final Material LiFBeF2ThF4UF4 = new Material(
         "LFTR Fuel 3", // Material Name
@@ -38,9 +38,10 @@ public final class NUCLIDE {
         StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ThF4UF4"), // Chemical Formula
         5, // Radioactivity Level
            // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65),
-            new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 28), new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1),
-            new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1) });
+        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 65),
+            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 28),
+            new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1),
+            new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1) });
 
     public static final Material LiFBeF2ZrF4UF4 = new Material(
         "LFTR Fuel 2", // Material Name
@@ -55,10 +56,10 @@ public final class NUCLIDE {
         StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ZrF4UF4"), // Chemical Formula
         5, // Radioactivity Level
            // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65),
-            new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 28),
-            new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 5),
-            new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 2) });
+        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 65),
+            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 28),
+            new MaterialStack(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE, 5),
+            new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 2) });
 
     public static final Material LiFBeF2ZrF4U235 = new Material(
         "LFTR Fuel 1", // Material Name
@@ -74,10 +75,10 @@ public final class NUCLIDE {
                                                                                                                // Formula
         5, // Radioactivity Level
            // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 55),
-            new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 25),
-            new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 6),
-            new MaterialStack(ELEMENT.getInstance().URANIUM235, 14) });
+        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 55),
+            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 25),
+            new MaterialStack(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE, 6),
+            new MaterialStack(MaterialsElements.getInstance().URANIUM235, 14) });
 
     // Misc
     public static final Material BurntLftrFuel_MK1 = new Material(
@@ -91,9 +92,10 @@ public final class NUCLIDE {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiBeF2UF4FP"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LITHIUM, 1),
-            new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1), new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
-            new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().LITHIUM, 1),
+            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1),
+            new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1),
+            new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1) });
 
     public static final Material BurntLftrFuel_MK2 = new Material(
         "Burnt Reactor Fuel II", // Material Name
@@ -106,9 +108,10 @@ public final class NUCLIDE {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiBeF2UF4FP"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LITHIUM, 1),
-            new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1), new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
-            new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().LITHIUM, 1),
+            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1),
+            new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1),
+            new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1) });
 
     // LFTR Core Fluids
     public static final Material LiFBeF2UF4FP = new Material(
@@ -122,9 +125,10 @@ public final class NUCLIDE {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4FP"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
-            new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1), new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
-            new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) });
+        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1),
+            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1),
+            new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1),
+            new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1) });
 
     public static final Material Sparged_LiFBeF2UF4FP = new Material(
         "Helium Sparged U Salt", // Material Name
@@ -137,9 +141,10 @@ public final class NUCLIDE {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4FP"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
-            new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1), new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
-            new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) });
+        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1),
+            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1),
+            new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1),
+            new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1) });
 
     public static final Material UF6F2FP = new Material(
         "Phosphorous Uranium Hexafluoride (P-UF6)", // Material Name
@@ -152,9 +157,9 @@ public final class NUCLIDE {
         false, // Uses Blast furnace?
         StringUtils.subscript("UF6F2FP"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 3),
-            new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1) });
+        new MaterialStack[] { new MaterialStack(MaterialsFluorides.URANIUM_HEXAFLUORIDE, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 3),
+            new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 1) });
 
     public static final Material LiFBeF2 = new Material(
         "Stable Molten Salt Base", // Material Name
@@ -167,8 +172,8 @@ public final class NUCLIDE {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
-            new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1) });
+        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1),
+            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1) });
 
     public static final Material LiFBeF2UF4 = new Material(
         "LFTR Fuel Base", // Material Name
@@ -181,7 +186,8 @@ public final class NUCLIDE {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(LiFBeF2, 1), new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1) });
+        new MaterialStack[] { new MaterialStack(LiFBeF2, 1),
+            new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1) });
 
     // LFTR Blanket Fluids
 
@@ -197,8 +203,8 @@ public final class NUCLIDE {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiFThF4"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
-            new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) });
+        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1),
+            new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1) });
 
     // Tier 2 Fuel blanket output
     public static final Material LiFBeF2ThF4 = new Material(
@@ -212,9 +218,9 @@ public final class NUCLIDE {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ThF4"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
-            new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
-            new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) });
+        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1),
+            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1),
+            new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1) });
 
     // Tier 1 Fuel blanket output
     public static final Material Sparged_LiFThF4 = new Material(
@@ -228,8 +234,8 @@ public final class NUCLIDE {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiFThF4"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
-            new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) });
+        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1),
+            new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1) });
 
     // Tier 2 Fuel blanket output
     public static final Material Sparged_LiFBeF2ThF4 = new Material(
@@ -243,9 +249,9 @@ public final class NUCLIDE {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ThF4"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
-            new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
-            new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) });
+        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1),
+            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1),
+            new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1) });
 
     public static final Material UF6F2 = new Material(
         "Fluorinated Uranium Hexafluoride (F-UF6)", // Material Name
@@ -258,8 +264,8 @@ public final class NUCLIDE {
         false, // Uses Blast furnace?
         StringUtils.subscript("UF6F2"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1),
-            new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) });
+        new MaterialStack[] { new MaterialStack(MaterialsFluorides.URANIUM_HEXAFLUORIDE, 1),
+            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2) });
 
     // Secondary material is molten metal
     public static final Material NAQ_FUEL_T1 = new Material(
@@ -272,8 +278,8 @@ public final class NUCLIDE {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NAQUADAH, 2),
-            new MaterialStack(ELEMENT.getInstance().TANTALUM, 3) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().NAQUADAH, 2),
+            new MaterialStack(MaterialsElements.getInstance().TANTALUM, 3) });
 
     // Secondary material is a plasma
     public static final Material NAQ_FUEL_T2 = new Material(
@@ -286,8 +292,8 @@ public final class NUCLIDE {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 2),
-            new MaterialStack(ELEMENT.getInstance().TITANIUM, 3) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().NAQUADAH_ENRICHED, 2),
+            new MaterialStack(MaterialsElements.getInstance().TITANIUM, 3) });
 
     // Secondary material is a plasma
     public static final Material NAQ_FUEL_T3 = new Material(
@@ -300,12 +306,12 @@ public final class NUCLIDE {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 2),
-            new MaterialStack(ELEMENT.getInstance().AMERICIUM, 3) });
+        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().NAQUADRIA, 2),
+            new MaterialStack(MaterialsElements.getInstance().AMERICIUM, 3) });
 
-    private static final NUCLIDE INSTANCE = new NUCLIDE();
+    private static final MaterialsNuclides INSTANCE = new MaterialsNuclides();
 
-    public static NUCLIDE getInstance() {
+    public static MaterialsNuclides getInstance() {
         return INSTANCE;
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui.java b/src/main/java/gtPlusPlus/core/network/packet/PacketVolumetricFlaskGui.java
index 9dfa1dbad5..449819335f 100644
--- a/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui.java
+++ b/src/main/java/gtPlusPlus/core/network/packet/PacketVolumetricFlaskGui.java
@@ -13,7 +13,7 @@ import gtPlusPlus.core.network.handler.AbstractServerMessageHandler;
 import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter;
 import io.netty.buffer.ByteBuf;
 
-public class Packet_VolumetricFlaskGui extends AbstractServerMessageHandler<Packet_VolumetricFlaskGui>
+public class PacketVolumetricFlaskGui extends AbstractServerMessageHandler<PacketVolumetricFlaskGui>
     implements AbstractPacket {
 
     private int x;
@@ -21,9 +21,9 @@ public class Packet_VolumetricFlaskGui extends AbstractServerMessageHandler<Pack
     private int z;
     private int flaskValue;
 
-    public Packet_VolumetricFlaskGui() {}
+    public PacketVolumetricFlaskGui() {}
 
-    public Packet_VolumetricFlaskGui(TileEntityVolumetricFlaskSetter tile, int aCustomValue) {
+    public PacketVolumetricFlaskGui(TileEntityVolumetricFlaskSetter tile, int aCustomValue) {
         x = tile.xCoord;
         y = tile.yCoord;
         z = tile.zCoord;
@@ -81,7 +81,7 @@ public class Packet_VolumetricFlaskGui extends AbstractServerMessageHandler<Pack
         this.flaskValue = aVal;
     }
 
-    protected TileEntityVolumetricFlaskSetter getTileEntity(Packet_VolumetricFlaskGui message, MessageContext ctx) {
+    protected TileEntityVolumetricFlaskSetter getTileEntity(PacketVolumetricFlaskGui message, MessageContext ctx) {
         Logger.INFO("Trying to get tile.");
         World worldObj = getWorld(ctx);
         if (worldObj == null) {
@@ -110,7 +110,7 @@ public class Packet_VolumetricFlaskGui extends AbstractServerMessageHandler<Pack
     }
 
     @Override
-    public IMessage handleServerMessage(EntityPlayer player, Packet_VolumetricFlaskGui message, MessageContext ctx) {
+    public IMessage handleServerMessage(EntityPlayer player, PacketVolumetricFlaskGui message, MessageContext ctx) {
         TileEntityVolumetricFlaskSetter te = getTileEntity(message, ctx);
         if (te != null) {
             Logger.INFO("Setting value on tile. " + message.getCustomValue());
diff --git a/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui2.java b/src/main/java/gtPlusPlus/core/network/packet/PacketVolumetricFlaskGui2.java
index 599469191b..35ed2c17dc 100644
--- a/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui2.java
+++ b/src/main/java/gtPlusPlus/core/network/packet/PacketVolumetricFlaskGui2.java
@@ -13,7 +13,7 @@ import gtPlusPlus.core.network.handler.AbstractClientMessageHandler;
 import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter;
 import io.netty.buffer.ByteBuf;
 
-public class Packet_VolumetricFlaskGui2 extends AbstractClientMessageHandler<Packet_VolumetricFlaskGui2>
+public class PacketVolumetricFlaskGui2 extends AbstractClientMessageHandler<PacketVolumetricFlaskGui2>
     implements AbstractPacket {
 
     private int x;
@@ -21,9 +21,9 @@ public class Packet_VolumetricFlaskGui2 extends AbstractClientMessageHandler<Pac
     private int z;
     private int flaskValue;
 
-    public Packet_VolumetricFlaskGui2() {}
+    public PacketVolumetricFlaskGui2() {}
 
-    public Packet_VolumetricFlaskGui2(TileEntityVolumetricFlaskSetter tile, int aCustomValue) {
+    public PacketVolumetricFlaskGui2(TileEntityVolumetricFlaskSetter tile, int aCustomValue) {
         x = tile.xCoord;
         y = tile.yCoord;
         z = tile.zCoord;
@@ -81,7 +81,7 @@ public class Packet_VolumetricFlaskGui2 extends AbstractClientMessageHandler<Pac
         this.flaskValue = aVal;
     }
 
-    protected TileEntityVolumetricFlaskSetter getTileEntity(Packet_VolumetricFlaskGui2 message, MessageContext ctx) {
+    protected TileEntityVolumetricFlaskSetter getTileEntity(PacketVolumetricFlaskGui2 message, MessageContext ctx) {
         Logger.INFO("Trying to get tile.");
         World worldObj = getWorld(ctx);
         if (worldObj == null) {
@@ -115,7 +115,7 @@ public class Packet_VolumetricFlaskGui2 extends AbstractClientMessageHandler<Pac
     }
 
     @Override
-    public IMessage handleClientMessage(EntityPlayer player, Packet_VolumetricFlaskGui2 message, MessageContext ctx) {
+    public IMessage handleClientMessage(EntityPlayer player, PacketVolumetricFlaskGui2 message, MessageContext ctx) {
         TileEntityVolumetricFlaskSetter te = getTileEntity(message, ctx);
         if (te != null) {
             Logger.INFO("Setting value on tile. " + message.getCustomValue());
diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
index 5f6f93542e..43b1d90648 100644
--- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
+++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -43,24 +43,24 @@ import gtPlusPlus.core.entity.monster.EntitySickBlaze;
 import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
 import gtPlusPlus.core.entity.projectile.EntityLightningAttack;
 import gtPlusPlus.core.entity.projectile.EntityToxinballSmall;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.CORE.ConfigSwitches;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches;
 import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
-import gtPlusPlus.nei.NEI_GTPP_Config;
-import gtPlusPlus.xmod.gregtech.common.render.GTPP_CapeRenderer;
-import gtPlusPlus.xmod.gregtech.common.render.GTPP_FlaskRenderer;
-import gtPlusPlus.xmod.gregtech.common.render.GTPP_Render_MachineBlock;
+import gtPlusPlus.nei.GTPPNEIConfig;
+import gtPlusPlus.xmod.gregtech.common.render.CapeRenderer;
+import gtPlusPlus.xmod.gregtech.common.render.FlaskRenderer;
+import gtPlusPlus.xmod.gregtech.common.render.MachineBlockRenderer;
 import ic2.core.item.ItemFluidCell;
 
 public class ClientProxy extends CommonProxy implements Runnable {
 
-    private final GTPP_CapeRenderer mCapeRenderer;
+    private final CapeRenderer mCapeRenderer;
 
     @SideOnly(Side.CLIENT)
     public static boolean mFancyGraphics = false;
 
     public ClientProxy() {
-        mCapeRenderer = new GTPP_CapeRenderer();
+        mCapeRenderer = new CapeRenderer();
         // Get Graphics Mode.
         mFancyGraphics = Minecraft.isFancyGraphicsEnabled();
     }
@@ -93,11 +93,11 @@ public class ClientProxy extends CommonProxy implements Runnable {
          */
         new CustomOreBlockRenderer();
         new CustomItemBlockRenderer();
-        new GTPP_Render_MachineBlock();
+        new MachineBlockRenderer();
 
-        new GTPP_FlaskRenderer();
+        new FlaskRenderer();
 
-        MinecraftForge.EVENT_BUS.register(new NEI_GTPP_Config());
+        MinecraftForge.EVENT_BUS.register(new GTPPNEIConfig());
 
         super.init(e);
     }
@@ -157,7 +157,7 @@ public class ClientProxy extends CommonProxy implements Runnable {
 
     @Override
     public void onLoadComplete(FMLLoadCompleteEvent event) {
-        if (CORE.ConfigSwitches.hideUniversalCells) {
+        if (GTPPCore.ConfigSwitches.hideUniversalCells) {
             hideUniversalCells();
         }
         super.onLoadComplete(event);
diff --git a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java b/src/main/java/gtPlusPlus/core/recipe/LoaderMachineComponents.java
index a10d2cd05b..b66c508359 100644
--- a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
+++ b/src/main/java/gtPlusPlus/core/recipe/LoaderMachineComponents.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.ItemList;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
-public class LOADER_Machine_Components {
+public class LoaderMachineComponents {
 
     public static void initialise() {
         registerDefaultComponents();
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
deleted file mode 100644
index 454e24f0d1..0000000000
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package gtPlusPlus.core.recipe;
-
-import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gtPlusPlus.api.recipe.GTPPRecipeMaps.alloyBlastSmelterRecipes;
-import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
-
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.MISC_MATERIALS;
-import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.MaterialUtils;
-
-public class RECIPES_SeleniumProcessing {
-
-    public static void init() {
-
-        // We need this
-        MaterialUtils.generateSpecialDustAndAssignToAMaterial(MISC_MATERIALS.SELENIUM_DIOXIDE, false);
-
-        // Makes Selenium Dioxide
-        processCopperRecipes();
-
-        // Liquify the Dried Dioxide
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(13), MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1))
-            .fluidInputs(FluidUtils.getSteam(500))
-            .fluidOutputs(MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(1000))
-            .duration(24 * SECONDS)
-            .eut(1024)
-            .addTo(pyrolyseRecipes);
-
-        // Produce Selenious Acid
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(14), MISC_MATERIALS.SELENIUM_DIOXIDE.getCell(1))
-            .itemOutputs(CI.emptyCells(1))
-            .fluidInputs(FluidUtils.getHotWater(4000))
-            .fluidOutputs(MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(1000))
-            .duration(24 * SECONDS)
-            .eut(TierEU.RECIPE_EV)
-            .addTo(pyrolyseRecipes);
-
-        // Make Selenium
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(14), ELEMENT.getInstance().CARBON.getDust(16))
-            .itemOutputs(ELEMENT.getInstance().SELENIUM.getIngot(1), ELEMENT.getInstance().SELENIUM.getIngot(1))
-            .outputChances(100_00, 20_00)
-            .fluidInputs(MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(750), Materials.SulfuricAcid.getFluid(8000))
-            .fluidOutputs(ELEMENT.getInstance().SELENIUM.getFluidStack(144 * 1))
-            .eut(TierEU.RECIPE_IV)
-            .duration(5 * MINUTES)
-            .addTo(alloyBlastSmelterRecipes);
-    }
-
-    public static void processCopperRecipes() {
-
-        // Copper
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                CI.getNumberedAdvancedCircuit(23),
-                ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Copper, 1))
-            .itemOutputs(
-                ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Copper, 1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1))
-            .outputChances(100_00, 1_00, 1_00, 5_00, 5_00, 5_00, 10_00, 10_00, 10_00)
-            .fluidInputs(FluidUtils.getHotWater(1000))
-            .fluidOutputs(MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(20))
-            .eut(1024)
-            .duration(40 * SECONDS)
-            .addTo(chemicalDehydratorRecipes);
-
-        // Tetra
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                CI.getNumberedAdvancedCircuit(23),
-                ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Tetrahedrite, 1))
-            .itemOutputs(
-                ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Tetrahedrite, 1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1))
-            .outputChances(100_00, 1_00, 1_00, 3_00, 3_00, 3_00, 8_00, 8_00, 8_00)
-            .fluidInputs(FluidUtils.getHotWater(1000))
-            .fluidOutputs(MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10))
-            .eut(1024)
-            .duration(40 * SECONDS)
-            .addTo(chemicalDehydratorRecipes);
-
-        // Chalco
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                CI.getNumberedAdvancedCircuit(23),
-                ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1))
-            .itemOutputs(
-                ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Chalcopyrite, 1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1))
-            .outputChances(100_00, 1_00, 1_00, 3_00, 3_00, 3_00, 8_00, 8_00, 8_00)
-            .fluidInputs(FluidUtils.getHotWater(1000))
-            .fluidOutputs(MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10))
-            .eut(1024)
-            .duration(40 * SECONDS)
-            .addTo(chemicalDehydratorRecipes);
-
-        // Malachite
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                CI.getNumberedAdvancedCircuit(23),
-                ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Malachite, 1))
-            .itemOutputs(
-                ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Malachite, 1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
-                MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1))
-            .outputChances(100_00, 1_00, 1_00, 3_00, 3_00, 3_00, 8_00, 8_00, 8_00)
-            .fluidInputs(FluidUtils.getHotWater(1000))
-            .fluidOutputs(MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10))
-            .eut(1024)
-            .duration(40 * SECONDS)
-            .addTo(chemicalDehydratorRecipes);
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java b/src/main/java/gtPlusPlus/core/recipe/RecipesBatteries.java
index 4369fdbfa3..2d8e417f1b 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesBatteries.java
@@ -8,7 +8,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
-public class RECIPE_Batteries {
+public class RecipesBatteries {
 
     static ItemStack RECIPE_Battery_Sodium = GregtechItemList.Battery_RE_EV_Sodium.get(1);
     static ItemStack RECIPE_Battery_Cadmium = GregtechItemList.Battery_RE_EV_Cadmium.get(1);
@@ -27,35 +27,35 @@ public class RECIPE_Batteries {
 
         RecipeUtils.addShapedGregtechRecipe(
             GT_Battery_Sodium,
-            RECIPES_Machines.cableTier4,
+            RecipesMachines.cableTier4,
             GT_Battery_Sodium,
             CI.circuitTier3,
             machineTransformer_EV,
             CI.circuitTier3,
             GT_Battery_Sodium,
-            RECIPES_Machines.cableTier4,
+            RecipesMachines.cableTier4,
             GT_Battery_Sodium,
             RECIPE_Battery_Sodium);
         RecipeUtils.addShapedGregtechRecipe(
             GT_Battery_Cadmium,
-            RECIPES_Machines.cableTier4,
+            RecipesMachines.cableTier4,
             GT_Battery_Cadmium,
             CI.circuitTier3,
             machineTransformer_EV,
             CI.circuitTier3,
             GT_Battery_Cadmium,
-            RECIPES_Machines.cableTier4,
+            RecipesMachines.cableTier4,
             GT_Battery_Cadmium,
             RECIPE_Battery_Cadmium);
         RecipeUtils.addShapedGregtechRecipe(
             GT_Battery_Lithium,
-            RECIPES_Machines.cableTier4,
+            RecipesMachines.cableTier4,
             GT_Battery_Lithium,
             CI.circuitTier3,
             machineTransformer_EV,
             CI.circuitTier3,
             GT_Battery_Lithium,
-            RECIPES_Machines.cableTier4,
+            RecipesMachines.cableTier4,
             GT_Battery_Lithium,
             RECIPE_Battery_Lithium);
     }
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java
index 454810ae47..5ada7c5a03 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java
@@ -3,8 +3,8 @@ package gtPlusPlus.core.recipe;
 import static gregtech.api.enums.Mods.EnderIO;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
-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 static gtPlusPlus.core.recipe.common.CI.bitsd;
 import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack;
 import static gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits.generatePipeRecipes;
@@ -14,30 +14,30 @@ 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.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.MaterialsAlloy;
+import gtPlusPlus.core.material.MaterialsElements;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
-import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
+import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 
-public class RECIPES_General {
+public class RecipesGeneral {
 
     static final ItemStack NULL = null;
     static ItemStack RECIPE_Paper;
@@ -87,7 +87,7 @@ public class RECIPES_General {
             "stickWood",
             "dustBone",
             "stickWood",
-            ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest))) {
+            ItemUtils.getSimpleStack(BOPBlockRegistrator.sapling_Rainforest))) {
             Logger.INFO("Added a recipe for Rainforest oak Saplings.");
         }
 
@@ -112,7 +112,7 @@ public class RECIPES_General {
         // Potin
         if (RecipeUtils.addShapelessGregtechRecipe(
             new Object[] { "dustLead", "dustBronze", "dustTin", "dustLead", "dustBronze" },
-            ALLOY.POTIN.getDust(5))) {
+            MaterialsAlloy.POTIN.getDust(5))) {
             Logger.INFO("Added shapeless recipe for Potin Dust.");
         }
 
@@ -126,11 +126,11 @@ public class RECIPES_General {
             new Object[] { ItemUtils.getSimpleStack(ModItems.dustTumbagaMix),
                 ItemUtils.getSimpleStack(ModItems.dustTumbagaMix), ItemUtils.getSimpleStack(ModItems.dustTumbagaMix),
                 "dustGold" },
-            ALLOY.TUMBAGA.getDust(10))) {
+            MaterialsAlloy.TUMBAGA.getDust(10))) {
             Logger.INFO("Added shapeless recipe for Tumbaga Dust.");
         }
 
-        if (CORE.ConfigSwitches.enableMachine_Pollution) {
+        if (GTPPCore.ConfigSwitches.enableMachine_Pollution) {
             RecipeUtils.addShapedRecipe(
                 CI.craftingToolFile,
                 "plateIron",
@@ -166,7 +166,7 @@ public class RECIPES_General {
                 ItemUtils.simpleMetaStack(ModItems.itemBasicTurbine, 2, 1));
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(Blocks.glass, 16),
                 ItemUtils.getSimpleStack(Blocks.glowstone, 16),
@@ -178,7 +178,7 @@ public class RECIPES_General {
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(Blocks.glass, 64),
                 ItemUtils.getSimpleStack(Blocks.glowstone, 64),
@@ -247,7 +247,7 @@ public class RECIPES_General {
         }
 
         // Magic Feather
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(Items.feather, 64),
                 ItemUtils.getSimpleStack(Blocks.emerald_block, 32),
@@ -262,13 +262,13 @@ public class RECIPES_General {
             .addTo(assemblerRecipes);
 
         // Pest Killer
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getTieredMachineCasing(1),
                 CI.getElectricPump(2, 1),
                 CI.getPlate(2, 4),
                 ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(0), 2),
-                GT_Utility.getIntegratedCircuit(16))
+                GTUtility.getIntegratedCircuit(16))
             .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockPestKiller))
             .fluidInputs(FluidUtils.getHotWater(500))
             .duration(1 * MINUTES)
@@ -355,21 +355,22 @@ public class RECIPES_General {
             ItemUtils.getSimpleStack(ModItems.itemPlateRawMeat),
             ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 1));
 
-        generateWireRecipes(ELEMENT.getInstance().ZIRCONIUM);
-        generateWireRecipes(ALLOY.HG1223);
-        generateWireRecipes(ALLOY.LEAGRISIUM);
-        generateWireRecipes(ALLOY.TRINIUM_TITANIUM);
-        generateWireRecipes(ELEMENT.STANDALONE.HYPOGEN);
-        generateWireRecipes(ELEMENT.STANDALONE.CHRONOMATIC_GLASS);
+        generateWireRecipes(MaterialsElements.getInstance().ZIRCONIUM);
+        generateWireRecipes(MaterialsAlloy.HG1223);
+        generateWireRecipes(MaterialsAlloy.LEAGRISIUM);
+        generateWireRecipes(MaterialsAlloy.TRINIUM_TITANIUM);
+        generateWireRecipes(MaterialsElements.STANDALONE.HYPOGEN);
+        generateWireRecipes(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS);
 
         // No Material for void, natch.
         if (Thaumcraft.isModLoaded()) {
             generatePipeRecipes(GT_Materials.Void.mDefaultLocalName, GT_Materials.Void.getMass(), 15);
         }
 
-        Material[] gtpp = new Material[] { ALLOY.STABALLOY, ALLOY.TANTALLOY_60, ALLOY.TANTALLOY_61, ALLOY.POTIN,
-            ALLOY.MARAGING300, ALLOY.MARAGING350, ALLOY.INCONEL_690, ALLOY.INCONEL_792, ALLOY.HASTELLOY_X,
-            ALLOY.TRINIUM_NAQUADAH_CARBON };
+        Material[] gtpp = new Material[] { MaterialsAlloy.STABALLOY, MaterialsAlloy.TANTALLOY_60,
+            MaterialsAlloy.TANTALLOY_61, MaterialsAlloy.POTIN, MaterialsAlloy.MARAGING300, MaterialsAlloy.MARAGING350,
+            MaterialsAlloy.INCONEL_690, MaterialsAlloy.INCONEL_792, MaterialsAlloy.HASTELLOY_X,
+            MaterialsAlloy.TRINIUM_NAQUADAH_CARBON };
 
         for (Material mat : gtpp) {
             // generatePipeRecipes multiplies the voltage multiplier by 8 because ??! reasons.
@@ -391,7 +392,7 @@ public class RECIPES_General {
 
         RecipeUtils.addShapedGregtechRecipe(
             CI.component_Plate[6],
-            ALLOY.MARAGING250.getGear(1),
+            MaterialsAlloy.MARAGING250.getGear(1),
             CI.component_Plate[6],
             CI.getTieredCircuitOreDictName(4),
             GregtechItemList.Casing_AdvancedVacuum.get(1),
@@ -403,7 +404,7 @@ public class RECIPES_General {
 
         RecipeUtils.addShapedGregtechRecipe(
             CI.component_Plate[6],
-            ALLOY.MARAGING300.getGear(1),
+            MaterialsAlloy.MARAGING300.getGear(1),
             CI.component_Plate[6],
             CI.getTieredCircuitOreDictName(5),
             GregtechItemList.Casing_Adv_BlastFurnace.get(1),
@@ -415,7 +416,7 @@ public class RECIPES_General {
 
         RecipeUtils.addShapedGregtechRecipe(
             CI.component_Plate[8],
-            ALLOY.PIKYONIUM.getGear(1),
+            MaterialsAlloy.PIKYONIUM.getGear(1),
             CI.component_Plate[9],
             CI.getTieredCircuitOreDictName(7),
             GregtechItemList.Casing_Naq_Reactor_A.get(1),
@@ -426,47 +427,47 @@ public class RECIPES_General {
             GregtechItemList.Hatch_Input_Naquadah.get(1L, new Object[0]));
 
         if (PollutionUtils.isPollutionEnabled()) {
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_LV.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LV.get(1),
                     Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_LV.get(1) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_MV.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MV.get(1),
                     Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_MV.get(1) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_HV.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_HV.get(1),
                     Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_HV.get(1) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_EV.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_EV.get(1),
                     Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_EV.get(1) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_IV.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_IV.get(1),
                     Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_IV.get(1) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_LuV.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LuV.get(1),
                     Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_LuV.get(1) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_ZPM.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_ZPM.get(1),
                     Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_ZPM.get(1) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_UV.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_UV.get(1),
                     Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_UV.get(1) });
-            GT_ModHandler.addCraftingRecipe(
+            GTModHandler.addCraftingRecipe(
                 GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L, new Object[0]),
                 bitsd,
                 new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MAX.get(1),
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java
index 5da803b392..22008ac647 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.core.recipe;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.enums.Mods.Backpack;
 import static gregtech.api.enums.Mods.Baubles;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
@@ -23,21 +23,21 @@ import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
 import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
 import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.BUCKETS;
-import static gregtech.api.util.GT_RecipeBuilder.HOURS;
-import static gregtech.api.util.GT_RecipeBuilder.INGOTS;
-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.AssemblyLine;
-import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER;
-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.GT_RecipeConstants.FUSION_THRESHOLD;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME;
-import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
+import static gregtech.api.util.GTRecipeBuilder.BUCKETS;
+import static gregtech.api.util.GTRecipeBuilder.HOURS;
+import static gregtech.api.util.GTRecipeBuilder.INGOTS;
+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.AssemblyLine;
+import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER;
+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 static gregtech.api.util.GTRecipeConstants.FUSION_THRESHOLD;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME;
+import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.alloyBlastSmelterRecipes;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes;
@@ -50,20 +50,19 @@ import net.minecraft.item.ItemStack;
 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.Loader;
-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.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_RecipeConstants;
-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.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
@@ -72,20 +71,20 @@ import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.item.chemistry.IonParticles;
 import gtPlusPlus.core.item.crafting.ItemDummyResearch;
 import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH;
-import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.MISC_MATERIALS;
-import gtPlusPlus.core.material.ORES;
+import gtPlusPlus.core.material.MaterialMisc;
+import gtPlusPlus.core.material.MaterialsAlloy;
+import gtPlusPlus.core.material.MaterialsElements;
+import gtPlusPlus.core.material.MaterialsOres;
 import gtPlusPlus.core.material.Particle;
-import gtPlusPlus.core.material.nuclear.FLUORIDES;
+import gtPlusPlus.core.material.nuclear.MaterialsFluorides;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
+import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
-public class RECIPES_GREGTECH {
+public class RecipesGregTech {
 
     public static void run() {
         Logger.INFO("Loading Recipes through GregAPI for Industrial Multiblocks.");
@@ -122,8 +121,8 @@ public class RECIPES_GREGTECH {
         /*
          * Special Recipe handlers
          */
-        RECIPES_SeleniumProcessing.init();
-        RECIPES_RareEarthProcessing.init();
+        RecipesSeleniumProcessing.init();
+        RecipesRareEarthProcessing.init();
 
         addFuels();
     }
@@ -132,7 +131,7 @@ public class RECIPES_GREGTECH {
 
         // Wood's Glass Laser Lens
         RA.stdBuilder()
-            .itemInputs(MISC_MATERIALS.WOODS_GLASS.getDust(5), ItemList.Shape_Mold_Ball.get(0))
+            .itemInputs(MaterialMisc.WOODS_GLASS.getDust(5), ItemList.Shape_Mold_Ball.get(0))
             .itemOutputs(GregtechItemList.Laser_Lens_WoodsGlass.get(1))
             .duration(5 * MINUTES)
             .eut(TierEU.RECIPE_HV)
@@ -147,7 +146,7 @@ public class RECIPES_GREGTECH {
         // 4 NO2 (g) + O2 (g) + 2 H2O (l) → 4 HNO3 (aq)
 
         // Advanced method for Nitric Acid Production
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(CI.getNumberedAdvancedCircuit(17), CI.getPinkCatalyst(0))
             .fluidInputs(Materials.NitrogenDioxide.getGas(4000L), FluidUtils.getAir(4000), FluidUtils.getWater(2000))
             .fluidOutputs(FluidUtils.getFluidStack("nitricacid", 4000))
@@ -157,34 +156,34 @@ public class RECIPES_GREGTECH {
             .addTo(chemicalPlantRecipes);
 
         // Advanced recipe for Fluorine Production
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(17),
                 CI.getPurpleCatalyst(0),
                 ItemUtils.getSimpleStack(Blocks.sandstone, 64),
                 ItemUtils.getSimpleStack(Blocks.sandstone, 64))
             .itemOutputs(
-                FLUORIDES.FLUORITE.getOre(8),
-                FLUORIDES.FLUORITE.getOre(4),
-                FLUORIDES.FLUORITE.getOre(4),
-                FLUORIDES.FLUORITE.getOre(4))
+                MaterialsFluorides.FLUORITE.getOre(8),
+                MaterialsFluorides.FLUORITE.getOre(4),
+                MaterialsFluorides.FLUORITE.getOre(4),
+                MaterialsFluorides.FLUORITE.getOre(4))
             .fluidInputs(FluidUtils.getFluidStack("nitricacid", 4000), FluidUtils.getAir(8000))
             .duration(10 * SECONDS)
             .eut(1024)
             .metadata(CHEMPLANT_CASING_TIER, 5)
             .addTo(chemicalPlantRecipes);
         // Advanced recipe for Fluorine Production
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(17),
                 CI.getPurpleCatalyst(0),
                 ItemUtils.getSimpleStack(Blocks.sand, 64),
                 ItemUtils.getSimpleStack(Blocks.sand, 64))
             .itemOutputs(
-                FLUORIDES.FLUORITE.getOre(4),
-                FLUORIDES.FLUORITE.getOre(2),
-                FLUORIDES.FLUORITE.getOre(2),
-                FLUORIDES.FLUORITE.getOre(2))
+                MaterialsFluorides.FLUORITE.getOre(4),
+                MaterialsFluorides.FLUORITE.getOre(2),
+                MaterialsFluorides.FLUORITE.getOre(2),
+                MaterialsFluorides.FLUORITE.getOre(2))
             .fluidInputs(FluidUtils.getFluidStack("nitricacid", 5000), FluidUtils.getAir(12000))
             .duration(10 * SECONDS)
             .eut(1024)
@@ -192,7 +191,7 @@ public class RECIPES_GREGTECH {
             .addTo(chemicalPlantRecipes);
 
         // 3NO2 + H2O = 2HNO3 + NO
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(CI.getNumberedAdvancedCircuit(16), CI.getPinkCatalyst(0))
             .fluidInputs(Materials.NitrogenDioxide.getGas(3000L), FluidUtils.getDistilledWater(1000))
             .fluidOutputs(FluidUtils.getFluidStack("nitricacid", 2000), Materials.NitricOxide.getGas(1000L))
@@ -202,7 +201,7 @@ public class RECIPES_GREGTECH {
             .addTo(chemicalPlantRecipes);
         // Produce Boric Acid
         // Na2B4O7·10H2O + 2HCl = 4B(OH)3 + 2NaCl + 5H2O
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(CI.getNumberedAdvancedCircuit(21), ItemUtils.getItemStackOfAmountFromOreDict("dustBorax", 23))
             .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSalt", 4))
             .fluidInputs(FluidUtils.getFluidStack(GenericChem.HydrochloricAcid, 2000))
@@ -213,13 +212,13 @@ public class RECIPES_GREGTECH {
             .addTo(chemicalPlantRecipes);
 
         // Produce Th232
-        GT_Values.RA.stdBuilder()
-            .itemInputs(CI.getNumberedAdvancedCircuit(22), ELEMENT.getInstance().THORIUM.getDust(16))
+        GTValues.RA.stdBuilder()
+            .itemInputs(CI.getNumberedAdvancedCircuit(22), MaterialsElements.getInstance().THORIUM.getDust(16))
             .itemOutputs(
-                ELEMENT.getInstance().THORIUM.getSmallDust(32),
-                ELEMENT.getInstance().THORIUM232.getDust(2),
-                ELEMENT.getInstance().THORIUM232.getSmallDust(2),
-                ELEMENT.getInstance().URANIUM232.getDust(1))
+                MaterialsElements.getInstance().THORIUM.getSmallDust(32),
+                MaterialsElements.getInstance().THORIUM232.getDust(2),
+                MaterialsElements.getInstance().THORIUM232.getSmallDust(2),
+                MaterialsElements.getInstance().URANIUM232.getDust(1))
             .fluidInputs(FluidUtils.getDistilledWater(2000), FluidUtils.getFluidStack("boricacid", 1500))
             .duration(5 * MINUTES)
             .eut(TierEU.RECIPE_EV)
@@ -227,22 +226,22 @@ public class RECIPES_GREGTECH {
             .addTo(chemicalPlantRecipes);
 
         // Modify Sapling into Pine Sapling
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(CI.getNumberedBioCircuit(6), ItemUtils.getSimpleStack(Blocks.sapling, 32))
-            .itemOutputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Pine, 16))
+            .itemOutputs(ItemUtils.getSimpleStack(BOPBlockRegistrator.sapling_Pine, 16))
             .fluidInputs(FluidUtils.getFluidStack("fluid.geneticmutagen", 2000), FluidUtils.getDistilledWater(8000))
             .duration(120 * SECONDS)
             .eut(64)
             .metadata(CHEMPLANT_CASING_TIER, 2)
             .addTo(chemicalPlantRecipes);
 
-        int aLaureniumTier = ALLOY.LAURENIUM.vTier;
+        int aLaureniumTier = MaterialsAlloy.LAURENIUM.vTier;
         // Adding Recipes for Casings
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(12),
                 CI.getTieredMachineCasing(aLaureniumTier - 1),
-                ALLOY.LAURENIUM.getPlate(8),
+                MaterialsAlloy.LAURENIUM.getPlate(8),
                 CI.getGear(aLaureniumTier, 2))
             .itemOutputs(GregtechItemList.Casing_Machine_Custom_3.get(1))
             .fluidInputs(
@@ -254,13 +253,13 @@ public class RECIPES_GREGTECH {
             .metadata(CHEMPLANT_CASING_TIER, 5)
             .addTo(chemicalPlantRecipes);
 
-        int aBotmiumTier = ALLOY.BOTMIUM.vTier;
+        int aBotmiumTier = MaterialsAlloy.BOTMIUM.vTier;
         // Adding Recipes for Casings
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(12),
                 CI.getTieredMachineCasing(aBotmiumTier - 1),
-                ALLOY.BOTMIUM.getPlate(8),
+                MaterialsAlloy.BOTMIUM.getPlate(8),
                 CI.getGear(aBotmiumTier, 2))
             .itemOutputs(GregtechItemList.Casing_Machine_Custom_4.get(1))
             .fluidInputs(
@@ -274,7 +273,7 @@ public class RECIPES_GREGTECH {
 
         // Refine GT HF into GT++ HF
         if (FluidUtils.doesHydrofluoricAcidGtExist()) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(CI.getNumberedAdvancedCircuit(22))
                 .fluidInputs(FluidUtils.getHydrofluoricAcid(2000), FluidUtils.getHydrofluoricAcidGT(5000))
                 .fluidOutputs(FluidUtils.getHydrofluoricAcid(4500))
@@ -288,7 +287,7 @@ public class RECIPES_GREGTECH {
 
     private static void fluidHeaterRecipes() {
         RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(20))
+            .itemInputs(GTUtility.getIntegratedCircuit(20))
             .fluidInputs(Materials.Water.getFluid(1000))
             .fluidOutputs(FluidUtils.getHotWater(1000))
             .duration(1 * SECONDS + 10 * TICKS)
@@ -300,9 +299,9 @@ public class RECIPES_GREGTECH {
         // Hypogen
         RA.stdBuilder()
             .fluidInputs(
-                ELEMENT.STANDALONE.DRAGON_METAL.getFluidStack(144),
-                ELEMENT.STANDALONE.RHUGNOR.getFluidStack(288))
-            .fluidOutputs(ELEMENT.STANDALONE.HYPOGEN.getFluidStack(36))
+                MaterialsElements.STANDALONE.DRAGON_METAL.getFluidStack(144),
+                MaterialsElements.STANDALONE.RHUGNOR.getFluidStack(288))
+            .fluidOutputs(MaterialsElements.STANDALONE.HYPOGEN.getFluidStack(36))
             .duration(6 * MINUTES + 49 * SECONDS + 12 * TICKS)
             .eut(TierEU.RECIPE_UHV)
             .metadata(FUSION_THRESHOLD, 1_200_000_000)
@@ -313,8 +312,8 @@ public class RECIPES_GREGTECH {
             .fluidInputs(
                 MaterialUtils.getMaterial("Infinity", "Neutronium")
                     .getMolten(144),
-                ALLOY.QUANTUM.getFluidStack(288))
-            .fluidOutputs(ELEMENT.STANDALONE.RHUGNOR.getFluidStack(144))
+                MaterialsAlloy.QUANTUM.getFluidStack(288))
+            .fluidOutputs(MaterialsElements.STANDALONE.RHUGNOR.getFluidStack(144))
             .duration(25 * SECONDS + 12 * TICKS)
             .eut(TierEU.RECIPE_UV)
             .metadata(FUSION_THRESHOLD, 2_000_000_000)
@@ -335,19 +334,19 @@ public class RECIPES_GREGTECH {
                 ItemList.Energy_LapotronicOrb.get(32),
                 CI.getTieredComponent(OrePrefixes.cableGt12, 7, 32),
                 CI.getTieredComponent(OrePrefixes.wireGt16, 6, 64),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadria, 64L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gadolinium, 32L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Samarium, 16L),
-                ALLOY.ARCANITE.getGear(8),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Naquadria, 64L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gadolinium, 32L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Samarium, 16L),
+                MaterialsAlloy.ARCANITE.getGear(8),
                 new Object[] { CI.getTieredCircuitOreDictName(5), 64 },
                 new Object[] { CI.getTieredCircuitOreDictName(6), 32 },
                 new Object[] { CI.getTieredCircuitOreDictName(7), 16 },
                 GregtechItemList.Laser_Lens_Special.get(1),
                 ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, 64))
             .fluidInputs(
-                ALLOY.NITINOL_60.getFluidStack(144 * 9 * 4),
-                ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * 8),
-                ALLOY.TUMBAGA.getFluidStack(144 * 9 * 32),
+                MaterialsAlloy.NITINOL_60.getFluidStack(144 * 9 * 4),
+                MaterialsAlloy.ENERGYCRYSTAL.getFluidStack(144 * 9 * 8),
+                MaterialsAlloy.TUMBAGA.getFluidStack(144 * 9 * 32),
                 Materials.Nichrome.getMolten(16 * INGOTS))
             .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockCasings3Misc, 15, 32))
             .eut(TierEU.RECIPE_LuV)
@@ -376,7 +375,7 @@ public class RECIPES_GREGTECH {
                 CI.getTieredFluid(8, 144 * 32),
                 CI.getAlternativeTieredFluid(7, 144 * 16),
                 CI.getTertiaryTieredFluid(7, 144 * 16),
-                ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144))
+                MaterialsAlloy.BABBIT_ALLOY.getFluidStack(128 * 144))
             .itemOutputs(GregtechItemList.Hatch_Input_TurbineHousing.get(4))
             .eut(TierEU.RECIPE_UV)
             .duration(2 * HOURS)
@@ -411,7 +410,7 @@ public class RECIPES_GREGTECH {
                     CI.getTertiaryTieredFluid(j - 2, 144 * 16),
                     CI.getAlternativeTieredFluid(j, 144 * 16))
                 .itemOutputs(aGemCasings[aCasingSlot++])
-                .eut(GT_Values.VP[j])
+                .eut(GTValues.VP[j])
                 .duration(2 * MINUTES)
                 .addTo(AssemblyLine);
         }
@@ -446,7 +445,7 @@ public class RECIPES_GREGTECH {
                     CI.getAlternativeTieredFluid(j, 144 * 16),
                     CI.getTertiaryTieredFluid(j - 1, 144 * 16))
                 .itemOutputs(aGemBatteries[aCasingSlot++])
-                .eut(GT_Values.VP[j])
+                .eut(GTValues.VP[j])
                 .duration(2 * MINUTES)
                 .addTo(AssemblyLine);
         }
@@ -510,7 +509,7 @@ public class RECIPES_GREGTECH {
                         CI.getAlternativeTieredFluid(h - 1, 144 * 4 * 8),
                         CI.getAlternativeTieredFluid(h - 2, 144 * 4 * 8))
                     .itemOutputs(aChargeOutputs[aCurrSlot])
-                    .eut(GT_Values.VP[h])
+                    .eut(GTValues.VP[h])
                     .duration((aCurrSlot + 1) * HOURS)
                     .addTo(AssemblyLine);
                 aCurrSlot++;
@@ -556,11 +555,11 @@ public class RECIPES_GREGTECH {
                 new Object[] { OrePrefixes.circuit.get(Materials.UV), 8 },
                 new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 16 },
                 ItemList.Circuit_Chip_PPIC.get(16, new Object() {}),
-                ALLOY.PIKYONIUM.getPlate(16),
-                ALLOY.CINOBITE.getScrew(32))
+                MaterialsAlloy.PIKYONIUM.getPlate(16),
+                MaterialsAlloy.CINOBITE.getScrew(32))
             .fluidInputs(
-                ALLOY.PIKYONIUM.getFluidStack(144 * 8),
-                ALLOY.INDALLOY_140.getFluidStack(144 * 9),
+                MaterialsAlloy.PIKYONIUM.getFluidStack(144 * 8),
+                MaterialsAlloy.INDALLOY_140.getFluidStack(144 * 9),
                 Materials.SolderingAlloy.getMolten(144 * 10))
             .itemOutputs(GregtechItemList.Mega_AlloyBlastSmelter.get(1L))
             .eut(TierEU.RECIPE_UHV / 2)
@@ -581,40 +580,40 @@ public class RECIPES_GREGTECH {
                 .itemInputs(CI.getEmitter(i, 2), CI.getSensor(i, 2))
                 .itemOutputs(aTransParts[i - 1].get(1))
                 .duration(5 * SECONDS)
-                .eut(GT_Values.VP[i])
+                .eut(GTValues.VP[i])
                 .addTo(laserEngraverRecipes);
         }
 
         RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 6L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 6L),
                 GregtechItemList.Laser_Lens_Special.get(0))
-            .itemOutputs(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getDust(1))
+            .itemOutputs(MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getDust(1))
             .duration(3 * MINUTES)
             .eut(TierEU.RECIPE_UEV)
             .addTo(laserEngraverRecipes);
 
         RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 8L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 8L),
                 GregtechItemList.Laser_Lens_Special.get(0))
-            .itemOutputs(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getDust(1))
+            .itemOutputs(MaterialsElements.STANDALONE.ASTRAL_TITANIUM.getDust(1))
             .duration(2 * MINUTES)
             .eut(TierEU.RECIPE_UHV)
             .addTo(laserEngraverRecipes);
 
         RA.stdBuilder()
-            .itemInputs(ALLOY.NITINOL_60.getBlock(2), GregtechItemList.Laser_Lens_Special.get(0))
-            .itemOutputs(ELEMENT.STANDALONE.ADVANCED_NITINOL.getBlock(1))
+            .itemInputs(MaterialsAlloy.NITINOL_60.getBlock(2), GregtechItemList.Laser_Lens_Special.get(0))
+            .itemOutputs(MaterialsElements.STANDALONE.ADVANCED_NITINOL.getBlock(1))
             .duration(1 * MINUTES)
             .eut(TierEU.RECIPE_UV)
             .addTo(laserEngraverRecipes);
 
         RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 64L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 64L),
                 GregtechItemList.Laser_Lens_Special.get(0))
-            .itemOutputs(ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getDust(1))
+            .itemOutputs(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getDust(1))
             .duration(5 * MINUTES)
             .eut(TierEU.RECIPE_UHV)
             .addTo(laserEngraverRecipes);
@@ -641,14 +640,14 @@ public class RECIPES_GREGTECH {
 
         if (Loader.isModLoaded("OpenBlocks")) {
             RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(14))
+                .itemInputs(GTUtility.getIntegratedCircuit(14))
                 .fluidInputs(FluidRegistry.getFluidStack("mobessence", 100))
                 .fluidOutputs(FluidRegistry.getFluidStack("xpjuice", 1332))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
                 .addTo(brewingRecipes);
             RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(14))
+                .itemInputs(GTUtility.getIntegratedCircuit(14))
                 .fluidInputs(FluidRegistry.getFluidStack("xpjuice", 1332))
                 .fluidOutputs(FluidRegistry.getFluidStack("mobessence", 100))
                 .duration(5 * SECONDS)
@@ -657,21 +656,21 @@ public class RECIPES_GREGTECH {
         }
 
         RA.stdBuilder()
-            .itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest))
+            .itemInputs(ItemUtils.getSimpleStack(BOPBlockRegistrator.sapling_Rainforest))
             .fluidInputs(Materials.Water.getFluid(100L))
             .fluidOutputs(Materials.Biomass.getFluid(100L))
             .duration(1 * MINUTES)
             .eut(3)
             .addTo(brewingRecipes);
         RA.stdBuilder()
-            .itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest))
+            .itemInputs(ItemUtils.getSimpleStack(BOPBlockRegistrator.sapling_Rainforest))
             .fluidInputs(Materials.Honey.getFluid(100L))
             .fluidOutputs(Materials.Biomass.getFluid(100L))
             .duration(1 * MINUTES)
             .eut(3)
             .addTo(brewingRecipes);
         RA.stdBuilder()
-            .itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest))
+            .itemInputs(ItemUtils.getSimpleStack(BOPBlockRegistrator.sapling_Rainforest))
             .fluidInputs(FluidUtils.getFluidStack("juice", 100))
             .fluidOutputs(Materials.Biomass.getFluid(100L))
             .duration(1 * MINUTES)
@@ -710,146 +709,148 @@ public class RECIPES_GREGTECH {
     private static void blastSmelterRecipes() {
 
         // Eglin Steel
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(6),
-                ELEMENT.getInstance().IRON.getDust(4),
-                ALLOY.KANTHAL.getDust(1),
-                ALLOY.INVAR.getDust(5),
-                ELEMENT.getInstance().SULFUR.getDust(1),
-                ELEMENT.getInstance().CARBON.getDust(1),
-                ELEMENT.getInstance().SILICON.getDust(4))
-            .fluidOutputs(ALLOY.EGLIN_STEEL.getFluidStack(16 * 144))
+                GTUtility.getIntegratedCircuit(6),
+                MaterialsElements.getInstance().IRON.getDust(4),
+                MaterialsAlloy.KANTHAL.getDust(1),
+                MaterialsAlloy.INVAR.getDust(5),
+                MaterialsElements.getInstance().SULFUR.getDust(1),
+                MaterialsElements.getInstance().CARBON.getDust(1),
+                MaterialsElements.getInstance().SILICON.getDust(4))
+            .fluidOutputs(MaterialsAlloy.EGLIN_STEEL.getFluidStack(16 * 144))
             .eut(TierEU.RECIPE_MV)
             .duration(45 * SECONDS)
             .addTo(alloyBlastSmelterRecipes);
 
         // HG1223
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(5),
-                ELEMENT.getInstance().BARIUM.getDust(2),
-                ELEMENT.getInstance().CALCIUM.getDust(2),
-                ELEMENT.getInstance().COPPER.getDust(3))
-            .fluidOutputs(ALLOY.HG1223.getFluidStack(16 * 144))
+                GTUtility.getIntegratedCircuit(5),
+                MaterialsElements.getInstance().BARIUM.getDust(2),
+                MaterialsElements.getInstance().CALCIUM.getDust(2),
+                MaterialsElements.getInstance().COPPER.getDust(3))
+            .fluidOutputs(MaterialsAlloy.HG1223.getFluidStack(16 * 144))
             .eut(TierEU.RECIPE_LuV)
             .duration(2 * MINUTES)
             .addTo(alloyBlastSmelterRecipes);
 
         // NITINOL_60
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(2),
-                ELEMENT.getInstance().TITANIUM.getDust(3),
-                ELEMENT.getInstance().NICKEL.getDust(2))
-            .fluidOutputs(ALLOY.NITINOL_60.getFluidStack(5 * 144))
+                GTUtility.getIntegratedCircuit(2),
+                MaterialsElements.getInstance().TITANIUM.getDust(3),
+                MaterialsElements.getInstance().NICKEL.getDust(2))
+            .fluidOutputs(MaterialsAlloy.NITINOL_60.getFluidStack(5 * 144))
             .eut(TierEU.RECIPE_IV)
             .duration(1 * MINUTES + 15 * SECONDS)
             .addTo(alloyBlastSmelterRecipes);
 
         // INDALLOY_140
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(5),
-                ELEMENT.getInstance().BISMUTH.getDust(47),
-                ELEMENT.getInstance().LEAD.getDust(25),
-                ELEMENT.getInstance().TIN.getDust(13),
-                ELEMENT.getInstance().CADMIUM.getDust(10),
-                ELEMENT.getInstance().INDIUM.getDust(5))
-            .fluidOutputs(ALLOY.INDALLOY_140.getFluidStack(100 * 144))
+                GTUtility.getIntegratedCircuit(5),
+                MaterialsElements.getInstance().BISMUTH.getDust(47),
+                MaterialsElements.getInstance().LEAD.getDust(25),
+                MaterialsElements.getInstance().TIN.getDust(13),
+                MaterialsElements.getInstance().CADMIUM.getDust(10),
+                MaterialsElements.getInstance().INDIUM.getDust(5))
+            .fluidOutputs(MaterialsAlloy.INDALLOY_140.getFluidStack(100 * 144))
             .eut(TierEU.RECIPE_IV)
             .duration(40 * SECONDS)
             .addTo(alloyBlastSmelterRecipes);
 
         // Germanium Roasting
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(15),
+                GTUtility.getIntegratedCircuit(15),
                 ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedSphalerite", 8),
-                ELEMENT.getInstance().CARBON.getDust(32))
+                MaterialsElements.getInstance().CARBON.getDust(32))
             .fluidInputs(Materials.SulfuricAcid.getFluid(2000))
-            .fluidOutputs(ELEMENT.getInstance().GERMANIUM.getFluidStack(288))
+            .fluidOutputs(MaterialsElements.getInstance().GERMANIUM.getFluidStack(288))
             .eut(4_000)
             .duration(5 * MINUTES)
             .addTo(alloyBlastSmelterRecipes);
 
         // Rhenium Roasting
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(20),
+                GTUtility.getIntegratedCircuit(20),
                 ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedScheelite", 8),
-                ELEMENT.getInstance().CARBON.getDust(32))
+                MaterialsElements.getInstance().CARBON.getDust(32))
             .fluidInputs(Materials.SulfuricAcid.getFluid(10000))
-            .fluidOutputs(ELEMENT.getInstance().RHENIUM.getFluidStack(144))
+            .fluidOutputs(MaterialsElements.getInstance().RHENIUM.getFluidStack(144))
             .eut(4_000)
             .duration(5 * MINUTES)
             .addTo(alloyBlastSmelterRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(20),
+                GTUtility.getIntegratedCircuit(20),
                 ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMolybdenite", 8),
-                ELEMENT.getInstance().CARBON.getDust(32))
+                MaterialsElements.getInstance().CARBON.getDust(32))
             .fluidInputs(Materials.SulfuricAcid.getFluid(7500))
-            .fluidOutputs(ELEMENT.getInstance().RHENIUM.getFluidStack(144))
+            .fluidOutputs(MaterialsElements.getInstance().RHENIUM.getFluidStack(144))
             .eut(4_000)
             .duration(5 * MINUTES)
             .addTo(alloyBlastSmelterRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(20),
+                GTUtility.getIntegratedCircuit(20),
                 ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMolybdenum", 8),
-                ELEMENT.getInstance().CARBON.getDust(32))
+                MaterialsElements.getInstance().CARBON.getDust(32))
             .fluidInputs(Materials.SulfuricAcid.getFluid(5000))
-            .fluidOutputs(ELEMENT.getInstance().RHENIUM.getFluidStack(288))
+            .fluidOutputs(MaterialsElements.getInstance().RHENIUM.getFluidStack(288))
             .eut(4_000)
             .duration(5 * MINUTES)
             .addTo(alloyBlastSmelterRecipes);
 
         // Thallium Roasting
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(21),
+                GTUtility.getIntegratedCircuit(21),
                 ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedZinc", 3),
                 ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPyrite", 4),
-                ELEMENT.getInstance().CARBON.getDust(16))
+                MaterialsElements.getInstance().CARBON.getDust(16))
             .fluidInputs(Materials.SulfuricAcid.getFluid(1250))
-            .fluidOutputs(ELEMENT.getInstance().THALLIUM.getFluidStack(288))
+            .fluidOutputs(MaterialsElements.getInstance().THALLIUM.getFluidStack(288))
             .eut(TierEU.RECIPE_IV)
             .duration(1 * MINUTES + 15 * SECONDS)
             .noOptimize()
             .addTo(alloyBlastSmelterRecipes);
 
         // Strontium processing
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(21),
-                MISC_MATERIALS.STRONTIUM_OXIDE.getDust(8),
-                ELEMENT.getInstance().ALUMINIUM.getDust(8))
-            .itemOutputs(ELEMENT.getInstance().ALUMINIUM.getIngot(8), ELEMENT.getInstance().STRONTIUM.getIngot(8))
-            .fluidOutputs(ELEMENT.getInstance().OXYGEN.getFluidStack(8000))
+                GTUtility.getIntegratedCircuit(21),
+                MaterialMisc.STRONTIUM_OXIDE.getDust(8),
+                MaterialsElements.getInstance().ALUMINIUM.getDust(8))
+            .itemOutputs(
+                MaterialsElements.getInstance().ALUMINIUM.getIngot(8),
+                MaterialsElements.getInstance().STRONTIUM.getIngot(8))
+            .fluidOutputs(MaterialsElements.getInstance().OXYGEN.getFluidStack(8000))
             .eut(TierEU.RECIPE_EV)
             .duration(2 * MINUTES)
             .addTo(alloyBlastSmelterRecipes);
 
         // molten botmium
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(4),
+                GTUtility.getIntegratedCircuit(4),
                 ItemUtils.getItemStackOfAmountFromOreDict("dustNitinol60", 1),
                 ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 6),
                 ItemUtils.getItemStackOfAmountFromOreDict("dustRuthenium", 6),
                 ItemUtils.getItemStackOfAmountFromOreDict("dustThallium", 3))
-            .fluidOutputs(ALLOY.BOTMIUM.getFluidStack(2304))
+            .fluidOutputs(MaterialsAlloy.BOTMIUM.getFluidStack(2304))
             .eut(TierEU.RECIPE_UV)
             .duration(2 * MINUTES)
             .addTo(alloyBlastSmelterRecipes);
 
         // molten precious metals alloy
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(6),
+                GTUtility.getIntegratedCircuit(6),
                 ItemUtils.getItemStackOfAmountFromOreDict("dustRuthenium", 1),
                 ItemUtils.getItemStackOfAmountFromOreDict("dustRhodium", 1),
                 ItemUtils.getItemStackOfAmountFromOreDict("dustPalladium", 1),
@@ -862,11 +863,11 @@ public class RECIPES_GREGTECH {
             .addTo(alloyBlastSmelterRecipes);
 
         // lossless phonon transfer medium
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_Utility.getIntegratedCircuit(5),
+                GTUtility.getIntegratedCircuit(5),
                 WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.dust, 5),
-                MyMaterial.metastableOganesson.get(OrePrefixes.dust, 1),
+                GGMaterial.metastableOganesson.get(OrePrefixes.dust, 1),
                 Materials.Praseodymium.getDust(15),
                 Materials.SuperconductorUIVBase.getDust(6))
             .fluidInputs(MaterialsUEVplus.PhononCrystalSolution.getFluid(4000L))
@@ -883,7 +884,7 @@ public class RECIPES_GREGTECH {
         ItemStack foodRaisins = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foodRaisins", 1);
 
         if (cropGrape != null && foodRaisins != null) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(CI.getNumberedBioCircuit(20), cropGrape)
                 .itemOutputs(foodRaisins)
                 .eut(2)
@@ -892,18 +893,18 @@ public class RECIPES_GREGTECH {
         }
 
         // Process Waste Water
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(CI.getNumberedBioCircuit(21))
             .itemOutputs(
                 ItemUtils.getSimpleStack(Blocks.dirt),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L))
             .outputChances(20_00, 5_00, 10, 7, 6, 5, 4, 3, 2)
             .fluidInputs(FluidUtils.getFluidStack("sludge", 1000))
             .fluidOutputs(Materials.Methane.getGas(100))
@@ -912,7 +913,7 @@ public class RECIPES_GREGTECH {
             .addTo(chemicalDehydratorRecipes);
 
         // C8H10 = C8H8 + 2H
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(CI.getNumberedAdvancedCircuit(18), CI.emptyCells(3))
             .itemOutputs(
                 ItemUtils.getItemStackOfAmountFromOreDict("cellStyrene", 1),
@@ -926,7 +927,7 @@ public class RECIPES_GREGTECH {
          * Add custom recipes for drying leather
          */
         if (Backpack.isModLoaded()) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(CI.getNumberedAdvancedCircuit(18), new ItemStack(Items.leather, 2))
                 .itemOutputs(ItemUtils.getCorrectStacktype("Backpack:tannedLeather", 1))
                 .fluidInputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 1000))
@@ -935,10 +936,10 @@ public class RECIPES_GREGTECH {
                 .addTo(chemicalDehydratorRecipes);
 
             if (NewHorizonsCoreMod.isModLoaded()) {
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
                         CI.getNumberedAdvancedCircuit(18),
-                        GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 2L, 0))
+                        GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 2L, 0))
                     .itemOutputs(ItemUtils.getCorrectStacktype("Backpack:tannedLeather", 1))
                     .fluidInputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 1000))
                     .eut(180)
@@ -948,11 +949,11 @@ public class RECIPES_GREGTECH {
         }
         // Alternative ACETIC ANHYDRIDE recipe for Kevlar Line
         // 2C2H4O2 = C4H6O3 + H2O
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(CI.getNumberedAdvancedCircuit(18), CI.emptyCells(1))
             .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1))
             .fluidInputs(FluidUtils.getFluidStack("aceticacid", 2000))
-            .fluidOutputs(MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000))
+            .fluidOutputs(MaterialMisc.ACETIC_ANHYDRIDE.getFluidStack(1000))
             .eut(TierEU.RECIPE_HV)
             .duration(30 * SECONDS)
             .addTo(chemicalDehydratorRecipes);
@@ -962,7 +963,7 @@ public class RECIPES_GREGTECH {
         // Styrene
         // C8H10 = C8H8 + 2H
         RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .itemOutputs()
             .fluidInputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 1000))
             .fluidOutputs(Materials.Styrene.getFluid(1000L), Materials.Hydrogen.getGas(2000))
@@ -973,7 +974,7 @@ public class RECIPES_GREGTECH {
         // Short-cut Styrene
         // C6H6 + C2H4 = C8H8 + 2H
         RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .itemOutputs()
             .fluidInputs(Materials.Ethylene.getGas(500L), Materials.Benzene.getFluid(500L))
             .fluidOutputs(Materials.Styrene.getFluid(500L), Materials.Hydrogen.getGas(1000))
@@ -986,8 +987,8 @@ public class RECIPES_GREGTECH {
 
         RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Vanadium, 32L),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.VanadiumSteel, 8L))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Vanadium, 32L),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.VanadiumSteel, 8L))
             .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 0, 4))
             .fluidInputs(Materials.Oxygen.getGas(8000L))
             .duration(16 * SECONDS)
@@ -997,7 +998,7 @@ public class RECIPES_GREGTECH {
         RA.stdBuilder()
             .itemInputs(
                 ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 0, 2),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VanadiumGallium, 8L))
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.VanadiumGallium, 8L))
             .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 8))
             .fluidInputs(Materials.Tantalum.getMolten(4 * INGOTS))
             .duration(32 * SECONDS)
@@ -1007,9 +1008,9 @@ public class RECIPES_GREGTECH {
         RA.stdBuilder()
             .itemInputs(
                 ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1),
-                GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 4L),
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 4L),
                 ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(3), 4),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 2L))
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 2L))
             .itemOutputs(ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1))
             .fluidInputs(Materials.Oxygen.getGas(16 * BUCKETS))
             .duration(3 * SECONDS + 4 * TICKS)
@@ -1019,9 +1020,9 @@ public class RECIPES_GREGTECH {
         RA.stdBuilder()
             .itemInputs(
                 GregtechItemList.Casing_Vanadium_Redox.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 4L),
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 4L),
                 ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(4), 4),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 2L))
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 2L))
             .itemOutputs(GregtechItemList.Casing_Vanadium_Redox_IV.get(1))
             .fluidInputs(Materials.Nitrogen.getGas(16 * BUCKETS))
             .duration(6 * SECONDS)
@@ -1031,9 +1032,9 @@ public class RECIPES_GREGTECH {
         RA.stdBuilder()
             .itemInputs(
                 GregtechItemList.Casing_Vanadium_Redox_IV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 4L),
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 4L),
                 ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 4),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 2L))
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 2L))
             .itemOutputs(GregtechItemList.Casing_Vanadium_Redox_LuV.get(1))
             .fluidInputs(Materials.Helium.getGas(8 * BUCKETS))
             .duration(12 * SECONDS + 10 * TICKS)
@@ -1045,7 +1046,7 @@ public class RECIPES_GREGTECH {
                 GregtechItemList.Casing_Vanadium_Redox_LuV.get(1),
                 ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 16),
                 ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 4),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 2L))
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 2L))
             .itemOutputs(GregtechItemList.Casing_Vanadium_Redox_ZPM.get(1))
             .fluidInputs(Materials.Argon.getGas(4 * BUCKETS))
             .duration(25 * SECONDS)
@@ -1055,9 +1056,9 @@ public class RECIPES_GREGTECH {
         RA.stdBuilder()
             .itemInputs(
                 GregtechItemList.Casing_Vanadium_Redox_ZPM.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Naquadah, 4L),
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Naquadah, 4L),
                 ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 4),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 2L))
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 2L))
             .itemOutputs(GregtechItemList.Casing_Vanadium_Redox_UV.get(1))
             .fluidInputs(Materials.Radon.getGas(4 * BUCKETS))
             .duration(50 * SECONDS)
@@ -1067,9 +1068,9 @@ public class RECIPES_GREGTECH {
         RA.stdBuilder()
             .itemInputs(
                 GregtechItemList.Casing_Vanadium_Redox_UV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 4L),
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 4L),
                 ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(8), 4),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 2L))
+                GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 2L))
             .itemOutputs(GregtechItemList.Casing_Vanadium_Redox_MAX.get(1))
             .fluidInputs(FluidUtils.getFluidStack("krypton", 500))
             .duration(1 * MINUTES + 40 * SECONDS)
@@ -1080,8 +1081,8 @@ public class RECIPES_GREGTECH {
             .itemInputs(
                 ItemUtils.getSimpleStack(CI.explosiveITNT, 2),
                 ItemUtils.getSimpleStack(CI.explosiveTNT, 4),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 2L),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iron, 1L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 2L),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Iron, 1L))
             .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockMiningExplosive, 3))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_MV / 2)
@@ -1089,9 +1090,9 @@ public class RECIPES_GREGTECH {
 
         RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 8L),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.BlackSteel, 8L))
+                GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 8L),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.BlackSteel, 8L))
             .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 64))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_HV)
@@ -1102,9 +1103,9 @@ public class RECIPES_GREGTECH {
                 CI.fluidRegulator_LV,
                 CI.electricMotor_LV,
                 CI.getTieredComponent(OrePrefixes.bolt, 1, 8),
-                GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Brass, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Brass, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2L))
+                GTOreDictUnificator.get(OrePrefixes.ring, Materials.Brass, 1L),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Brass, 1L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2L))
             .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
@@ -1115,9 +1116,9 @@ public class RECIPES_GREGTECH {
                 CI.fluidRegulator_MV,
                 CI.electricMotor_MV,
                 CI.getTieredComponent(OrePrefixes.bolt, 2, 8),
-                GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Invar, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L))
+                GTOreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 1L),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Invar, 1L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L))
             .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_MV)
@@ -1128,9 +1129,9 @@ public class RECIPES_GREGTECH {
                 CI.fluidRegulator_HV,
                 CI.electricMotor_HV,
                 CI.getTieredComponent(OrePrefixes.bolt, 3, 8),
-                GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Chrome, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Chrome, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L))
+                GTOreDictUnificator.get(OrePrefixes.ring, Materials.Chrome, 1L),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Chrome, 1L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L))
             .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_HV)
@@ -1141,37 +1142,37 @@ public class RECIPES_GREGTECH {
                 CI.fluidRegulator_EV,
                 CI.electricMotor_EV,
                 CI.getTieredComponent(OrePrefixes.bolt, 4, 8),
-                GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Titanium, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2L))
+                GTOreDictUnificator.get(OrePrefixes.ring, Materials.Titanium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2L))
             .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1))
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
         RA.stdBuilder()
-            .itemInputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1), GT_Utility.getIntegratedCircuit(20))
+            .itemInputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1), GTUtility.getIntegratedCircuit(20))
             .itemOutputs(ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1000, 1))
             .duration(1 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
         RA.stdBuilder()
-            .itemInputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1), GT_Utility.getIntegratedCircuit(20))
+            .itemInputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1), GTUtility.getIntegratedCircuit(20))
             .itemOutputs(ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1001, 1))
             .duration(6 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
         RA.stdBuilder()
-            .itemInputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1), GT_Utility.getIntegratedCircuit(20))
+            .itemInputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1), GTUtility.getIntegratedCircuit(20))
             .itemOutputs(ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1002, 1))
             .duration(24 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
         RA.stdBuilder()
-            .itemInputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1), GT_Utility.getIntegratedCircuit(20))
+            .itemInputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1), GTUtility.getIntegratedCircuit(20))
             .itemOutputs(ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1003, 1))
             .duration(1 * MINUTES + 36 * SECONDS)
             .eut(TierEU.RECIPE_EV)
@@ -1214,7 +1215,7 @@ public class RECIPES_GREGTECH {
                 .itemOutputs(aPackOutput[aAS])
                 .fluidInputs(CI.getTieredFluid(i, (144 * 4)))
                 .duration(30 * i * SECONDS)
-                .eut(GT_Values.VP[i])
+                .eut(GTValues.VP[i])
                 .addTo(assemblerRecipes);
         }
 
@@ -1223,11 +1224,11 @@ public class RECIPES_GREGTECH {
             // Turbine Housing Research Page
             RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(17),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Trinium, 64L),
+                    GTUtility.getIntegratedCircuit(17),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Trinium, 64L),
                     CI.getSensor(6, 6),
                     CI.getBolt(7, 64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 64L),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 64L),
                     ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 12))
                 .itemOutputs(
                     ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_8_TURBINE_AUTOMATION, 1))
@@ -1239,10 +1240,10 @@ public class RECIPES_GREGTECH {
             // Cloaking Device Research Page
             RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(17),
+                    GTUtility.getIntegratedCircuit(17),
                     ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 4),
                     CI.getFieldGenerator(6, 16),
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Palladium, 32L),
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Palladium, 32L),
                     ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 12))
                 .itemOutputs(ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1))
                 .fluidInputs(CI.getAlternativeTieredFluid(7, 144 * 32))
@@ -1255,7 +1256,7 @@ public class RECIPES_GREGTECH {
     private static void distilleryRecipes() {
         Logger.INFO("Registering Distillery/Distillation Tower Recipes.");
         RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(4))
+            .itemInputs(GTUtility.getIntegratedCircuit(4))
             .fluidInputs(Materials.Air.getGas(1000L))
             .fluidOutputs(Materials.Helium.getGas(1L))
             .duration(20 * SECONDS)
@@ -1300,15 +1301,15 @@ public class RECIPES_GREGTECH {
         // Lava
 
         RA.stdBuilder()
-            .fluidInputs(FluidUtils.getLava(1000), FluidUtils.getWater(16_000 / GT_Values.STEAM_PER_WATER))
+            .fluidInputs(FluidUtils.getLava(1000), FluidUtils.getWater(16_000 / GTValues.STEAM_PER_WATER))
             .fluidOutputs(FluidUtils.getPahoehoeLava(1000), FluidUtils.getSteam(16_000))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tantalum, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungstate, 1),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tantalum, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tungstate, 1),
                 new ItemStack(Blocks.obsidian, 1, 0))
             .outputChances(444, 222, 56, 56, 56, 125, 1000)
             .duration(1 * SECONDS)
@@ -1318,13 +1319,13 @@ public class RECIPES_GREGTECH {
         // Pahoehoe Lava
 
         RA.stdBuilder()
-            .fluidInputs(FluidUtils.getPahoehoeLava(1000), FluidUtils.getWater(16_000 / GT_Values.STEAM_PER_WATER))
+            .fluidInputs(FluidUtils.getPahoehoeLava(1000), FluidUtils.getWater(16_000 / GTValues.STEAM_PER_WATER))
             .fluidOutputs(FluidUtils.getSteam(16_000))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Electrum, 1),
-                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tantalum, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungstate, 1),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Electrum, 1),
+                GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tantalum, 1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tungstate, 1),
                 new ItemStack(Blocks.obsidian, 1, 0))
             .outputChances(167, 56, 56, 125, 3700)
             .duration(1 * SECONDS)
@@ -1336,7 +1337,7 @@ public class RECIPES_GREGTECH {
         RA.stdBuilder()
             .fluidInputs(
                 FluidUtils.getFluidStack("ic2hotcoolant", 500),
-                FluidUtils.getWater(100_000 / GT_Values.STEAM_PER_WATER))
+                FluidUtils.getWater(100_000 / GTValues.STEAM_PER_WATER))
             .fluidOutputs(FluidUtils.getFluidStack("ic2coolant", 500), FluidUtils.getSuperHeatedSteam(100_000))
             .duration(1 * SECONDS)
             .eut(0)
@@ -1346,9 +1347,9 @@ public class RECIPES_GREGTECH {
 
         RA.stdBuilder()
             .fluidInputs(
-                MISC_MATERIALS.SOLAR_SALT_HOT.getFluidStack(100),
-                FluidUtils.getWater(100_000 / GT_Values.STEAM_PER_WATER))
-            .fluidOutputs(MISC_MATERIALS.SOLAR_SALT_COLD.getFluidStack(100), FluidUtils.getSuperHeatedSteam(100_000))
+                MaterialMisc.SOLAR_SALT_HOT.getFluidStack(100),
+                FluidUtils.getWater(100_000 / GTValues.STEAM_PER_WATER))
+            .fluidOutputs(MaterialMisc.SOLAR_SALT_COLD.getFluidStack(100), FluidUtils.getSuperHeatedSteam(100_000))
             .duration(1 * SECONDS)
             .eut(0)
             .addTo(thermalBoilerRecipes);
@@ -1363,21 +1364,21 @@ public class RECIPES_GREGTECH {
             .metadata(FUEL_TYPE, 2)
             .duration(0)
             .eut(0)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
         RA.stdBuilder()
             .itemInputs(ItemUtils.getIC2Cell(2))
             .metadata(FUEL_VALUE, 32)
             .metadata(FUEL_TYPE, 2)
             .duration(0)
             .eut(0)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
         RA.stdBuilder()
             .itemInputs(ItemUtils.getIC2Cell(11))
             .metadata(FUEL_VALUE, 24)
             .metadata(FUEL_TYPE, 2)
             .duration(0)
             .eut(0)
-            .addTo(GT_RecipeConstants.Fuel);
+            .addTo(GTRecipeConstants.Fuel);
     }
 
     private static void extractorRecipes() {
@@ -1405,7 +1406,7 @@ public class RECIPES_GREGTECH {
     private static void fluidExtractorRecipes() {
         // Gelid Cryotheum
         RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cryotheum, 1L))
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cryotheum, 1L))
             .fluidOutputs(FluidUtils.getFluidStack("cryotheum", 250))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_HV / 2)
@@ -1421,7 +1422,7 @@ public class RECIPES_GREGTECH {
 
         // Blazing Pyrotheum
         RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Pyrotheum, 1L))
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Pyrotheum, 1L))
             .fluidOutputs(FluidUtils.getFluidStack("pyrotheum", 250))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_HV / 2)
@@ -1431,10 +1432,10 @@ public class RECIPES_GREGTECH {
     private static void centrifugeRecipes() {
 
         RA.stdBuilder()
-            .itemInputs(CI.getNumberedAdvancedCircuit(2), MISC_MATERIALS.SOLAR_SALT_COLD.getCell(1))
+            .itemInputs(CI.getNumberedAdvancedCircuit(2), MaterialMisc.SOLAR_SALT_COLD.getCell(1))
             .itemOutputs(
-                MISC_MATERIALS.SODIUM_NITRATE.getDust(3),
-                MISC_MATERIALS.POTASSIUM_NITRATE.getDust(2),
+                MaterialMisc.SODIUM_NITRATE.getDust(3),
+                MaterialMisc.POTASSIUM_NITRATE.getDust(2),
                 CI.emptyCells(1))
             .duration(6 * SECONDS)
             .eut(TierEU.RECIPE_MV)
@@ -1447,9 +1448,9 @@ public class RECIPES_GREGTECH {
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(2),
                 CI.emptyCells(1),
-                MISC_MATERIALS.SODIUM_NITRATE.getDust(3),
-                MISC_MATERIALS.POTASSIUM_NITRATE.getDust(2))
-            .itemOutputs(MISC_MATERIALS.SOLAR_SALT_COLD.getCell(1))
+                MaterialMisc.SODIUM_NITRATE.getDust(3),
+                MaterialMisc.POTASSIUM_NITRATE.getDust(2))
+            .itemOutputs(MaterialMisc.SOLAR_SALT_COLD.getCell(1))
             .duration(2 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(mixerRecipes);
@@ -1462,7 +1463,7 @@ public class RECIPES_GREGTECH {
                 Materials.Potassium.getDust(9),
                 Materials.Lithium.getDust(9),
                 Materials.Sulfur.getDust(9))
-            .itemOutputs(ALLOY.LEAGRISIUM.getDust(50))
+            .itemOutputs(MaterialsAlloy.LEAGRISIUM.getDust(50))
             .fluidInputs(Materials.Hydrogen.getGas(5000))
             .duration(1 * MINUTES)
             .eut(TierEU.RECIPE_EV)
@@ -1476,7 +1477,7 @@ public class RECIPES_GREGTECH {
                 Materials.Titanium.getDust(1),
                 Materials.Nickel.getDust(4),
                 Materials.Cobalt.getDust(2))
-            .itemOutputs(ALLOY.MARAGING250.getDust(24))
+            .itemOutputs(MaterialsAlloy.MARAGING250.getDust(24))
             .duration(1 * MINUTES)
             .eut(TierEU.RECIPE_EV)
             .addTo(mixerRecipes);
@@ -1487,8 +1488,8 @@ public class RECIPES_GREGTECH {
         RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(21),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 32L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Sulfur, 8L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 32L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Sulfur, 8L))
             .fluidInputs(FluidUtils.getFluidStack("sulfuricacid", 4000))
             .fluidOutputs(FluidUtils.getFluidStack("sulfuricapatite", 8000))
             .duration(20 * SECONDS)
@@ -1498,7 +1499,7 @@ public class RECIPES_GREGTECH {
         // KOH + HNO3 = KNO3 + H2O
         RA.stdBuilder()
             .itemInputs(ItemUtils.getSimpleStack(GenericChem.mPotassiumHydroxide, 3), CI.getNumberedAdvancedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumNitrade, 5L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumNitrade, 5L))
             .fluidInputs(Materials.NitricAcid.getFluid(1000))
             .fluidOutputs(Materials.Water.getFluid(1000))
             .duration(5 * SECONDS)
@@ -1510,7 +1511,7 @@ public class RECIPES_GREGTECH {
             .itemInputs(
                 ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6),
                 CI.getNumberedAdvancedCircuit(1))
-            .itemOutputs(MISC_MATERIALS.SODIUM_NITRATE.getDust(10))
+            .itemOutputs(MaterialMisc.SODIUM_NITRATE.getDust(10))
             .fluidInputs(Materials.NitricAcid.getFluid(2000))
             .fluidOutputs(Materials.CarbonDioxide.getGas(1000))
             .duration(5 * SECONDS)
@@ -1522,10 +1523,10 @@ public class RECIPES_GREGTECH {
 
         // Synthetic Graphite
         RA.stdBuilder()
-            .itemInputs(ALLOY.SILICON_CARBIDE.getDust(16), GT_Utility.getIntegratedCircuit(22))
+            .itemInputs(MaterialsAlloy.SILICON_CARBIDE.getDust(16), GTUtility.getIntegratedCircuit(22))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 8L),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Silicon, 8L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 8L),
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Silicon, 8L))
             .fluidInputs(Materials.Nitrogen.getGas(4000))
             .fluidOutputs()
             .duration(1 * MINUTES)
@@ -1537,14 +1538,14 @@ public class RECIPES_GREGTECH {
 
     private static void compressorRecipes() {
         RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Clay, 1L))
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Clay, 1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
         RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, Materials.MeatRaw, 1L))
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, Materials.MeatRaw, 1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
@@ -1560,8 +1561,8 @@ public class RECIPES_GREGTECH {
     private static void macerationRecipes() {
 
         RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.block, Materials.MeatRaw, 1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L))
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.block, Materials.MeatRaw, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L))
             .duration(44 * SECONDS)
             .eut(4)
             .addTo(maceratorRecipes);
@@ -1569,7 +1570,7 @@ public class RECIPES_GREGTECH {
         if (ItemUtils.simpleMetaStack("chisel:limestone", 0, 1) != null) {
             RA.stdBuilder()
                 .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("limestone", 1))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 4L))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 4L))
                 .duration(20 * SECONDS)
                 .eut(2)
                 .addTo(maceratorRecipes);
@@ -1579,8 +1580,8 @@ public class RECIPES_GREGTECH {
     private static void cyclotronRecipes() {
 
         // Polonium
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(GregtechItemList.Pellet_RTG_PO210.get(1))
             .outputChances(100)
             .fluidInputs(FluidUtils.getFluidStack("molten.bismuth", 1))
@@ -1589,8 +1590,8 @@ public class RECIPES_GREGTECH {
             .addTo(cyclotronRecipes);
 
         // Americium
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(GregtechItemList.Pellet_RTG_AM241.get(4))
             .outputChances(2500)
             .fluidInputs(FluidUtils.getFluidStack("molten.americium", 1))
@@ -1599,8 +1600,8 @@ public class RECIPES_GREGTECH {
             .addTo(cyclotronRecipes);
 
         // Strontium u235
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(GregtechItemList.Pellet_RTG_SR90.get(1))
             .outputChances(570)
             .fluidInputs(FluidUtils.getFluidStack("molten.uranium235", 10))
@@ -1609,8 +1610,8 @@ public class RECIPES_GREGTECH {
             .addTo(cyclotronRecipes);
 
         // Strontium u233
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(GregtechItemList.Pellet_RTG_SR90.get(1))
             .outputChances(660)
             .fluidInputs(FluidUtils.getFluidStack("molten.uranium233", 10))
@@ -1619,8 +1620,8 @@ public class RECIPES_GREGTECH {
             .addTo(cyclotronRecipes);
 
         // Strontium pu239
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(GregtechItemList.Pellet_RTG_SR90.get(1))
             .outputChances(220)
             .fluidInputs(FluidUtils.getFluidStack("molten.plutonium", 10))
@@ -1629,8 +1630,8 @@ public class RECIPES_GREGTECH {
             .addTo(cyclotronRecipes);
 
         // Plutonium
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1))
             .itemOutputs(GregtechItemList.Pellet_RTG_PU238.get(2))
             .outputChances(780)
             .fluidInputs(FluidUtils.getFluidStack("molten.plutonium238", 1))
@@ -1639,8 +1640,8 @@ public class RECIPES_GREGTECH {
             .addTo(cyclotronRecipes);
 
         // Neptunium
-        GT_Values.RA.stdBuilder()
-            .itemInputs(ELEMENT.getInstance().URANIUM238.getDust(1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(MaterialsElements.getInstance().URANIUM238.getDust(1))
             .itemOutputs(ItemUtils.getSimpleStack(ModItems.dustNeptunium238))
             .outputChances(500)
             .fluidInputs(FluidUtils.getFluidStack("deuterium", 400))
@@ -1653,8 +1654,8 @@ public class RECIPES_GREGTECH {
          */
 
         // Quark Smash
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(3))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(3))
             .itemOutputs(
                 Particle.getBaseParticle(Particle.UP),
                 Particle.getBaseParticle(Particle.DOWN),
@@ -1668,8 +1669,8 @@ public class RECIPES_GREGTECH {
             .eut(TierEU.RECIPE_ZPM)
             .addTo(cyclotronRecipes);
         // Lepton Smash
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(6))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(6))
             .itemOutputs(
                 Particle.getBaseParticle(Particle.ELECTRON),
                 Particle.getBaseParticle(Particle.MUON),
@@ -1683,8 +1684,8 @@ public class RECIPES_GREGTECH {
             .eut(TierEU.RECIPE_ZPM)
             .addTo(cyclotronRecipes);
         // Boson Smash
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(9))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(9))
             .itemOutputs(
                 Particle.getBaseParticle(Particle.GLUON),
                 Particle.getBaseParticle(Particle.PHOTON),
@@ -1697,8 +1698,8 @@ public class RECIPES_GREGTECH {
             .eut(TierEU.RECIPE_ZPM)
             .addTo(cyclotronRecipes);
         // Mixed Smash 1
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(12))
             .itemOutputs(
                 Particle.getBaseParticle(Particle.GRAVITON),
                 Particle.getBaseParticle(Particle.ETA_MESON),
@@ -1714,8 +1715,8 @@ public class RECIPES_GREGTECH {
             .eut(TierEU.RECIPE_UV)
             .addTo(cyclotronRecipes);
         // Mixed Smash 1
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(12))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(12))
             .itemOutputs(
                 Particle.getBaseParticle(Particle.GRAVITON),
                 Particle.getBaseParticle(Particle.ETA_MESON),
@@ -1726,13 +1727,13 @@ public class RECIPES_GREGTECH {
                 Particle.getBaseParticle(Particle.OMEGA),
                 Particle.getBaseParticle(Particle.HIGGS_BOSON))
             .outputChances(5000, 200, 200, 100, 80, 60, 40, 30)
-            .fluidInputs(new FluidStack(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 2500))
+            .fluidInputs(new FluidStack(MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 2500))
             .duration(1 * MINUTES + 40 * SECONDS)
             .eut(TierEU.RECIPE_UV)
             .addTo(cyclotronRecipes);
         // Graviton Smash
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(15))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(15))
             .itemOutputs(Particle.getBaseParticle(Particle.GRAVITON), Particle.getBaseParticle(Particle.UNKNOWN))
             .outputChances(1000, 100)
             .fluidInputs(FluidUtils.getFluidStack("plasma.hydrogen", 100))
@@ -1748,8 +1749,8 @@ public class RECIPES_GREGTECH {
         }
 
         // Quantum Anomaly
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24), Particle.getBaseParticle(Particle.UNKNOWN))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24), Particle.getBaseParticle(Particle.UNKNOWN))
             .itemOutputs(GregtechItemList.Laser_Lens_Special.get(1))
             .outputChances(100)
             .fluidInputs(aPlasma)
@@ -1776,8 +1777,8 @@ public class RECIPES_GREGTECH {
             // Ionize Plasma
             if ((aPlasma2 != null && !aPlasma2.isFluidEqual(aPlasma_NULL))
                 || (aPlasma3 != null && !aPlasma3.isFluidEqual(aPlasma_NULL))) {
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.getIntegratedCircuit(1 + (tenCountA - 1)))
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.getIntegratedCircuit(1 + (tenCountA - 1)))
                     .itemOutputs(
                         Particle.getIon(y, 1),
                         Particle.getIon(y, 2),
@@ -1806,8 +1807,8 @@ public class RECIPES_GREGTECH {
         }
 
         // Generate Hydrogen Ion Recipe
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(24))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(24))
             .itemOutputs(
                 Particle.getIon("Hydrogen", 1),
                 Particle.getIon("Hydrogen", 2),
@@ -1824,8 +1825,8 @@ public class RECIPES_GREGTECH {
             .eut(TierEU.RECIPE_LuV)
             .addTo(cyclotronRecipes);
         // Generate Hydrogen Plasma Recipe
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(21), Particle.getIon("Hydrogen", 0))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(21), Particle.getIon("Hydrogen", 0))
             .itemOutputs(
                 Particle.getBaseParticle(Particle.PROTON),
                 Particle.getBaseParticle(Particle.NEUTRON),
@@ -1840,8 +1841,8 @@ public class RECIPES_GREGTECH {
             .eut(TierEU.RECIPE_LuV)
             .addTo(cyclotronRecipes);
         // Generate Protons Easily
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(20), Particle.getIon("Hydrogen", 0))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(20), Particle.getIon("Hydrogen", 0))
             .itemOutputs(
                 Particle.getBaseParticle(Particle.PROTON),
                 Particle.getBaseParticle(Particle.PROTON),
@@ -1857,8 +1858,8 @@ public class RECIPES_GREGTECH {
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(cyclotronRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(22), Particle.getBaseParticle(Particle.UNKNOWN))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(22), Particle.getBaseParticle(Particle.UNKNOWN))
             .itemOutputs(
                 Particle.getBaseParticle(Particle.PROTON),
                 Particle.getBaseParticle(Particle.PROTON),
@@ -1875,9 +1876,9 @@ public class RECIPES_GREGTECH {
             .eut(TierEU.RECIPE_LuV)
             .addTo(cyclotronRecipes);
         // Create Strange Dust
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                ELEMENT.getInstance().PLUTONIUM238.getDust(1),
+                MaterialsElements.getInstance().PLUTONIUM238.getDust(1),
                 Particle.getBaseParticle(Particle.UNKNOWN),
                 Particle.getBaseParticle(Particle.UNKNOWN),
                 Particle.getBaseParticle(Particle.UNKNOWN),
@@ -1886,7 +1887,7 @@ public class RECIPES_GREGTECH {
                 Particle.getBaseParticle(Particle.UNKNOWN),
                 Particle.getBaseParticle(Particle.UNKNOWN),
                 Particle.getBaseParticle(Particle.UNKNOWN))
-            .itemOutputs(ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT.getDust(1))
+            .itemOutputs(MaterialsOres.DEEP_EARTH_REACTOR_FUEL_DEPOSIT.getDust(1))
             .outputChances(2500)
             .fluidInputs(FluidUtils.getFluidStack(FluidUtils.getWildcardFluidStack("ender", 1000), 1000))
             .duration(15 * MINUTES)
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/main/java/gtPlusPlus/core/recipe/RecipesLaserEngraver.java
index 1f8d5d9a8e..63c136c8f9 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesLaserEngraver.java
@@ -1,27 +1,27 @@
 package gtPlusPlus.core.recipe;
 
 import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes;
-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.GTRecipeBuilder.HOURS;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+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.OreDictNames;
 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;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
+import gtPlusPlus.everglades.dimension.DimensionEverglades;
 
-public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
+public class RecipesLaserEngraver implements IOreRecipeRegistrator {
 
-    public RECIPES_LaserEngraver() {
+    public RecipesLaserEngraver() {
         OrePrefixes.crafting.add(this);
     }
 
@@ -29,18 +29,18 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
     public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
         final String aModName, final ItemStack aStack) {
         if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lithium, 2L),
-                    GT_Utility.copyAmount(0L, aStack))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Lithium, 2L),
+                    GTUtility.copyAmount(0L, aStack))
                 .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleLithium7", 1))
                 .duration(4 * MINUTES)
                 .eut(TierEU.RECIPE_EV)
                 .addTo(laserEngraverRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3L),
-                    GT_Utility.copyAmount(0L, aStack))
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3L),
+                    GTUtility.copyAmount(0L, aStack))
                 .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1))
                 .duration(2 * MINUTES)
                 .eut(TierEU.RECIPE_EV)
@@ -71,62 +71,62 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
             ItemStack wireT4a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Naquadah", 1);
 
             // T1
-            GT_Values.RA.stdBuilder()
-                .itemInputs(wireT1a, GT_Utility.copyAmount(0L, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(wireT1a, GTUtility.copyAmount(0L, aStack))
                 .itemOutputs(coilWire1)
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(laserEngraverRecipes);
-            GT_Values.RA.stdBuilder()
-                .itemInputs(wireT1b, GT_Utility.copyAmount(0L, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(wireT1b, GTUtility.copyAmount(0L, aStack))
                 .itemOutputs(coilWire1)
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
                 .addTo(laserEngraverRecipes);
             // T2
-            GT_Values.RA.stdBuilder()
-                .itemInputs(wireT2a, GT_Utility.copyAmount(0L, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(wireT2a, GTUtility.copyAmount(0L, aStack))
                 .itemOutputs(coilWire2)
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_EV)
                 .addTo(laserEngraverRecipes);
-            GT_Values.RA.stdBuilder()
-                .itemInputs(wireT2b, GT_Utility.copyAmount(0L, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(wireT2b, GTUtility.copyAmount(0L, aStack))
                 .itemOutputs(coilWire2)
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_EV)
                 .addTo(laserEngraverRecipes);
             // T3
-            GT_Values.RA.stdBuilder()
-                .itemInputs(wireT3a, GT_Utility.copyAmount(0L, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(wireT3a, GTUtility.copyAmount(0L, aStack))
                 .itemOutputs(coilWire3)
                 .duration(30 * SECONDS)
                 .eut(TierEU.RECIPE_IV)
                 .addTo(laserEngraverRecipes);
-            GT_Values.RA.stdBuilder()
-                .itemInputs(wireT3b, GT_Utility.copyAmount(0L, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(wireT3b, GTUtility.copyAmount(0L, aStack))
                 .itemOutputs(coilWire3)
                 .duration(30 * SECONDS)
                 .eut(TierEU.RECIPE_IV)
                 .addTo(laserEngraverRecipes);
-            GT_Values.RA.stdBuilder()
-                .itemInputs(wireT3c, GT_Utility.copyAmount(0L, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(wireT3c, GTUtility.copyAmount(0L, aStack))
                 .itemOutputs(coilWire3)
                 .duration(30 * SECONDS)
                 .eut(TierEU.RECIPE_IV)
                 .addTo(laserEngraverRecipes);
             // T4
-            GT_Values.RA.stdBuilder()
-                .itemInputs(wireT4a, GT_Utility.copyAmount(0L, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(wireT4a, GTUtility.copyAmount(0L, aStack))
                 .itemOutputs(coilWire4)
                 .duration(40 * SECONDS)
                 .eut(TierEU.RECIPE_LuV)
                 .addTo(laserEngraverRecipes);
 
         } else if (aOreDictName.equals(OreDictNames.craftingLensOrange.toString())) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk), GT_Utility.copyAmount(0L, aStack))
-                .itemOutputs(ItemUtils.getSimpleStack(Dimension_Everglades.portalItem))
+            GTValues.RA.stdBuilder()
+                .itemInputs(ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk), GTUtility.copyAmount(0L, aStack))
+                .itemOutputs(ItemUtils.getSimpleStack(DimensionEverglades.portalItem))
                 .duration(3 * HOURS)
                 .eut(TierEU.RECIPE_IV)
                 .addTo(laserEngraverRecipes);
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachineComponents.java
index 4929872caa..516aecf93a 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachineComponents.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.core.recipe;
 
-public class RECIPES_MachineComponents {
+public class RecipesMachineComponents {
 
     // Fluid Pipe
     public static String pipeTier7 = "pipeHugeSteel";
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java
index 0c89e94b7e..2287d6cf4f 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java
@@ -7,14 +7,14 @@ import static gregtech.api.enums.Mods.RemoteIO;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
 import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
-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.GT_RecipeConstants.AssemblyLine;
-import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER;
-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.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.AssemblyLine;
+import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes;
 
 import java.util.List;
@@ -26,41 +26,41 @@ import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-import com.github.technus.tectech.recipe.TT_recipeAdder;
-import com.github.technus.tectech.thing.CustomItemList;
 import com.google.common.collect.ImmutableList;
 
+import bartworks.system.material.WerkstoffLoader;
 import goodgenerator.loader.Loaders;
-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.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.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.item.crafting.ItemDummyResearch;
 import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.MISC_MATERIALS;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.core.material.MaterialMisc;
+import gtPlusPlus.core.material.MaterialsAlloy;
+import gtPlusPlus.core.material.MaterialsElements;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
+import gtPlusPlus.everglades.dimension.DimensionEverglades;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.covers.CoverManager;
 import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
+import tectech.recipe.TTRecipeAdder;
+import tectech.thing.CustomItemList;
 
-public class RECIPES_Machines {
+public class RecipesMachines {
 
     // Outputs
     public static ItemStack RECIPE_Buffer_ULV = GregtechItemList.Energy_Buffer_1by1_ULV.get(1);
@@ -230,7 +230,7 @@ public class RECIPES_Machines {
     }
 
     private static void advHeatExchanger() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(18),
                 ItemList.Machine_Multi_HeatExchanger.get(1),
@@ -242,7 +242,7 @@ public class RECIPES_Machines {
             .duration(60 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(18),
                 ItemList.Casing_StableTitanium.get(1),
@@ -311,34 +311,34 @@ public class RECIPES_Machines {
 
     private static void multiForgeHammer() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(CI.machineHull_IV, 2),
                 ItemList.Machine_IV_Hammer.get(1),
                 CI.getPlate(4, 8),
                 CI.getBolt(5, 32),
-                ELEMENT.getInstance().ZIRCONIUM.getFineWire(32),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 4L))
+                MaterialsElements.getInstance().ZIRCONIUM.getFineWire(32),
+                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 4L))
             .itemOutputs(GregtechItemList.Controller_IndustrialForgeHammer.get(1))
             .fluidInputs(CI.getTieredFluid(4, 144 * 12))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             GregtechItemList.Casing_IndustrialForgeHammer.get(1),
             CI.bitsd,
-            new Object[] { "IBI", "HCH", "IHI", 'I', CI.getPlate(4, 1), 'B', ALLOY.BABBIT_ALLOY.getPlate(1), 'C',
-                ItemList.Casing_HeatProof.get(1), 'H', ALLOY.HASTELLOY_X.getRod(1) });
+            new Object[] { "IBI", "HCH", "IHI", 'I', CI.getPlate(4, 1), 'B', MaterialsAlloy.BABBIT_ALLOY.getPlate(1),
+                'C', ItemList.Casing_HeatProof.get(1), 'H', MaterialsAlloy.HASTELLOY_X.getRod(1) });
     }
 
     private static void multiMolecularTransformer() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getTieredGTPPMachineCasing(6, 1),
                 CI.getPlate(5, 16),
                 CI.getBolt(5, 32),
-                ALLOY.HG1223.getFineWire(64),
+                MaterialsAlloy.HG1223.getFineWire(64),
                 CI.getEmitter(4, 8),
                 ItemUtils.getItemStackOfAmountFromOreDict("circuitMaster", 10))
             .itemOutputs(
@@ -348,41 +348,41 @@ public class RECIPES_Machines {
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(
                 RESEARCH_ITEM,
                 ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_11_MOLECULAR_TRANSFORMER, 1))
             .metadata(RESEARCH_TIME, 30 * MINUTES)
             .itemInputs(
-                ALLOY.HG1223.getFineWire(64),
-                ALLOY.HG1223.getFineWire(64),
+                MaterialsAlloy.HG1223.getFineWire(64),
+                MaterialsAlloy.HG1223.getFineWire(64),
                 ItemList.Electric_Motor_IV.get(16),
                 ItemList.Energy_LapotronicOrb.get(16),
                 CI.getTieredComponent(OrePrefixes.cableGt12, 6, 16),
                 CI.getTieredComponent(OrePrefixes.wireGt16, 5, 32),
-                ALLOY.ZERON_100.getFrameBox(4),
-                ALLOY.ZIRCONIUM_CARBIDE.getPlateDouble(32),
-                ALLOY.BABBIT_ALLOY.getPlate(64),
-                ALLOY.LEAGRISIUM.getGear(8),
+                MaterialsAlloy.ZERON_100.getFrameBox(4),
+                MaterialsAlloy.ZIRCONIUM_CARBIDE.getPlateDouble(32),
+                MaterialsAlloy.BABBIT_ALLOY.getPlate(64),
+                MaterialsAlloy.LEAGRISIUM.getGear(8),
                 new Object[] { CI.getTieredCircuitOreDictName(4), 64 },
                 new Object[] { CI.getTieredCircuitOreDictName(5), 32 },
                 new Object[] { CI.getTieredCircuitOreDictName(6), 16 },
                 GregtechItemList.Laser_Lens_WoodsGlass.get(1))
             .fluidInputs(
-                ALLOY.NITINOL_60.getFluidStack(144 * 9 * (2)),
-                ALLOY.INCOLOY_MA956.getFluidStack(144 * 9 * (8)),
-                ALLOY.KANTHAL.getFluidStack(144 * 1 * (4)))
+                MaterialsAlloy.NITINOL_60.getFluidStack(144 * 9 * (2)),
+                MaterialsAlloy.INCOLOY_MA956.getFluidStack(144 * 9 * (8)),
+                MaterialsAlloy.KANTHAL.getFluidStack(144 * 1 * (4)))
             .itemOutputs(GregtechItemList.Controller_MolecularTransformer.get(1))
             .eut(TierEU.RECIPE_LuV)
             .duration(10 * MINUTES)
             .addTo(AssemblyLine);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(16),
                 CI.getPlate(6, 4),
                 CI.getScrew(6, 8),
-                ELEMENT.getInstance().PALLADIUM.getFineWire(16),
+                MaterialsElements.getInstance().PALLADIUM.getFineWire(16),
                 CI.getSensor(5, 2),
                 ItemUtils.getItemStackOfAmountFromOreDict("circuitElite", 4))
             .itemOutputs(GregtechItemList.Casing_Molecular_Transformer_1.get(1))
@@ -390,7 +390,7 @@ public class RECIPES_Machines {
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(16),
                 CI.getPlate(5, 4),
@@ -403,12 +403,12 @@ public class RECIPES_Machines {
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(16),
                 ItemUtils.getSimpleStack(Blocks.glowstone, 16),
                 CI.getGear(5, 8),
-                ELEMENT.getInstance().TITANIUM.getWire04(4),
+                MaterialsElements.getInstance().TITANIUM.getWire04(4),
                 CI.getFieldGenerator(4, 2),
                 ItemUtils.getItemStackOfAmountFromOreDict("circuitData", 8))
             .itemOutputs(GregtechItemList.Casing_Molecular_Transformer_3.get(1))
@@ -433,7 +433,7 @@ public class RECIPES_Machines {
             CI.getDoublePlate(4, 1),
             GregtechItemList.Casing_Turbine_Shaft.get(1));
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(18),
                 ItemList.Casing_Turbine.get(1),
@@ -447,7 +447,7 @@ public class RECIPES_Machines {
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
         // Steam
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(18),
                 ItemList.Casing_Turbine.get(1),
@@ -458,7 +458,7 @@ public class RECIPES_Machines {
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(18),
                 ItemList.LargeSteamTurbine.get(1),
@@ -472,7 +472,7 @@ public class RECIPES_Machines {
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
         // Gas
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(18),
                 ItemList.Casing_Turbine1.get(1),
@@ -483,7 +483,7 @@ public class RECIPES_Machines {
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(18),
                 ItemList.LargeGasTurbine.get(1),
@@ -497,7 +497,7 @@ public class RECIPES_Machines {
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
         // HP Steam
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(18),
                 ItemList.Casing_Turbine2.get(1),
@@ -508,7 +508,7 @@ public class RECIPES_Machines {
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(18),
                 ItemList.LargeHPSteamTurbine.get(1),
@@ -522,7 +522,7 @@ public class RECIPES_Machines {
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
         // Plasma
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(18),
                 ItemList.Casing_Turbine3.get(1),
@@ -533,7 +533,7 @@ public class RECIPES_Machines {
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(18),
                 ItemList.LargePlasmaTurbine.get(1),
@@ -546,7 +546,7 @@ public class RECIPES_Machines {
             .duration(60 * SECONDS)
             .eut(TierEU.RECIPE_ZPM)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(18),
                 new ItemStack(supercriticalFluidTurbineCasing, 1),
@@ -557,10 +557,10 @@ public class RECIPES_Machines {
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(18),
-                GT_Utility.copyAmount(1, Loaders.SCTurbine),
+                GTUtility.copyAmount(1, Loaders.SCTurbine),
                 new ItemStack(WerkstoffLoader.items.get(OrePrefixes.plate), 8, 10104),
                 new ItemStack(WerkstoffLoader.items.get(OrePrefixes.screw), 16, 10104),
                 new ItemStack(WerkstoffLoader.items.get(OrePrefixes.gearGt), 4, 10104),
@@ -575,54 +575,54 @@ public class RECIPES_Machines {
 
     private static void multiSolarTower() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(17),
                 CI.getTieredGTPPMachineCasing(3, 4),
-                ALLOY.MARAGING250.getPlate(8),
-                ALLOY.MARAGING250.getBolt(8),
-                ALLOY.MARAGING250.getScrew(8),
+                MaterialsAlloy.MARAGING250.getPlate(8),
+                MaterialsAlloy.MARAGING250.getBolt(8),
+                MaterialsAlloy.MARAGING250.getScrew(8),
                 CI.getCircuit(5, 8))
             .itemOutputs(GregtechItemList.Industrial_Solar_Tower.get(1))
             .fluidInputs(CI.getTieredFluid(3, 144 * 16))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(17),
-                ALLOY.MARAGING350.getFrameBox(1),
-                ALLOY.STAINLESS_STEEL.getPlate(4),
-                ALLOY.MARAGING350.getScrew(8))
+                MaterialsAlloy.MARAGING350.getFrameBox(1),
+                MaterialsAlloy.STAINLESS_STEEL.getPlate(4),
+                MaterialsAlloy.MARAGING350.getScrew(8))
             .itemOutputs(GregtechItemList.Casing_SolarTower_Structural.get(1))
             .fluidInputs(CI.getTieredFluid(3, 144 * 4))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(17),
-                ALLOY.MARAGING250.getFrameBox(1),
-                ALLOY.STAINLESS_STEEL.getPlate(4),
-                ALLOY.MARAGING250.getBolt(16),
-                ELEMENT.getInstance().ALUMINIUM.getScrew(8))
+                MaterialsAlloy.MARAGING250.getFrameBox(1),
+                MaterialsAlloy.STAINLESS_STEEL.getPlate(4),
+                MaterialsAlloy.MARAGING250.getBolt(16),
+                MaterialsElements.getInstance().ALUMINIUM.getScrew(8))
             .itemOutputs(GregtechItemList.Casing_SolarTower_SaltContainment.get(1))
             .fluidInputs(CI.getTieredFluid(3, 144 * 4))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(17),
-                ALLOY.MARAGING250.getFrameBox(1),
-                ALLOY.STEEL_BLACK.getPlate(4),
-                ALLOY.MARAGING250.getScrew(8))
+                MaterialsAlloy.MARAGING250.getFrameBox(1),
+                MaterialsAlloy.STEEL_BLACK.getPlate(4),
+                MaterialsAlloy.MARAGING250.getScrew(8))
             .itemOutputs(GregtechItemList.Casing_SolarTower_HeatContainment.get(1))
             .fluidInputs(CI.getAlternativeTieredFluid(3, 144 * 4))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(17),
                 CI.getTieredGTPPMachineCasing(2, 1),
@@ -640,7 +640,7 @@ public class RECIPES_Machines {
 
     private static void multiElementalDuplicator() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, ItemList.Machine_IV_Replicator.get(1))
             .metadata(RESEARCH_TIME, 12 * HOURS)
             .itemInputs(
@@ -660,13 +660,13 @@ public class RECIPES_Machines {
                 CI.getTieredFluid(7, 144 * 32),
                 CI.getAlternativeTieredFluid(6, 144 * 16),
                 CI.getTertiaryTieredFluid(6, 144 * 16),
-                ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144))
+                MaterialsAlloy.BABBIT_ALLOY.getFluidStack(128 * 144))
             .itemOutputs(GregtechItemList.Controller_ElementalDuplicator.get(1))
             .eut(TierEU.RECIPE_ZPM)
             .duration(10 * MINUTES)
             .addTo(AssemblyLine);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, GregtechItemList.Modulator_III.get(1))
             .metadata(RESEARCH_TIME, 4 * HOURS)
             .itemInputs(
@@ -683,13 +683,13 @@ public class RECIPES_Machines {
                 CI.getTieredFluid(6, 144 * 16),
                 CI.getAlternativeTieredFluid(5, 144 * 8),
                 CI.getTertiaryTieredFluid(5, 144 * 8),
-                ALLOY.BABBIT_ALLOY.getFluidStack(64 * 144))
+                MaterialsAlloy.BABBIT_ALLOY.getFluidStack(64 * 144))
             .itemOutputs(GregtechItemList.Hatch_Input_Elemental_Duplicator.get(1))
             .eut(TierEU.RECIPE_LuV)
             .duration(2 * HOURS)
             .addTo(AssemblyLine);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, GregtechItemList.ResonanceChamber_III.get(1))
             .metadata(RESEARCH_TIME, 2 * HOURS)
             .itemInputs(
@@ -706,7 +706,7 @@ public class RECIPES_Machines {
                 CI.getTieredFluid(5, 144 * 16),
                 CI.getAlternativeTieredFluid(4, 144 * 8),
                 CI.getTertiaryTieredFluid(4, 144 * 8),
-                ALLOY.BABBIT_ALLOY.getFluidStack(16 * 144))
+                MaterialsAlloy.BABBIT_ALLOY.getFluidStack(16 * 144))
             .itemOutputs(GregtechItemList.Casing_ElementalDuplicator.get(1))
             .eut(TierEU.RECIPE_LuV)
             .duration(10 * MINUTES)
@@ -752,7 +752,7 @@ public class RECIPES_Machines {
     }
 
     private static void zyngen() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(6),
                 CI.getTieredMachineHull(4),
@@ -770,19 +770,19 @@ public class RECIPES_Machines {
 
     private static void chemPlant() {
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             GregtechItemList.Casing_Machine_Custom_1.get(2L),
             CI.bits,
             new Object[] { "PhP", "PFP", "PwP", 'P', OrePrefixes.plate.get(Materials.Bronze), 'F',
                 OrePrefixes.frameGt.get(Materials.Bronze) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             GregtechItemList.Casing_Machine_Custom_2.get(2L),
             CI.bits,
             new Object[] { "PPP", "hFw", "PPP", 'P', OrePrefixes.plate.get(Materials.Aluminium), 'F',
                 OrePrefixes.frameGt.get(Materials.Aluminium) });
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedBioCircuit(19),
                 CI.getTieredGTPPMachineCasing(2, 4),
@@ -791,11 +791,11 @@ public class RECIPES_Machines {
                 CI.getTieredComponentOfMaterial(Materials.Plastic, OrePrefixes.pipeLarge, 4),
                 CI.getTieredComponent(OrePrefixes.frameGt, 2, 4))
             .itemOutputs(GregtechItemList.ChemicalPlant_Controller.get(1))
-            .fluidInputs(ALLOY.STEEL_BLACK.getFluidStack(2 * (144 * 4)))
+            .fluidInputs(MaterialsAlloy.STEEL_BLACK.getFluidStack(2 * (144 * 4)))
             .duration(2 * MINUTES)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedBioCircuit(15),
                 CI.getTieredGTPPMachineCasing(1, 2),
@@ -804,7 +804,7 @@ public class RECIPES_Machines {
                 CI.getTieredComponentOfMaterial(Materials.Lead, OrePrefixes.plate, 48),
                 CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16))
             .itemOutputs(GregtechItemList.Bus_Catalysts.get(1))
-            .fluidInputs(ALLOY.BRONZE.getFluidStack(2 * (144 * 4)))
+            .fluidInputs(MaterialsAlloy.BRONZE.getFluidStack(2 * (144 * 4)))
             .duration(60 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
@@ -814,14 +814,14 @@ public class RECIPES_Machines {
     private static void algaeFarm() {
 
         // Give the bad algae a use.
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 32))
             .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 4))
             .duration(15 * SECONDS)
             .eut(16)
             .addTo(distilleryRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedBioCircuit(21),
                 CI.getTieredGTPPMachineCasing(0, 4),
@@ -830,7 +830,7 @@ public class RECIPES_Machines {
                 CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.bolt, 16),
                 CI.getTieredComponentOfMaterial(Materials.Redstone, OrePrefixes.dust, 32))
             .itemOutputs(GregtechItemList.AlgaeFarm_Controller.get(1))
-            .fluidInputs(ALLOY.POTIN.getFluidStack(2 * (144 * 4)))
+            .fluidInputs(MaterialsAlloy.POTIN.getFluidStack(2 * (144 * 4)))
             .duration(60 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
@@ -838,7 +838,7 @@ public class RECIPES_Machines {
     }
 
     private static void distillus() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(19),
                 ItemList.Distillation_Tower.get(2),
@@ -846,10 +846,10 @@ public class RECIPES_Machines {
                 CI.getTieredComponent(OrePrefixes.circuit, 6, 8))
             .itemOutputs(GregtechItemList.Machine_Adv_DistillationTower.get(1))
             .fluidInputs(
-                ALLOY.AQUATIC_STEEL.getFluidStack(144 * 32),
-                ALLOY.BABBIT_ALLOY.getFluidStack(144 * 16),
-                ALLOY.BRONZE.getFluidStack(144 * 64),
-                ALLOY.KANTHAL.getFluidStack(144 * 16))
+                MaterialsAlloy.AQUATIC_STEEL.getFluidStack(144 * 32),
+                MaterialsAlloy.BABBIT_ALLOY.getFluidStack(144 * 16),
+                MaterialsAlloy.BRONZE.getFluidStack(144 * 64),
+                MaterialsAlloy.KANTHAL.getFluidStack(144 * 16))
             .duration(10 * MINUTES)
             .eut(TierEU.RECIPE_LuV)
             .metadata(CHEMPLANT_CASING_TIER, 5)
@@ -864,7 +864,7 @@ public class RECIPES_Machines {
             TierEU.RECIPE_IV };
 
         for (int tier = 1; tier < aOutputs.length + 1; tier++) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     CI.getNumberedBioCircuit(19),
                     CI.getElectricPump(tier, 2),
@@ -889,7 +889,7 @@ public class RECIPES_Machines {
         long[] voltageTiers = new long[] { 16, TierEU.RECIPE_LV, TierEU.RECIPE_MV, TierEU.RECIPE_HV, TierEU.RECIPE_EV,
             TierEU.RECIPE_IV, TierEU.RECIPE_LuV, TierEU.RECIPE_ZPM, TierEU.RECIPE_UV, TierEU.RECIPE_UHV };
         for (int i = 0; i < 10; i++) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     CI.getNumberedBioCircuit(20),
                     CI.getTieredMachineCasing(i),
@@ -928,7 +928,7 @@ public class RECIPES_Machines {
         IV_MACHINE_AlloySmelter = ItemList.Machine_IV_AlloySmelter.get(1);
         IV_MACHINE_Mixer = ItemList.Machine_IV_Mixer.get(1);
         EV_MACHINE_ChemicalBath = ItemList.Machine_EV_ChemicalBath.get(1);
-        if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCokeOven) {
             if (Railcraft.isModLoaded()) {
                 // Misc
                 INPUT_RCCokeOvenBlock = ItemUtils
@@ -940,41 +940,41 @@ public class RECIPES_Machines {
 
     private static void runModRecipes() {
         // Computer Cube
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(CI.getDataOrb(), 4 * (1)),
                 ItemList.Cover_Screen.get(4),
                 CI.machineHull_IV,
                 ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 2))
             .itemOutputs(GregtechItemList.Gregtech_Computer_Cube.get(1))
-            .fluidInputs(ELEMENT.getInstance().TANTALUM.getFluidStack(144 * 16))
+            .fluidInputs(MaterialsElements.getInstance().TANTALUM.getFluidStack(144 * 16))
             .duration(3 * MINUTES)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
         // Circuit programmer
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (1)),
                 ItemList.Cover_Controller.get(1, CI.electricMotor_MV),
                 CI.machineHull_MV,
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2))
+                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2),
+                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2))
             .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer))
-            .fluidInputs(ELEMENT.getInstance().IRON.getFluidStack(144 * 4))
+            .fluidInputs(MaterialsElements.getInstance().IRON.getFluidStack(144 * 4))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
         // Lead Lined Chest
         for (ItemStack plateRubber : OreDictionary.getOres("plateAnyRubber")) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     CI.machineHull_LV,
-                    GT_Utility.copyAmount(32, plateRubber),
+                    GTUtility.copyAmount(32, plateRubber),
                     ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 9),
                     ItemUtils.getSimpleStack(Blocks.chest))
                 .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockDecayablesChest))
-                .fluidInputs(ELEMENT.getInstance().LEAD.getFluidStack(144 * 16))
+                .fluidInputs(MaterialsElements.getInstance().LEAD.getFluidStack(144 * 16))
                 .duration(1 * MINUTES + 30 * SECONDS)
                 .eut(60)
                 .addTo(assemblerRecipes);
@@ -982,39 +982,39 @@ public class RECIPES_Machines {
         }
 
         // RTG
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemOutputs(GregtechItemList.RTG.get(1))
-            .fluidInputs(ALLOY.NIOBIUM_CARBIDE.getFluidStack(144 * 16))
+            .fluidInputs(MaterialsAlloy.NIOBIUM_CARBIDE.getFluidStack(144 * 16))
             .duration(10 * MINUTES)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
         // Super Jukebox
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.machineHull_LV,
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 4),
+                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 4),
                 ItemUtils.getItemStackOfAmountFromOreDict("plateTumbaga", 8),
                 ItemUtils.getSimpleStack(Blocks.jukebox))
             .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockCustomJukebox))
-            .fluidInputs(ELEMENT.getInstance().COPPER.getFluidStack(144 * 2))
+            .fluidInputs(MaterialsElements.getInstance().COPPER.getFluidStack(144 * 2))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
         // Poo Collector
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.machineHull_MV,
                 ItemList.FluidRegulator_MV.get(2),
                 CI.getTieredComponent(OrePrefixes.pipeMedium, 2, 2),
-                ALLOY.EGLIN_STEEL.getPlate(4),
-                ALLOY.POTIN.getScrew(6))
+                MaterialsAlloy.EGLIN_STEEL.getPlate(4),
+                MaterialsAlloy.POTIN.getScrew(6))
             .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockPooCollector))
-            .fluidInputs(ALLOY.TUMBAGA.getFluidStack(144 * 4))
+            .fluidInputs(MaterialsAlloy.TUMBAGA.getFluidStack(144 * 4))
             .duration(60 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
         // Adv. Poo Collector
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getTieredMachineHull(-1),
                 ItemUtils.getSimpleStack(ModBlocks.blockPooCollector),
@@ -1027,14 +1027,14 @@ public class RECIPES_Machines {
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        ItemStack aBronzeBricks = ItemUtils.simpleMetaStack(GregTech_API.sBlockCasings1, 10, 1);
+        ItemStack aBronzeBricks = ItemUtils.simpleMetaStack(GregTechAPI.sBlockCasings1, 10, 1);
         // Steam Macerator Multi
         RecipeUtils.addShapedGregtechRecipe(
             aBronzeBricks,
             "gemDiamond",
             aBronzeBricks,
             "craftingPiston",
-            ALLOY.TUMBAGA.getFrameBox(1),
+            MaterialsAlloy.TUMBAGA.getFrameBox(1),
             "craftingPiston",
             aBronzeBricks,
             "gemDiamond",
@@ -1047,7 +1047,7 @@ public class RECIPES_Machines {
             "plateWroughtIron",
             aBronzeBricks,
             "rotorTin",
-            ALLOY.TUMBAGA.getFrameBox(1),
+            MaterialsAlloy.TUMBAGA.getFrameBox(1),
             "rotorTin",
             aBronzeBricks,
             "plateWroughtIron",
@@ -1057,17 +1057,17 @@ public class RECIPES_Machines {
         // Steam Mixer Multi
         RecipeUtils.addShapedGregtechRecipe(
             aBronzeBricks,
-            ALLOY.TUMBAGA.getRing(1),
+            MaterialsAlloy.TUMBAGA.getRing(1),
             aBronzeBricks,
-            ALLOY.TUMBAGA.getRotor(1),
-            ALLOY.TUMBAGA.getFrameBox(1),
-            ALLOY.TUMBAGA.getRotor(1),
+            MaterialsAlloy.TUMBAGA.getRotor(1),
+            MaterialsAlloy.TUMBAGA.getFrameBox(1),
+            MaterialsAlloy.TUMBAGA.getRotor(1),
             aBronzeBricks,
-            ALLOY.TUMBAGA.getRing(1),
+            MaterialsAlloy.TUMBAGA.getRing(1),
             aBronzeBricks,
             GregtechItemList.Controller_SteamMixerMulti.get(1));
 
-        ItemStack aWoodenCasing = ItemUtils.simpleMetaStack(GregTech_API.sBlockCasings9, 2, 1);
+        ItemStack aWoodenCasing = ItemUtils.simpleMetaStack(GregTechAPI.sBlockCasings9, 2, 1);
         // WaterPump
         RecipeUtils.addShapedGregtechRecipe(
             "frameGtBronze",
@@ -1087,7 +1087,7 @@ public class RECIPES_Machines {
             "plateWroughtIron",
             aBronzeBricks,
             "gearBronze",
-            ALLOY.TUMBAGA.getFrameBox(1),
+            MaterialsAlloy.TUMBAGA.getFrameBox(1),
             "gearBronze",
             aBronzeBricks,
             "plateWroughtIron",
@@ -1103,7 +1103,7 @@ public class RECIPES_Machines {
             Blocks.anvil,
             "plateWroughtIron",
             aBronzeBricks,
-            ALLOY.TUMBAGA.getFrameBox(1),
+            MaterialsAlloy.TUMBAGA.getFrameBox(1),
             aBronzeBricks,
             GregtechItemList.Controller_SteamForgeHammerMulti.get(1));
 
@@ -1112,9 +1112,9 @@ public class RECIPES_Machines {
             aBronzeBricks,
             "craftingPiston",
             aBronzeBricks,
-            ALLOY.TUMBAGA.getGear(1),
-            ALLOY.TUMBAGA.getFrameBox(1),
-            ALLOY.TUMBAGA.getGear(1),
+            MaterialsAlloy.TUMBAGA.getGear(1),
+            MaterialsAlloy.TUMBAGA.getFrameBox(1),
+            MaterialsAlloy.TUMBAGA.getGear(1),
             aBronzeBricks,
             "craftingPiston",
             aBronzeBricks,
@@ -1126,7 +1126,7 @@ public class RECIPES_Machines {
             "pipeMediumBronze",
             "plateBronze",
             "plateBronze",
-            GregtechItemList.GT_FluidTank_ULV.get(1),
+            GregtechItemList.GTFluidTank_ULV.get(1),
             "plateBronze",
             "plateBronze",
             "pipeMediumBronze",
@@ -1136,13 +1136,13 @@ public class RECIPES_Machines {
         // Steam Input Bus
         RecipeUtils.addShapedGregtechRecipe(
             "plateBronze",
-            ALLOY.TUMBAGA.getPlate(1),
+            MaterialsAlloy.TUMBAGA.getPlate(1),
             "plateBronze",
             "plateTin",
             ItemUtils.getSimpleStack(Blocks.hopper),
             "plateTin",
             "plateBronze",
-            ALLOY.TUMBAGA.getPlate(1),
+            MaterialsAlloy.TUMBAGA.getPlate(1),
             "plateBronze",
             GregtechItemList.Hatch_Input_Bus_Steam.get(1));
 
@@ -1151,16 +1151,16 @@ public class RECIPES_Machines {
             "plateBronze",
             "plateTin",
             "plateBronze",
-            ALLOY.TUMBAGA.getPlate(1),
+            MaterialsAlloy.TUMBAGA.getPlate(1),
             ItemUtils.getSimpleStack(Blocks.hopper),
-            ALLOY.TUMBAGA.getPlate(1),
+            MaterialsAlloy.TUMBAGA.getPlate(1),
             "plateBronze",
             "plateTin",
             "plateBronze",
             GregtechItemList.Hatch_Output_Bus_Steam.get(1));
 
         // Flask Configurator
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(8),
                 CI.getTieredMachineHull(2),
@@ -1174,7 +1174,7 @@ public class RECIPES_Machines {
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        if (CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) {
             // Industrial Centrifuge
             RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1);
             RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1);
@@ -1204,12 +1204,12 @@ public class RECIPES_Machines {
                 CI.component_Plate[6],
                 RECIPE_IndustrialCentrifugeCasing);
 
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    ALLOY.MARAGING250.getPlate(4),
-                    ALLOY.INCONEL_792.getPlate(2),
-                    ALLOY.TUMBAGA.getRod(3),
-                    GT_Utility.getIntegratedCircuit(1))
+                    MaterialsAlloy.MARAGING250.getPlate(4),
+                    MaterialsAlloy.INCONEL_792.getPlate(2),
+                    MaterialsAlloy.TUMBAGA.getRod(3),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(RECIPE_IndustrialCentrifugeCasing)
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -1217,7 +1217,7 @@ public class RECIPES_Machines {
 
         }
 
-        if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCokeOven) {
             // Industrial Coke Oven
             RECIPE_IndustrialCokeOvenController = GregtechItemList.Industrial_CokeOven.get(1);
             RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(1);
@@ -1250,12 +1250,12 @@ public class RECIPES_Machines {
                 CI.component_Rod[7],
                 CI.component_Plate[7],
                 RECIPE_IndustrialCokeOvenFrame);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    ALLOY.TANTALLOY_61.getPlate(4),
-                    ALLOY.TANTALLOY_61.getRod(4),
-                    ALLOY.TANTALLOY_61.getFrameBox(1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    MaterialsAlloy.TANTALLOY_61.getPlate(4),
+                    MaterialsAlloy.TANTALLOY_61.getRod(4),
+                    MaterialsAlloy.TANTALLOY_61.getFrameBox(1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(RECIPE_IndustrialCokeOvenFrame)
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -1287,7 +1287,7 @@ public class RECIPES_Machines {
                 RECIPE_IndustrialCokeOvenCasingB);
         }
 
-        if (CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) {
             // Industrial Electrolyzer
             RECIPE_IndustrialElectrolyzerController = GregtechItemList.Industrial_Electrolyzer.get(1);
             RECIPE_IndustrialElectrolyzerFrame = GregtechItemList.Casing_Electrolyzer.get(1);
@@ -1304,13 +1304,13 @@ public class RECIPES_Machines {
                 "stickLongPotin",
                 "platePotin",
                 RECIPE_IndustrialElectrolyzerFrame);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    ALLOY.POTIN.getPlate(4),
-                    ALLOY.POTIN.getLongRod(3),
-                    GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Chrome, 1),
-                    ALLOY.POTIN.getFrameBox(1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    MaterialsAlloy.POTIN.getPlate(4),
+                    MaterialsAlloy.POTIN.getLongRod(3),
+                    GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Chrome, 1),
+                    MaterialsAlloy.POTIN.getFrameBox(1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(RECIPE_IndustrialElectrolyzerFrame)
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -1330,7 +1330,7 @@ public class RECIPES_Machines {
                 RECIPE_IndustrialElectrolyzerController);
         }
 
-        if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialPlatePress) {
             // Industrial Material Press
             RECIPE_IndustrialMaterialPressController = GregtechItemList.Industrial_PlatePress.get(1);
             RECIPE_IndustrialMaterialPressFrame = GregtechItemList.Casing_MaterialPress.get(1);
@@ -1347,13 +1347,13 @@ public class RECIPES_Machines {
                 "stickLongTumbaga",
                 "plateTitanium",
                 RECIPE_IndustrialMaterialPressFrame);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4),
-                    ALLOY.TANTALLOY_60.getRod(2),
-                    ALLOY.TUMBAGA.getLongRod(2),
-                    ALLOY.TUMBAGA.getFrameBox(1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4),
+                    MaterialsAlloy.TANTALLOY_60.getRod(2),
+                    MaterialsAlloy.TUMBAGA.getLongRod(2),
+                    MaterialsAlloy.TUMBAGA.getFrameBox(1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(RECIPE_IndustrialMaterialPressFrame)
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -1373,7 +1373,7 @@ public class RECIPES_Machines {
                 RECIPE_IndustrialMaterialPressController);
         }
 
-        if (CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) {
             // Industrial Maceration Stack
             RECIPE_IndustrialMacerationStackController = GregtechItemList.Industrial_MacerationStack.get(1);
             RECIPE_IndustrialMacerationStackFrame = GregtechItemList.Casing_MacerationStack.get(1);
@@ -1390,13 +1390,13 @@ public class RECIPES_Machines {
                 "stickLongPalladium",
                 "platePalladium",
                 RECIPE_IndustrialMacerationStackFrame);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 5),
-                    GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Platinum, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Palladium, 1),
-                    ALLOY.INCONEL_625.getFrameBox(1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 5),
+                    GTOreDictUnificator.get(OrePrefixes.stick, Materials.Platinum, 2),
+                    GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Palladium, 1),
+                    MaterialsAlloy.INCONEL_625.getFrameBox(1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(RECIPE_IndustrialMacerationStackFrame)
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -1428,7 +1428,7 @@ public class RECIPES_Machines {
                 GregtechItemList.Maceration_Upgrade_Chip.get(1));
         }
 
-        if (CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialWireMill) {
             // Industrial Wire Factory
             RECIPE_IndustrialWireFactoryController = GregtechItemList.Industrial_WireFactory.get(1);
             RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(1);
@@ -1445,12 +1445,12 @@ public class RECIPES_Machines {
                 "stickBlueSteel",
                 "plateBlueSteel",
                 RECIPE_IndustrialWireFactoryFrame);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 4),
+                    GTOreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4),
+                    GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(RECIPE_IndustrialWireFactoryFrame)
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -1471,7 +1471,7 @@ public class RECIPES_Machines {
         }
 
         // Tiered Tanks
-        if (CORE.ConfigSwitches.enableMachine_FluidTanks) {
+        if (GTPPCore.ConfigSwitches.enableMachine_FluidTanks) {
             CI.component_Plate[1] = "plateTin";
             pipeTier1 = "pipeLargeClay";
             CI.circuitTier1 = ItemList.Circuit_Primitive.get(1);
@@ -1488,8 +1488,8 @@ public class RECIPES_Machines {
             ItemStack waterBucket = ItemUtils.getSimpleStack(Items.water_bucket);
 
             // Allows clearing stored fluids.
-            GregtechItemList[] aTanks = new GregtechItemList[] { GregtechItemList.GT_FluidTank_ULV,
-                GregtechItemList.GT_FluidTank_LV, GregtechItemList.GT_FluidTank_MV, GregtechItemList.GT_FluidTank_HV };
+            GregtechItemList[] aTanks = new GregtechItemList[] { GregtechItemList.GTFluidTank_ULV,
+                GregtechItemList.GTFluidTank_LV, GregtechItemList.GTFluidTank_MV, GregtechItemList.GTFluidTank_HV };
             for (GregtechItemList aTank : aTanks) {
                 RecipeUtils.addShapelessGregtechRecipe(new Object[] { aTank.get(1) }, aTank.get(1));
             }
@@ -1504,7 +1504,7 @@ public class RECIPES_Machines {
                 CI.component_Plate[4],
                 waterBucket,
                 CI.component_Plate[4],
-                GregtechItemList.GT_FluidTank_ULV.get(1));
+                GregtechItemList.GTFluidTank_ULV.get(1));
             RecipeUtils.addShapedGregtechRecipe(
                 CI.component_Plate[5],
                 CI.component_Plate[4],
@@ -1515,7 +1515,7 @@ public class RECIPES_Machines {
                 CI.component_Plate[3],
                 CI.electricPump_LV,
                 CI.component_Plate[3],
-                GregtechItemList.GT_FluidTank_LV.get(1));
+                GregtechItemList.GTFluidTank_LV.get(1));
             RecipeUtils.addShapedGregtechRecipe(
                 CI.component_Plate[8],
                 CI.component_Plate[3],
@@ -1526,7 +1526,7 @@ public class RECIPES_Machines {
                 CI.component_Plate[5],
                 CI.electricPump_LV,
                 CI.component_Plate[5],
-                GregtechItemList.GT_FluidTank_MV.get(1));
+                GregtechItemList.GTFluidTank_MV.get(1));
             RecipeUtils.addShapedGregtechRecipe(
                 CI.circuitTier1,
                 CI.component_Plate[7],
@@ -1537,10 +1537,10 @@ public class RECIPES_Machines {
                 CI.circuitTier1,
                 CI.electricPump_MV,
                 CI.circuitTier1,
-                GregtechItemList.GT_FluidTank_HV.get(1));
+                GregtechItemList.GTFluidTank_HV.get(1));
         }
 
-        if (CORE.ConfigSwitches.enableMultiblock_MultiTank) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_MultiTank) {
             // Industrial Multi Tank
             // RECIPE_IndustrialMultiTankController = GregtechItemList.Industrial_MultiTank.get(1);
             RECIPE_IndustrialMultiTankFrame = GregtechItemList.Casing_MultitankExterior.get(1);
@@ -1574,14 +1574,14 @@ public class RECIPES_Machines {
 
         // Semi-Fluid Generators
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedBioCircuit(14),
                 CI.getTieredMachineHull(1, 1),
                 CI.getElectricMotor(1, 2),
                 CI.getElectricPiston(1, 2),
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Cobalt, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Cobalt, 1L),
+                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1L),
                 CI.getGear(1, 2))
             .itemOutputs(GregtechItemList.Generator_SemiFluid_LV.get(1))
             .fluidInputs(Materials.Plastic.getMolten(144))
@@ -1589,14 +1589,14 @@ public class RECIPES_Machines {
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedBioCircuit(14),
                 CI.getTieredMachineHull(2, 1),
                 CI.getElectricMotor(2, 2),
                 CI.getElectricPiston(2, 2),
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 1L),
+                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L),
                 CI.getGear(2, 2))
             .itemOutputs(GregtechItemList.Generator_SemiFluid_MV.get(1))
             .fluidInputs(Materials.Plastic.getMolten(144))
@@ -1604,29 +1604,29 @@ public class RECIPES_Machines {
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedBioCircuit(14),
                 CI.getTieredMachineHull(3, 1),
                 CI.getElectricMotor(3, 2),
                 CI.getElectricPiston(3, 2),
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Chrome, 2))
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 1L),
+                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
+                GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Chrome, 2))
             .itemOutputs(GregtechItemList.Generator_SemiFluid_HV.get(1))
             .fluidInputs(Materials.Plastic.getMolten(144))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedBioCircuit(14),
                 CI.getTieredMachineHull(4, 1),
                 CI.getElectricMotor(4, 2),
                 CI.getElectricPiston(4, 2),
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Titanium, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Titanium, 1L),
+                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
                 CI.getGear(4, 2))
             .itemOutputs(GregtechItemList.Generator_SemiFluid_EV.get(1))
             .fluidInputs(Materials.Plastic.getMolten(144))
@@ -1634,14 +1634,14 @@ public class RECIPES_Machines {
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedBioCircuit(14),
                 CI.getTieredMachineHull(5, 1),
                 CI.getElectricMotor(5, 2),
                 CI.getElectricPiston(5, 2),
-                GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 1L),
+                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L),
                 CI.getGear(5, 2))
             .itemOutputs(GregtechItemList.Generator_SemiFluid_IV.get(1))
             .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(144))
@@ -1649,39 +1649,39 @@ public class RECIPES_Machines {
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             GregtechItemList.Generator_SemiFluid_LV.get(1L),
             CI.bits,
             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.Cobalt), 'G', ALLOY.TUMBAGA.getGear(2) });
-        GT_ModHandler.addCraftingRecipe(
+                OrePrefixes.cableGt01.get(Materials.Cobalt), 'G', MaterialsAlloy.TUMBAGA.getGear(2) });
+        GTModHandler.addCraftingRecipe(
             GregtechItemList.Generator_SemiFluid_MV.get(1L),
             CI.bits,
             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.AnnealedCopper), 'G', ALLOY.EGLIN_STEEL.getGear(2) });
-        GT_ModHandler.addCraftingRecipe(
+                OrePrefixes.cableGt01.get(Materials.AnnealedCopper), 'G', MaterialsAlloy.EGLIN_STEEL.getGear(2) });
+        GTModHandler.addCraftingRecipe(
             GregtechItemList.Generator_SemiFluid_HV.get(1L),
             CI.bits,
             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',
-                GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Chrome, 1) });
-        GT_ModHandler.addCraftingRecipe(
+                GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Chrome, 1) });
+        GTModHandler.addCraftingRecipe(
             GregtechItemList.Generator_SemiFluid_EV.get(1L),
             CI.bits,
             new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E',
                 ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.EV), 'W',
-                OrePrefixes.cableGt01.get(Materials.Titanium), 'G', ALLOY.INCOLOY_DS.getGear(1) });
-        GT_ModHandler.addCraftingRecipe(
+                OrePrefixes.cableGt01.get(Materials.Titanium), 'G', MaterialsAlloy.INCOLOY_DS.getGear(1) });
+        GTModHandler.addCraftingRecipe(
             GregtechItemList.Generator_SemiFluid_IV.get(1L),
             CI.bits,
             new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Piston_IV, 'E',
                 ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.IV), 'W',
-                OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', ALLOY.NITINOL_60.getGear(1) });
+                OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', MaterialsAlloy.NITINOL_60.getGear(1) });
 
-        if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) {
             // Industrial Blast Smelter
             RECIPE_IndustrialBlastSmelterController = GregtechItemList.Industrial_AlloyBlastSmelter.get(1);
             RECIPE_IndustrialBlastSmelterFrame = GregtechItemList.Casing_BlastSmelter.get(1);
@@ -1711,11 +1711,11 @@ public class RECIPES_Machines {
                 CI.craftingToolWrench,
                 "plateZirconiumCarbide",
                 RECIPE_IndustrialBlastSmelterFrame);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    ALLOY.ZIRCONIUM_CARBIDE.getPlate(6),
-                    ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    MaterialsAlloy.ZIRCONIUM_CARBIDE.getPlate(6),
+                    MaterialsAlloy.ZIRCONIUM_CARBIDE.getFrameBox(1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(RECIPE_IndustrialBlastSmelterFrame)
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -1733,12 +1733,12 @@ public class RECIPES_Machines {
                 "plateStaballoy",
                 "plateStaballoy",
                 RECIPE_IndustrialBlastSmelterCoil);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    ALLOY.STABALLOY.getPlate(6),
-                    ALLOY.STABALLOY.getFrameBox(2),
+                    MaterialsAlloy.STABALLOY.getPlate(6),
+                    MaterialsAlloy.STABALLOY.getFrameBox(2),
                     CI.gearboxCasing_Tier_3,
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(RECIPE_IndustrialBlastSmelterCoil)
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -1746,35 +1746,35 @@ public class RECIPES_Machines {
 
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Casing_Coil_Infinity.get(1),
                 ItemList.Reactor_Coolant_Sp_6.get(4),
-                ALLOY.LAURENIUM.getPlateDouble(2),
+                MaterialsAlloy.LAURENIUM.getPlateDouble(2),
                 CustomItemList.eM_Coil.get(1))
             .itemOutputs(GregtechItemList.Casing_Coil_QuantumForceTransformer.get(1))
-            .fluidInputs(ALLOY.QUANTUM.getFluidStack(144 * 4))
+            .fluidInputs(MaterialsAlloy.QUANTUM.getFluidStack(144 * 4))
             .duration(1 * MINUTES + 30 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
 
-        TT_recipeAdder.addResearchableAssemblylineRecipe(
+        TTRecipeAdder.addResearchableAssemblylineRecipe(
             GregtechItemList.Casing_Coil_QuantumForceTransformer.get(1),
             2048 * 120 * 20,
             2048,
-            (int) GT_Values.VP[11],
+            (int) GTValues.VP[11],
             16,
             new Object[] { GregtechItemList.Controller_MolecularTransformer.get(1),
-                GT_ModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1),
+                GTModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1),
                 new Object[] { OrePrefixes.circuit.get(Materials.UEV), 8 }, ItemList.Electric_Pump_UEV.get(4),
                 ItemList.Field_Generator_UEV.get(4), GregtechItemList.Laser_Lens_Special.get(1) },
-            new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10),
-                ALLOY.PIKYONIUM.getFluidStack(144 * 32) },
+            new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10),
+                MaterialsAlloy.PIKYONIUM.getFluidStack(144 * 32) },
             GregtechItemList.QuantumForceTransformer.get(1),
             1200 * 20,
-            (int) GT_Values.VP[11]);
+            (int) GTValues.VP[11]);
 
-        if (CORE.ConfigSwitches.enableMultiblock_MatterFabricator) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_MatterFabricator) {
             // Industrial Matter Fabricator
             RECIPE_IndustrialMatterFabController = GregtechItemList.Industrial_MassFab.get(1);
             RECIPE_IndustrialMatterFabFrame = GregtechItemList.Casing_MatterFab.get(1);
@@ -1785,9 +1785,9 @@ public class RECIPES_Machines {
                 CI.getPlate(8, 1),
                 CI.circuitTier8,
                 CI.getPlate(8, 1),
-                GT_OreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L),
+                GTOreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L),
                 CI.machineCasing_UV,
-                GT_OreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L),
+                GTOreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L),
                 CI.getPlate(8, 1),
                 CI.circuitTier8,
                 CI.getPlate(8, 1),
@@ -1804,7 +1804,7 @@ public class RECIPES_Machines {
                 CI.component_Rod[8],
                 "plateNiobiumCarbide",
                 RECIPE_IndustrialMatterFabFrame);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemOutputs(RECIPE_IndustrialMatterFabFrame)
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -1822,13 +1822,13 @@ public class RECIPES_Machines {
                 CI.getPlate(7, 1),
                 CI.getPlate(6, 1),
                 RECIPE_IndustrialMatterFabCoil);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     CI.machineCasing_UV,
-                    ALLOY.ZERON_100.getPlate(4),
-                    ALLOY.PIKYONIUM.getPlate(2),
-                    ALLOY.STELLITE.getFrameBox(2),
-                    GT_Utility.getIntegratedCircuit(1))
+                    MaterialsAlloy.ZERON_100.getPlate(4),
+                    MaterialsAlloy.PIKYONIUM.getPlate(2),
+                    MaterialsAlloy.STELLITE.getFrameBox(2),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(RECIPE_IndustrialMatterFabCoil)
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -1836,7 +1836,7 @@ public class RECIPES_Machines {
 
         }
 
-        if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialSifter) {
             // Industrial Sieve
             RECIPE_IndustrialSieveController = GregtechItemList.Industrial_Sifter.get(1);
             RECIPE_IndustrialSieveFrame = GregtechItemList.Casing_Sifter.get(1);
@@ -1866,11 +1866,11 @@ public class RECIPES_Machines {
                 "plateEglinSteel",
                 "plateEglinSteel",
                 RECIPE_IndustrialSieveFrame);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    ALLOY.EGLIN_STEEL.getPlate(8),
-                    ALLOY.TUMBAGA.getFrameBox(1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    MaterialsAlloy.EGLIN_STEEL.getPlate(8),
+                    MaterialsAlloy.TUMBAGA.getFrameBox(1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(RECIPE_IndustrialSieveFrame)
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -1888,11 +1888,11 @@ public class RECIPES_Machines {
                 "wireFineSteel",
                 "frameGtEglinSteel",
                 RECIPE_IndustrialSieveGrate);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 5),
-                    ALLOY.EGLIN_STEEL.getFrameBox(4),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 5),
+                    MaterialsAlloy.EGLIN_STEEL.getFrameBox(4),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(RECIPE_IndustrialSieveGrate)
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -1900,40 +1900,40 @@ public class RECIPES_Machines {
 
         }
 
-        if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_TreeFarmer) {
             // Industrial Tree Farmer
             RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1);
             RECIPE_TreeFarmFrame = GregtechItemList.Casing_PLACEHOLDER_TreeFarmer.get(1);
             // Industrial Tree Farm Controller
             RecipeUtils.addShapedGregtechRecipe(
                 ItemList.Field_Generator_IV.get(1),
-                ALLOY.INCOLOY_MA956.getRotor(1),
+                MaterialsAlloy.INCOLOY_MA956.getRotor(1),
                 ItemList.Field_Generator_IV.get(1),
-                ALLOY.NITINOL_60.getPlate(1),
+                MaterialsAlloy.NITINOL_60.getPlate(1),
                 GregtechItemList.GTPP_Casing_IV.get(1),
-                ALLOY.NITINOL_60.getPlate(1),
+                MaterialsAlloy.NITINOL_60.getPlate(1),
                 ItemList.Field_Generator_IV.get(1),
-                ALLOY.INCONEL_792.getComponentByPrefix(OrePrefixes.pipeMedium, 1),
+                MaterialsAlloy.INCONEL_792.getComponentByPrefix(OrePrefixes.pipeMedium, 1),
                 ItemList.Field_Generator_IV.get(1),
                 RECIPE_TreeFarmController);
             // Industrial Tree Farm Frame
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(2),
-                    ALLOY.TUMBAGA.getFrameBox(1),
+                    GTUtility.getIntegratedCircuit(2),
+                    MaterialsAlloy.TUMBAGA.getFrameBox(1),
                     ItemUtils.getItemStackOfAmountFromOreDict("pipeTinySteel", 1),
                     ItemList.MV_Coil.get(1),
                     ItemList.IC2_Plantball.get(4),
-                    GT_OreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 8))
+                    GTOreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 8))
                 .itemOutputs(RECIPE_TreeFarmFrame)
-                .fluidInputs(GT_ModHandler.getDistilledWater(2000))
+                .fluidInputs(GTModHandler.getDistilledWater(2000))
                 .duration(10 * SECONDS)
                 .eut(64)
                 .addTo(assemblerRecipes);
 
         }
 
-        if (CORE.ConfigSwitches.enableMachine_Tesseracts) {
+        if (GTPPCore.ConfigSwitches.enableMachine_Tesseracts) {
             // Tesseracts
             RECIPE_TesseractGenerator = GregtechItemList.GT4_Tesseract_Generator.get(1);
             RECIPE_TesseractTerminal = GregtechItemList.GT4_Tesseract_Terminal.get(1);
@@ -1963,7 +1963,7 @@ public class RECIPES_Machines {
                 RECIPE_TesseractTerminal);
         }
 
-        if (CORE.ConfigSwitches.enableMachine_SimpleWasher) {
+        if (GTPPCore.ConfigSwitches.enableMachine_SimpleWasher) {
             final List<ItemStack> washers = ImmutableList.of(
                 GregtechItemList.SimpleDustWasher_LV.get(1),
                 GregtechItemList.SimpleDustWasher_MV.get(1),
@@ -1976,7 +1976,7 @@ public class RECIPES_Machines {
 
             for (int i = 0; i < washers.size(); i++) {
                 final int tier = i + 1;
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(
                         CI.getTieredMachineHull(tier),
                         CI.getTieredComponent(OrePrefixes.screw, tier, tier * 4),
@@ -1986,13 +1986,13 @@ public class RECIPES_Machines {
                     .itemOutputs(washers.get(i))
                     .fluidInputs(CI.getTieredFluid(tier, 144 * tier))
                     .duration(20 * 5 * tier)
-                    .eut(GT_Values.VP[tier])
+                    .eut(GTValues.VP[tier])
                     .addTo(assemblerRecipes);
 
             }
         }
 
-        if (CORE.ConfigSwitches.enableMachine_Pollution && PollutionUtils.isPollutionEnabled()) {
+        if (GTPPCore.ConfigSwitches.enableMachine_Pollution && PollutionUtils.isPollutionEnabled()) {
 
             RecipeUtils.addShapedGregtechRecipe(
                 "plateCarbon",
@@ -2141,7 +2141,7 @@ public class RECIPES_Machines {
                 GregtechItemList.Pollution_Cleaner_MAX.get(1));
         }
 
-        if (CORE.ConfigSwitches.enableMultiblock_ThermalBoiler) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_ThermalBoiler) {
             RECIPE_ThermalBoilerController = GregtechItemList.GT4_Thermal_Boiler.get(1);
             RECIPE_ThermalBoilerCasing = GregtechItemList.Casing_ThermalContainment.get(2);
             ItemStack centrifugeEV = ItemList.Machine_EV_Centrifuge.get(1);
@@ -2171,21 +2171,21 @@ public class RECIPES_Machines {
                 RECIPE_ThermalBoilerController);
 
             RecipeUtils.addShapedGregtechRecipe(
-                ALLOY.MARAGING350.getPlate(1),
+                MaterialsAlloy.MARAGING350.getPlate(1),
                 "plateStainlessSteel",
-                ALLOY.MARAGING350.getPlate(1),
+                MaterialsAlloy.MARAGING350.getPlate(1),
                 "circuitAdvanced",
                 CI.machineCasing_HV,
                 "circuitAdvanced",
-                ALLOY.MARAGING350.getPlate(1),
-                ALLOY.MARAGING350.getPlate(1),
-                ALLOY.MARAGING350.getPlate(1),
+                MaterialsAlloy.MARAGING350.getPlate(1),
+                MaterialsAlloy.MARAGING350.getPlate(1),
+                MaterialsAlloy.MARAGING350.getPlate(1),
                 RECIPE_ThermalBoilerCasing);
 
             // Lava Filter Recipe
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(18),
+                    GTUtility.getIntegratedCircuit(18),
                     ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 32),
                     ItemUtils.getItemStackOfAmountFromOreDict("wireFineSteel", 32),
                     ItemUtils.getItemStackOfAmountFromOreDict("ringTumbaga", 16),
@@ -2224,7 +2224,7 @@ public class RECIPES_Machines {
             CI.getTieredCircuit(7),
             GregtechItemList.Hatch_Air_Intake_Extreme.get(1));
 
-        if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) {
 
             // Thorium Reactor
             RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1);
@@ -2269,7 +2269,7 @@ public class RECIPES_Machines {
                 RECIPE_LFTROuterCasing);
 
             // LFTR Control Circuit
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1),
                     CI.fieldGenerator_HV)
@@ -2334,7 +2334,7 @@ public class RECIPES_Machines {
 
             RecipeUtils.addShapedGregtechRecipe(
                 CI.getPlate(5, 1),
-                ALLOY.HASTELLOY_X.getPlateDouble(1),
+                MaterialsAlloy.HASTELLOY_X.getPlateDouble(1),
                 CI.getPlate(5, 1),
                 CI.getPlate(5, 1),
                 CI.getTieredMachineCasing(5),
@@ -2345,7 +2345,7 @@ public class RECIPES_Machines {
                 GregtechItemList.ColdTrap_IV.get(1));
             RecipeUtils.addShapedGregtechRecipe(
                 CI.getPlate(7, 1),
-                ALLOY.HS188A.getPlateDouble(1),
+                MaterialsAlloy.HS188A.getPlateDouble(1),
                 CI.getPlate(7, 1),
                 CI.getPlate(7, 1),
                 GregtechItemList.ColdTrap_IV.get(1),
@@ -2359,22 +2359,22 @@ public class RECIPES_Machines {
                 CI.getFieldGenerator(3, 1),
                 CI.getRobotArm(5, 1),
                 CI.getPlate(5, 1),
-                ALLOY.HASTELLOY_N.getPlateDouble(1),
+                MaterialsAlloy.HASTELLOY_N.getPlateDouble(1),
                 ItemList.Machine_IV_ChemicalReactor.get(1),
-                ALLOY.HASTELLOY_N.getPlateDouble(1),
+                MaterialsAlloy.HASTELLOY_N.getPlateDouble(1),
                 CI.getPlate(5, 1),
-                ALLOY.HASTELLOY_N.getPlateDouble(1),
+                MaterialsAlloy.HASTELLOY_N.getPlateDouble(1),
                 CI.getFieldGenerator(3, 1),
                 GregtechItemList.ReactorProcessingUnit_IV.get(1));
             RecipeUtils.addShapedGregtechRecipe(
                 CI.getFieldGenerator(5, 1),
                 CI.getRobotArm(7, 1),
                 CI.getPlate(7, 1),
-                ALLOY.HS188A.getPlateDouble(1),
+                MaterialsAlloy.HS188A.getPlateDouble(1),
                 GregtechItemList.ReactorProcessingUnit_IV.get(1),
-                ALLOY.HS188A.getPlateDouble(1),
+                MaterialsAlloy.HS188A.getPlateDouble(1),
                 CI.getPlate(7, 1),
-                ALLOY.HS188A.getPlateDouble(1),
+                MaterialsAlloy.HS188A.getPlateDouble(1),
                 CI.getFieldGenerator(5, 1),
                 GregtechItemList.ReactorProcessingUnit_ZPM.get(1));
 
@@ -2395,52 +2395,52 @@ public class RECIPES_Machines {
         }
 
         // Cyclotron
-        if (CORE.ConfigSwitches.enableMultiblock_Cyclotron) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_Cyclotron) {
             RECIPE_CyclotronController = GregtechItemList.COMET_Cyclotron.get(1);
             RECIPE_CyclotronOuterCasing = GregtechItemList.Casing_Cyclotron_External.get(1);
             RECIPE_CyclotronInnerCoil = GregtechItemList.Casing_Cyclotron_Coil.get(1);
 
             // Outer Casing
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Casing_FrostProof.get(1),
                     ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, 4),
-                    ALLOY.INCOLOY_DS.getPlate(8),
-                    ALLOY.INCONEL_690.getScrew(16),
-                    ALLOY.EGLIN_STEEL.getLongRod(4),
+                    MaterialsAlloy.INCOLOY_DS.getPlate(8),
+                    MaterialsAlloy.INCONEL_690.getScrew(16),
+                    MaterialsAlloy.EGLIN_STEEL.getLongRod(4),
                     CI.getElectricPiston(3, 2))
                 .itemOutputs(RECIPE_CyclotronOuterCasing)
-                .fluidInputs(ALLOY.ZIRCONIUM_CARBIDE.getFluidStack(144 * 8) // Input Flui
+                .fluidInputs(MaterialsAlloy.ZIRCONIUM_CARBIDE.getFluidStack(144 * 8) // Input Flui
                 )
                 .duration(60 * SECONDS)
                 .eut(TierEU.RECIPE_EV)
                 .addTo(assemblerRecipes);
             // Inner Coil
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Casing_Coil_Nichrome.get(1),
                     ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, 8),
-                    ALLOY.INCOLOY_MA956.getPlate(8),
-                    ALLOY.TANTALLOY_61.getBolt(16),
-                    ALLOY.INCOLOY_020.getScrew(32),
+                    MaterialsAlloy.INCOLOY_MA956.getPlate(8),
+                    MaterialsAlloy.TANTALLOY_61.getBolt(16),
+                    MaterialsAlloy.INCOLOY_020.getScrew(32),
                     CI.getFieldGenerator(4, 1))
                 .itemOutputs(RECIPE_CyclotronInnerCoil)
-                .fluidInputs(ALLOY.HG1223.getFluidStack(144 * 5) // Input Flui
+                .fluidInputs(MaterialsAlloy.HG1223.getFluidStack(144 * 5) // Input Flui
                 )
                 .duration(2 * MINUTES)
                 .eut(TierEU.RECIPE_IV)
                 .addTo(assemblerRecipes);
             // Controller
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     CI.machineHull_IV,
                     ItemUtils.getSimpleStack(RECIPE_CyclotronInnerCoil, 2),
-                    ALLOY.INCOLOY_020.getPlate(8),
-                    ALLOY.TANTALLOY_61.getGear(2),
-                    ALLOY.INCOLOY_MA956.getScrew(16),
+                    MaterialsAlloy.INCOLOY_020.getPlate(8),
+                    MaterialsAlloy.TANTALLOY_61.getGear(2),
+                    MaterialsAlloy.INCOLOY_MA956.getScrew(16),
                     ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 16))
                 .itemOutputs(RECIPE_CyclotronController)
-                .fluidInputs(ALLOY.INCOLOY_020.getFluidStack(144 * 9) // Input Flui
+                .fluidInputs(MaterialsAlloy.INCOLOY_020.getFluidStack(144 * 9) // Input Flui
                 )
                 .duration(5 * MINUTES)
                 .eut(TierEU.RECIPE_IV)
@@ -2449,14 +2449,14 @@ public class RECIPES_Machines {
         }
 
         // Mazut
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             GregtechItemList.Controller_LargeSemifluidGenerator.get(1L),
             CI.bitsd,
             new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E',
                 ItemList.Electric_Pump_EV, 'C', OrePrefixes.circuit.get(Materials.EV), 'W',
-                OrePrefixes.cableGt08.get(Materials.Electrum), 'G', ALLOY.INCONEL_792.getGear(1) });
+                OrePrefixes.cableGt08.get(Materials.Electrum), 'G', MaterialsAlloy.INCONEL_792.getGear(1) });
 
-        if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_PowerSubstation) {
             RecipeUtils.addShapedRecipe(
                 "screwTitanium",
                 "plateIncoloy020",
@@ -2484,7 +2484,7 @@ public class RECIPES_Machines {
                 GregtechItemList.PowerSubStation.get(1));
         }
 
-        if (CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) {
             RecipeUtils.addShapedRecipe(
                 "plateRedSteel",
                 CI.craftingToolHammer_Hard,
@@ -2496,11 +2496,11 @@ public class RECIPES_Machines {
                 CI.craftingToolWrench,
                 "plateRedSteel",
                 GregtechItemList.Casing_ThermalCentrifuge.get(1));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 6),
-                    GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 6),
+                    GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(GregtechItemList.Casing_ThermalCentrifuge.get(1L))
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -2519,7 +2519,7 @@ public class RECIPES_Machines {
                 GregtechItemList.Industrial_ThermalCentrifuge.get(1));
         }
 
-        if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant) {
+        if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialWashPlant) {
             RecipeUtils.addShapedRecipe(
                 "plateGrisium",
                 CI.craftingToolHammer_Hard,
@@ -2531,12 +2531,12 @@ public class RECIPES_Machines {
                 CI.craftingToolWrench,
                 "plateGrisium",
                 GregtechItemList.Casing_WashPlant.get(1));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    ALLOY.LEAGRISIUM.getPlate(4),
-                    ALLOY.TALONITE.getPlate(2),
-                    ALLOY.LEAGRISIUM.getFrameBox(1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    MaterialsAlloy.LEAGRISIUM.getPlate(4),
+                    MaterialsAlloy.TALONITE.getPlate(2),
+                    MaterialsAlloy.LEAGRISIUM.getFrameBox(1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(GregtechItemList.Casing_WashPlant.get(1L))
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -2555,8 +2555,8 @@ public class RECIPES_Machines {
                 GregtechItemList.Industrial_WashPlant.get(1));
         }
 
-        if (CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter) {
-            GT_Values.RA.stdBuilder()
+        if (GTPPCore.ConfigSwitches.enableMultiblock_LargeAutoCrafter) {
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1),
                     ItemList.Block_IridiumTungstensteel.get(1),
@@ -2569,7 +2569,7 @@ public class RECIPES_Machines {
                 .duration(2 * MINUTES)
                 .eut(TierEU.RECIPE_IV)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     GregtechItemList.Casing_Refinery_Structural.get(4),
                     ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 1),
@@ -2581,7 +2581,7 @@ public class RECIPES_Machines {
                 .duration(5 * MINUTES)
                 .eut(TierEU.RECIPE_IV)
                 .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1),
                     CI.getEmitter(4, 2),
@@ -2597,8 +2597,8 @@ public class RECIPES_Machines {
 
         }
 
-        if (CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) {
-            ItemStack plate = ALLOY.MARAGING300.getPlate(1);
+        if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) {
+            ItemStack plate = MaterialsAlloy.MARAGING300.getPlate(1);
             RecipeUtils.addShapedRecipe(
                 plate,
                 CI.craftingToolHammer_Hard,
@@ -2610,12 +2610,12 @@ public class RECIPES_Machines {
                 CI.craftingToolWrench,
                 plate,
                 GregtechItemList.Casing_CuttingFactoryFrame.get(1));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    ALLOY.MARAGING300.getPlate(4),
-                    ALLOY.STELLITE.getPlate(2),
-                    ALLOY.TALONITE.getFrameBox(1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    MaterialsAlloy.MARAGING300.getPlate(4),
+                    MaterialsAlloy.STELLITE.getPlate(2),
+                    MaterialsAlloy.TALONITE.getFrameBox(1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(GregtechItemList.Casing_CuttingFactoryFrame.get(1L))
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -2635,8 +2635,8 @@ public class RECIPES_Machines {
         }
 
         // IV_MACHINE_Extruder
-        if (CORE.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) {
-            ItemStack plate = ALLOY.INCONEL_690.getPlate(1);
+        if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) {
+            ItemStack plate = MaterialsAlloy.INCONEL_690.getPlate(1);
             RecipeUtils.addShapedRecipe(
                 plate,
                 CI.craftingToolHammer_Hard,
@@ -2648,12 +2648,12 @@ public class RECIPES_Machines {
                 CI.craftingToolWrench,
                 plate,
                 GregtechItemList.Casing_Extruder.get(1));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    ALLOY.INCONEL_690.getPlate(4),
-                    ALLOY.TALONITE.getPlate(2),
-                    ALLOY.STABALLOY.getFrameBox(1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    MaterialsAlloy.INCONEL_690.getPlate(4),
+                    MaterialsAlloy.TALONITE.getPlate(2),
+                    MaterialsAlloy.STABALLOY.getFrameBox(1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(GregtechItemList.Casing_Extruder.get(1L))
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -2672,8 +2672,8 @@ public class RECIPES_Machines {
                 GregtechItemList.Industrial_Extruder.get(1));
         }
 
-        if (CORE.ConfigSwitches.enableMultiblock_IndustrialFishingPort) {
-            ItemStack plate = ALLOY.AQUATIC_STEEL.getPlate(1);
+        if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialFishingPort) {
+            ItemStack plate = MaterialsAlloy.AQUATIC_STEEL.getPlate(1);
             RecipeUtils.addShapedRecipe(
                 plate,
                 CI.craftingToolHammer_Hard,
@@ -2685,12 +2685,12 @@ public class RECIPES_Machines {
                 CI.craftingToolWrench,
                 plate,
                 GregtechItemList.Casing_FishPond.get(1));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    ALLOY.AQUATIC_STEEL.getPlate(4),
-                    ALLOY.EGLIN_STEEL.getPlate(2),
-                    ALLOY.EGLIN_STEEL.getFrameBox(1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    MaterialsAlloy.AQUATIC_STEEL.getPlate(4),
+                    MaterialsAlloy.EGLIN_STEEL.getPlate(2),
+                    MaterialsAlloy.EGLIN_STEEL.getFrameBox(1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(GregtechItemList.Casing_FishPond.get(1L))
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -2711,9 +2711,9 @@ public class RECIPES_Machines {
 
         if (true) {
             // Advanced Vacuum Freezer
-            ItemStack plate = ALLOY.LEAGRISIUM.getPlateDouble(1);
-            ItemStack gear = ALLOY.INCOLOY_MA956.getGear(1);
-            ItemStack frame = ALLOY.NITINOL_60.getFrameBox(1);
+            ItemStack plate = MaterialsAlloy.LEAGRISIUM.getPlateDouble(1);
+            ItemStack gear = MaterialsAlloy.INCOLOY_MA956.getGear(1);
+            ItemStack frame = MaterialsAlloy.NITINOL_60.getFrameBox(1);
             ItemStack cell1 = ItemList.Reactor_Coolant_He_6.get(1);
             ItemStack cell2 = ItemList.Reactor_Coolant_NaK_6.get(1);
 
@@ -2741,9 +2741,9 @@ public class RECIPES_Machines {
                 GregtechItemList.Industrial_Cryogenic_Freezer.get(1));
 
             // Advanced Blast Furnace
-            plate = ALLOY.HASTELLOY_N.getPlateDouble(1);
-            gear = ALLOY.HASTELLOY_W.getGear(1);
-            frame = ALLOY.HASTELLOY_X.getFrameBox(1);
+            plate = MaterialsAlloy.HASTELLOY_N.getPlateDouble(1);
+            gear = MaterialsAlloy.HASTELLOY_W.getGear(1);
+            frame = MaterialsAlloy.HASTELLOY_X.getFrameBox(1);
             cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1);
             cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1);
             ItemStack cell3 = ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1);
@@ -2771,28 +2771,28 @@ public class RECIPES_Machines {
                 plate,
                 GregtechItemList.Machine_Adv_BlastFurnace.get(1));
             // Hatch_Input_Pyrotheum
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Hatch_Input_IV.get(1),
                     GregtechItemList.Casing_Adv_BlastFurnace.get(1),
-                    ALLOY.MARAGING250.getPlate(4),
-                    ALLOY.MARAGING300.getGear(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 2),
-                    GT_Utility.getIntegratedCircuit(1))
+                    MaterialsAlloy.MARAGING250.getPlate(4),
+                    MaterialsAlloy.MARAGING300.getGear(1),
+                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 2),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(GregtechItemList.Hatch_Input_Pyrotheum.get(1L))
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
                 .addTo(assemblerRecipes);
             // Casing_Adv_BlastFurnace
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    ALLOY.HASTELLOY_X.getFrameBox(1),
-                    ALLOY.HASTELLOY_N.getPlateDouble(4),
-                    ALLOY.HASTELLOY_W.getGear(1),
+                    MaterialsAlloy.HASTELLOY_X.getFrameBox(1),
+                    MaterialsAlloy.HASTELLOY_N.getPlateDouble(4),
+                    MaterialsAlloy.HASTELLOY_W.getGear(1),
                     ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1),
                     ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1),
                     ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(GregtechItemList.Casing_Adv_BlastFurnace.get(1L))
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -2800,8 +2800,8 @@ public class RECIPES_Machines {
 
             // Advanced Implosion Compressor
             plate = ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 1);
-            gear = ALLOY.LEAGRISIUM.getGear(1);
-            frame = ALLOY.CINOBITE.getFrameBox(1);
+            gear = MaterialsAlloy.LEAGRISIUM.getGear(1);
+            frame = MaterialsAlloy.CINOBITE.getFrameBox(1);
             cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1);
             cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1);
 
@@ -2818,9 +2818,9 @@ public class RECIPES_Machines {
                 GregtechItemList.Machine_Adv_ImplosionCompressor.get(1));
 
             // Supply Depot
-            plate = ALLOY.TUNGSTEN_CARBIDE.getPlateDouble(1);
-            gear = ALLOY.TRINIUM_TITANIUM.getRing(1);
-            frame = ALLOY.TUNGSTEN_CARBIDE.getFrameBox(1);
+            plate = MaterialsAlloy.TUNGSTEN_CARBIDE.getPlateDouble(1);
+            gear = MaterialsAlloy.TRINIUM_TITANIUM.getRing(1);
+            frame = MaterialsAlloy.TUNGSTEN_CARBIDE.getFrameBox(1);
             cell1 = CI.conveyorModule_LuV;
             cell2 = CI.electricMotor_LuV;
             ItemStack casingAmazon = GregtechItemList.Casing_AmazonWarehouse.get(1);
@@ -2836,15 +2836,15 @@ public class RECIPES_Machines {
                 gear,
                 plate,
                 GregtechItemList.Casing_AmazonWarehouse.get(1));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    ALLOY.TUNGSTEN_CARBIDE.getFrameBox(1),
-                    ALLOY.TUNGSTEN_CARBIDE.getPlateDouble(4),
-                    ALLOY.TRINIUM_TITANIUM.getRing(1),
+                    MaterialsAlloy.TUNGSTEN_CARBIDE.getFrameBox(1),
+                    MaterialsAlloy.TUNGSTEN_CARBIDE.getPlateDouble(4),
+                    MaterialsAlloy.TRINIUM_TITANIUM.getRing(1),
                     ItemList.Electric_Motor_LuV.get(1),
                     ItemList.Conveyor_Module_LuV.get(1),
                     ItemUtils.getItemStackOfAmountFromOreDict("cableGt12VanadiumGallium", 1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(GregtechItemList.Casing_AmazonWarehouse.get(1L))
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -2876,8 +2876,8 @@ public class RECIPES_Machines {
                 GregtechItemList.Industrial_Mixer.get(1));
         }
 
-        if (CORE.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) {
-            ItemStack plate = ALLOY.STABALLOY.getPlate(1);
+        if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) {
+            ItemStack plate = MaterialsAlloy.STABALLOY.getPlate(1);
 
             ItemStack o_Compressor = ItemList.Machine_IV_Compressor.get(1);
             ItemStack o_Lathe = ItemList.Machine_IV_Lathe.get(1);
@@ -2897,12 +2897,12 @@ public class RECIPES_Machines {
                 CI.craftingToolWrench,
                 plate,
                 GregtechItemList.Casing_Multi_Use.get(1));
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    ALLOY.STABALLOY.getPlate(4),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2),
-                    ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1),
-                    GT_Utility.getIntegratedCircuit(1))
+                    MaterialsAlloy.STABALLOY.getPlate(4),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2),
+                    MaterialsAlloy.ZIRCONIUM_CARBIDE.getFrameBox(1),
+                    GTUtility.getIntegratedCircuit(1))
                 .itemOutputs(GregtechItemList.Casing_Multi_Use.get(1L))
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
@@ -2922,33 +2922,33 @@ public class RECIPES_Machines {
         }
 
         // Drilling Platform Casings
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemUtils.getItemStackOfAmountFromOreDict("frameGtTriniumNaquadahCarbonite", 4),
                 ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleTriniumTitaniumAlloy", 1 * (1)),
                 ItemUtils.getItemStackOfAmountFromOreDict("gearGtPikyonium64B", 2 * (1)),
-                ALLOY.TRINIUM_REINFORCED_STEEL.getPlateDouble(4 * 1),
+                MaterialsAlloy.TRINIUM_REINFORCED_STEEL.getPlateDouble(4 * 1),
                 ItemUtils.getSimpleStack((CI.machineHull_LuV), 1 * 1))
             .itemOutputs(GregtechItemList.Casing_BedrockMiner.get(1))
-            .fluidInputs(ALLOY.MARAGING350.getFluidStack(144 * 16 * 1))
-            .duration((int) GT_Values.V[4])
+            .fluidInputs(MaterialsAlloy.MARAGING350.getFluidStack(144 * 16 * 1))
+            .duration((int) GTValues.V[4])
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
 
         int aCostMultiplier = 1;
 
         // Reservoir Hatch
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 ItemList.Hatch_Input_EV.get(1),
-                GT_ModHandler.getModItem(RemoteIO.ID, "tile.machine", 1),
+                GTModHandler.getModItem(RemoteIO.ID, "tile.machine", 1),
                 ItemList.Electric_Pump_EV.get(1))
             .itemOutputs(GregtechItemList.Hatch_Reservoir.get(1))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
         // Mystic Frame
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 GregtechItemList.Casing_Multi_Use.get(1),
                 ItemList.Field_Generator_MV.get(1, CI.circuitTier7),
@@ -2957,7 +2957,7 @@ public class RECIPES_Machines {
                 ItemList.Sensor_HV.get(1, CI.circuitTier7),
                 CI.getTieredComponent(OrePrefixes.plate, 7, 8 * aCostMultiplier),
                 CI.getTieredComponent(OrePrefixes.wireGt08, 8, 4 * aCostMultiplier))
-            .itemOutputs(ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame, 2))
+            .itemOutputs(ItemUtils.getSimpleStack(DimensionEverglades.blockPortalFrame, 2))
             .fluidInputs(CI.getTieredFluid(6, (144 * 8)))
             .duration(4 * MINUTES + 30 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
@@ -2992,7 +2992,7 @@ public class RECIPES_Machines {
             ItemStack aPrevTier = (i == 0 ? CI.getTieredMachineHull(1) : aOutput[i - 1]);
             aPrevTier.stackSize = 1;
             int aTier = (i + 1);
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     aPrevTier,
                     CI.getTieredComponent(OrePrefixes.plate, aTier, 4),
@@ -3006,7 +3006,7 @@ public class RECIPES_Machines {
                 .eut(voltageTiers[i])
                 .addTo(assemblerRecipes);
             // Energy Buffer
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     ItemUtils.getSimpleStack(aOutput[i], 4),
                     CI.getTieredComponent(OrePrefixes.plate, aTier, 8),
@@ -3040,7 +3040,7 @@ public class RECIPES_Machines {
                 CI.getTransmissionComponent(tier, 2), CI.getFieldGenerator(tier, 1),
                 CI.getTieredComponent(OrePrefixes.plate, tier + 1, 4),
                 CI.getTieredComponent(OrePrefixes.circuit, tier + 1, 2), };
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(aInputs)
                 .itemOutputs(aChargers[tier - 1])
                 .fluidInputs(CI.getAlternativeTieredFluid(tier, (144 * 2 * (tier + 1))))
@@ -3053,7 +3053,7 @@ public class RECIPES_Machines {
 
     private static void largeArcFurnace() {
         int aCostMultiplier = 1;
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 GregtechItemList.Casing_Multi_Use.get(aCostMultiplier),
                 CI.getTransmissionComponent(2, 2 * aCostMultiplier),
@@ -3065,7 +3065,7 @@ public class RECIPES_Machines {
             .duration(60 * SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 GregtechItemList.Casing_Industrial_Arc_Furnace.get(1),
                 CI.getFieldGenerator(4, 2 * aCostMultiplier),
@@ -3083,7 +3083,7 @@ public class RECIPES_Machines {
 
     private static void industrialVacuumFurnace() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 GregtechItemList.Casing_Multi_Use.get(1),
                 CI.getHeatCoil(2),
@@ -3095,7 +3095,7 @@ public class RECIPES_Machines {
             .duration(60 * SECONDS)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 GregtechItemList.Casing_Vacuum_Furnace.get(1),
                 CI.getTieredComponent(OrePrefixes.wireGt16, 7, 4),
@@ -3114,7 +3114,7 @@ public class RECIPES_Machines {
     private static void milling() {
 
         // Isa Mill Controller
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, ItemList.Machine_IV_Macerator.get(1))
             .metadata(RESEARCH_TIME, 20 * MINUTES)
             .itemInputs(
@@ -3122,11 +3122,11 @@ public class RECIPES_Machines {
                 CI.getTieredGTPPMachineCasing(6, 4),
                 ItemList.Component_Grinder_Tungsten.get(16),
                 new Object[] { CI.getTieredCircuitOreDictName(6), 8 },
-                ALLOY.INCONEL_625.getGear(8),
-                ALLOY.INCONEL_625.getPlate(32),
-                ALLOY.ZERON_100.getPlateDouble(8),
-                ALLOY.ZERON_100.getPlateDouble(8),
-                ALLOY.ZERON_100.getScrew(64),
+                MaterialsAlloy.INCONEL_625.getGear(8),
+                MaterialsAlloy.INCONEL_625.getPlate(32),
+                MaterialsAlloy.ZERON_100.getPlateDouble(8),
+                MaterialsAlloy.ZERON_100.getPlateDouble(8),
+                MaterialsAlloy.ZERON_100.getScrew(64),
                 CI.getTieredComponentOfMaterial(Materials.NiobiumTitanium, OrePrefixes.wireFine, 32),
                 CI.getTieredComponentOfMaterial(Materials.NiobiumTitanium, OrePrefixes.wireFine, 32),
                 CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.foil, 16),
@@ -3141,50 +3141,50 @@ public class RECIPES_Machines {
             .addTo(AssemblyLine);
 
         // Isa Mill Gearbox
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(7),
                 ItemList.Casing_Gearbox_Titanium.get(2),
-                ALLOY.INCONEL_625.getGear(4),
+                MaterialsAlloy.INCONEL_625.getGear(4),
                 CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.gearGtSmall, 8),
-                ALLOY.INCONEL_625.getPlate(16),
-                ALLOY.ZERON_100.getBolt(16))
+                MaterialsAlloy.INCONEL_625.getPlate(16),
+                MaterialsAlloy.ZERON_100.getBolt(16))
             .itemOutputs(GregtechItemList.Casing_IsaMill_Gearbox.get(1))
-            .fluidInputs(ALLOY.TUNGSTENSTEEL.getFluidStack(8 * 144))
+            .fluidInputs(MaterialsAlloy.TUNGSTENSTEEL.getFluidStack(8 * 144))
             .duration(2 * MINUTES)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
         // Isa Mill Casing
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(7),
                 CI.getTieredGTPPMachineCasing(5, 1),
-                ALLOY.INCONEL_625.getPlate(8),
-                ALLOY.ZERON_100.getRod(4),
+                MaterialsAlloy.INCONEL_625.getPlate(8),
+                MaterialsAlloy.ZERON_100.getRod(4),
                 CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.gearGtSmall, 4),
-                ALLOY.ZERON_100.getScrew(8))
+                MaterialsAlloy.ZERON_100.getScrew(8))
             .itemOutputs(GregtechItemList.Casing_IsaMill_Casing.get(1))
-            .fluidInputs(ELEMENT.getInstance().TITANIUM.getFluidStack(4 * 144))
+            .fluidInputs(MaterialsElements.getInstance().TITANIUM.getFluidStack(4 * 144))
             .duration(2 * MINUTES)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
         // Isa Mill Pipe
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(7),
                 CI.getTieredGTPPMachineCasing(4, 2),
-                ALLOY.INCONEL_625.getPlateDouble(4),
-                ALLOY.INCOLOY_MA956.getRing(8),
+                MaterialsAlloy.INCONEL_625.getPlateDouble(4),
+                MaterialsAlloy.INCOLOY_MA956.getRing(8),
                 CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.plate, 8),
-                ALLOY.INCOLOY_MA956.getBolt(16))
+                MaterialsAlloy.INCOLOY_MA956.getBolt(16))
             .itemOutputs(GregtechItemList.Casing_IsaMill_Pipe.get(1))
-            .fluidInputs(ELEMENT.getInstance().ALUMINIUM.getFluidStack(8 * 144))
+            .fluidInputs(MaterialsElements.getInstance().ALUMINIUM.getFluidStack(8 * 144))
             .duration(8 * MINUTES)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
 
         // Flotation Cell Controller
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, ItemList.Distillation_Tower.get(1))
             .metadata(RESEARCH_TIME, 20 * MINUTES)
             .itemInputs(
@@ -3192,11 +3192,11 @@ public class RECIPES_Machines {
                 CI.getTieredGTPPMachineCasing(5, 4),
                 ItemList.Machine_IV_Distillery.get(1),
                 new Object[] { CI.getTieredCircuitOreDictName(6), 8 },
-                ALLOY.STELLITE.getGear(8),
-                ALLOY.STELLITE.getPlate(32),
-                ALLOY.HASTELLOY_N.getPlateDouble(8),
-                ALLOY.HASTELLOY_N.getPlateDouble(8),
-                ALLOY.HASTELLOY_N.getScrew(64),
+                MaterialsAlloy.STELLITE.getGear(8),
+                MaterialsAlloy.STELLITE.getPlate(32),
+                MaterialsAlloy.HASTELLOY_N.getPlateDouble(8),
+                MaterialsAlloy.HASTELLOY_N.getPlateDouble(8),
+                MaterialsAlloy.HASTELLOY_N.getScrew(64),
                 CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64),
                 CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64),
                 CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32),
@@ -3211,21 +3211,21 @@ public class RECIPES_Machines {
             .addTo(AssemblyLine);
 
         // Flotation Cell Casing
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(7),
                 CI.getTieredGTPPMachineCasing(4, 1),
-                ALLOY.AQUATIC_STEEL.getPlate(8),
-                ALLOY.STELLITE.getRing(8),
+                MaterialsAlloy.AQUATIC_STEEL.getPlate(8),
+                MaterialsAlloy.STELLITE.getRing(8),
                 CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.plateDouble, 4),
-                ALLOY.HASTELLOY_N.getScrew(8))
+                MaterialsAlloy.HASTELLOY_N.getScrew(8))
             .itemOutputs(GregtechItemList.Casing_Flotation_Cell.get(1))
-            .fluidInputs(ALLOY.STAINLESS_STEEL.getFluidStack(8 * 144))
+            .fluidInputs(MaterialsAlloy.STAINLESS_STEEL.getFluidStack(8 * 144))
             .duration(2 * MINUTES)
             .eut(TierEU.RECIPE_LuV)
             .addTo(assemblerRecipes);
         // Milling Bus
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(7),
                 CI.getTieredGTPPMachineCasing(5, 1),
@@ -3234,7 +3234,7 @@ public class RECIPES_Machines {
                 CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plate, 32),
                 CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16))
             .itemOutputs(GregtechItemList.Bus_Milling_Balls.get(1))
-            .fluidInputs(ELEMENT.getInstance().TUNGSTEN.getFluidStack(8 * 144))
+            .fluidInputs(MaterialsElements.getInstance().TUNGSTEN.getFluidStack(8 * 144))
             .duration(4 * MINUTES)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
@@ -3244,12 +3244,12 @@ public class RECIPES_Machines {
     private static void sparging() {
 
         // Sparge Tower Research
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(8),
-                ELEMENT.getInstance().HELIUM.getCell(8),
-                ELEMENT.getInstance().FLUORINE.getCell(8),
-                ALLOY.HS188A.getIngot(8),
+                MaterialsElements.getInstance().HELIUM.getCell(8),
+                MaterialsElements.getInstance().FLUORINE.getCell(8),
+                MaterialsAlloy.HS188A.getIngot(8),
                 ItemList.Distillation_Tower.get(1))
             .itemOutputs(ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_10_SPARGING, 1))
             .duration(5 * MINUTES)
@@ -3257,7 +3257,7 @@ public class RECIPES_Machines {
             .addTo(assemblerRecipes);
 
         // Sparge Tower Controller
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_10_SPARGING, 1))
             .metadata(RESEARCH_TIME, 20 * MINUTES)
             .itemInputs(
@@ -3265,11 +3265,11 @@ public class RECIPES_Machines {
                 CI.getTieredGTPPMachineCasing(4, 4),
                 ItemList.Machine_IV_Distillery.get(1),
                 new Object[] { CI.getTieredCircuitOreDictName(5), 8 },
-                ALLOY.HS188A.getGear(8),
-                ALLOY.HS188A.getPlate(32),
-                ALLOY.HASTELLOY_N.getPlateDouble(8),
-                ALLOY.HASTELLOY_N.getPlateDouble(8),
-                ALLOY.HASTELLOY_N.getScrew(64),
+                MaterialsAlloy.HS188A.getGear(8),
+                MaterialsAlloy.HS188A.getPlate(32),
+                MaterialsAlloy.HASTELLOY_N.getPlateDouble(8),
+                MaterialsAlloy.HASTELLOY_N.getPlateDouble(8),
+                MaterialsAlloy.HASTELLOY_N.getScrew(64),
                 CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64),
                 CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64),
                 CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32),
@@ -3284,16 +3284,16 @@ public class RECIPES_Machines {
             .addTo(AssemblyLine);
 
         // Sparge Tower Casing
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(8),
                 CI.getTieredGTPPMachineCasing(3, 1),
-                ALLOY.HS188A.getPlate(2),
-                ALLOY.HASTELLOY_N.getRing(4),
+                MaterialsAlloy.HS188A.getPlate(2),
+                MaterialsAlloy.HASTELLOY_N.getRing(4),
                 CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plateDouble, 4),
-                ALLOY.HASTELLOY_N.getScrew(4))
+                MaterialsAlloy.HASTELLOY_N.getScrew(4))
             .itemOutputs(GregtechItemList.Casing_Sparge_Tower_Exterior.get(1))
-            .fluidInputs(ALLOY.STAINLESS_STEEL.getFluidStack(8 * 144))
+            .fluidInputs(MaterialsAlloy.STAINLESS_STEEL.getFluidStack(8 * 144))
             .duration(2 * MINUTES)
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
@@ -3306,7 +3306,7 @@ public class RECIPES_Machines {
 
         long[] voltageTiers = new long[] { TierEU.RECIPE_LV, TierEU.RECIPE_MV, TierEU.RECIPE_HV };
         for (int i = 1; i < 4; i++) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
                     CI.getNumberedBioCircuit(10 + i),
                     CI.getTieredMachineCasing(i),
@@ -3322,7 +3322,7 @@ public class RECIPES_Machines {
 
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedBioCircuit(14),
                 aChisels[2],
@@ -3335,7 +3335,7 @@ public class RECIPES_Machines {
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedBioCircuit(14),
                 ItemList.Casing_SolidSteel.get(2),
@@ -3353,16 +3353,16 @@ public class RECIPES_Machines {
 
     private static void rockBreaker() {
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 CI.getNumberedAdvancedCircuit(12),
                 ItemList.Machine_EV_RockBreaker.get(1),
-                ALLOY.STAINLESS_STEEL.getPlate(8),
-                ALLOY.STAINLESS_STEEL.getRing(4),
+                MaterialsAlloy.STAINLESS_STEEL.getPlate(8),
+                MaterialsAlloy.STAINLESS_STEEL.getRing(4),
                 CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.plateDouble, 8),
-                ALLOY.EGLIN_STEEL.getScrew(8))
+                MaterialsAlloy.EGLIN_STEEL.getScrew(8))
             .itemOutputs(GregtechItemList.Controller_IndustrialRockBreaker.get(1))
-            .fluidInputs(ELEMENT.getInstance().ALUMINIUM.getFluidStack(144 * 8))
+            .fluidInputs(MaterialsElements.getInstance().ALUMINIUM.getFluidStack(144 * 8))
             .duration(2 * MINUTES)
             .eut(TierEU.RECIPE_EV)
             .addTo(assemblerRecipes);
@@ -3370,18 +3370,18 @@ public class RECIPES_Machines {
     }
 
     private static void fakeMachineCasingCovers() {
-        int aMaxTier = GT_Values.VOLTAGE_NAMES.length;
+        int aMaxTier = GTValues.VOLTAGE_NAMES.length;
         ItemStack aTier[] = new ItemStack[aMaxTier];
         for (int i = 0; i < aMaxTier; i++) {
             aTier[i] = ItemUtils.simpleMetaStack(CoverManager.Cover_Gt_Machine_Casing, i, 7);
         }
         // Add recipes for new ones
         for (int i = 0; i < aMaxTier; i++) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(CI.getTieredMachineCasing(i))
                 .itemOutputs(aTier[i])
                 .duration(i * 5 * SECONDS)
-                .eut(GT_Values.VP[i])
+                .eut(GTValues.VP[i])
                 .addTo(cutterRecipes);
         }
     }
@@ -3415,9 +3415,9 @@ public class RECIPES_Machines {
 
         // Input Buses
         for (int tier = 1; tier < mSuperBusesInput.length + 1; tier++) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(17),
+                    GTUtility.getIntegratedCircuit(17),
                     mInputHatch[tier - 1],
                     CI.getElectricMotor(tier, 2),
                     CI.getConveyor(tier, 5),
@@ -3426,15 +3426,15 @@ public class RECIPES_Machines {
                 .itemOutputs(mSuperBusesInput[tier - 1].get(1))
                 .fluidInputs(CI.getAlternativeTieredFluid(tier, 144 * 8))
                 .duration(60 * SECONDS)
-                .eut(GT_Values.VP[tier])
+                .eut(GTValues.VP[tier])
                 .addTo(assemblerRecipes);
 
         }
         // Output Buses
         for (int tier = 1; tier < mSuperBusesOutput.length + 1; tier++) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(18),
+                    GTUtility.getIntegratedCircuit(18),
                     mOutputHatch[tier - 1],
                     CI.getElectricPiston(tier, 2),
                     CI.getConveyor(tier, 5),
@@ -3443,7 +3443,7 @@ public class RECIPES_Machines {
                 .itemOutputs(mSuperBusesOutput[tier - 1].get(1))
                 .fluidInputs(CI.getTertiaryTieredFluid(tier, 144 * 8))
                 .duration(60 * SECONDS)
-                .eut(GT_Values.VP[tier])
+                .eut(GTValues.VP[tier])
                 .addTo(assemblerRecipes);
 
         }
@@ -3458,9 +3458,9 @@ public class RECIPES_Machines {
             GregtechItemList.GT_MetaTileEntity_ChiselBus_HV.get(1), };
 
         for (int tier = 1; tier < mChiselBuses.length + 1; tier++) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(17),
+                    GTUtility.getIntegratedCircuit(17),
                     mSuperBusesInput[tier - 1],
                     CI.getSensor(tier, 1),
                     CI.getRobotArm(tier, 2),
@@ -3469,7 +3469,7 @@ public class RECIPES_Machines {
                 .itemOutputs(mChiselBuses[tier - 1])
                 .fluidInputs(CI.getAlternativeTieredFluid(tier, 144 * 2))
                 .duration(60 * SECONDS)
-                .eut(GT_Values.VP[tier + 1])
+                .eut(GTValues.VP[tier + 1])
                 .addTo(assemblerRecipes);
 
         }
@@ -3486,9 +3486,9 @@ public class RECIPES_Machines {
 
         for (int i = 0; i < 4; i++) {
             int componentTier = i + 5;
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_Utility.getIntegratedCircuit(17),
+                    GTUtility.getIntegratedCircuit(17),
                     mSuperBusesInput[i],
                     CI.getSensor(componentTier, 1),
                     CI.getFluidRegulator(componentTier, 1),
@@ -3497,7 +3497,7 @@ public class RECIPES_Machines {
                 .itemOutputs(mSolidifierHatches[i])
                 .fluidInputs(CI.getTieredFluid(componentTier, 144 * 2))
                 .duration(30 * SECONDS)
-                .eut(GT_Values.VP[componentTier])
+                .eut(GTValues.VP[componentTier])
                 .addTo(assemblerRecipes);
 
         }
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RecipesRareEarthProcessing.java
index 0cf0152c53..e8597a9f48 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesRareEarthProcessing.java
@@ -5,33 +5,33 @@ import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes;
 import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes;
 import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes;
 import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gtPlusPlus.core.material.MISC_MATERIALS.BRINE;
-import static gtPlusPlus.core.material.MISC_MATERIALS.HYDROGEN_CHLORIDE;
-import static gtPlusPlus.core.material.MISC_MATERIALS.HYDROGEN_CHLORIDE_MIX;
-import static gtPlusPlus.core.material.MISC_MATERIALS.RARE_EARTH_HIGH;
-import static gtPlusPlus.core.material.MISC_MATERIALS.RARE_EARTH_LOW;
-import static gtPlusPlus.core.material.MISC_MATERIALS.RARE_EARTH_MID;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gtPlusPlus.core.material.MaterialMisc.BRINE;
+import static gtPlusPlus.core.material.MaterialMisc.HYDROGEN_CHLORIDE;
+import static gtPlusPlus.core.material.MaterialMisc.HYDROGEN_CHLORIDE_MIX;
+import static gtPlusPlus.core.material.MaterialMisc.RARE_EARTH_HIGH;
+import static gtPlusPlus.core.material.MaterialMisc.RARE_EARTH_LOW;
+import static gtPlusPlus.core.material.MaterialMisc.RARE_EARTH_MID;
 
 import net.minecraftforge.fluids.Fluid;
 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_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.material.MaterialGenerator;
-import gtPlusPlus.core.material.ORES;
+import gtPlusPlus.core.material.MaterialsOres;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
-public class RECIPES_RareEarthProcessing {
+public class RecipesRareEarthProcessing {
 
     public static void init() {
 
@@ -55,8 +55,8 @@ public class RECIPES_RareEarthProcessing {
         }
 
         // Add Process for creating Brine
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 16L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 16L))
             .fluidInputs(Materials.SaltWater.getFluid(2000L))
             .fluidOutputs(FluidUtils.getFluidStack(mBrine, 4000))
             .duration(20 * SECONDS)
@@ -64,29 +64,29 @@ public class RECIPES_RareEarthProcessing {
             .addTo(brewingRecipes);
 
         // Chloralkali process
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.getIntegratedCircuit(1), ItemList.Cell_Empty.get(2L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(1), ItemList.Cell_Empty.get(2L))
             .itemOutputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1L))
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1L))
             .fluidInputs(FluidUtils.getFluidStack(mBrine, 2000))
             .duration(30 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(electrolyzerRecipes);
 
         // Generate Special Laser Recipe
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L),
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L),
                 CI.getNumberedBioCircuit(2))
             .itemOutputs(ItemUtils.getSimpleStack(ModItems.cellHydrogenChlorideMix, 2))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_HV)
             .addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(GregtechItemList.Laser_Lens_WoodsGlass.get(0))
             .fluidInputs(HYDROGEN_CHLORIDE_MIX.getFluidStack(4000))
             .fluidOutputs(HYDROGEN_CHLORIDE.getFluidStack(4000))
@@ -96,13 +96,13 @@ public class RECIPES_RareEarthProcessing {
             .addTo(laserEngraverRecipes);
 
         // Set Material Tiers correctly
-        ORES.GREENOCKITE.vTier = 1;
+        MaterialsOres.GREENOCKITE.vTier = 1;
         RARE_EARTH_LOW.vTier = 1;
         RARE_EARTH_MID.vTier = 3;
         RARE_EARTH_HIGH.vTier = 5;
 
         // Set Material Voltages correctly
-        ORES.GREENOCKITE.vVoltageMultiplier = 30;
+        MaterialsOres.GREENOCKITE.vVoltageMultiplier = 30;
         RARE_EARTH_LOW.vVoltageMultiplier = 30;
         RARE_EARTH_MID.vVoltageMultiplier = 480;
         RARE_EARTH_HIGH.vVoltageMultiplier = 7680;
@@ -127,8 +127,8 @@ public class RECIPES_RareEarthProcessing {
             .getFluid();
 
         // LV Rare Earth
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L))
             .itemOutputs(RARE_EARTH_LOW.getCrushed(2), RARE_EARTH_LOW.getCrushed(2), RARE_EARTH_LOW.getCrushed(2))
             .fluidInputs(Materials.SulfuricAcid.getFluid(1000L))
             .duration(30 * SECONDS)
@@ -136,8 +136,8 @@ public class RECIPES_RareEarthProcessing {
             .addTo(chemicalBathRecipes);
 
         // HV Rare Earth
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L))
             .itemOutputs(RARE_EARTH_MID.getCrushed(2), RARE_EARTH_MID.getCrushed(2), RARE_EARTH_MID.getCrushed(2))
             .outputChances(10000, 9000, 8000)
             .fluidInputs(FluidUtils.getFluidStack(aHydrochloric, 1000))
@@ -146,8 +146,8 @@ public class RECIPES_RareEarthProcessing {
             .addTo(chemicalBathRecipes);
 
         // IV Rare Earth
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L))
             .itemOutputs(RARE_EARTH_HIGH.getCrushed(2), RARE_EARTH_HIGH.getCrushed(2), RARE_EARTH_HIGH.getCrushed(2))
             .outputChances(10000, 9000, 8000)
             .fluidInputs(FluidUtils.getHydrofluoricAcid(1000))
@@ -156,8 +156,8 @@ public class RECIPES_RareEarthProcessing {
             .addTo(chemicalBathRecipes);
 
         // IV Rare Earth
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L))
             .itemOutputs(RARE_EARTH_HIGH.getCrushed(2), RARE_EARTH_HIGH.getCrushed(2), RARE_EARTH_HIGH.getCrushed(2))
             .outputChances(9000, 8000, 7000)
             .fluidInputs(Materials.HydrofluoricAcid.getFluid(2000L))
diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesSeleniumProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RecipesSeleniumProcessing.java
new file mode 100644
index 0000000000..68f38dc5c2
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesSeleniumProcessing.java
@@ -0,0 +1,154 @@
+package gtPlusPlus.core.recipe;
+
+import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.alloyBlastSmelterRecipes;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
+
+import gregtech.api.enums.GTValues;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TierEU;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.material.MaterialMisc;
+import gtPlusPlus.core.material.MaterialsElements;
+import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
+
+public class RecipesSeleniumProcessing {
+
+    public static void init() {
+
+        // We need this
+        MaterialUtils.generateSpecialDustAndAssignToAMaterial(MaterialMisc.SELENIUM_DIOXIDE, false);
+
+        // Makes Selenium Dioxide
+        processCopperRecipes();
+
+        // Liquify the Dried Dioxide
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(13), MaterialMisc.SELENIUM_DIOXIDE.getDust(1))
+            .fluidInputs(FluidUtils.getSteam(500))
+            .fluidOutputs(MaterialMisc.SELENIUM_DIOXIDE.getFluidStack(1000))
+            .duration(24 * SECONDS)
+            .eut(1024)
+            .addTo(pyrolyseRecipes);
+
+        // Produce Selenious Acid
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(14), MaterialMisc.SELENIUM_DIOXIDE.getCell(1))
+            .itemOutputs(CI.emptyCells(1))
+            .fluidInputs(FluidUtils.getHotWater(4000))
+            .fluidOutputs(MaterialMisc.SELENIOUS_ACID.getFluidStack(1000))
+            .duration(24 * SECONDS)
+            .eut(TierEU.RECIPE_EV)
+            .addTo(pyrolyseRecipes);
+
+        // Make Selenium
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.getIntegratedCircuit(14), MaterialsElements.getInstance().CARBON.getDust(16))
+            .itemOutputs(
+                MaterialsElements.getInstance().SELENIUM.getIngot(1),
+                MaterialsElements.getInstance().SELENIUM.getIngot(1))
+            .outputChances(100_00, 20_00)
+            .fluidInputs(MaterialMisc.SELENIOUS_ACID.getFluidStack(750), Materials.SulfuricAcid.getFluid(8000))
+            .fluidOutputs(MaterialsElements.getInstance().SELENIUM.getFluidStack(144 * 1))
+            .eut(TierEU.RECIPE_IV)
+            .duration(5 * MINUTES)
+            .addTo(alloyBlastSmelterRecipes);
+    }
+
+    public static void processCopperRecipes() {
+
+        // Copper
+        GTValues.RA.stdBuilder()
+            .itemInputs(
+                CI.getNumberedAdvancedCircuit(23),
+                ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Copper, 1))
+            .itemOutputs(
+                ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Copper, 1),
+                MaterialMisc.SELENIUM_DIOXIDE.getDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1))
+            .outputChances(100_00, 1_00, 1_00, 5_00, 5_00, 5_00, 10_00, 10_00, 10_00)
+            .fluidInputs(FluidUtils.getHotWater(1000))
+            .fluidOutputs(MaterialMisc.SELENIUM_DIOXIDE.getFluidStack(20))
+            .eut(1024)
+            .duration(40 * SECONDS)
+            .addTo(chemicalDehydratorRecipes);
+
+        // Tetra
+        GTValues.RA.stdBuilder()
+            .itemInputs(
+                CI.getNumberedAdvancedCircuit(23),
+                ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Tetrahedrite, 1))
+            .itemOutputs(
+                ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Tetrahedrite, 1),
+                MaterialMisc.SELENIUM_DIOXIDE.getDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1))
+            .outputChances(100_00, 1_00, 1_00, 3_00, 3_00, 3_00, 8_00, 8_00, 8_00)
+            .fluidInputs(FluidUtils.getHotWater(1000))
+            .fluidOutputs(MaterialMisc.SELENIUM_DIOXIDE.getFluidStack(10))
+            .eut(1024)
+            .duration(40 * SECONDS)
+            .addTo(chemicalDehydratorRecipes);
+
+        // Chalco
+        GTValues.RA.stdBuilder()
+            .itemInputs(
+                CI.getNumberedAdvancedCircuit(23),
+                ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1))
+            .itemOutputs(
+                ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Chalcopyrite, 1),
+                MaterialMisc.SELENIUM_DIOXIDE.getDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1))
+            .outputChances(100_00, 1_00, 1_00, 3_00, 3_00, 3_00, 8_00, 8_00, 8_00)
+            .fluidInputs(FluidUtils.getHotWater(1000))
+            .fluidOutputs(MaterialMisc.SELENIUM_DIOXIDE.getFluidStack(10))
+            .eut(1024)
+            .duration(40 * SECONDS)
+            .addTo(chemicalDehydratorRecipes);
+
+        // Malachite
+        GTValues.RA.stdBuilder()
+            .itemInputs(
+                CI.getNumberedAdvancedCircuit(23),
+                ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Malachite, 1))
+            .itemOutputs(
+                ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Malachite, 1),
+                MaterialMisc.SELENIUM_DIOXIDE.getDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1),
+                MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1))
+            .outputChances(100_00, 1_00, 1_00, 3_00, 3_00, 3_00, 8_00, 8_00, 8_00)
+            .fluidInputs(FluidUtils.getHotWater(1000))
+            .fluidOutputs(MaterialMisc.SELENIUM_DIOXIDE.getFluidStack(10))
+            .eut(1024)
+            .duration(40 * SECONDS)
+            .addTo(chemicalDehydratorRecipes);
+    }
+}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java b/src/main/java/gtPlusPlus/core/recipe/RecipesTools.java
index 229b7cc045..f8fa439021 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesTools.java
@@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
-public class RECIPES_Tools {
+public class RecipesTools {
 
     // Outputs
     public static ItemStack RECIPE_SandStone = new ItemStack(Blocks.sandstone, 2);
diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java
index a26887ad1f..addc3df7e4 100644
--- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java
@@ -4,21 +4,21 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 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.enums.OrePrefixes;
 import gregtech.api.util.ExternalMaterials;
-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.api.objects.Logger;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.item.chemistry.GenericChem;
-import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.recipe.LOADER_Machine_Components;
+import gtPlusPlus.core.material.MaterialsAlloy;
+import gtPlusPlus.core.material.MaterialsElements;
+import gtPlusPlus.core.recipe.LoaderMachineComponents;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -31,11 +31,11 @@ public class CI {
     public static ItemStack _NULL = ItemUtils.getErrorStack(1);
 
     // bits
-    public static long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE
-        | GT_ModHandler.RecipeBits.BUFFERED;
-    public static long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-        | GT_ModHandler.RecipeBits.REVERSIBLE
-        | GT_ModHandler.RecipeBits.BUFFERED;
+    public static long bits = GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE
+        | GTModHandler.RecipeBits.BUFFERED;
+    public static long bitsd = GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+        | GTModHandler.RecipeBits.REVERSIBLE
+        | GTModHandler.RecipeBits.BUFFERED;
 
     // Circuits
     public static Object circuitPrimitive;
@@ -265,17 +265,17 @@ public class CI {
         } else if (tier == 3) {
             return Materials.Steel;
         } else if (tier == 4) {
-            return ALLOY.EGLIN_STEEL;
+            return MaterialsAlloy.EGLIN_STEEL;
         } else if (tier == 5) {
             return Materials.Aluminium;
         } else if (tier == 6) {
-            return ALLOY.MARAGING250;
+            return MaterialsAlloy.MARAGING250;
         } else if (tier == 7) {
-            return ALLOY.TANTALLOY_61;
+            return MaterialsAlloy.TANTALLOY_61;
         } else if (tier == 8) {
-            return ALLOY.INCONEL_792;
+            return MaterialsAlloy.INCONEL_792;
         } else if (tier == 9) {
-            return ALLOY.ZERON_100;
+            return MaterialsAlloy.ZERON_100;
         } else if (tier == 10) {
             return Materials.NaquadahEnriched;
         } else if (tier == 11) {
@@ -405,26 +405,31 @@ public class CI {
         gearboxCasing_Tier_4 = ItemList.Casing_Gearbox_TungstenSteel.get(1);
 
         // Machine Components
-        LOADER_Machine_Components.initialise();
+        LoaderMachineComponents.initialise();
     }
 
     public static ItemStack emptyCells(int i) {
         return ItemUtils.getEmptyCell(i);
     }
 
-    private static final Material[] aMaterial_Main = new Material[] { ALLOY.POTIN, ALLOY.TUMBAGA, ALLOY.EGLIN_STEEL,
-        ALLOY.TANTALUM_CARBIDE, ALLOY.INCOLOY_DS, ALLOY.INCONEL_625, ALLOY.ZERON_100, ALLOY.PIKYONIUM,
-        ELEMENT.STANDALONE.ADVANCED_NITINOL, ALLOY.ABYSSAL, ALLOY.QUANTUM, ELEMENT.STANDALONE.HYPOGEN };
+    private static final Material[] aMaterial_Main = new Material[] { MaterialsAlloy.POTIN, MaterialsAlloy.TUMBAGA,
+        MaterialsAlloy.EGLIN_STEEL, MaterialsAlloy.TANTALUM_CARBIDE, MaterialsAlloy.INCOLOY_DS,
+        MaterialsAlloy.INCONEL_625, MaterialsAlloy.ZERON_100, MaterialsAlloy.PIKYONIUM,
+        MaterialsElements.STANDALONE.ADVANCED_NITINOL, MaterialsAlloy.ABYSSAL, MaterialsAlloy.QUANTUM,
+        MaterialsElements.STANDALONE.HYPOGEN };
 
-    private static final Material[] aMaterial_Secondary = new Material[] { ALLOY.STEEL, ALLOY.SILICON_CARBIDE,
-        ALLOY.BLOODSTEEL, ALLOY.TANTALUM_CARBIDE, ALLOY.INCONEL_792, ALLOY.ARCANITE, ALLOY.LAFIUM, ALLOY.CINOBITE,
-        ALLOY.TITANSTEEL, ALLOY.OCTIRON, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN, ELEMENT.STANDALONE.HYPOGEN };
+    private static final Material[] aMaterial_Secondary = new Material[] { MaterialsAlloy.STEEL,
+        MaterialsAlloy.SILICON_CARBIDE, MaterialsAlloy.BLOODSTEEL, MaterialsAlloy.TANTALUM_CARBIDE,
+        MaterialsAlloy.INCONEL_792, MaterialsAlloy.ARCANITE, MaterialsAlloy.LAFIUM, MaterialsAlloy.CINOBITE,
+        MaterialsAlloy.TITANSTEEL, MaterialsAlloy.OCTIRON, MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN,
+        MaterialsElements.STANDALONE.HYPOGEN };
 
-    private static final Material[] aMaterial_Tertiary = new Material[] { ELEMENT.getInstance().LEAD,
-        ELEMENT.getInstance().ALUMINIUM, ELEMENT.STANDALONE.BLACK_METAL, ELEMENT.getInstance().TITANIUM,
-        ALLOY.HASTELLOY_N, ALLOY.ENERGYCRYSTAL, ALLOY.TRINIUM_NAQUADAH_CARBON, ALLOY.TRINIUM_REINFORCED_STEEL, // Arceus
-        ALLOY.TITANSTEEL, ELEMENT.STANDALONE.ASTRAL_TITANIUM, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN,
-        ELEMENT.STANDALONE.HYPOGEN };
+    private static final Material[] aMaterial_Tertiary = new Material[] { MaterialsElements.getInstance().LEAD,
+        MaterialsElements.getInstance().ALUMINIUM, MaterialsElements.STANDALONE.BLACK_METAL,
+        MaterialsElements.getInstance().TITANIUM, MaterialsAlloy.HASTELLOY_N, MaterialsAlloy.ENERGYCRYSTAL,
+        MaterialsAlloy.TRINIUM_NAQUADAH_CARBON, MaterialsAlloy.TRINIUM_REINFORCED_STEEL, // Arceus
+        MaterialsAlloy.TITANSTEEL, MaterialsElements.STANDALONE.ASTRAL_TITANIUM,
+        MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN, MaterialsElements.STANDALONE.HYPOGEN };
 
     private static final Materials[] aMaterial_Cables = new Materials[] { Materials.Tin, Materials.Cobalt,
         Materials.AnnealedCopper, Materials.Gold, Materials.Titanium, Materials.Nichrome, Materials.Platinum,
@@ -454,7 +459,7 @@ public class CI {
         if (a == null) {
             ItemStack aCell = getTieredComponent(OrePrefixes.liquid, aTier, 1);
             if (aCell != null) {
-                a = GT_Utility.getFluidForFilledItem(aCell, true);
+                a = GTUtility.getFluidForFilledItem(aCell, true);
                 a.amount = aAmount;
             }
         }
@@ -517,7 +522,7 @@ public class CI {
         }
 
         if (aPrefix == OrePrefixes.circuit) {
-            return GT_OreDictUnificator.get(OrePrefixes.circuit, aMaterial_Circuits[aTier], aAmount);
+            return GTOreDictUnificator.get(OrePrefixes.circuit, aMaterial_Circuits[aTier], aAmount);
         }
 
         // Check for Cables first, catch SuperConductor case and swap to wire.
@@ -571,11 +576,11 @@ public class CI {
             } else if (aTier == 4) {
                 return ItemUtils.getOrePrefixStack(aPrefix, Materials.TungstenSteel, aAmount);
             } else if (aTier == 5) {
-                return ItemUtils.getOrePrefixStack(aPrefix, ALLOY.MARAGING350, aAmount);
+                return ItemUtils.getOrePrefixStack(aPrefix, MaterialsAlloy.MARAGING350, aAmount);
             } else if (aTier == 6) {
-                return ItemUtils.getOrePrefixStack(aPrefix, ALLOY.STABALLOY, aAmount);
+                return ItemUtils.getOrePrefixStack(aPrefix, MaterialsAlloy.STABALLOY, aAmount);
             } else if (aTier == 7) {
-                return ItemUtils.getOrePrefixStack(aPrefix, ALLOY.HASTELLOY_X, aAmount);
+                return ItemUtils.getOrePrefixStack(aPrefix, MaterialsAlloy.HASTELLOY_X, aAmount);
             } else if (aTier == 8) {
                 return ItemUtils.getOrePrefixStack(aPrefix, Materials.Ultimate, aAmount);
             } else if (aTier == 9) {
@@ -926,7 +931,7 @@ public class CI {
         if (i > 8) {
             i = 8;
         }
-        return ItemUtils.simpleMetaStack(GregTech_API.sBlockCasings5, i, 1);
+        return ItemUtils.simpleMetaStack(GregTechAPI.sBlockCasings5, i, 1);
     }
 
     public static ItemStack getNumberedBioCircuit(int i) {
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java b/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java
index 3b39da877a..066213aed2 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java
@@ -4,7 +4,7 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.recipe.common.CI;
 
 public class SlotDataStick extends Slot {
@@ -26,8 +26,8 @@ public class SlotDataStick extends Slot {
                 mDataItems[1] = CI.getDataOrb();
             }
             if (mDataItems[0] != null && mDataItems[1] != null) {
-                if (GT_Utility.areStacksEqual(itemstack, mDataItems[0], true)
-                    || GT_Utility.areStacksEqual(itemstack, mDataItems[1], true)) {
+                if (GTUtility.areStacksEqual(itemstack, mDataItems[0], true)
+                    || GTUtility.areStacksEqual(itemstack, mDataItems[1], true)) {
                     isValid = true;
                 }
             }
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java b/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java
index 5e4072df6a..6eac7a78ee 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java
@@ -5,7 +5,7 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.recipe.common.CI;
 
 public class SlotIntegratedCircuit extends Slot {
@@ -40,7 +40,7 @@ public class SlotIntegratedCircuit extends Slot {
     public static synchronized boolean isItemValidForSlot(int aLockedCircuitNumber, final ItemStack itemstack) {
         boolean isValid = false;
         if (mCircuitItem == null) {
-            mCircuitItem = GT_Utility.getIntegratedCircuit(0)
+            mCircuitItem = GTUtility.getIntegratedCircuit(0)
                 .getItem();
         }
         if (mCircuitItem2 == null) {
@@ -76,7 +76,7 @@ public class SlotIntegratedCircuit extends Slot {
      */
     public static synchronized int isRegularProgrammableCircuit(final ItemStack itemstack) {
         if (mCircuitItem == null) {
-            mCircuitItem = GT_Utility.getIntegratedCircuit(0)
+            mCircuitItem = GTUtility.getIntegratedCircuit(0)
                 .getItem();
         }
         if (mCircuitItem2 == null) {
diff --git a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java
index 56cf2fdbab..cfc152d832 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.tileentities;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.general.BlockSuperLight.TileEntitySuperLight;
-import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox;
+import gtPlusPlus.core.block.machine.BlockSuperJukebox.TileEntitySuperJukebox;
 import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
 import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
index 98f1d67439..d5d348e0d8 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
@@ -15,16 +15,16 @@ import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.IFluidHandler;
 
-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.interfaces.IDescribable;
 import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.net.GT_Packet_Block_Event;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.net.GTPacketBlockEvent;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.covers.CoverInfo;
 import gtPlusPlus.api.interfaces.ILazyCoverable;
@@ -297,9 +297,9 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
         return this.canAccessData() ? this.mInventory.isValidSlot(aIndex) : false;
     }
 
-    private final GT_CoverBehavior[] mCoverBehaviors = new GT_CoverBehavior[] { GregTech_API.sNoBehavior,
-        GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior,
-        GregTech_API.sNoBehavior };
+    private final CoverBehavior[] mCoverBehaviors = new CoverBehavior[] { GregTechAPI.sNoBehavior,
+        GregTechAPI.sNoBehavior, GregTechAPI.sNoBehavior, GregTechAPI.sNoBehavior, GregTechAPI.sNoBehavior,
+        GregTechAPI.sNoBehavior };
     protected TileEntityBase mMetaTileEntity;
     protected long mStoredEnergy = 0;
     protected int mAverageEUInputIndex = 0, mAverageEUOutputIndex = 0;
@@ -309,7 +309,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
         mActiveEUOutputs = new boolean[] { false, false, false, false, false, false };
     private byte[] mSidedRedstone = new byte[] { 15, 15, 15, 15, 15, 15 };
     private int[] mCoverSides = new int[] { 0, 0, 0, 0, 0, 0 }, mCoverData = new int[] { 0, 0, 0, 0, 0, 0 },
-        mTimeStatistics = new int[GregTech_API.TICKS_FOR_LAG_AVERAGING];
+        mTimeStatistics = new int[GregTechAPI.TICKS_FOR_LAG_AVERAGING];
     private boolean mHasEnoughEnergy = true;
     protected boolean mRunningThroughTick = false;
     protected boolean mInputDisabled = false;
@@ -763,14 +763,14 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
     public final boolean getOpacity(int aX, int aY, int aZ) {
         return this.ignoreUnloadedChunks && this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ)
             ? false
-            : GT_Utility.isOpaqueBlock(this.worldObj, aX, aY, aZ);
+            : GTUtility.isOpaqueBlock(this.worldObj, aX, aY, aZ);
     }
 
     @Override
     public final boolean getAir(int aX, int aY, int aZ) {
         return this.ignoreUnloadedChunks && this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ)
             ? true
-            : GT_Utility.isBlockAir(this.worldObj, aX, aY, aZ);
+            : GTUtility.isBlockAir(this.worldObj, aX, aY, aZ);
     }
 
     @Override
@@ -846,9 +846,9 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 
     @Override
     public final void sendBlockEvent(byte aID, byte aValue) {
-        GT_Values.NW.sendPacketToAllPlayersInRange(
+        GTValues.NW.sendPacketToAllPlayersInRange(
             this.worldObj,
-            new GT_Packet_Block_Event(this.xCoord, (short) this.yCoord, this.zCoord, aID, aValue),
+            new GTPacketBlockEvent(this.xCoord, (short) this.yCoord, this.zCoord, aID, aValue),
             this.xCoord,
             this.zCoord);
     }
@@ -858,7 +858,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
     }
 
     public final void setOnFire() {
-        GT_Utility.setCoordsOnFire(this.worldObj, this.xCoord, this.yCoord, this.zCoord, false);
+        GTUtility.setCoordsOnFire(this.worldObj, this.xCoord, this.yCoord, this.zCoord, false);
     }
 
     public final void setToFire() {
@@ -926,8 +926,8 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
     }
 
     @Override
-    public GT_CoverBehavior getCoverBehaviorAtSide(ForgeDirection side) {
-        return side != ForgeDirection.UNKNOWN ? mCoverBehaviors[side.ordinal()] : GregTech_API.sNoBehavior;
+    public CoverBehavior getCoverBehaviorAtSide(ForgeDirection side) {
+        return side != ForgeDirection.UNKNOWN ? mCoverBehaviors[side.ordinal()] : GregTechAPI.sNoBehavior;
     }
 
     @Override
@@ -944,7 +944,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
             final int ordinalSide = side.ordinal();
             mCoverSides[ordinalSide] = aID;
             mCoverData[ordinalSide] = 0;
-            mCoverBehaviors[ordinalSide] = (GT_CoverBehavior) GregTech_API.getCoverBehaviorNew(aID);
+            mCoverBehaviors[ordinalSide] = (CoverBehavior) GregTechAPI.getCoverBehaviorNew(aID);
             return true;
         }
         return false;
@@ -958,7 +958,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 
     @Override
     public void setCoverItemAtSide(ForgeDirection side, ItemStack aCover) {
-        GregTech_API.getCoverBehaviorNew(aCover)
+        GregTechAPI.getCoverBehaviorNew(aCover)
             .placeCover(side, aCover, this);
     }
 
@@ -970,7 +970,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 
     @Override
     public ItemStack getCoverItemAtSide(ForgeDirection side) {
-        return GT_Utility.intToStack(getCoverIDAtSide(side));
+        return GTUtility.intToStack(getCoverIDAtSide(side));
     }
 
     @Override
@@ -1056,12 +1056,12 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
     }
 
     public String getOwnerName() {
-        if (GT_Utility.isStringInvalid(mOwnerName)) return "Player";
+        if (GTUtility.isStringInvalid(mOwnerName)) return "Player";
         return mOwnerName;
     }
 
     public String setOwnerName(String aName) {
-        if (GT_Utility.isStringInvalid(aName)) return mOwnerName = "Player";
+        if (GTUtility.isStringInvalid(aName)) return mOwnerName = "Player";
         return mOwnerName = aName;
     }
 
@@ -1222,15 +1222,15 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 
     @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;
         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())) {
             tStack.stackSize += aStack.stackSize;
             return true;
@@ -1240,7 +1240,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 
     @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
@@ -1290,8 +1290,8 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
             this.doExplosion(
                 this.oOutput * (long) (this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() ? 4
                     : (this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() / 2L ? 2 : 1)));
-            GT_Mod arg9999 = GT_Mod.instance;
-            GT_Mod.achievements.issueAchievement(
+            GTMod arg9999 = GTMod.instance;
+            GTMod.achievements.issueAchievement(
                 this.getWorldObj()
                     .getPlayerEntityByName(this.mOwnerName),
                 "electricproblems");
@@ -1300,10 +1300,10 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 
     public void doExplosion(long aAmount) {
         if (this.canAccessData()) {
-            if (GregTech_API.sMachineWireFire && this.mMetaTileEntity.isElectric()) {
+            if (GregTechAPI.sMachineWireFire && this.mMetaTileEntity.isElectric()) {
                 try {
                     this.mReleaseEnergy = true;
-                    Util.emitEnergyToNetwork(GT_Values.V[5], Math.max(1L, this.getStoredEU() / GT_Values.V[5]), this);
+                    Util.emitEnergyToNetwork(GTValues.V[5], Math.max(1L, this.getStoredEU() / GTValues.V[5]), this);
                 } catch (Exception arg4) {}
             }
             this.mReleaseEnergy = false;
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java
index ce28dd0b3e..113440e8b5 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java
@@ -9,7 +9,7 @@ import net.minecraft.network.Packet;
 import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.inventories.InventoryCircuitProgrammer;
 import gtPlusPlus.core.recipe.common.CI;
@@ -109,7 +109,7 @@ public class TileEntityCircuitProgrammer extends TileEntity implements ISidedInv
                     // Check Circuit Type
                     ItemStack aOutput;
                     if (aTypeInSlot == 0) {
-                        aOutput = GT_Utility.getIntegratedCircuit(e);
+                        aOutput = GTUtility.getIntegratedCircuit(e);
                     } else if (aTypeInSlot == 1) {
                         aOutput = CI.getNumberedBioCircuit(e);
                     } else if (aTypeInSlot == 2) {
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java
index 4b3fd3f087..a6754b00b0 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java
@@ -25,13 +25,13 @@ import com.cleanroommc.modularui.widgets.TextWidget;
 import com.cleanroommc.modularui.widgets.slot.SlotGroup;
 
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.inventories.Inventory_DecayablesChest;
+import gtPlusPlus.core.inventories.InventoryDecayablesChest;
 import gtPlusPlus.core.item.materials.DustDecayable;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class TileEntityDecayablesChest extends TileEntity implements ISidedInventory, IGuiHolder {
 
-    private final Inventory_DecayablesChest inventoryContents;
+    private final InventoryDecayablesChest inventoryContents;
 
     /** Determines if the check for adjacent chests has taken place. */
     public boolean adjacentChestChecked;
@@ -57,10 +57,10 @@ public class TileEntityDecayablesChest extends TileEntity implements ISidedInven
     private int tickCount = 0;
 
     public TileEntityDecayablesChest() {
-        this.inventoryContents = new Inventory_DecayablesChest();
+        this.inventoryContents = new InventoryDecayablesChest();
     }
 
-    public Inventory_DecayablesChest getInventory() {
+    public InventoryDecayablesChest getInventory() {
         return this.inventoryContents;
     }
 
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
index 1a09b6b423..49d466d70d 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
@@ -17,7 +17,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.FishingHooks;
 
 import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.inventories.InventoryFishTrap;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -76,7 +76,7 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
         }
         for (final ItemStack contents : this.getInventory()
             .getInventory()) {
-            if (GT_Utility.areStacksEqual(loot, contents)) {
+            if (GTUtility.areStacksEqual(loot, contents)) {
                 if (contents.stackSize < contents.getMaxStackSize()) {
                     contents.stackSize++;
                     this.markDirty();
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java
index a9bc2b0049..7f1cde2476 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java
@@ -12,8 +12,8 @@ import net.minecraftforge.fluids.FluidStack;
 
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.container.Container_VolumetricFlaskSetter;
-import gtPlusPlus.core.inventories.Inventory_VolumetricFlaskSetter;
+import gtPlusPlus.core.container.ContainerVolumetricFlaskSetter;
+import gtPlusPlus.core.inventories.InventoryVolumetricFlaskSetter;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
@@ -21,7 +21,7 @@ import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISidedInventory {
 
     private int tickCount = 0;
-    private final Inventory_VolumetricFlaskSetter inventoryContents;
+    private final InventoryVolumetricFlaskSetter inventoryContents;
     private String customName;
     public int locationX;
     public int locationY;
@@ -30,7 +30,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
     private int aCustomValue = 1000;
 
     public TileEntityVolumetricFlaskSetter() {
-        this.inventoryContents = new Inventory_VolumetricFlaskSetter();
+        this.inventoryContents = new InventoryVolumetricFlaskSetter();
         this.setTileLocation();
     }
 
@@ -62,7 +62,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
     public final boolean hasFlask() {
         for (int i = 0; i < this.getInventory()
             .getInventory().length - 1; i++) {
-            if (i == Container_VolumetricFlaskSetter.SLOT_OUTPUT) {
+            if (i == ContainerVolumetricFlaskSetter.SLOT_OUTPUT) {
                 continue;
             }
             if (this.getInventory()
@@ -73,7 +73,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
         return false;
     }
 
-    public Inventory_VolumetricFlaskSetter getInventory() {
+    public InventoryVolumetricFlaskSetter getInventory() {
         return this.inventoryContents;
     }
 
@@ -124,9 +124,9 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
 
         // Check if there is output in slot.
         Boolean hasOutput = false;
-        if (aInputs[Container_VolumetricFlaskSetter.SLOT_OUTPUT] != null) {
+        if (aInputs[ContainerVolumetricFlaskSetter.SLOT_OUTPUT] != null) {
             hasOutput = true;
-            if (aInputs[Container_VolumetricFlaskSetter.SLOT_OUTPUT].stackSize >= 16) {
+            if (aInputs[ContainerVolumetricFlaskSetter.SLOT_OUTPUT].stackSize >= 16) {
                 return false;
             }
         }
@@ -145,7 +145,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
                 log("Skipping Custom slot as value <= 0");
                 continue;
             }
-            if (e == Container_VolumetricFlaskSetter.SLOT_OUTPUT) {
+            if (e == ContainerVolumetricFlaskSetter.SLOT_OUTPUT) {
                 continue;
             }
 
@@ -163,7 +163,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
                 }
                 // Existing Output
                 else {
-                    ItemStack f = aInputs[Container_VolumetricFlaskSetter.SLOT_OUTPUT];
+                    ItemStack f = aInputs[ContainerVolumetricFlaskSetter.SLOT_OUTPUT];
                     FluidStack aFluidInCheckedSlot = VolumetricFlaskHelper.getFlaskFluid(f);
                     int aTypeInCheckedSlot = getFlaskType(f);
                     // Check that the Circuit in the Output slot is not null and the same type as the circuit input.
@@ -214,7 +214,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
                             VolumetricFlaskHelper.setFluid(aOutput, aOutputFluid);
                         }
                         this.setInventorySlotContents(e, aInputStack);
-                        this.setInventorySlotContents(Container_VolumetricFlaskSetter.SLOT_OUTPUT, aOutput);
+                        this.setInventorySlotContents(ContainerVolumetricFlaskSetter.SLOT_OUTPUT, aOutput);
                         return true;
                     }
                 }
@@ -359,7 +359,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
 
     @Override
     public boolean canExtractItem(final int aSlot, final ItemStack p_102008_2_, final int p_102008_3_) {
-        return aSlot == Container_VolumetricFlaskSetter.SLOT_OUTPUT;
+        return aSlot == ContainerVolumetricFlaskSetter.SLOT_OUTPUT;
     }
 
     public String getCustomName() {
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java
index dfdb7104b0..66378f0f7a 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java
@@ -27,11 +27,11 @@ import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import net.minecraftforge.oredict.OreDictionary;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
 import gtPlusPlus.core.inventories.InventoryPestKiller;
-import gtPlusPlus.core.material.MISC_MATERIALS;
+import gtPlusPlus.core.material.MaterialMisc;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
@@ -186,7 +186,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory,
             if (f != null) {
                 if (f.isFluidEqual(FluidUtils.getWildcardFluidStack("formaldehyde", 1))) {
                     return 1;
-                } else if (f.isFluidEqual(MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1))) {
+                } else if (f.isFluidEqual(MaterialMisc.HYDROGEN_CYANIDE.getFluidStack(1))) {
                     return 2;
                 }
             }
@@ -330,7 +330,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory,
         if (this.getInventory()
             .getInventory()[0] == null) {
             return true;
-        } else if (GT_Utility.areStacksEqual(
+        } else if (GTUtility.areStacksEqual(
             aStack,
             this.getInventory()
                 .getInventory()[0])) {
@@ -471,7 +471,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory,
             ArrayList<ItemStack> t2Cells = OreDictionary.getOres("cellHydrogenCyanide");
             didFill = addFluid(t1Cells, aInput, FluidUtils.getWildcardFluidStack("formaldehyde", 1000));
             if (!didFill) {
-                didFill = addFluid(t2Cells, aInput, MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1000));
+                didFill = addFluid(t2Cells, aInput, MaterialMisc.HYDROGEN_CYANIDE.getFluidStack(1000));
             }
         }
 
@@ -495,7 +495,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory,
 
     public boolean addFluid(ArrayList<ItemStack> inputs, ItemStack aInput, FluidStack aFluidForInput) {
         for (ItemStack a : inputs) {
-            if (GT_Utility.areStacksEqual(a, aInput)) {
+            if (GTUtility.areStacksEqual(a, aInput)) {
                 if (mTank.getFluid() == null || mTank.getFluid()
                     .isFluidEqual(aFluidForInput)) {
                     boolean didFill = fill(ForgeDirection.UNKNOWN, aFluidForInput, true) > 0;
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java
index 7c90ddc1c2..02641f1e08 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java
@@ -9,9 +9,9 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 
 import gregtech.api.enums.ItemList;
-import gregtech.common.items.GT_MetaGenerated_Item_01;
+import gregtech.common.items.MetaGeneratedItem01;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.container.Container_ProjectTable;
+import gtPlusPlus.core.container.ContainerProjectTable;
 import gtPlusPlus.core.inventories.projecttable.InventoryProjectMain;
 import gtPlusPlus.core.inventories.projecttable.InventoryProjectOutput;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
@@ -28,7 +28,7 @@ public class TileEntityProjectTable extends TileEntity
     public InventoryProjectMain inventoryGrid;
     public InventoryProjectOutput inventoryOutputs;
 
-    private Container_ProjectTable container;
+    private ContainerProjectTable container;
 
     public TileEntityProjectTable() {
         this.inventoryGrid = new InventoryProjectMain(); // number of slots - without product slot
@@ -36,7 +36,7 @@ public class TileEntityProjectTable extends TileEntity
         this.canUpdate();
     }
 
-    public void setContainer(Container_ProjectTable container) {
+    public void setContainer(ContainerProjectTable container) {
         this.container = container;
     }
 
@@ -122,7 +122,7 @@ public class TileEntityProjectTable extends TileEntity
             // Data stick
             ItemStack dataStick = this.inventoryOutputs.getStackInSlot(0);
             if (dataStick != null && this.container != null && container.getOutputContent() != null) {
-                if ((dataStick.getItem() instanceof GT_MetaGenerated_Item_01 && dataStick.getItemDamage() == 32708)
+                if ((dataStick.getItem() instanceof MetaGeneratedItem01 && dataStick.getItemDamage() == 32708)
                     || (dataStick == ItemList.Tool_DataStick.get(1))
                     || (dataStick == GregtechItemList.Old_Tool_DataStick.get(1))
                     || (dataStick.getItem() instanceof MetaGeneratedGregtechItems
diff --git a/src/main/java/gtPlusPlus/core/util/Utils.java b/src/main/java/gtPlusPlus/core/util/Utils.java
index 610cc4f8fa..c3c877388b 100644
--- a/src/main/java/gtPlusPlus/core/util/Utils.java
+++ b/src/main/java/gtPlusPlus/core/util/Utils.java
@@ -26,15 +26,15 @@ import net.minecraftforge.fluids.FluidStack;
 import org.apache.commons.lang3.EnumUtils;
 
 import cpw.mods.fml.common.FMLCommonHandler;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.TC_Aspects;
-import gregtech.api.enums.TC_Aspects.TC_AspectStack;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.TCAspects;
+import gregtech.api.enums.TCAspects.TC_AspectStack;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
@@ -56,7 +56,7 @@ public class Utils {
             .isClient();
     }
 
-    public static TC_AspectStack getTcAspectStack(final TC_Aspects aspect, final long size) {
+    public static TC_AspectStack getTcAspectStack(final TCAspects aspect, final long size) {
         return getTcAspectStack(aspect.name(), (int) size);
     }
 
@@ -64,7 +64,7 @@ public class Utils {
         return getTcAspectStack(aspect, (int) size);
     }
 
-    public static TC_AspectStack getTcAspectStack(final TC_Aspects aspect, final int size) {
+    public static TC_AspectStack getTcAspectStack(final TCAspects aspect, final int size) {
         return getTcAspectStack(aspect.name(), size);
     }
 
@@ -75,14 +75,14 @@ public class Utils {
         if (aspect.equalsIgnoreCase("COGNITIO")) {
             // Adds in Compat for older GT Versions which Misspell aspects.
             try {
-                if (EnumUtils.isValidEnum(TC_Aspects.class, "COGNITIO")) {
+                if (EnumUtils.isValidEnum(TCAspects.class, "COGNITIO")) {
                     Logger.WARNING("TC Aspect found - " + aspect);
-                    returnValue = new TC_AspectStack(TC_Aspects.valueOf("COGNITIO"), size);
+                    returnValue = new TC_AspectStack(TCAspects.valueOf("COGNITIO"), size);
                 } else {
                     Logger.INFO(
                         "Fallback TC Aspect found - " + aspect
                             + " - PLEASE UPDATE GREGTECH TO A NEWER VERSION TO REMOVE THIS MESSAGE - THIS IS NOT AN ERROR");
-                    returnValue = new TC_AspectStack(TC_Aspects.valueOf("COGNITO"), size);
+                    returnValue = new TC_AspectStack(TCAspects.valueOf("COGNITO"), size);
                 }
             } catch (final NoSuchFieldError r) {
                 Logger.INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus");
@@ -90,14 +90,14 @@ public class Utils {
         } else if (aspect.equalsIgnoreCase("EXANIMUS")) {
             // Adds in Compat for older GT Versions which Misspell aspects.
             try {
-                if (EnumUtils.isValidEnum(TC_Aspects.class, "EXANIMUS")) {
+                if (EnumUtils.isValidEnum(TCAspects.class, "EXANIMUS")) {
                     Logger.WARNING("TC Aspect found - " + aspect);
-                    returnValue = new TC_AspectStack(TC_Aspects.valueOf("EXANIMUS"), size);
+                    returnValue = new TC_AspectStack(TCAspects.valueOf("EXANIMUS"), size);
                 } else {
                     Logger.INFO(
                         "Fallback TC Aspect found - " + aspect
                             + " - PLEASE UPDATE GREGTECH TO A NEWER VERSION TO REMOVE THIS MESSAGE - THIS IS NOT AN ERROR");
-                    returnValue = new TC_AspectStack(TC_Aspects.valueOf("EXAMINIS"), size);
+                    returnValue = new TC_AspectStack(TCAspects.valueOf("EXAMINIS"), size);
                 }
             } catch (final NoSuchFieldError r) {
                 Logger.INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus");
@@ -106,21 +106,21 @@ public class Utils {
         } else if (aspect.equalsIgnoreCase("PRAECANTATIO")) {
             // Adds in Compat for older GT Versions which Misspell aspects.
             try {
-                if (EnumUtils.isValidEnum(TC_Aspects.class, "PRAECANTATIO")) {
+                if (EnumUtils.isValidEnum(TCAspects.class, "PRAECANTATIO")) {
                     Logger.WARNING("TC Aspect found - " + aspect);
-                    returnValue = new TC_AspectStack(TC_Aspects.valueOf("PRAECANTATIO"), size);
+                    returnValue = new TC_AspectStack(TCAspects.valueOf("PRAECANTATIO"), size);
                 } else {
                     Logger.INFO(
                         "Fallback TC Aspect found - " + aspect
                             + " - PLEASE UPDATE GREGTECH TO A NEWER VERSION TO REMOVE THIS MESSAGE - THIS IS NOT AN ERROR");
-                    returnValue = new TC_AspectStack(TC_Aspects.valueOf("PRAECANTIO"), size);
+                    returnValue = new TC_AspectStack(TCAspects.valueOf("PRAECANTIO"), size);
                 }
             } catch (final NoSuchFieldError r) {
                 Logger.INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus");
             }
         } else {
             Logger.WARNING("TC Aspect found - " + aspect);
-            returnValue = new TC_AspectStack(TC_Aspects.valueOf(aspect), size);
+            returnValue = new TC_AspectStack(TCAspects.valueOf(aspect), size);
         }
 
         return returnValue;
@@ -352,17 +352,17 @@ public class Utils {
     }
 
     public static String addBookTitleLocalization(final String aTitle) {
-        return GT_LanguageManager
-            .addStringLocalization("Book." + aTitle + ".Name", aTitle, !GregTech_API.sPostloadFinished);
+        return GTLanguageManager
+            .addStringLocalization("Book." + aTitle + ".Name", aTitle, !GregTechAPI.sPostloadFinished);
     }
 
     public static String[] addBookPagesLocalization(final String aTitle, final String[] aPages) {
         String[] aLocalizationPages = new String[aPages.length];
         for (byte i = 0; i < aPages.length; i = (byte) (i + 1)) {
-            aLocalizationPages[i] = GT_LanguageManager.addStringLocalization(
+            aLocalizationPages[i] = GTLanguageManager.addStringLocalization(
                 "Book." + aTitle + ".Page" + ((i < 10) ? "0" + i : Byte.valueOf(i)),
                 aPages[i],
-                !GregTech_API.sPostloadFinished);
+                !GregTechAPI.sPostloadFinished);
         }
         return aLocalizationPages;
     }
@@ -370,16 +370,16 @@ public class Utils {
     public static ItemStack getWrittenBook(ItemStack book, int ID, String mapping, String title, String author,
         String[] pages) {
 
-        if (GT_Utility.isStringInvalid(mapping)) {
+        if (GTUtility.isStringInvalid(mapping)) {
             return null;
         }
 
-        ItemStack stack = CORE.sBookList.get(mapping);
+        ItemStack stack = GTPPCore.sBookList.get(mapping);
         if (stack != null) {
-            return GT_Utility.copyAmount(1L, stack);
+            return GTUtility.copyAmount(1L, stack);
         }
 
-        if (GT_Utility.isStringInvalid(title) || GT_Utility.isStringInvalid(author) || pages.length <= 0) {
+        if (GTUtility.isStringInvalid(title) || GTUtility.isStringInvalid(author) || pages.length <= 0) {
             return null;
         }
 
@@ -400,11 +400,11 @@ public class Utils {
                     NBTList.appendTag(new NBTTagString(pages[i]));
                 } else {
                     Logger.INFO("WARNING: String for written Book too long! -> " + pages[i]);
-                    GT_Log.err.println("WARNING: String for written Book too long! -> " + pages[i]);
+                    GTLog.err.println("WARNING: String for written Book too long! -> " + pages[i]);
                 }
             } else {
                 Logger.INFO("WARNING: Too much Pages for written Book! -> " + title);
-                GT_Log.err.println("WARNING: Too much Pages for written Book! -> " + title);
+                GTLog.err.println("WARNING: Too much Pages for written Book! -> " + title);
                 break;
             }
         }
@@ -423,14 +423,14 @@ public class Utils {
             mapping,
             title,
             author);
-        GT_Log.out.println(logMessage);
+        GTLog.out.println(logMessage);
 
         NBTUtils.createIntegerTagCompound(stack, "stats", "mMeta", ID);
-        CORE.sBookList.put(mapping, stack);
+        GTPPCore.sBookList.put(mapping, stack);
 
         Logger.INFO(String.format("Creating book: %s by %s. Using Meta %d.", title, author, ID));
 
-        return GT_Utility.copy(stack);
+        return GTUtility.copy(stack);
     }
 
 }
diff --git a/src/main/java/gtPlusPlus/core/util/math/MathUtils.java b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java
index ac3ef2e947..4fb34bd158 100644
--- a/src/main/java/gtPlusPlus/core/util/math/MathUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java
@@ -4,15 +4,15 @@ import java.text.NumberFormat;
 import java.util.Map;
 import java.util.Random;
 
-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.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.Utils;
 
 public class MathUtils {
 
-    static final Random rand = CORE.RANDOM;
+    static final Random rand = GTPPCore.RANDOM;
 
     /** Formats a number with group separator and at most 2 fraction digits. */
     private static final NumberFormat sNumberFormat = NumberFormat.getInstance();
@@ -273,7 +273,7 @@ public class MathUtils {
     }
 
     public static int safeInt(long number) {
-        return number > GT_Values.V[GT_Values.V.length - 1] ? safeInt(GT_Values.V[GT_Values.V.length - 1], 1)
+        return number > GTValues.V[GTValues.V.length - 1] ? safeInt(GTValues.V[GTValues.V.length - 1], 1)
             : number < Integer.MIN_VALUE ? Integer.MIN_VALUE : (int) number;
     }
 
@@ -391,7 +391,7 @@ public class MathUtils {
 
     /**
      * Inverts the value, making Positives into Negatives and vice versa.
-     * 
+     *
      * @param aPositive - An int value, either positive or negative.
      * @return - Inverted int Value.
      */
@@ -484,7 +484,7 @@ public class MathUtils {
 
     /**
      * Balances a number within a range.
-     * 
+     *
      * @param aInput - The number to balance
      * @param aMin   - The minimum bounds
      * @param aMax   - The maximum bounds
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java
index 87bd0e60c6..f0fbd2f253 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java
@@ -11,7 +11,7 @@ import net.minecraft.util.DamageSource;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.handler.events.EntityDeathHandler;
 import ic2.core.IC2Potion;
@@ -49,7 +49,7 @@ public class EntityUtils {
             if ((radiationLevel > 0) && (entityHolding instanceof final EntityLivingBase entityLiving)) {
                 if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode) {
                     if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving)
-                            && !GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
+                            && !GTUtility.isWearingFullRadioHazmat(entityLiving)) {
                         if (entityLiving.getActivePotionEffect(IC2Potion.radiation) != null) {
                             entityLiving.getActivePotionEffect(IC2Potion.radiation);
                         }
@@ -120,8 +120,8 @@ public class EntityUtils {
         if (!world.isRemote) {
             if ((heatLevel > 0) && (entityHolding instanceof final EntityLivingBase entityLiving)) {
                 if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode) {
-                    if (!GT_Utility.isWearingFullHeatHazmat(entityLiving)) {
-                        GT_Utility.applyHeatDamage(entityLiving, heatLevel);
+                    if (!GTUtility.isWearingFullHeatHazmat(entityLiving)) {
+                        GTUtility.applyHeatDamage(entityLiving, heatLevel);
                     }
                 }
             }
@@ -134,7 +134,7 @@ public class EntityUtils {
 
     /**
      * Provides the ability to provide custom drops upon the death of EntityLivingBase objects.
-     * 
+     *
      * @param aMobClass  - The Base Class you want to drop this item.
      * @param aStack     - The ItemStack, stack size is not respected.
      * @param aMaxAmount - The maximum size of the ItemStack which drops.
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java
index 2b6e96541d..95ba020887 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.util.minecraft;
 
 import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import java.util.HashMap;
 
@@ -16,10 +16,10 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
 
 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.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.FluidGT6;
 import gtPlusPlus.core.item.base.BaseItemComponent;
@@ -302,7 +302,7 @@ public class FluidUtils {
         }
 
         if (register) {
-            GT_LanguageManager.addStringLocalization(rFluid.getUnlocalizedName(), aLocalName);
+            GTLanguageManager.addStringLocalization(rFluid.getUnlocalizedName(), aLocalName);
             if (FluidRegistry.registerFluid(rFluid)) {
                 switch (aState) {
                     case 0 -> {
@@ -375,7 +375,7 @@ public class FluidUtils {
         if ((aFullContainer != null) && (aEmptyContainer != null)
             && !FluidContainerRegistry
                 .registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Cell_Empty.get(1L))
                 .itemOutputs(aFullContainer)
                 .fluidInputs(new FluidStack(rFluid, aFluidAmount))
@@ -529,7 +529,7 @@ public class FluidUtils {
                 aGenerateCell);
 
             if (dustStack != null) {
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(dustStack)
                     .fluidOutputs(FluidUtils.getFluidStack(gtFluid, amountPerItem))
                     .duration(1 * SECONDS)
@@ -537,7 +537,7 @@ public class FluidUtils {
                     .addTo(fluidExtractionRecipes);
             }
             if (dustStack2 != null) {
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(dustStack2)
                     .fluidOutputs(FluidUtils.getFluidStack(gtFluid, amountPerItem))
                     .duration(1 * SECONDS)
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index bedc0d2439..1e211290cd 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -5,7 +5,7 @@ import static gregtech.api.enums.Mods.GregTech;
 import static gregtech.api.enums.Mods.IndustrialCraft2;
 import static gregtech.api.enums.Mods.Minecraft;
 import static gregtech.api.recipe.RecipeMaps.packagerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,15 +25,15 @@ import net.minecraftforge.oredict.OreDictionary;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
-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_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.items.MetaGeneratedTool01;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Pair;
@@ -41,16 +41,16 @@ import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.base.dusts.BaseItemDustUnique;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.item.chemistry.GenericChem;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.CORE_Preloader;
-import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
+import gtPlusPlus.preloader.PreloaderCore;
+import gtPlusPlus.xmod.gregtech.api.items.GTMetaTool;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_DustGeneration;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGenDustGeneration;
 
 public class ItemUtils {
 
@@ -94,7 +94,7 @@ public class ItemUtils {
     }
 
     public static ItemStack getIC2Cell(final int meta) {
-        return GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", 1L, meta);
+        return GTModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", 1L, meta);
     }
 
     public static ItemStack getEmptyCell() {
@@ -105,7 +105,7 @@ public class ItemUtils {
         if (ItemList.Cell_Empty.hasBeenSet()) {
             return ItemList.Cell_Empty.get(i);
         }
-        final ItemStack temp = GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", i, 0);
+        final ItemStack temp = GTModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", i, 0);
         return temp != null ? temp : null;
     }
 
@@ -122,7 +122,7 @@ public class ItemUtils {
             if (em != null) {
 
                 final ItemStack metaStack = new ItemStack(em, 1, meta);
-                GT_OreDictUnificator.registerOre(oreDictName, metaStack);
+                GTOreDictUnificator.registerOre(oreDictName, metaStack);
 
             }
         } catch (final NullPointerException e) {
@@ -308,7 +308,7 @@ public class ItemUtils {
     }
 
     public static ItemStack getItemStackOfAmountFromOreDictNoBroken(String oredictName, final int amount) {
-        if (CORE_Preloader.DEBUG_MODE) {
+        if (PreloaderCore.DEBUG_MODE) {
             Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(1));
             Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(2));
             Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(3));
@@ -353,7 +353,7 @@ public class ItemUtils {
     }
 
     public static ItemStack getGregtechDust(final Materials material, final int amount) {
-        final ItemStack returnValue = GT_OreDictUnificator.get(OrePrefixes.dust, material, 1L);
+        final ItemStack returnValue = GTOreDictUnificator.get(OrePrefixes.dust, material, 1L);
         if (returnValue != null) {
             if (ItemUtils.checkForInvalidItems(returnValue)) {
                 return returnValue.copy();
@@ -371,7 +371,7 @@ public class ItemUtils {
 
     public static Item[] generateSpecialUseDusts(final String unlocalizedName, final String materialName,
         String mChemForm, final int Colour) {
-        GT_LanguageManager.addStringLocalization("gtplusplus.material." + materialName, materialName);
+        GTLanguageManager.addStringLocalization("gtplusplus.material." + materialName, materialName);
         final Item[] output = {
             new BaseItemDustUnique("itemDust" + unlocalizedName, materialName, mChemForm, Colour, "Dust"),
             new BaseItemDustUnique("itemDustSmall" + unlocalizedName, materialName, mChemForm, Colour, "Small"),
@@ -383,15 +383,15 @@ public class ItemUtils {
         final ItemStack smallDust = ItemUtils.getSimpleStack(output[1]);
         final ItemStack tinyDust = ItemUtils.getSimpleStack(output[2]);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(4, smallDust), ItemList.Schematic_Dust.get(0))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(4, smallDust), ItemList.Schematic_Dust.get(0))
             .itemOutputs(normalDust)
             .duration(5 * SECONDS)
             .eut(4)
             .addTo(packagerRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(9, tinyDust), ItemList.Schematic_Dust.get(0))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(9, tinyDust), ItemList.Schematic_Dust.get(0))
             .itemOutputs(normalDust)
             .duration(5 * SECONDS)
             .eut(4)
@@ -503,7 +503,7 @@ public class ItemUtils {
             output = new Item[] { new BaseItemDustUnique("itemDust" + unlocalizedName, materialName, Colour, "Dust") };
         }
 
-        new RecipeGen_DustGeneration(material, disableExtraRecipes);
+        new RecipeGenDustGeneration(material, disableExtraRecipes);
 
         return output;
     }
@@ -657,7 +657,7 @@ public class ItemUtils {
         if (mPrefix == OrePrefixes.rod) {
             mPrefix = OrePrefixes.stick;
         }
-        ItemStack aGtStack = GT_OreDictUnificator.get(mPrefix, mMat, mAmount);
+        ItemStack aGtStack = GTOreDictUnificator.get(mPrefix, mMat, mAmount);
         if (aGtStack == null) {
             Logger
                 .INFO("Failed to find `" + mPrefix + MaterialUtils.getMaterialName(mMat) + "` in OD. [Prefix Search]");
@@ -695,7 +695,7 @@ public class ItemUtils {
     }
 
     public static boolean registerFuel(ItemStack aBurnable, int burn) {
-        return CORE.burnables.add(new Pair<>(burn, aBurnable));
+        return GTPPCore.burnables.add(new Pair<>(burn, aBurnable));
     }
 
     public static boolean checkForInvalidItems(ItemStack mInput) {
@@ -772,8 +772,8 @@ public class ItemUtils {
         IInventory aTemp = aInputInventory;
         for (int i = 0; i < p.length; ++i) {
             for (int j = i + 1; j < p.length; ++j) {
-                if (p[j] != null && (p[i] == null || GT_Utility.areStacksEqual(p[i], p[j]))) {
-                    GT_Utility.moveStackFromSlotAToSlotB(aTemp, aTemp, j, i, (byte) 64, (byte) 1, (byte) 64, (byte) 1);
+                if (p[j] != null && (p[i] == null || GTUtility.areStacksEqual(p[i], p[j]))) {
+                    GTUtility.moveStackFromSlotAToSlotB(aTemp, aTemp, j, i, (byte) 64, (byte) 1, (byte) 64, (byte) 1);
                 }
             }
         }
@@ -840,9 +840,9 @@ public class ItemUtils {
         final Item mItem = aStack.getItem();
         final Item aSkookum = ItemUtils.getItemFromFQRN("miscutils:gt.plusplus.metatool.01");
         final Class aSkookClass = aSkookum.getClass();
-        if (aSkookClass.isInstance(mItem) || mItem instanceof GT_MetaGenerated_Tool_01
+        if (aSkookClass.isInstance(mItem) || mItem instanceof MetaGeneratedTool01
             || mItem instanceof MetaGeneratedGregtechTools
-            || mItem instanceof Gregtech_MetaTool
+            || mItem instanceof GTMetaTool
             || mItem == aSkookum) {
             return true;
         }
@@ -884,7 +884,7 @@ public class ItemUtils {
     }
 
     public static ItemStack getNullStack() {
-        return GT_Values.NI;
+        return GTValues.NI;
     }
 
     public static ItemStack depleteStack(ItemStack aStack) {
@@ -908,7 +908,7 @@ public class ItemUtils {
             Item aItem = aStack.getItem();
             if (aItem == CI.getNumberedBioCircuit(0)
                 .getItem() || aItem
-                    == GT_Utility.getIntegratedCircuit(0)
+                    == GTUtility.getIntegratedCircuit(0)
                         .getItem()
                 || aItem == CI.getNumberedAdvancedCircuit(0)
                     .getItem()) {
@@ -919,91 +919,91 @@ public class ItemUtils {
     }
 
     public static boolean isCatalyst(ItemStack aStack) {
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mBlueCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mBlueCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mBrownCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mBrownCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mOrangeCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mOrangeCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mPurpleCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mPurpleCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mRedCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mRedCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mYellowCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mYellowCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mPinkCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mPinkCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mFormaldehydeCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mFormaldehydeCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mSolidAcidCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mSolidAcidCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mInfiniteMutationCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mInfiniteMutationCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, AgriculturalChem.mGreenCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, AgriculturalChem.mGreenCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mPlatinumGroupCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mPlatinumGroupCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mPlasticPolymerCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mPlasticPolymerCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mRubberPolymerCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mRubberPolymerCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mAdhesionPromoterCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mAdhesionPromoterCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mTitaTungstenIndiumCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mTitaTungstenIndiumCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mRadioactivityCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mRadioactivityCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mRareEarthGroupCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mRareEarthGroupCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mSimpleNaquadahCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mSimpleNaquadahCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mAdvancedNaquadahCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mAdvancedNaquadahCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mRawIntelligenceCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mRawIntelligenceCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mUltimatePlasticCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mUltimatePlasticCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mBiologicalIntelligenceCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mBiologicalIntelligenceCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.TemporalHarmonyCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.TemporalHarmonyCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mLimpidWaterCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mLimpidWaterCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mFlawlessWaterCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mFlawlessWaterCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mParticleAccelerationCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mParticleAccelerationCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mSynchrotronCapableCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mSynchrotronCapableCatalyst, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mAlgagenicGrowthPromoterCatalyst, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mAlgagenicGrowthPromoterCatalyst, true)) {
             return true;
         }
 
@@ -1011,10 +1011,10 @@ public class ItemUtils {
     }
 
     public static boolean isMillingBall(ItemStack aStack) {
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mMillingBallAlumina, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mMillingBallAlumina, true)) {
             return true;
         }
-        if (GT_Utility.areStacksEqual(aStack, GenericChem.mMillingBallSoapstone, true)) {
+        if (GTUtility.areStacksEqual(aStack, GenericChem.mMillingBallSoapstone, true)) {
             return true;
         }
         return false;
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index 9aa8b3c0fa..6675e19891 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -13,7 +13,7 @@ import gregtech.api.enums.Element;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TextureSet;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.TypeCounter;
@@ -22,7 +22,7 @@ import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes;
 import gtPlusPlus.core.item.base.foil.BaseItemFoil;
 import gtPlusPlus.core.item.base.wire.BaseItemFineWire;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.material.state.MaterialState;
@@ -73,7 +73,7 @@ public class MaterialUtils {
             int radioactivity = 0;
             if (material.isRadioactive()) {
                 ItemStack aDustStack = ItemUtils.getOrePrefixStack(OrePrefixes.dust, material, 1);
-                radioactivity = aDustStack != null ? GT_Utility.getRadioactivityLevel(aDustStack) : 0;
+                radioactivity = aDustStack != null ? GTUtility.getRadioactivityLevel(aDustStack) : 0;
                 if (radioactivity == 0) {
                     long aProtons = material.getProtons();
                     radioactivity = (int) Math.min(Math.max((aProtons / 30), 1), 9);
@@ -275,7 +275,7 @@ public class MaterialUtils {
                     + "' & fallback '"
                     + aFallbackMaterialName
                     + "', returning _NULL.");
-            CORE.crash();
+            GTPPCore.crash();
         }
         return g;
     }
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java
index 3abc92b69e..16e5652e82 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.util.minecraft;
 
 import java.util.HashMap;
 
-import gregtech.common.GT_Worldgen_GT_Ore_Layer;
+import gregtech.common.WorldgenGTOreLayer;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -18,12 +18,11 @@ public class MiningUtils {
         String aTextWorldGen;
         if (MiningUtils.findAndMapOreTypesFromGT()) {
             int mapKey = 0;
-            for (AutoMap<GT_Worldgen_GT_Ore_Layer> g : MiningUtils.mOreMaps) {
-                for (GT_Worldgen_GT_Ore_Layer h : g) {
+            for (AutoMap<WorldgenGTOreLayer> g : MiningUtils.mOreMaps) {
+                for (WorldgenGTOreLayer h : g) {
 
                     try {
-                        aTextWorldGen = (String) ReflectionUtils
-                            .getField(GT_Worldgen_GT_Ore_Layer.class, "aTextWorldgen")
+                        aTextWorldGen = (String) ReflectionUtils.getField(WorldgenGTOreLayer.class, "aTextWorldgen")
                             .get(h);
                     } catch (IllegalArgumentException | IllegalAccessException e) {
                         aTextWorldGen = h.mWorldGenName;
@@ -37,14 +36,14 @@ public class MiningUtils {
         }
     }
 
-    public static AutoMap<GT_Worldgen_GT_Ore_Layer>[] mOreMaps = new AutoMap[7];
-    private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Overworld = new AutoMap<>();
-    private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Nether = new AutoMap<>();
-    private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_End = new AutoMap<>();
-    private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Moon = new AutoMap<>();
-    private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Mars = new AutoMap<>();
-    private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Comets = new AutoMap<>();
-    private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Misc = new AutoMap<>();
+    public static AutoMap<WorldgenGTOreLayer>[] mOreMaps = new AutoMap[7];
+    private static final AutoMap<WorldgenGTOreLayer> Ores_Overworld = new AutoMap<>();
+    private static final AutoMap<WorldgenGTOreLayer> Ores_Nether = new AutoMap<>();
+    private static final AutoMap<WorldgenGTOreLayer> Ores_End = new AutoMap<>();
+    private static final AutoMap<WorldgenGTOreLayer> Ores_Moon = new AutoMap<>();
+    private static final AutoMap<WorldgenGTOreLayer> Ores_Mars = new AutoMap<>();
+    private static final AutoMap<WorldgenGTOreLayer> Ores_Comets = new AutoMap<>();
+    private static final AutoMap<WorldgenGTOreLayer> Ores_Misc = new AutoMap<>();
 
     public static boolean findAndMapOreTypesFromGT() {
         // Gets Moon ID
@@ -92,11 +91,11 @@ public class MiningUtils {
         Ores_End.clear();
         Ores_Misc.clear();
 
-        for (GT_Worldgen_GT_Ore_Layer x : GT_Worldgen_GT_Ore_Layer.sList) {
+        for (WorldgenGTOreLayer x : WorldgenGTOreLayer.sList) {
             if (x.mEnabled) {
 
                 try {
-                    aEndAsteroids = ReflectionUtils.getField(GT_Worldgen_GT_Ore_Layer.class, "mEndAsteroid")
+                    aEndAsteroids = ReflectionUtils.getField(WorldgenGTOreLayer.class, "mEndAsteroid")
                         .getBoolean(x);
                 } catch (IllegalArgumentException | IllegalAccessException e) {
                     aEndAsteroids = false;
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java
index 4b0f15b81e..bff2a25386 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java
@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 public class NBTUtils {
 
@@ -18,7 +18,7 @@ public class NBTUtils {
     public static void setBookTitle(ItemStack aStack, String aTitle) {
         NBTTagCompound tNBT = getNBT(aStack);
         tNBT.setString("title", aTitle);
-        GT_Utility.ItemNBT.setNBT(aStack, tNBT);
+        GTUtility.ItemNBT.setNBT(aStack, tNBT);
     }
 
     public static ItemStack[] readItemsFromNBT(ItemStack itemstack) {
@@ -82,7 +82,7 @@ public class NBTUtils {
     public static void setBoolean(ItemStack aStack, String aTag, boolean aBoolean) {
         NBTTagCompound tNBT = getNBT(aStack);
         tNBT.setBoolean(aTag, aBoolean);
-        GT_Utility.ItemNBT.setNBT(aStack, tNBT);
+        GTUtility.ItemNBT.setNBT(aStack, tNBT);
     }
 
     public static boolean getBoolean(ItemStack aStack, String aTag) {
@@ -93,7 +93,7 @@ public class NBTUtils {
     public static void setInteger(ItemStack aStack, String aTag, int aInt) {
         NBTTagCompound tNBT = getNBT(aStack);
         tNBT.setInteger(aTag, aInt);
-        GT_Utility.ItemNBT.setNBT(aStack, tNBT);
+        GTUtility.ItemNBT.setNBT(aStack, tNBT);
     }
 
     public static int getInteger(ItemStack aStack, String aTag) {
@@ -104,7 +104,7 @@ public class NBTUtils {
     public static void setLong(ItemStack aStack, String aTag, long aInt) {
         NBTTagCompound tNBT = getNBT(aStack);
         tNBT.setLong(aTag, aInt);
-        GT_Utility.ItemNBT.setNBT(aStack, tNBT);
+        GTUtility.ItemNBT.setNBT(aStack, tNBT);
     }
 
     public static long getLong(ItemStack aStack, String aTag) {
@@ -115,7 +115,7 @@ public class NBTUtils {
     public static void setString(ItemStack aStack, String aTag, String aString) {
         NBTTagCompound tNBT = getNBT(aStack);
         tNBT.setString(aTag, aString);
-        GT_Utility.ItemNBT.setNBT(aStack, tNBT);
+        GTUtility.ItemNBT.setNBT(aStack, tNBT);
     }
 
     public static String getString(ItemStack aStack, String aTag) {
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
index ba7353cba6..5e29ddb53e 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
@@ -18,6 +18,7 @@ import net.minecraftforge.common.util.FakePlayer;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
@@ -41,7 +42,7 @@ public class PlayerUtils {
     }
 
     public static void messagePlayer(final EntityPlayer P, final String S) {
-        gregtech.api.util.GT_Utility.sendChatToPlayer(P, S);
+        GTUtility.sendChatToPlayer(P, S);
     }
 
     public static void messagePlayer(final EntityPlayer P, final IChatComponent S) {
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
index ed2da4d7f7..6df6974030 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
@@ -16,17 +16,17 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.objects.ItemData;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.ShapedRecipe;
-import gtPlusPlus.core.handler.COMPAT_HANDLER;
+import gtPlusPlus.core.handler.CompatHandler;
 import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler;
 import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.data.ArrayUtils;
 
@@ -64,11 +64,11 @@ public class RecipeUtils {
         Object[] o = new Object[] { slot_1, slot_2, slot_3, slot_4, slot_5, slot_6, slot_7, slot_8, slot_9 };
 
         try {
-            int size = COMPAT_HANDLER.mRecipesToGenerate.size();
-            COMPAT_HANDLER.mRecipesToGenerate.put(new InternalRecipeObject(o, resultItem, false));
+            int size = CompatHandler.mRecipesToGenerate.size();
+            CompatHandler.mRecipesToGenerate.put(new InternalRecipeObject(o, resultItem, false));
             // Utils.LOG_WARNING("Success! Added a recipe for "+resultItem.getDisplayName());
-            if (COMPAT_HANDLER.mRecipesToGenerate.size() > size) {
-                if (!COMPAT_HANDLER.areInitItemsLoaded) {
+            if (CompatHandler.mRecipesToGenerate.size() > size) {
+                if (!CompatHandler.areInitItemsLoaded) {
                     RegistrationHandler.recipesSuccess++;
                 } else {
                     LateRegistrationHandler.recipesSuccess++;
@@ -78,7 +78,7 @@ public class RecipeUtils {
             Logger.RECIPE(
                 "[Fix] Invalid Recipe detected for: " + resultItem != null ? resultItem.getUnlocalizedName()
                     : "INVALID OUTPUT ITEM");
-            if (!COMPAT_HANDLER.areInitItemsLoaded) {
+            if (!CompatHandler.areInitItemsLoaded) {
                 RegistrationHandler.recipesFailed++;
             } else {
                 LateRegistrationHandler.recipesFailed++;
@@ -163,18 +163,18 @@ public class RecipeUtils {
             InputItem9 };
 
         if (gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE != GTplusplus.INIT_PHASE.POST_INIT) {
-            CORE.crash(
+            GTPPCore.crash(
                 "Load Phase " + gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE
                     + " should be "
                     + GTplusplus.INIT_PHASE.POST_INIT
                     + ". Unable to register recipe.");
         }
 
-        int size = COMPAT_HANDLER.mGtRecipesToGenerate.size();
-        COMPAT_HANDLER.mGtRecipesToGenerate.put(new InternalRecipeObject(o, OutputItem, true));
+        int size = CompatHandler.mGtRecipesToGenerate.size();
+        CompatHandler.mGtRecipesToGenerate.put(new InternalRecipeObject(o, OutputItem, true));
 
-        if (COMPAT_HANDLER.mGtRecipesToGenerate.size() > size) {
-            if (!COMPAT_HANDLER.areInitItemsLoaded) {
+        if (CompatHandler.mGtRecipesToGenerate.size() > size) {
+            if (!CompatHandler.areInitItemsLoaded) {
                 RegistrationHandler.recipesSuccess++;
             } else {
                 LateRegistrationHandler.recipesSuccess++;
@@ -195,7 +195,7 @@ public class RecipeUtils {
             return false;
         }
         // let gregtech handle shapeless recipes.
-        if (GT_ModHandler.addShapelessCraftingRecipe(OutputItem, inputItems)) {
+        if (GTModHandler.addShapelessCraftingRecipe(OutputItem, inputItems)) {
             return true;
         }
         return false;
@@ -294,7 +294,7 @@ public class RecipeUtils {
             boolean rReturn = false;
             ArrayList<IRecipe> tList = (ArrayList) 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) {
@@ -302,19 +302,19 @@ public class RecipeUtils {
                 if (!aNotRemoveShapelessRecipes
                     || !(tRecipe instanceof ShapelessRecipes) && !(tRecipe instanceof ShapelessOreRecipe)) {
                     if (aOnlyRemoveNativeHandlers) {
-                        if (!gregtech.api.util.GT_ModHandler.sNativeRecipeClasses.contains(
+                        if (!GTModHandler.sNativeRecipeClasses.contains(
                             tRecipe.getClass()
                                 .getName())) {
                             continue;
                         }
-                    } else if (gregtech.api.util.GT_ModHandler.sSpecialRecipeClasses.contains(
+                    } else if (GTModHandler.sSpecialRecipeClasses.contains(
                         tRecipe.getClass()
                             .getName())) {
                                 continue;
                             }
 
                     ItemStack tStack = tRecipe.getRecipeOutput();
-                    if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(tStack), aOutput, aIgnoreNBT)) {
+                    if (GTUtility.areStacksEqual(GTOreDictUnificator.get(tStack), aOutput, aIgnoreNBT)) {
                         tList.remove(i--);
                         tList_sS = tList.size();
                         rReturn = true;
@@ -372,7 +372,7 @@ public class RecipeUtils {
                     "Cleaned a " + o.getClass()
                         .getSimpleName() + " from recipe input.");
                 Logger.INFO("ERROR");
-                CORE.crash("Bad Shaped Recipe.");
+                GTPPCore.crash("Bad Shaped Recipe.");
             }
         }
         Logger.RECIPE("Using String: " + aFullString);
@@ -414,10 +414,10 @@ public class RecipeUtils {
 
         ShapedOreRecipe aRecipe = new ShapedOreRecipe(aOutputStack, aDataObject);
 
-        int size = COMPAT_HANDLER.mRecipesToGenerate.size();
-        COMPAT_HANDLER.mRecipesToGenerate.put(new InternalRecipeObject2(aRecipe));
-        if (COMPAT_HANDLER.mRecipesToGenerate.size() > size) {
-            if (!COMPAT_HANDLER.areInitItemsLoaded) {
+        int size = CompatHandler.mRecipesToGenerate.size();
+        CompatHandler.mRecipesToGenerate.put(new InternalRecipeObject2(aRecipe));
+        if (CompatHandler.mRecipesToGenerate.size() > size) {
+            if (!CompatHandler.areInitItemsLoaded) {
                 RegistrationHandler.recipesSuccess++;
             } else {
                 LateRegistrationHandler.recipesSuccess++;
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
index 4e6e508c15..d9cf2e3769 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
@@ -6,16 +6,16 @@ import net.minecraftforge.fluids.FluidStack;
 
 import org.apache.commons.lang3.ArrayUtils;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
-import gregtech.common.GT_Pollution;
+import gregtech.common.Pollution;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.base.cell.BaseItemCell;
-import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.material.MaterialGenerator;
+import gtPlusPlus.core.material.MaterialMisc;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
@@ -24,19 +24,19 @@ public class PollutionUtils {
     public static AutoMap<FluidStack> mPollutionFluidStacks = new AutoMap<>();
 
     public static boolean isPollutionEnabled() {
-        return GT_Mod.gregtechproxy.mPollution;
+        return GTMod.gregtechproxy.mPollution;
     }
 
     public static boolean addPollution(IGregTechTileEntity te, int pollutionValue) {
-        if (GT_Mod.gregtechproxy.mPollution) {
-            GT_Pollution.addPollution(te, pollutionValue);
+        if (GTMod.gregtechproxy.mPollution) {
+            Pollution.addPollution(te, pollutionValue);
             return true;
         }
         return false;
     }
 
     public static void addPollution(IHasWorldObjectAndCoords aTileOfSomeSort, int pollutionValue) {
-        if (GT_Mod.gregtechproxy.mPollution) {
+        if (GTMod.gregtechproxy.mPollution) {
             Chunk c = aTileOfSomeSort.getWorld()
                 .getChunkFromBlockCoords(aTileOfSomeSort.getXCoord(), aTileOfSomeSort.getZCoord());
             addPollution(c, pollutionValue);
@@ -44,8 +44,8 @@ public class PollutionUtils {
     }
 
     public static void addPollution(Chunk aChunk, int pollutionValue) {
-        if (GT_Mod.gregtechproxy.mPollution) {
-            GT_Pollution.addPollution(aChunk, pollutionValue);
+        if (GTMod.gregtechproxy.mPollution) {
+            Pollution.addPollution(aChunk, pollutionValue);
         }
     }
 
@@ -74,7 +74,7 @@ public class PollutionUtils {
     }
 
     public static void nullifyPollution(Chunk aChunk) {
-        if (GT_Mod.gregtechproxy.mPollution) {
+        if (GTMod.gregtechproxy.mPollution) {
             if (aChunk == null) {
                 return;
             }
@@ -86,11 +86,11 @@ public class PollutionUtils {
     }
 
     public static int getPollution(IGregTechTileEntity te) {
-        return GT_Pollution.getPollution(te);
+        return Pollution.getPollution(te);
     }
 
     public static int getPollution(Chunk te) {
-        return GT_Pollution.getPollution(te);
+        return Pollution.getPollution(te);
     }
 
     public static void setPollutionFluids() {
@@ -103,33 +103,33 @@ public class PollutionUtils {
                 if (CD != null) {
                     Logger.INFO("[PollutionCompat] Found carbon dioxide fluid, registering it.");
                     PollutionUtils.mPollutionFluidStacks.put(CD);
-                    MISC_MATERIALS.CARBON_DIOXIDE.registerComponentForMaterial(CD);
+                    MaterialMisc.CARBON_DIOXIDE.registerComponentForMaterial(CD);
                     ItemStack cellCD = ItemUtils.getItemStackOfAmountFromOreDict("cellCarbonDioxide", 1);
                     if (ItemUtils.checkForInvalidItems(cellCD)) {
                         Logger.INFO("[PollutionCompat] Found carbon dioxide cell, registering component.");
-                        MISC_MATERIALS.CARBON_DIOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD);
+                        MaterialMisc.CARBON_DIOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD);
                     } else {
                         Logger.INFO("[PollutionCompat] Did not find carbon dioxide cell, registering new component.");
-                        new BaseItemCell(MISC_MATERIALS.CARBON_DIOXIDE);
+                        new BaseItemCell(MaterialMisc.CARBON_DIOXIDE);
                     }
                 } else {
-                    MaterialGenerator.generate(MISC_MATERIALS.CARBON_DIOXIDE, false, false);
+                    MaterialGenerator.generate(MaterialMisc.CARBON_DIOXIDE, false, false);
                 }
 
                 if (CM != null) {
                     Logger.INFO("[PollutionCompat] Found carbon monoxide fluid, registering it.");
                     PollutionUtils.mPollutionFluidStacks.put(CM);
-                    MISC_MATERIALS.CARBON_MONOXIDE.registerComponentForMaterial(CM);
+                    MaterialMisc.CARBON_MONOXIDE.registerComponentForMaterial(CM);
                     ItemStack cellCD = ItemUtils.getItemStackOfAmountFromOreDict("cellCarbonMonoxide", 1);
                     if (ItemUtils.checkForInvalidItems(cellCD)) {
                         Logger.INFO("[PollutionCompat] Found carbon monoxide cell, registering component.");
-                        MISC_MATERIALS.CARBON_MONOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD);
+                        MaterialMisc.CARBON_MONOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD);
                     } else {
                         Logger.INFO("[PollutionCompat] Did not find carbon monoxide cell, registering new component.");
-                        new BaseItemCell(MISC_MATERIALS.CARBON_MONOXIDE);
+                        new BaseItemCell(MaterialMisc.CARBON_MONOXIDE);
                     }
                 } else {
-                    MaterialGenerator.generate(MISC_MATERIALS.CARBON_MONOXIDE, false, false);
+                    MaterialGenerator.generate(MaterialMisc.CARBON_MONOXIDE, false, false);
                 }
 
                 if (SD != null) {
diff --git a/src/main/java/gtPlusPlus/core/util/recipe/GT_RecipeUtils.java b/src/main/java/gtPlusPlus/core/util/recipe/GTRecipeUtils.java
index c5498e4f59..980068ed97 100644
--- a/src/main/java/gtPlusPlus/core/util/recipe/GT_RecipeUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/recipe/GTRecipeUtils.java
@@ -11,18 +11,18 @@ import org.apache.commons.lang3.ArrayUtils;
 
 import gnu.trove.map.hash.TCustomHashMap;
 import gnu.trove.set.hash.TCustomHashSet;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
 import gtPlusPlus.api.objects.Logger;
 
-public class GT_RecipeUtils {
+public class GTRecipeUtils {
 
-    public static List<GT_Recipe> removeDuplicates(List<GT_Recipe> inputRecipes, String recipeMapName) {
-        TCustomHashSet<GT_Recipe> recipesHashSet = new TCustomHashSet<>(RecipeHashStrat.RecipeHashingStrategy);
-        ArrayList<GT_Recipe> recipeOutput = new ArrayList<>();
-        TCustomHashMap<GT_Recipe, ItemStack> circuitMap = new TCustomHashMap<>(RecipeHashStrat.RecipeHashingStrategy);
+    public static List<GTRecipe> removeDuplicates(List<GTRecipe> inputRecipes, String recipeMapName) {
+        TCustomHashSet<GTRecipe> recipesHashSet = new TCustomHashSet<>(RecipeHashStrat.RecipeHashingStrategy);
+        ArrayList<GTRecipe> recipeOutput = new ArrayList<>();
+        TCustomHashMap<GTRecipe, ItemStack> circuitMap = new TCustomHashMap<>(RecipeHashStrat.RecipeHashingStrategy);
         int removedRecipeCount = 0;
 
-        for (GT_Recipe recipeInput : inputRecipes) {
+        for (GTRecipe recipeInput : inputRecipes) {
             ItemStack savedCircuit = null;
             // create a new input ItemStack array that does not contain programmable circuits if they were in the recipe
             ArrayList<ItemStack> itemInputsWithoutProgrammableCircuit = new ArrayList<>();
@@ -37,7 +37,7 @@ public class GT_RecipeUtils {
                     savedCircuit = itemStack;
                 }
             }
-            GT_Recipe newRecipe = new GT_Recipe(
+            GTRecipe newRecipe = new GTRecipe(
                 false,
                 itemInputsWithoutProgrammableCircuit.toArray(new ItemStack[0]),
                 recipeInput.mOutputs,
@@ -72,7 +72,7 @@ public class GT_RecipeUtils {
         }
         // iterate over all recipes without duplicates and add them to the output. If the recipe had a programmable
         // circuit in it then add it back with its damage value coming from the circuit map.
-        for (GT_Recipe filteredRecipe : recipesHashSet) {
+        for (GTRecipe filteredRecipe : recipesHashSet) {
             // check to see if the recipe is in the circuit map
             if (circuitMap.contains(filteredRecipe)) {
                 // add the circuit back
diff --git a/src/main/java/gtPlusPlus/core/util/recipe/RecipeHashStrat.java b/src/main/java/gtPlusPlus/core/util/recipe/RecipeHashStrat.java
index 18323a4c8b..1a730c9cbf 100644
--- a/src/main/java/gtPlusPlus/core/util/recipe/RecipeHashStrat.java
+++ b/src/main/java/gtPlusPlus/core/util/recipe/RecipeHashStrat.java
@@ -9,24 +9,24 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
 import gnu.trove.strategy.HashingStrategy;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
 
 public class RecipeHashStrat {
 
-    public static final HashingStrategy<GT_Recipe> RecipeHashingStrategy = new HashingStrategy<>() {
+    public static final HashingStrategy<GTRecipe> RecipeHashingStrategy = new HashingStrategy<>() {
 
         @Override
-        public int computeHashCode(GT_Recipe recipe) {
+        public int computeHashCode(GTRecipe recipe) {
             return com.google.common.base.Objects.hashCode(recipe.mDuration, recipe.mEUt);
         }
 
         @Override
-        public boolean equals(GT_Recipe recipe1, GT_Recipe recipe2) {
+        public boolean equals(GTRecipe recipe1, GTRecipe recipe2) {
             return areRecipesEqual(recipe1, recipe2);
         }
     };
 
-    public static boolean areRecipesEqual(GT_Recipe recipe1, GT_Recipe recipe2) {
+    public static boolean areRecipesEqual(GTRecipe recipe1, GTRecipe recipe2) {
         // both item outputs use a copy to prevent interfering with chance based output orders
         // sort all the arrays for recipe1
         RecipeHashStrat.sortItemStackArray(recipe1.mInputs);
diff --git a/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java b/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
index fc02cd8b74..f33d3d90d7 100644
--- a/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
+++ b/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
@@ -5,13 +5,13 @@ import static gtPlusPlus.api.recipe.GTPPRecipeMaps.cokeOvenRecipes;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
-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;
 
 public final class AddGregtechRecipe {
 
-    public static boolean importPyroRecipe(GT_Recipe aRecipe) {
+    public static boolean importPyroRecipe(GTRecipe aRecipe) {
 
         int aModifiedTime = (int) (aRecipe.mDuration * 0.8);
 
@@ -29,7 +29,7 @@ public final class AddGregtechRecipe {
         }
 
         int aCircuitNumber = -1;
-        Item aCircuit = GT_Utility.getIntegratedCircuit(1)
+        Item aCircuit = GTUtility.getIntegratedCircuit(1)
             .getItem();
         boolean hasCircuit = false;
 
@@ -54,12 +54,12 @@ public final class AddGregtechRecipe {
         }
         ItemStack[] inputs;
         if (aInputItem == null) {
-            inputs = new ItemStack[] { GT_Utility.getIntegratedCircuit(aCircuitNumber) };
+            inputs = new ItemStack[] { GTUtility.getIntegratedCircuit(aCircuitNumber) };
         } else {
-            inputs = new ItemStack[] { GT_Utility.getIntegratedCircuit(aCircuitNumber), aInputItem };
+            inputs = new ItemStack[] { GTUtility.getIntegratedCircuit(aCircuitNumber), aInputItem };
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(inputs)
             .itemOutputs(aRecipe.mOutputs)
             .fluidInputs(aRecipe.mFluidInputs)
author	NotAPenguin <michiel.vandeginste@gmail.com>	2024-09-02 23:17:17 +0200
committer	GitHub <noreply@github.com>	2024-09-02 23:17:17 +0200
commit	1b820de08a05070909a267e17f033fcf58ac8710 (patch)
tree	02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/gtPlusPlus/core
parent	afd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff)
download	GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2 GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip