34 files changed, 907 insertions, 920 deletions

diff --git a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java
index de8cca2b43..909a1272da 100644
--- a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java
+++ b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java
@@ -4,7 +4,7 @@ import net.minecraft.block.material.Material;
 import net.minecraftforge.fluids.Fluid;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import goodgenerator.crossmod.nei.NEI_Config;
+import goodgenerator.crossmod.nei.NEIConfig;
 
 public class FluidsBuilder {
 
@@ -36,7 +36,7 @@ public class FluidsBuilder {
         tmp2.SetTexture("lightlyCrackedNaquadahGas");
         tmp2.setBlockName("lightlyCrackedNaquadahGas");
         GameRegistry.registerBlock(tmp2, "lightlyCrackedNaquadahGas");
-        NEI_Config.hide(tmp2);
+        NEIConfig.hide(tmp2);
     }
 
     public static void crackedNaquadahGas_Moderately() {
@@ -47,7 +47,7 @@ public class FluidsBuilder {
         tmp2.SetTexture("moderatelyCrackedNaquadahGas");
         tmp2.setBlockName("moderatelyCrackedNaquadahGas");
         GameRegistry.registerBlock(tmp2, "moderatelyCrackedNaquadahGas");
-        NEI_Config.hide(tmp2);
+        NEIConfig.hide(tmp2);
     }
 
     public static void crackedNaquadahGas_Heavily() {
@@ -58,7 +58,7 @@ public class FluidsBuilder {
         tmp2.SetTexture("heavilyCrackedNaquadahGas");
         tmp2.setBlockName("heavilyCrackedNaquadahGas");
         GameRegistry.registerBlock(tmp2, "heavilyCrackedNaquadahGas");
-        NEI_Config.hide(tmp2);
+        NEIConfig.hide(tmp2);
     }
 
     public static void crackedLightNaquadahFuel_Lightly() {
@@ -69,7 +69,7 @@ public class FluidsBuilder {
         tmp2.SetTexture("lightlyCrackedLightNaquadahFuel");
         tmp2.setBlockName("lightlyCrackedLightNaquadahFuel");
         GameRegistry.registerBlock(tmp2, "lightlyCrackedLightNaquadahFuel");
-        NEI_Config.hide(tmp2);
+        NEIConfig.hide(tmp2);
     }
 
     public static void crackedLightNaquadahFuel_Moderately() {
@@ -80,7 +80,7 @@ public class FluidsBuilder {
         tmp2.SetTexture("moderatelyCrackedLightNaquadahFuel");
         tmp2.setBlockName("moderatelyCrackedLightNaquadahFuel");
         GameRegistry.registerBlock(tmp2, "moderatelyCrackedLightNaquadahFuel");
-        NEI_Config.hide(tmp2);
+        NEIConfig.hide(tmp2);
     }
 
     public static void crackedLightNaquadahFuel_Heavily() {
@@ -91,7 +91,7 @@ public class FluidsBuilder {
         tmp2.SetTexture("heavilyCrackedLightNaquadahFuel");
         tmp2.setBlockName("heavilyCrackedLightNaquadahFuel");
         GameRegistry.registerBlock(tmp2, "heavilyCrackedLightNaquadahFuel");
-        NEI_Config.hide(tmp2);
+        NEIConfig.hide(tmp2);
     }
 
     public static void crackedHeavyNaquadahFuel_Lightly() {
@@ -102,7 +102,7 @@ public class FluidsBuilder {
         tmp2.SetTexture("lightlyCrackedHeavyNaquadahFuel");
         tmp2.setBlockName("lightlyCrackedHeavyNaquadahFuel");
         GameRegistry.registerBlock(tmp2, "lightlyCrackedHeavyNaquadahFuel");
-        NEI_Config.hide(tmp2);
+        NEIConfig.hide(tmp2);
     }
 
     public static void crackedHeavyNaquadahFuel_Moderately() {
@@ -113,7 +113,7 @@ public class FluidsBuilder {
         tmp2.SetTexture("moderatelyCrackedHeavyNaquadahFuel");
         tmp2.setBlockName("moderatelyCrackedHeavyNaquadahFuel");
         GameRegistry.registerBlock(tmp2, "moderatelyCrackedHeavyNaquadahFuel");
-        NEI_Config.hide(tmp2);
+        NEIConfig.hide(tmp2);
     }
 
     public static void crackedHeavyNaquadahFuel_Heavily() {
@@ -124,7 +124,7 @@ public class FluidsBuilder {
         tmp2.SetTexture("heavilyCrackedHeavyNaquadahFuel");
         tmp2.setBlockName("heavilyCrackedHeavyNaquadahFuel");
         GameRegistry.registerBlock(tmp2, "heavilyCrackedHeavyNaquadahFuel");
-        NEI_Config.hide(tmp2);
+        NEIConfig.hide(tmp2);
     }
 
     public static void crackedNaquadahAsphalt_Lightly() {
@@ -137,7 +137,7 @@ public class FluidsBuilder {
         tmp2.SetTexture("lightlyCrackedNaquadahAsphalt");
         tmp2.setBlockName("lightlyCrackedNaquadahAsphalt");
         GameRegistry.registerBlock(tmp2, "lightlyCrackedNaquadahAsphalt");
-        NEI_Config.hide(tmp2);
+        NEIConfig.hide(tmp2);
     }
 
     public static void crackedNaquadahAsphalt_Moderately() {
@@ -150,7 +150,7 @@ public class FluidsBuilder {
         tmp2.SetTexture("moderatelyCrackedNaquadahAsphalt");
         tmp2.setBlockName("moderatelyCrackedNaquadahAsphalt");
         GameRegistry.registerBlock(tmp2, "moderatelyCrackedNaquadahAsphalt");
-        NEI_Config.hide(tmp2);
+        NEIConfig.hide(tmp2);
     }
 
     public static void crackedNaquadahAsphalt_Heavily() {
@@ -163,7 +163,7 @@ public class FluidsBuilder {
         tmp2.SetTexture("heavilyCrackedNaquadahAsphalt");
         tmp2.setBlockName("heavilyCrackedNaquadahAsphalt");
         GameRegistry.registerBlock(tmp2, "heavilyCrackedNaquadahAsphalt");
-        NEI_Config.hide(tmp2);
+        NEIConfig.hide(tmp2);
     }
 
     public static void combustionPromotor() {
@@ -174,7 +174,7 @@ public class FluidsBuilder {
         tmp2.SetTexture("combustionPromotor");
         tmp2.setBlockName("combustionPromotor");
         GameRegistry.registerBlock(tmp2, "combustionPromotor");
-        NEI_Config.hide(tmp2);
+        NEIConfig.hide(tmp2);
     }
 
     public static void coalTar() {
@@ -186,7 +186,7 @@ public class FluidsBuilder {
         tmp2.SetTexture("coalTar");
         tmp2.setBlockTextureName("coalTar");
         GameRegistry.registerBlock(tmp2, "coalTar");
-        NEI_Config.hide(tmp2);
+        NEIConfig.hide(tmp2);
     }
 
     public static void supercriticalSteam() {
@@ -198,6 +198,6 @@ public class FluidsBuilder {
         tmp2.SetTexture("supercriticalSteam");
         tmp2.setBlockTextureName("supercriticalSteam");
         GameRegistry.registerBlock(tmp2, "supercriticalSteam");
-        NEI_Config.hide(tmp2);
+        NEIConfig.hide(tmp2);
     }
 }
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockCasing.java
index c10b0f7184..4f784b5501 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockCasing.java
@@ -17,9 +17,9 @@ import net.minecraft.world.World;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import goodgenerator.main.GoodGenerator;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 
-public class Casing extends Block {
+public class BlockCasing extends Block {
 
     @SideOnly(Side.CLIENT)
     protected IIcon[] texture;
@@ -27,17 +27,17 @@ public class Casing extends Block {
     String[] textureNames;
     protected String name;
 
-    public Casing(String name) {
+    public BlockCasing(String name) {
         super(Material.iron);
         this.setHardness(9.0F);
         this.setResistance(5.0F);
         this.name = name;
         this.setHarvestLevel("wrench", 2);
         this.setCreativeTab(GoodGenerator.GG);
-        GregTech_API.registerMachineBlock(this, -1);
+        GregTechAPI.registerMachineBlock(this, -1);
     }
 
-    public Casing(String name, String[] texture) {
+    public BlockCasing(String name, String[] texture) {
         super(Material.iron);
         this.setHardness(9.0F);
         this.setResistance(5.0F);
@@ -45,10 +45,10 @@ public class Casing extends Block {
         this.textureNames = texture;
         this.setHarvestLevel("wrench", 2);
         this.setCreativeTab(GoodGenerator.GG);
-        GregTech_API.registerMachineBlock(this, -1);
+        GregTechAPI.registerMachineBlock(this, -1);
     }
 
-    public Casing(String name, String[] texture, Material material) {
+    public BlockCasing(String name, String[] texture, Material material) {
         super(material);
         this.setHardness(9.0F);
         this.setResistance(5.0F);
@@ -56,7 +56,7 @@ public class Casing extends Block {
         this.textureNames = texture;
         this.setHarvestLevel("wrench", 2);
         this.setCreativeTab(GoodGenerator.GG);
-        GregTech_API.registerMachineBlock(this, -1);
+        GregTechAPI.registerMachineBlock(this, -1);
     }
 
     @Override
@@ -90,15 +90,15 @@ public class Casing extends Block {
 
     @Override
     public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
-        if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
+            GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         }
     }
 
     @Override
     public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) {
-        if (GregTech_API.isMachineBlock(this, aMetaData)) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        if (GregTechAPI.isMachineBlock(this, aMetaData)) {
+            GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockComplexTextureCasing.java
index 0a0169d0b4..03b7f61557 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockComplexTextureCasing.java
@@ -11,14 +11,14 @@ import net.minecraft.util.IIcon;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class ComplexTextureCasing extends Casing {
+public class BlockComplexTextureCasing extends BlockCasing {
 
     @SideOnly(Side.CLIENT)
     protected IIcon[] texture1, texture2;
     String[] textureSide;
     String[] textureTopAndDown;
 
-    public ComplexTextureCasing(String name, String[] textureSide, String[] textureTopAndDown) {
+    public BlockComplexTextureCasing(String name, String[] textureSide, String[] textureTopAndDown) {
         super(name);
         this.textureSide = textureSide;
         this.textureTopAndDown = textureTopAndDown;
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockFrame.java
index b4acb03518..b29ef7f2f2 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockFrame.java
@@ -6,9 +6,9 @@ import net.minecraft.world.IBlockAccess;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class Frame extends Casing {
+public class BlockFrame extends BlockCasing {
 
-    public Frame(String name, String[] texture) {
+    public BlockFrame(String name, String[] texture) {
         super(name, texture, Material.iron);
     }
 
@@ -20,7 +20,7 @@ public class Frame extends Casing {
     @Override
     @SideOnly(Side.CLIENT)
     public boolean shouldSideBeRendered(IBlockAccess worldClient, int xCoord, int yCoord, int zCoord, int aSide) {
-        if (worldClient.getBlock(xCoord, yCoord, zCoord) instanceof Frame) return false;
+        if (worldClient.getBlock(xCoord, yCoord, zCoord) instanceof BlockFrame) return false;
         return super.shouldSideBeRendered(worldClient, xCoord, yCoord, zCoord, aSide);
     }
 
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockTEContainer.java
index dcd2bdd801..9bf51b7377 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockTEContainer.java
@@ -20,16 +20,16 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import goodgenerator.blocks.tileEntity.EssentiaHatch;
-import goodgenerator.blocks.tileEntity.EssentiaOutputHatch;
-import goodgenerator.blocks.tileEntity.EssentiaOutputHatch_ME;
+import goodgenerator.blocks.tileEntity.MTEEssentiaHatch;
+import goodgenerator.blocks.tileEntity.MTEEssentiaOutputHatch;
+import goodgenerator.blocks.tileEntity.MTEEssentiaOutputHatchME;
 import goodgenerator.main.GoodGenerator;
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTUtility;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.IEssentiaContainerItem;
 
-public class TEBlock extends BlockContainer {
+public class BlockTEContainer extends BlockContainer {
 
     @SideOnly(Side.CLIENT)
     protected IIcon[] texture;
@@ -38,7 +38,7 @@ public class TEBlock extends BlockContainer {
     protected String name;
     protected int index;
 
-    public TEBlock(String name, String[] texture, CreativeTabs Tab) {
+    public BlockTEContainer(String name, String[] texture, CreativeTabs Tab) {
         super(Material.iron);
         this.setHardness(9.0F);
         this.setResistance(5.0F);
@@ -46,10 +46,10 @@ public class TEBlock extends BlockContainer {
         this.textureNames = texture;
         this.setHarvestLevel("wrench", 2);
         this.setCreativeTab(GoodGenerator.GG);
-        GregTech_API.registerMachineBlock(this, -1);
+        GregTechAPI.registerMachineBlock(this, -1);
     }
 
-    public TEBlock(String name, String[] texture, int index) {
+    public BlockTEContainer(String name, String[] texture, int index) {
         super(Material.iron);
         this.setHardness(9.0F);
         this.setResistance(5.0F);
@@ -58,10 +58,10 @@ public class TEBlock extends BlockContainer {
         this.setHarvestLevel("wrench", 2);
         this.index = index;
         this.setCreativeTab(GoodGenerator.GG);
-        GregTech_API.registerMachineBlock(this, -1);
+        GregTechAPI.registerMachineBlock(this, -1);
     }
 
-    public TEBlock(String name, String[] texture, Material material) {
+    public BlockTEContainer(String name, String[] texture, Material material) {
         super(material);
         this.setHardness(9.0F);
         this.setResistance(5.0F);
@@ -69,7 +69,7 @@ public class TEBlock extends BlockContainer {
         this.textureNames = texture;
         this.setHarvestLevel("wrench", 2);
         this.setCreativeTab(GoodGenerator.GG);
-        GregTech_API.registerMachineBlock(this, -1);
+        GregTechAPI.registerMachineBlock(this, -1);
     }
 
     public int getIndex() {
@@ -107,15 +107,15 @@ public class TEBlock extends BlockContainer {
 
     @Override
     public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
-        if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
+            GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         }
     }
 
     @Override
     public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) {
-        if (GregTech_API.isMachineBlock(this, aMetaData)) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        if (GregTechAPI.isMachineBlock(this, aMetaData)) {
+            GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         }
         aWorld.removeTileEntity(aX, aY, aZ);
     }
@@ -144,11 +144,11 @@ public class TEBlock extends BlockContainer {
     public TileEntity createTileEntity(World world, int meta) {
         switch (index) {
             case 1:
-                return new EssentiaHatch();
+                return new MTEEssentiaHatch();
             case 2:
-                return new EssentiaOutputHatch();
+                return new MTEEssentiaOutputHatch();
             case 3:
-                return new EssentiaOutputHatch_ME();
+                return new MTEEssentiaOutputHatchME();
             default:
                 return null;
         }
@@ -162,7 +162,7 @@ public class TEBlock extends BlockContainer {
         } else {
             TileEntity tile = world.getTileEntity(x, y, z);
             if (index == 1) {
-                if (tile instanceof EssentiaHatch) {
+                if (tile instanceof MTEEssentiaHatch) {
                     ItemStack tItemStack = player.getHeldItem();
                     if (tItemStack != null) {
                         Item tItem = tItemStack.getItem();
@@ -172,26 +172,26 @@ public class TEBlock extends BlockContainer {
                                 .size() > 0) {
                             Aspect tLocked = ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem())
                                 .getAspects()[0];
-                            ((EssentiaHatch) tile).setLockedAspect(tLocked);
-                            GT_Utility.sendChatToPlayer(
+                            ((MTEEssentiaHatch) tile).setLockedAspect(tLocked);
+                            GTUtility.sendChatToPlayer(
                                 player,
                                 String.format(
                                     StatCollector.translateToLocal("essentiahatch.chat.0"),
                                     tLocked.getLocalizedDescription()));
                         }
                     } else {
-                        ((EssentiaHatch) tile).setLockedAspect(null);
-                        GT_Utility.sendChatToPlayer(player, StatCollector.translateToLocal("essentiahatch.chat.1"));
+                        ((MTEEssentiaHatch) tile).setLockedAspect(null);
+                        GTUtility.sendChatToPlayer(player, StatCollector.translateToLocal("essentiahatch.chat.1"));
                     }
                     world.markBlockForUpdate(x, y, z);
                     return true;
                 } else return false;
             } else if (index == 2) {
-                if (tile instanceof EssentiaOutputHatch && player.isSneaking()) {
+                if (tile instanceof MTEEssentiaOutputHatch && player.isSneaking()) {
                     ItemStack tItemStack = player.getHeldItem();
                     if (tItemStack == null) {
-                        ((EssentiaOutputHatch) tile).clear();
-                        GT_Utility
+                        ((MTEEssentiaOutputHatch) tile).clear();
+                        GTUtility
                             .sendChatToPlayer(player, StatCollector.translateToLocal("essentiaoutputhatch.chat.0"));
                     }
                     return true;
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockTurbineCasing.java
index 986ab4e0c8..6b6de38161 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockTurbineCasing.java
@@ -5,7 +5,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_LargeTurbineBase;
+import goodgenerator.blocks.tileEntity.base.MTELargeTurbineBase;
 import goodgenerator.client.render.BlockRenderHandler;
 import goodgenerator.main.GoodGenerator;
 import gregtech.api.enums.Textures;
@@ -14,7 +14,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.render.TextureFactory;
 
-public class TurbineCasing extends Casing implements ITextureBlock {
+public class BlockTurbineCasing extends BlockCasing implements ITextureBlock {
 
     public static IIconContainer[][] turbineShape = new IIconContainer[3][9];
     public IIconContainer base;
@@ -24,7 +24,7 @@ public class TurbineCasing extends Casing implements ITextureBlock {
             turbineShape[i][j - 1] = new Textures.BlockIcons.CustomIcon("icons/turbines/TURBINE_" + i + "" + j);
     }
 
-    public TurbineCasing(String name, String texture) {
+    public BlockTurbineCasing(String name, String texture) {
         super(name, new String[] { GoodGenerator.MOD_ID + ":" + texture });
         base = new Textures.BlockIcons.CustomIcon("icons/" + texture);
     }
@@ -33,9 +33,9 @@ public class TurbineCasing extends Casing implements ITextureBlock {
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (!(tTileEntity instanceof IGregTechTileEntity)) return 0;
         IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity;
-        if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbineBase && tTile.getFrontFacing() == side) {
+        if (tTile.getMetaTileEntity() instanceof MTELargeTurbineBase && tTile.getFrontFacing() == side) {
             if (tTile.isActive()) return 1;
-            return ((GT_MetaTileEntity_LargeTurbineBase) tTile.getMetaTileEntity()).hasTurbine() ? 2 : 3;
+            return ((MTELargeTurbineBase) tTile.getMetaTileEntity()).hasTurbine() ? 2 : 3;
         }
         return 0;
     }
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTEDieselGenerator.java
index 5ed8a07ebe..c1294f2a91 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTEDieselGenerator.java
@@ -7,35 +7,35 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.ItemList;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
+import gregtech.api.metatileentity.implementations.MTEBasicGenerator;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 
-public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator {
+public class MTEDieselGenerator extends MTEBasicGenerator {
 
     public int mEfficiency;
 
-    public DieselGenerator(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEDieselGenerator(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
             aNameRegional,
             aTier,
             new String[] { "Requires liquid Fuel",
-                "Causes " + (int) (GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond * (1.1 - aTier * 0.1))
+                "Causes " + (int) (GTMod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond * (1.1 - aTier * 0.1))
                     + " Pollution per second" });
         mEfficiency = 100 - aTier * 10;
     }
 
-    public DieselGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEDieselGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         mEfficiency = 100 - aTier * 10;
     }
@@ -47,7 +47,7 @@ public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new DieselGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEDieselGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -67,7 +67,7 @@ public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator {
 
     @Override
     public int getFuelValue(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack) || getRecipeMap() == null) return 0;
+        if (GTUtility.isStackInvalid(aStack) || getRecipeMap() == null) return 0;
         long rValue = super.getFuelValue(aStack);
         if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) {
             rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3L);
@@ -81,7 +81,7 @@ public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator {
     @Override
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         if (aTick % 100 == 0 && mFluid != null && mFluid.amount > this.getCapacity()) {
-            GT_Log.err.println(
+            GTLog.err.println(
                 "Dupe Abuse: " + aBaseMetaTileEntity.getOwnerName()
                     + " Coords: "
                     + aBaseMetaTileEntity.getXCoord()
@@ -208,6 +208,6 @@ public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator {
 
     @Override
     public int getPollution() {
-        return (int) (GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond * (1.1 - mTier * 0.1));
+        return (int) (GTMod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond * (1.1 - mTier * 0.1));
     }
 }
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTENeutronAccele