33 files changed, 727 insertions, 787 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GTPPMTECable.java
index 9b1408ba51..9025dad232 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GTPPMTECable.java
@@ -10,17 +10,17 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntityCable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTECable;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTUtility;
 
-public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implements IMetaTileEntityCable {
+public class GTPPMTECable extends MTECable implements IMetaTileEntityCable {
 
     private static Textures.BlockIcons INSULATION_MEDIUM_PLUS;
 
     static {
         try {
-            INSULATION_MEDIUM_PLUS = (Textures.BlockIcons) GT_Utility
+            INSULATION_MEDIUM_PLUS = (Textures.BlockIcons) GTUtility
                 .getField(Textures.BlockIcons.class, "INSULATION_MEDIUM_PLUS")
                 .get(null);
         } catch (IllegalAccessException | NullPointerException e) {
@@ -30,9 +30,9 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
 
     private short[] vRGB = null;
 
-    public GregtechMetaPipeEntity_Cable(final int aID, final String aName, final String aNameRegional,
-        final float aThickNess, final Materials aMaterial, final long aCableLossPerMeter, final long aAmperage,
-        final long aVoltage, final boolean aInsulated, final boolean aCanShock, final short[] aRGB) {
+    public GTPPMTECable(final int aID, final String aName, final String aNameRegional, final float aThickNess,
+        final Materials aMaterial, final long aCableLossPerMeter, final long aAmperage, final long aVoltage,
+        final boolean aInsulated, final boolean aCanShock, final short[] aRGB) {
         super(
             aID,
             aName,
@@ -47,16 +47,16 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
         this.vRGB = aRGB == null || aRGB.length != 4 ? Materials.Iron.mRGBa : aRGB;
     }
 
-    public GregtechMetaPipeEntity_Cable(final String aName, final float aThickNess, final Materials aMaterial,
+    public GTPPMTECable(final String aName, final float aThickNess, final Materials aMaterial,
         final long aCableLossPerMeter, final long aAmperage, final long aVoltage, final boolean aInsulated,
         final boolean aCanShock, final short[] aRGB) {
         super(aName, aThickNess, aMaterial, aCableLossPerMeter, aAmperage, aVoltage, aInsulated, aCanShock);
         this.vRGB = aRGB == null || aRGB.length != 4 ? Materials.Iron.mRGBa : aRGB;
     }
 
-    public GregtechMetaPipeEntity_Cable(final int aID, final String aName, final String aNameRegional,
-        final float aThickNess, final long aCableLossPerMeter, final long aAmperage, final long aVoltage,
-        final boolean aInsulated, final boolean aCanShock, final short[] aRGB) {
+    public GTPPMTECable(final int aID, final String aName, final String aNameRegional, final float aThickNess,
+        final long aCableLossPerMeter, final long aAmperage, final long aVoltage, final boolean aInsulated,
+        final boolean aCanShock, final short[] aRGB) {
         this(
             aID,
             aName,
@@ -71,15 +71,14 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
             aRGB);
     }
 
-    public GregtechMetaPipeEntity_Cable(final String aName, final float aThickNess, final long aCableLossPerMeter,
-        final long aAmperage, final long aVoltage, final boolean aInsulated, final boolean aCanShock,
-        final short[] aRGB) {
+    public GTPPMTECable(final String aName, final float aThickNess, final long aCableLossPerMeter, final long aAmperage,
+        final long aVoltage, final boolean aInsulated, final boolean aCanShock, final short[] aRGB) {
         this(aName, aThickNess, null, aCableLossPerMeter, aAmperage, aVoltage, aInsulated, aCanShock, aRGB);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaPipeEntity_Cable(
+        return new GTPPMTECable(
             this.mName,
             this.mThickNess,
             this.mMaterial,
@@ -105,51 +104,50 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
             wireMaterial = Materials.Iron;
         }
 
-        if (!mInsulated) return new ITexture[] { new GT_RenderedTexture(
+        if (!mInsulated) return new ITexture[] { new GTRenderedTexture(
             wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire],
             Dyes.getModulation(aColorIndex, vRGB)) };
         if (aConnected) {
             float tThickNess = getThickNess();
-            if (tThickNess < 0.124F) return new ITexture[] { new GT_RenderedTexture(
+            if (tThickNess < 0.124F) return new ITexture[] { new GTRenderedTexture(
                 Textures.BlockIcons.INSULATION_FULL,
                 Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
             if (tThickNess < 0.374F) // 0.375 x1
                 return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                    new GT_RenderedTexture(
+                    new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                    new GTRenderedTexture(
                         Textures.BlockIcons.INSULATION_TINY,
                         Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
             if (tThickNess < 0.499F) // 0.500 x2
                 return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                    new GT_RenderedTexture(
+                    new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                    new GTRenderedTexture(
                         Textures.BlockIcons.INSULATION_SMALL,
                         Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
             if (tThickNess < 0.624F) // 0.625 x4
                 return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                    new GT_RenderedTexture(
+                    new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                    new GTRenderedTexture(
                         Textures.BlockIcons.INSULATION_MEDIUM,
                         Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
             if (tThickNess < 0.749F) // 0.750 x8
                 return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                    new GT_RenderedTexture(
+                    new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                    new GTRenderedTexture(
                         INSULATION_MEDIUM_PLUS,
                         Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
             if (tThickNess < 0.874F) // 0.825 x12
                 return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                    new GT_RenderedTexture(
+                    new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                    new GTRenderedTexture(
                         Textures.BlockIcons.INSULATION_LARGE,
                         Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
-            return new ITexture[] {
-                new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                new GT_RenderedTexture(
+            return new ITexture[] { new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                new GTRenderedTexture(
                     Textures.BlockIcons.INSULATION_HUGE,
                     Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
         }
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             Textures.BlockIcons.INSULATION_FULL,
             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GTPPMTEFluid.java
index e9f9a2dda4..550e5e409c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GTPPMTEFluid.java
@@ -8,34 +8,34 @@ import gregtech.api.enums.SubTag;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
+import gregtech.api.metatileentity.implementations.MTEFluid;
 import gregtech.api.render.TextureFactory;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 
-public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid {
+public class GTPPMTEFluid extends MTEFluid {
 
     public final GT_Materials mMaterial;
 
-    public GregtechMetaPipeEntityFluid(int aID, String aName, String aNameRegional, float aThickNess,
-        GT_Materials aMaterial, int aCapacity, int aHeatResistance, boolean aGasProof) {
+    public GTPPMTEFluid(int aID, String aName, String aNameRegional, float aThickNess, GT_Materials aMaterial,
+        int aCapacity, int aHeatResistance, boolean aGasProof) {
         this(aID, aName, aNameRegional, aThickNess, aMaterial, aCapacity, aHeatResistance, aGasProof, 1);
     }
 
-    public GregtechMetaPipeEntityFluid(final String aName, final float aThickNess, final GT_Materials aMaterial,
-        final int aCapacity, final int aHeatResistance, final boolean aGasProof) {
+    public GTPPMTEFluid(final String aName, final float aThickNess, final GT_Materials aMaterial, final int aCapacity,
+        final int aHeatResistance, final boolean aGasProof) {
         this(aName, aThickNess, aMaterial, aCapacity, aHeatResistance, aGasProof, 1);
     }
 
-    public GregtechMetaPipeEntityFluid(int aID, String aName, String aNameRegional, float aThickNess,
-        GT_Materials aMaterial, int aCapacity, int aHeatResistance, boolean aGasProof, int aFluidTypes) {
+    public GTPPMTEFluid(int aID, String aName, String aNameRegional, float aThickNess, GT_Materials aMaterial,
+        int aCapacity, int aHeatResistance, boolean aGasProof, int aFluidTypes) {
         super(aID, aName, aNameRegional, aThickNess, null, aCapacity, aHeatResistance, aGasProof, aFluidTypes);
         this.mLastReceivedFrom = 0;
         this.oLastReceivedFrom = 0;
         this.mMaterial = aMaterial;
     }
 
-    public GregtechMetaPipeEntityFluid(String aName, float aThickNess, GT_Materials aMaterial, int aCapacity,
-        int aHeatResistance, boolean aGasProof, int aFluidTypes) {
+    public GTPPMTEFluid(String aName, float aThickNess, GT_Materials aMaterial, int aCapacity, int aHeatResistance,
+        boolean aGasProof, int aFluidTypes) {
         super(aName, aThickNess, null, aCapacity, aHeatResistance, aGasProof, aFluidTypes);
         this.mLastReceivedFrom = 0;
         this.oLastReceivedFrom = 0;
@@ -51,7 +51,7 @@ public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid {
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaPipeEntityFluid(
+        return new GTPPMTEFluid(
             this.mName,
             this.mThickNess,
             this.mMaterial,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/METHatchAirIntake.java
index bab504910e..e475037c63 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/METHatchAirIntake.java
@@ -7,24 +7,23 @@ import net.minecraftforge.fluids.Fluid;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 
-public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_FluidGenerator {
+public class METHatchAirIntake extends MTEHatchFluidGenerator {
 
-    public GT_MetaTileEntity_Hatch_AirIntake(final int aID, final String aName, final String aNameRegional,
-        final int aTier) {
+    public METHatchAirIntake(final int aID, final String aName, final String aNameRegional, final int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_Hatch_AirIntake(final String aName, final int aTier, final String[] aDescription,
+    public METHatchAirIntake(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_AirIntake(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new METHatchAirIntake(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -71,30 +70,30 @@ public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_F
             .isServerSide()) {
             return;
         }
-        final float ran1 = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat();
+        final float ran1 = METHatchAirIntake.floatGen.nextFloat();
         float ran2 = 0.0f;
         float ran3 = 0.0f;
-        ran2 = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat();
-        ran3 = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat();
+        ran2 = METHatchAirIntake.floatGen.nextFloat();
+        ran3 = METHatchAirIntake.floatGen.nextFloat();
 
         final IGregTechTileEntity aMuffler = this.getBaseMetaTileEntity();
         final ForgeDirection aDir = aMuffler.getFrontFacing();
         final float xPos = aDir.offsetX * 0.76f + aMuffler.getXCoord() + 0.25f;
         float yPos = aDir.offsetY * 0.76f + aMuffler.getYCoord() + 0.65f;
         final float zPos = aDir.offsetZ * 0.76f + aMuffler.getZCoord() + 0.25f;
-        float ySpd = aDir.offsetY * 0.1f + 0.2f + 0.1f * GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat();
+        float ySpd = aDir.offsetY * 0.1f + 0.2f + 0.1f * METHatchAirIntake.floatGen.nextFloat();
         float xSpd;
         float zSpd;
         if (aDir.offsetY == -1) {
             // Logger.INFO("Y = -1");
-            final float temp = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 2.0f * CORE.PI;
+            final float temp = METHatchAirIntake.floatGen.nextFloat() * 2.0f * GTPPCore.PI;
             xSpd = (float) Math.sin(temp) * 0.1f;
             zSpd = (float) Math.cos(temp) * 0.1f;
             ySpd = -ySpd;
             yPos = yPos - 0.8f;
         } else {
-            xSpd = aDir.offsetX * (0.1f + 0.2f * GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat());
-            zSpd = aDir.offsetZ * (0.1f + 0.2f * GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat());
+            xSpd = aDir.offsetX * (0.1f + 0.2f * METHatchAirIntake.floatGen.nextFloat());
+            zSpd = aDir.offsetZ * (0.1f + 0.2f * METHatchAirIntake.floatGen.nextFloat());
 
             xSpd = -xSpd;
             zSpd = -zSpd;
@@ -103,24 +102,24 @@ public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_F
         aWorld.spawnParticle(
             name,
             (double) (xPos + ran1 * 0.5f),
-            (double) (yPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f),
-            (double) (zPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f),
+            (double) (yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
+            (double) (zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
             (double) xSpd,
             (double) -ySpd,
             (double) zSpd);
         aWorld.spawnParticle(
             name,
             (double) (xPos + ran2 * 0.5f),
-            (double) (yPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f),
-            (double) (zPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f),
+            (double) (yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
+            (double) (zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
             (double) xSpd,
             (double) -ySpd,
             (double) zSpd);
         aWorld.spawnParticle(
             name,
             (double) (xPos + ran3 * 0.5f),
-            (double) (yPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f),
-            (double) (zPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f),
+            (double) (yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
+            (double) (zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
             (double) xSpd,
             (double) -ySpd,
             (double) zSpd);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchAirIntakeExtreme.java
index 007310fc06..a03f8bada1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchAirIntakeExtreme.java
@@ -4,25 +4,20 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-public class GT_MetaTileEntity_Hatch_AirIntake_Extreme extends GT_MetaTileEntity_Hatch_AirIntake {
+public class MTEHatchAirIntakeExtreme extends METHatchAirIntake {
 
-    public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final int aID, final String aName, final String aNameRegional,
-        final int aTier) {
+    public MTEHatchAirIntakeExtreme(final int aID, final String aName, final String aNameRegional, final int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final String aName, final int aTier, final String[] aDescription,
+    public MTEHatchAirIntakeExtreme(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_AirIntake_Extreme(
-            this.mName,
-            this.mTier,
-            this.mDescriptionArray,
-            this.mTextures);
+        return new MTEHatchAirIntakeExtreme(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ChiselBus.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchChiselBus.java
index 3009c80c80..e9d13f3c48 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ChiselBus.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchChiselBus.java
@@ -11,15 +11,15 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
 
-public class GT_MetaTileEntity_ChiselBus extends GT_MetaTileEntity_Hatch_InputBus implements IAddUIWidgets {
+public class MTEHatchChiselBus extends MTEHatchInputBus implements IAddUIWidgets {
 
-    public GT_MetaTileEntity_ChiselBus(int id, String name, String nameRegional, int tier) {
+    public MTEHatchChiselBus(int id, String name, String nameRegional, int tier) {
         super(id, name, nameRegional, tier);
     }
 
-    public GT_MetaTileEntity_ChiselBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchChiselBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, getSlots(aTier), aDescription, aTextures);
     }
 
@@ -34,7 +34,7 @@ public class GT_MetaTileEntity_ChiselBus extends GT_MetaTileEntity_Hatch_InputBu
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ChiselBus(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEHatchChiselBus(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchDynamoBuffer.java
index f375900800..90b3648583 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchDynamoBuffer.java
@@ -1,21 +1,20 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.metatileentity.implementations.MTEHatchDynamo;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatch_Dynamo {
+public class MTEHatchDynamoBuffer extends MTEHatchDynamo {
 
-    public GT_MetaTileEntity_Hatch_DynamoBuffer(final int aID, final String aName, final String aNameRegional,
-        final int aTier) {
+    public MTEHatchDynamoBuffer(final int aID, final String aName, final String aNameRegional, final int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_Hatch_DynamoBuffer(final String aName, final int aTier, final String[] aDescription,
+    public MTEHatchDynamoBuffer(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
@@ -37,12 +36,12 @@ public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatc
 
     @Override
     public long maxEUStore() {
-        return 512L + GT_Values.V[this.mTier + 1] * 2048L;
+        return 512L + GTValues.V[this.mTier + 1] * 2048L;
     }
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_DynamoBuffer(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEHatchDynamoBuffer(this.mName,