24 files changed, 218 insertions, 216 deletions

diff --git a/src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java b/src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java
index c2e0556de9..3ede25f5ea 100644
--- a/src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java
+++ b/src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java
@@ -4,7 +4,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalChestBase;
+import gregtech.common.tileentities.storage.MTEDigitalChestBase;
 
 public class AE2DigitalChestHandler implements appeng.api.storage.IExternalStorageHandler {
 
@@ -12,14 +12,14 @@ public class AE2DigitalChestHandler implements appeng.api.storage.IExternalStora
     public boolean canHandle(final TileEntity te, final ForgeDirection d, final appeng.api.storage.StorageChannel chan,
         final appeng.api.networking.security.BaseActionSource mySrc) {
         return chan == appeng.api.storage.StorageChannel.ITEMS && te instanceof BaseMetaTileEntity
-            && ((BaseMetaTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase;
+            && ((BaseMetaTileEntity) te).getMetaTileEntity() instanceof MTEDigitalChestBase;
     }
 
     @Override
     public appeng.api.storage.IMEInventory<?> getInventory(final TileEntity te, final ForgeDirection d,
         final appeng.api.storage.StorageChannel chan, final appeng.api.networking.security.BaseActionSource src) {
         if (chan == appeng.api.storage.StorageChannel.ITEMS) {
-            return ((GT_MetaTileEntity_DigitalChestBase) (((BaseMetaTileEntity) te).getMetaTileEntity()));
+            return ((MTEDigitalChestBase) (((BaseMetaTileEntity) te).getMetaTileEntity()));
         }
         return null;
     }
diff --git a/src/main/java/gregtech/api/objects/GT_ArrayList.java b/src/main/java/gregtech/api/objects/GTArrayList.java
index 9124ef8616..33fbb18571 100644
--- a/src/main/java/gregtech/api/objects/GT_ArrayList.java
+++ b/src/main/java/gregtech/api/objects/GTArrayList.java
@@ -7,20 +7,20 @@ import java.util.Objects;
 
 import com.google.common.collect.Collections2;
 
-public class GT_ArrayList<E> extends ArrayList<E> {
+public class GTArrayList<E> extends ArrayList<E> {
 
     private static final long serialVersionUID = 1L;
     private int size_sS;
 
     private final boolean mAllowNulls;
 
-    public GT_ArrayList(boolean aAllowNulls, int aCapacity) {
+    public GTArrayList(boolean aAllowNulls, int aCapacity) {
         super(aCapacity);
         mAllowNulls = aAllowNulls;
     }
 
     @SafeVarargs
-    public GT_ArrayList(boolean aAllowNulls, E... aArray) {
+    public GTArrayList(boolean aAllowNulls, E... aArray) {
         super(Arrays.asList(aArray));
         mAllowNulls = aAllowNulls;
         if (!mAllowNulls) {
@@ -32,7 +32,7 @@ public class GT_ArrayList<E> extends ArrayList<E> {
         }
     }
 
-    public GT_ArrayList(boolean aAllowNulls, Collection<? extends E> aList) {
+    public GTArrayList(boolean aAllowNulls, Collection<? extends E> aList) {
         super(aList);
         mAllowNulls = aAllowNulls;
         if (!mAllowNulls) {
diff --git a/src/main/java/gregtech/api/objects/GT_ChunkManager.java b/src/main/java/gregtech/api/objects/GTChunkManager.java
index 14baaddd3d..59bc90aa1c 100644
--- a/src/main/java/gregtech/api/objects/GT_ChunkManager.java
+++ b/src/main/java/gregtech/api/objects/GTChunkManager.java
@@ -15,23 +15,23 @@ import net.minecraftforge.common.ForgeChunkManager.Ticket;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
 
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.enums.GTValues;
 import gregtech.api.interfaces.IChunkLoader;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Log;
+import gregtech.api.util.GTLog;
 
 /**
  * Handles re-initialization of chunks after a server restart.
  */
-public class GT_ChunkManager
+public class GTChunkManager
     implements ForgeChunkManager.OrderedLoadingCallback, ForgeChunkManager.PlayerOrderedLoadingCallback {
 
     private final Map<TileEntity, Ticket> registeredTickets = new HashMap<>();
-    public static GT_ChunkManager instance = new GT_ChunkManager();
+    public static GTChunkManager instance = new GTChunkManager();
 
     public static void init() {
-        ForgeChunkManager.setForcedChunkLoadingCallback(GT_Mod.instance, instance);
+        ForgeChunkManager.setForcedChunkLoadingCallback(GTMod.instance, instance);
     }
 
     @Override
@@ -54,7 +54,7 @@ public class GT_ChunkManager
     @Override
     public List<Ticket> ticketsLoaded(List<Ticket> tickets, World world, int maxTicketCount) {
         List<Ticket> validTickets = new ArrayList<>();
-        if (GT_Values.alwaysReloadChunkloaders) {
+        if (GTValues.alwaysReloadChunkloaders) {
             for (Ticket ticket : tickets) {
                 int x = ticket.getModData()
                     .getInteger("OwnerX");
@@ -108,24 +108,24 @@ public class GT_ChunkManager
      * @return if the chunk was loaded successfully
      */
     public static boolean requestPlayerChunkLoad(TileEntity owner, ChunkCoordIntPair chunkXZ, String player) {
-        if (!GT_Values.enableChunkloaders) return false;
-        if (!GT_Values.alwaysReloadChunkloaders && chunkXZ == null) return false;
-        if (GT_Values.debugChunkloaders && chunkXZ != null) GT_Log.out
-            .println("GT_ChunkManager: Chunk request: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")");
+        if (!GTValues.enableChunkloaders) return false;
+        if (!GTValues.alwaysReloadChunkloaders && chunkXZ == null) return false;
+        if (GTValues.debugChunkloaders && chunkXZ != null)
+            GTLog.out.println("GT_ChunkManager: Chunk request: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")");
         if (instance.registeredTickets.containsKey(owner)) {
             ForgeChunkManager.forceChunk(instance.registeredTickets.get(owner), chunkXZ);
         } else {
             Ticket ticket;
             if (player.equals("")) ticket = ForgeChunkManager
-                .requestTicket(GT_Mod.instance, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL);
+                .requestTicket(GTMod.instance, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL);
             else ticket = ForgeChunkManager
-                .requestPlayerTicket(GT_Mod.instance, player, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL);
+                .requestPlayerTicket(GTMod.instance, player, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL);
             if (ticket == null) {
-                if (GT_Values.debugChunkloaders)
-                    GT_Log.out.println("GT_ChunkManager: ForgeChunkManager.requestTicket failed");
+                if (GTValues.debugChunkloaders)
+                    GTLog.out.println("GT_ChunkManager: ForgeChunkManager.requestTicket failed");
                 return false;
             }
-            if (GT_Values.debugChunkloaders) GT_Log.out.println(
+            if (GTValues.debugChunkloaders) GTLog.out.println(
                 "GT_ChunkManager: ticket issued for machine at: (" + owner.xCoord
                     + ", "
                     + owner.yCoord
@@ -137,7 +137,7 @@ public class GT_ChunkManager
             tag.setInteger("OwnerY", owner.yCoord);
             tag.setInteger("OwnerZ", owner.zCoord);
             ForgeChunkManager.forceChunk(ticket, chunkXZ);
-            if (GT_Values.alwaysReloadChunkloaders)
+            if (GTValues.alwaysReloadChunkloaders)
                 ForgeChunkManager.forceChunk(ticket, new ChunkCoordIntPair(owner.xCoord >> 4, owner.zCoord >> 4));
             instance.registeredTickets.put(owner, ticket);
         }
@@ -150,28 +150,28 @@ public class GT_ChunkManager
     }
 
     public static void releaseChunk(TileEntity owner, ChunkCoordIntPair chunkXZ) {
-        if (!GT_Values.enableChunkloaders) return;
+        if (!GTValues.enableChunkloaders) return;
         Ticket ticket = instance.registeredTickets.get(owner);
         if (ticket != null) {
-            if (GT_Values.debugChunkloaders) GT_Log.out
+            if (GTValues.debugChunkloaders) GTLog.out
                 .println("GT_ChunkManager: Chunk release: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")");
             ForgeChunkManager.unforceChunk(ticket, chunkXZ);
         }
     }
 
     public static void releaseTicket(TileEntity owner) {
-        if (!GT_Values.enableChunkloaders) return;
+        if (!GTValues.enableChunkloaders) return;
         Ticket ticket = instance.registeredTickets.get(owner);
         if (ticket != null) {
-            if (GT_Values.debugChunkloaders) {
-                GT_Log.out.println(
+            if (GTValues.debugChunkloaders) {
+                GTLog.out.println(
                     "GT_ChunkManager: ticket released by machine at: (" + owner.xCoord
                         + ", "
                         + owner.yCoord
                         + ", "
                         + owner.zCoord
                         + ")");
-                for (ChunkCoordIntPair chunk : ticket.getChunkList()) GT_Log.out
+                for (ChunkCoordIntPair chunk : ticket.getChunkList()) GTLog.out
                     .println("GT_ChunkManager: Chunk release: (" + chunk.chunkXPos + ", " + chunk.chunkZPos + ")");
             }
             ForgeChunkManager.releaseTicket(ticket);
@@ -180,25 +180,25 @@ public class GT_ChunkManager
     }
 
     public static void printTickets() {
-        GT_Log.out.println("GT_ChunkManager: Start forced chunks dump:");
+        GTLog.out.println("GT_ChunkManager: Start forced chunks dump:");
         instance.registeredTickets.forEach((machine, ticket) -> {
-            GT_Log.out.print(
+            GTLog.out.print(
                 "GT_ChunkManager: Chunks forced by the machine at (" + machine.xCoord
                     + ", "
                     + machine.yCoord
                     + ", "
                     + machine.zCoord
                     + ")");
-            if (ticket.isPlayerTicket()) GT_Log.out.print(" Owner: " + ticket.getPlayerName());
-            GT_Log.out.print(" :");
+            if (ticket.isPlayerTicket()) GTLog.out.print(" Owner: " + ticket.getPlayerName());
+            GTLog.out.print(" :");
             for (ChunkCoordIntPair c : ticket.getChunkList()) {
-                GT_Log.out.print("(");
-                GT_Log.out.print(c.chunkXPos);
-                GT_Log.out.print(", ");
-                GT_Log.out.print(c.chunkZPos);
-                GT_Log.out.print("), ");
+                GTLog.out.print("(");
+                GTLog.out.print(c.chunkXPos);
+                GTLog.out.print(", ");
+                GTLog.out.print(c.chunkZPos);
+                GTLog.out.print("), ");
             }
         });
-        GT_Log.out.println("GT_ChunkManager: End forced chunks dump:");
+        GTLog.out.println("GT_ChunkManager: End forced chunks dump:");
     }
 }
diff --git a/src/main/java/gregtech/api/objects/GT_CopiedBlockTexture.java b/src/main/java/gregtech/api/objects/GTCopiedBlockTexture.java
index c5307b4803..79be90c3b6 100644
--- a/src/main/java/gregtech/api/objects/GT_CopiedBlockTexture.java
+++ b/src/main/java/gregtech/api/objects/GTCopiedBlockTexture.java
@@ -4,27 +4,28 @@ import net.minecraft.block.Block;
 
 import gregtech.api.enums.Dyes;
 import gregtech.api.interfaces.ITexture;
+import gregtech.common.render.GTCopiedBlockTextureRender;
 
 /**
  * @deprecated Replaced by the {@link gregtech.api.render.TextureFactory} API.
  */
 @Deprecated
-public class GT_CopiedBlockTexture extends gregtech.common.render.GT_CopiedBlockTexture implements ITexture {
+public class GTCopiedBlockTexture extends GTCopiedBlockTextureRender implements ITexture {
 
     // Backwards Compat
     @Deprecated
     public short[] mRGBa;
 
-    public GT_CopiedBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean aAllowAlpha) {
+    public GTCopiedBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean aAllowAlpha) {
         super(aBlock, ordinalSide, aMeta, aRGBa, aAllowAlpha);
-        GT_CopiedBlockTexture.this.mRGBa = aRGBa;
+        GTCopiedBlockTexture.this.mRGBa = aRGBa;
     }
 
-    public GT_CopiedBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa) {
+    public GTCopiedBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa) {
         this(aBlock, ordinalSide, aMeta, aRGBa, true);
     }
 
-    public GT_CopiedBlockTexture(Block aBlock, int ordinalSide, int aMeta) {
+    public GTCopiedBlockTexture(Block aBlock, int ordinalSide, int aMeta) {
         this(aBlock, ordinalSide, aMeta, Dyes._NULL.mRGBa);
     }
 
diff --git a/src/main/java/gregtech/api/objects/GT_Cover_Default.java b/src/main/java/gregtech/api/objects/GTCoverDefault.java
index cc5f96eef3..6e9664c355 100644
--- a/src/main/java/gregtech/api/objects/GT_Cover_Default.java
+++ b/src/main/java/gregtech/api/objects/GTCoverDefault.java
@@ -5,15 +5,15 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 
-public class GT_Cover_Default extends GT_CoverBehavior {
+public class GTCoverDefault extends CoverBehavior {
 
     /**
      * This is the Dummy, if there is a generic Cover without behavior
      */
-    public GT_Cover_Default() {
+    public GTCoverDefault() {
         super();
     }
 
@@ -26,12 +26,12 @@ public class GT_Cover_Default extends GT_CoverBehavior {
     public int onCoverScrewdriverclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
         aCoverVariable = ((aCoverVariable + 1) & 15);
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
-            ((aCoverVariable & 1) != 0 ? GT_Utility.trans("128.1", "Redstone ") : "")
-                + ((aCoverVariable & 2) != 0 ? GT_Utility.trans("129.1", "Energy ") : "")
-                + ((aCoverVariable & 4) != 0 ? GT_Utility.trans("130.1", "Fluids ") : "")
-                + ((aCoverVariable & 8) != 0 ? GT_Utility.trans("131.1", "Items ") : ""));
+            ((aCoverVariable & 1) != 0 ? GTUtility.trans("128.1", "Redstone ") : "")
+                + ((aCoverVariable & 2) != 0 ? GTUtility.trans("129.1", "Energy ") : "")
+                + ((aCoverVariable & 4) != 0 ? GTUtility.trans("130.1", "Fluids ") : "")
+                + ((aCoverVariable & 8) != 0 ? GTUtility.trans("131.1", "Items ") : ""));
         return aCoverVariable;
     }
 
diff --git a/src/main/java/gregtech/api/objects/GT_Cover_None.java b/src/main/java/gregtech/api/objects/GTCoverNone.java
index 279efe63d8..2c07538186 100644
--- a/src/main/java/gregtech/api/objects/GT_Cover_None.java
+++ b/src/main/java/gregtech/api/objects/GTCoverNone.java
@@ -1,6 +1,6 @@
 package gregtech.api.objects;
 
-import static gregtech.api.enums.GT_Values.E;
+import static gregtech.api.enums.GTValues.E;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -8,15 +8,15 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehavior;
+import gregtech.api.util.CoverBehavior;
 import gregtech.api.util.ISerializableObject;
 
-public class GT_Cover_None extends GT_CoverBehavior {
+public class GTCoverNone extends CoverBehavior {
 
     /**
      * This is the Dummy, if there is no Cover
      */
-    public GT_Cover_None() {}
+    public GTCoverNone() {}
 
     @Override
     public float getBlastProofLevel(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
diff --git a/src/main/java/gregtech/api/objects/GT_Fluid.java b/src/main/java/gregtech/api/objects/GTFluid.java
index 10824d6327..9ffeac5b8f 100644
--- a/src/main/java/gregtech/api/objects/GT_Fluid.java
+++ b/src/main/java/gregtech/api/objects/GTFluid.java
@@ -4,23 +4,23 @@ import static gregtech.api.enums.Mods.GregTech;
 
 import net.minecraftforge.fluids.Fluid;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.fluid.GT_FluidFactory;
+import gregtech.api.GregTechAPI;
+import gregtech.api.fluid.GTFluidFactory;
 
 /**
- * @deprecated use {@link GT_FluidFactory#builder}
+ * @deprecated use {@link GTFluidFactory#builder}
  */
 @Deprecated
-public class GT_Fluid extends Fluid implements Runnable {
+public class GTFluid extends Fluid implements Runnable {
 
     public final String mTextureName;
     private final short[] mRGBa;
 
-    public GT_Fluid(String aName, String aTextureName, short[] aRGBa) {
+    public GTFluid(String aName, String aTextureName, short[] aRGBa) {
         super(aName);
         mRGBa = aRGBa;
         mTextureName = aTextureName;
-        GregTech_API.sGTBlockIconload.add(this);
+        GregTechAPI.sGTBlockIconload.add(this);
     }
 
     @Override
@@ -31,6 +31,6 @@ public class GT_Fluid extends Fluid implements Runnable {
 
     @Override
     public void run() {
-        setIcons(GregTech_API.sBlockIcons.registerIcon(GregTech.getResourcePath("fluids", "fluid." + mTextureName)));
+        setIcons(GregTechAPI.sBlockIcons.registerIcon(GregTech.getResourcePath("fluids", "fluid." + mTextureName)));
     }
 }
diff --git a/src/main/java/gregtech/api/objects/GT_HashSet.java b/src/main/java/gregtech/api/objects/GTHashSet.java
index d42f194e5d..df012c05f7 100644
--- a/src/main/java/gregtech/api/objects/GT_HashSet.java
+++ b/src/main/java/gregtech/api/objects/GTHashSet.java
@@ -9,41 +9,41 @@ import java.util.Map;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTUtility;
 
-public class GT_HashSet<E extends GT_ItemStack> extends AbstractSet<E> {
+public class GTHashSet<E extends GTItemStack> extends AbstractSet<E> {
 
     private static final Object OBJECT = new Object();
-    private final transient HashMap<GT_ItemStack, Object> map;
+    private final transient HashMap<GTItemStack, Object> map;
 
-    public GT_HashSet() {
+    public GTHashSet() {
         map = new HashMap<>();
-        GregTech_API.sItemStackMappings.add(map);
+        GregTechAPI.sItemStackMappings.add(map);
     }
 
-    public GT_HashSet(Collection<? extends E> c) {
+    public GTHashSet(Collection<? extends E> c) {
         map = new HashMap<>(Math.max((int) (c.size() / .75f) + 1, 16));
         addAll(c);
-        GregTech_API.sItemStackMappings.add(map);
+        GregTechAPI.sItemStackMappings.add(map);
     }
 
-    public GT_HashSet(int initialCapacity, float loadFactor) {
+    public GTHashSet(int initialCapacity, float loadFactor) {
         map = new HashMap<>(initialCapacity, loadFactor);
-        GregTech_API.sItemStackMappings.add(map);
+        GregTechAPI.sItemStackMappings.add(map);
     }
 
-    public GT_HashSet(int initialCapacity) {
+    public GTHashSet(int initialCapacity) {
         map = new HashMap<>(initialCapacity);
-        GregTech_API.sItemStackMappings.add(map);
+        GregTechAPI.sItemStackMappings.add(map);
     }
 
-    GT_HashSet(int initialCapacity, float loadFactor, boolean dummy) {
+    GTHashSet(int initialCapacity, float loadFactor, boolean dummy) {
         map = new LinkedHashMap<>(initialCapacity, loadFactor);
-        GregTech_API.sItemStackMappings.add(map);
+        GregTechAPI.sItemStackMappings.add(map);
     }
 
-    public Map<GT_ItemStack, Object> getMap() {
+    public Map<GTItemStack, Object> getMap() {
         return map;
     }
 
@@ -70,8 +70,8 @@ public class GT_HashSet<E extends GT_ItemStack> extends AbstractSet<E> {
     }
 
     public boolean add(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return false;
-        return map.put(new GT_ItemStack(aStack), OBJECT) == null;
+        if (GTUtility.isStackInvalid(aStack)) return false;
+        return map.put(new GTItemStack(aStack), OBJECT) == null;
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/objects/GT_ItemStack.java b/src/main/java/gregtech/api/objects/GTItemStack.java
index 492655740d..3ddfcd706a 100644
--- a/src/main/java/gregtech/api/objects/GT_ItemStack.java
+++ b/src/main/java/gregtech/api/objects/GTItemStack.java
@@ -4,8 +4,8 @@ import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.item.ItemHolder;
 import it.unimi.dsi.fastutil.Hash;
 
@@ -13,7 +13,7 @@ import it.unimi.dsi.fastutil.Hash;
  * An optimization of {@link ItemStack} to have a better {@code hashcode} and {@code equals} in order to improve
  * {@code HashMap} and {@code Set} performance
  */
-public class GT_ItemStack extends ItemHolder {
+public class GTItemStack extends ItemHolder {
 
     /**
      * A better {@link Hash.Strategy} for {@link ItemStack}. Implementation originally from {@code GT_ItemStack2}.
@@ -38,26 +38,26 @@ public class GT_ItemStack extends ItemHolder {
     public final byte mStackSize;
     public final short mMetaData;
 
-    public GT_ItemStack(Item aItem, long aStackSize, long aMetaData) {
+    public GTItemStack(Item aItem, long aStackSize, long aMetaData) {
         super(new ItemStack(aItem, 1, (int) aMetaData));
         mItem = aItem;
         mStackSize = (byte) aStackSize;
         mMetaData = (short) aMetaData;
     }
 
-    public GT_ItemStack(ItemStack aStack) {
+    public GTItemStack(ItemStack aStack) {
         this(aStack, false);
     }
 
-    public GT_ItemStack(ItemStack aStack, boolean wildcard) {
+    public GTItemStack(ItemStack aStack, boolean wildcard) {
         this(
             aStack == null ? null : aStack.getItem(),
             aStack == null ? 0 : aStack.stackSize,
-            aStack == null ? 0 : wildcard ? GT_Values.W : Items.feather.getDamage(aStack));
+            aStack == null ? 0 : wildcard ? GTValues.W : Items.feather.getDamage(aStack));
     }
 
-    public GT_ItemStack(int aHashCode) {
-        this(GT_Utility.intToStack(aHashCode));
+    public GTItemStack(int aHashCode) {
+        this(GTUtility.intToStack(aHashCode));
     }
 
     public final ItemStack toStack() {
@@ -66,25 +66,25 @@ public class GT_ItemStack extends ItemHolder {
     }
 
     public final boolean isStackEqual(ItemStack aStack) {
-        return GT_Utility.areStacksEqual(toStack(), aStack);
+        return GTUtility.areStacksEqual(toStack(), aStack);
     }
 
-    public final boolean isStackEqual(GT_ItemStack aStack) {
-        return GT_Utility.areStacksEqual(toStack(), aStack.toStack());
+    public final boolean isStackEqual(GTItemStack aStack) {
+        return GTUtility.areStacksEqual(toStack(), aStack.toStack());
     }
 
     @Override
     public boolean equals(Object aStack) {
         if (aStack == this) return true;
-        if (aStack instanceof GT_ItemStack) {
-            return ((GT_ItemStack) aStack).mItem == mItem && ((GT_ItemStack) aStack).mMetaData == mMetaData;
+        if (aStack instanceof GTItemStack) {
+            return ((GTItemStack) aStack).mItem == mItem && ((GTItemStack) aStack).mMetaData == mMetaData;
         }
         return false;
     }
 
     @Override
     public int hashCode() {
-        return GT_Utility.stackToInt(toStack());
+        return GTUtility.stackToInt(toStack());
     }
 
     /**
@@ -102,6 +102,6 @@ public class GT_ItemStack extends ItemHolder {
      * @return a copy of the stack with stack size 1 and no NBT
      */
     public static ItemStack internalCopyStack(ItemStack aStack, boolean wildcard) {
-        return new ItemStack(aStack.getItem(), 1, wildcard ? GT_Values.W : Items.feather.getDamage(aStack));
+        return new ItemStack(aStack.getItem(), 1, wildcard ? GTValues.W : Items.feather.getDamage(aStack));
     }
 }
diff --git a/src/main/java/gregtech/api/objects/GT_ItemStack2.java b/src/main/java/gregtech/api/objects/GTItemStack2.java
index aa93876830..798915d848 100644
--- a/src/main/java/gregtech/api/objects/GT_ItemStack2.java
+++ b/src/main/java/gregtech/api/objects/GTItemStack2.java
@@ -8,28 +8,28 @@ import net.minecraft.item.ItemStack;
  * structure with GT_ItemStack. It also shouldn't be used to construct search query into a hash based data structure
  * that contains GT_ItemStack.
  *
- * @deprecated See {@link GT_ItemStack#ITEMSTACK_HASH_STRATEGY2}
+ * @deprecated See {@link GTItemStack#ITEMSTACK_HASH_STRATEGY2}
  */
 @Deprecated
-public class GT_ItemStack2 extends GT_ItemStack {
+public class GTItemStack2 extends GTItemStack {
 
-    public GT_ItemStack2(Item aItem, long aStackSize, long aMetaData) {
+    public GTItemStack2(Item aItem, long aStackSize, long aMetaData) {
         super(aItem, aStackSize, aMetaData);
     }
 
-    public GT_ItemStack2(ItemStack aStack) {
+    public GTItemStack2(ItemStack aStack) {
         super(aStack);
     }
 
-    public GT_ItemStack2(ItemStack aStack, boolean wildcard) {
+    public GTItemStack2(ItemStack aStack, boolean wildcard) {
         super(aStack, wildcard);
     }
 
     @Override
     public boolean equals(Object aStack) {
         if (aStack == this) return true;
-        if (aStack instanceof GT_ItemStack) {
-            return ((GT_ItemStack) aStack).mItem == mItem && ((GT_ItemStack) aStack).mMetaData == mMetaData;
+        if (aStack instanceof GTItemStack) {
+            return ((GTItemStack) aStack).mItem == mItem && ((GTItemStack) aStack).mMetaData == mMetaData;
         }
         return false;
     }
diff --git a/src/main/java/gregtech/api/objects/GT_MultiTexture.java b/src/main/java/gregtech/api/objects/GTMultiTexture.java
index 9748ecb934..ecd2f55661 100644
--- a/src/main/java/gregtech/api/objects/GT_MultiTexture.java
+++ b/src/main/java/gregtech/api/objects/GTMultiTexture.java
@@ -1,6 +1,7 @@
 package gregtech.api.objects;
 
 import gregtech.api.interfaces.ITexture;
+import gregtech.common.render.GTMultiTextureRender;
 
 /**
  * <p>
@@ -9,13 +10,13 @@ import gregtech.api.interfaces.ITexture;
  * <p>
  * I should have done this much earlier...
  * </p>
- * 
+ *
  * @deprecated Replaced by the {@link gregtech.api.render.TextureFactory} API.
  */
 @Deprecated
-public class GT_MultiTexture extends gregtech.common.render.GT_MultiTexture implements ITexture {
+public class GTMultiTexture extends GTMultiTextureRender implements ITexture {
 
-    public GT_MultiTexture(ITexture... aTextures) {
+    public GTMultiTexture(ITexture... aTextures) {
         super(aTextures);
     }
 
diff --git a/src/main/java/gregtech/api/objects/GT_RenderedTexture.java b/src/main/java/gregtech/api/objects/GTRenderedTexture.java
index bbb22e7d36..a4d0a064ff 100644
--- a/src/main/java/gregtech/api/objects/GT_RenderedTexture.java
+++ b/src/main/java/gregtech/api/objects/GTRenderedTexture.java
@@ -6,23 +6,23 @@ import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 
 @Deprecated
-public class GT_RenderedTexture extends gregtech.common.render.GT_RenderedTexture
+public class GTRenderedTexture extends gregtech.common.render.GTRenderedTexture
     implements ITexture, IColorModulationContainer {
 
     @Deprecated
     public short[] mRGBa;
 
-    public GT_RenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) {
+    public GTRenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) {
         super(aIcon, aRGBa, aAllowAlpha, false, true, false);
         if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture");
         mRGBa = aRGBa;
     }
 
-    public GT_RenderedTexture(IIconContainer aIcon, short[] aRGBa) {
+    public GTRenderedTexture(IIconContainer aIcon, short[] aRGBa) {
         this(aIcon, aRGBa, true);
     }
 
-    public GT_RenderedTexture(IIconContainer aIcon) {
+    public GTRenderedTexture(IIconContainer aIcon) {
         this(aIcon, Dyes._NULL.mRGBa);
     }
 
diff --git a/src/main/java/gregtech/api/objects/GT_SidedTexture.java b/src/main/java/gregtech/api/objects/GTSidedTexture.java
index d042ebede9..d7b2291386 100644
--- a/src/main/java/gregtech/api/objects/GT_SidedTexture.java
+++ b/src/main/java/gregtech/api/objects/GTSidedTexture.java
@@ -4,40 +4,40 @@ import gregtech.api.enums.Dyes;
 import gregtech.api.interfaces.IColorModulationContainer;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
+import gregtech.common.render.GTSidedTextureRender;
 
 /**
  * @deprecated Replaced by the {@link gregtech.api.render.TextureFactory} API.
  */
 @Deprecated