49 files changed, 386 insertions, 382 deletions

diff --git a/src/main/java/gregtech/common/tools/GT_Tool.java b/src/main/java/gregtech/common/tools/GTTool.java
index cb637a1bd5..436ec767a9 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool.java
+++ b/src/main/java/gregtech/common/tools/GTTool.java
@@ -15,12 +15,12 @@ import net.minecraft.util.IChatComponent;
 import net.minecraft.world.World;
 import net.minecraftforge.event.world.BlockEvent;
 
-import gregtech.api.damagesources.GT_DamageSources;
+import gregtech.api.damagesources.GTDamageSources;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.IToolStats;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public abstract class GT_Tool implements IToolStats {
+public abstract class GTTool implements IToolStats {
 
     public static final Enchantment[] FORTUNE_ENCHANTMENT = { Enchantment.fortune };
     public static final Enchantment[] LOOTING_ENCHANTMENT = { Enchantment.looting };
@@ -129,7 +129,7 @@ public abstract class GT_Tool implements IToolStats {
 
     @Override
     public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity) {
-        return GT_DamageSources.getCombatDamage(
+        return GTDamageSources.getCombatDamage(
             (aPlayer instanceof EntityPlayer) ? "player" : "mob",
             aPlayer,
             (aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase) aEntity) : null);
@@ -169,7 +169,7 @@ public abstract class GT_Tool implements IToolStats {
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java b/src/main/java/gregtech/common/tools/ToolAxe.java
index c54ebac3c9..03b761227c 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
+++ b/src/main/java/gregtech/common/tools/ToolAxe.java
@@ -14,13 +14,13 @@ import net.minecraft.util.IChatComponent;
 import net.minecraft.world.World;
 import net.minecraftforge.event.world.BlockEvent;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_Axe extends GT_Tool {
+public class ToolAxe extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -94,16 +94,16 @@ public class GT_Tool_Axe extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "axe")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.wood)
-            || GT_ToolHarvestHelper.isSpecialBlock(aBlock, Blocks.ladder);
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "axe")
+            || GTToolHarvestHelper.isAppropriateMaterial(aBlock, Material.wood)
+            || GTToolHarvestHelper.isSpecialBlock(aBlock, Blocks.ladder);
     }
 
     @Override
     public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
         int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
         int rAmount = 0;
-        if ((GregTech_API.sTimber) && (!aPlayer.isSneaking())
+        if ((GregTechAPI.sTimber) && (!aPlayer.isSneaking())
             && (OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData)))) {
             int tY = aY + 1;
             for (int tH = aPlayer.worldObj.getHeight(); tY < tH; tY++) {
@@ -125,7 +125,7 @@ public class GT_Tool_Axe extends GT_Tool {
             && OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData))) {
             float rAmount = 1.0F;
             float tIncrement = 1.0F;
-            if ((GregTech_API.sTimber) && !aPlayer.isSneaking()) {
+            if ((GregTechAPI.sTimber) && !aPlayer.isSneaking()) {
                 int tY = aY + 1;
                 for (int tH = aPlayer.worldObj.getHeight(); (tY < tH)
                     && (aPlayer.worldObj.getBlock(aX, tY, aZ) == aBlock); tY++) {
@@ -149,18 +149,18 @@ public class GT_Tool_Axe extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.toolHeadAxe.mTextureIndex]
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex];
+            ? MetaGeneratedTool.getPrimaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.toolHeadAxe.mTextureIndex]
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java b/src/main/java/gregtech/common/tools/ToolBranchCutter.java
index a8b83a0221..c9ad255a45 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
+++ b/src/main/java/gregtech/common/tools/ToolBranchCutter.java
@@ -16,12 +16,12 @@ import net.minecraftforge.event.world.BlockEvent;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.api.util.GTUtility;
 
-public class GT_Tool_BranchCutter extends GT_Tool {
+public class ToolBranchCutter extends GTTool {
 
     @Override
     public float getBaseDamage() {
@@ -63,9 +63,9 @@ public class GT_Tool_BranchCutter extends GT_Tool {
             } else if (aBlock == Blocks.leaves2) {
                 aDrops.clear();
                 aDrops.add(new ItemStack(Blocks.sapling, 1, (aMetaData & 0x3) + 4));
-            } else if (aBlock == GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("rubberLeaves", 1L))) {
+            } else if (aBlock == GTUtility.getBlockFromStack(GTModHandler.getIC2Item("rubberLeaves", 1L))) {
                 aDrops.clear();
-                aDrops.add(GT_ModHandler.getIC2Item("rubberSapling", 1L));
+                aDrops.add(GTModHandler.getIC2Item("rubberSapling", 1L));
             }
         }
         return 0;
@@ -73,8 +73,8 @@ public class GT_Tool_BranchCutter extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "grafter")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.leaves);
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "grafter")
+            || GTToolHarvestHelper.isAppropriateMaterial(aBlock, Material.leaves);
     }
 
     @Override
@@ -84,8 +84,8 @@ public class GT_Tool_BranchCutter extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java b/src/main/java/gregtech/common/tools/ToolButcheryKnife.java
index bdfe66401a..43323b8404 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java
+++ b/src/main/java/gregtech/common/tools/ToolButcheryKnife.java
@@ -11,9 +11,9 @@ import net.minecraft.util.IChatComponent;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_ButcheryKnife extends GT_Tool {
+public class ToolButcheryKnife extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -72,7 +72,7 @@ public class GT_Tool_ButcheryKnife extends GT_Tool {
 
     @Override
     public int[] getEnchantmentLevels(ItemStack aStack) {
-        return new int[] { (2 + GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolQuality) / 2 };
+        return new int[] { (2 + MetaGeneratedTool.getPrimaryMaterial(aStack).mToolQuality) / 2 };
     }
 
     @Override
@@ -82,8 +82,8 @@ public class GT_Tool_ButcheryKnife extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java b/src/main/java/gregtech/common/tools/ToolBuzzSaw.java
index 4d7192ce93..7e62ab7bb4 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java
+++ b/src/main/java/gregtech/common/tools/ToolBuzzSaw.java
@@ -10,9 +10,9 @@ import net.minecraft.util.IChatComponent;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_BuzzSaw extends GT_Tool_Saw {
+public class ToolBuzzSaw extends ToolSaw {
 
     @Override
     public int getToolDamagePerContainerCraft() {
@@ -57,15 +57,15 @@ public class GT_Tool_BuzzSaw extends GT_Tool_Saw {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return !aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadBuzzSaw.mTextureIndex]
             : Textures.ItemIcons.HANDLE_BUZZSAW;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return !aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java b/src/main/java/gregtech/common/tools/ToolChainsawHV.java
index 38c1d3acb8..f2dc1df3bf 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java
+++ b/src/main/java/gregtech/common/tools/ToolChainsawHV.java
@@ -4,8 +4,9 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Chainsaw_HV extends GT_Tool_Chainsaw_LV {
+public class ToolChainsawHV extends ToolChainsawLV {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -50,7 +51,7 @@ public class GT_Tool_Chainsaw_HV extends GT_Tool_Chainsaw_LV {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_HV;
     }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java b/src/main/java/gregtech/common/tools/ToolChainsawLV.java
index 142b0c50d2..ad47ae2cdc 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
+++ b/src/main/java/gregtech/common/tools/ToolChainsawLV.java
@@ -15,15 +15,15 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.IShearable;
 import net.minecraftforge.event.world.BlockEvent;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
+public class ToolChainsawLV extends ToolSaw {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -99,8 +99,8 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
     public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
         super.onToolCrafted(aStack, aPlayer);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "brrrr");
-            GT_Mod.achievements.issueAchievement(aPlayer, "buildChainsaw");
+            GTMod.achievements.issueAchievement(aPlayer, "brrrr");
+            GTMod.achievements.issueAchievement(aPlayer, "buildChainsaw");
         } catch (Exception ignored) {}
     }
 
@@ -122,7 +122,7 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
                 aEvent.dropChance = 1.0F;
                 return 1;
             }
-        if ((GregTech_API.sTimber) && (!aPlayer.isSneaking())
+        if ((GregTechAPI.sTimber) && (!aPlayer.isSneaking())
             && (OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData)))) {
             int tY = aY + 1;
             for (int tH = aPlayer.worldObj.getHeight(); tY < tH; tY++) {
@@ -143,7 +143,7 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
             && OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData))) {
             float rAmount = 1.0F;
             float tIncrement = 1.0F;
-            if ((GregTech_API.sTimber) && !aPlayer.isSneaking()) {
+            if ((GregTechAPI.sTimber) && !aPlayer.isSneaking()) {
                 int tY = aY + 1;
                 for (int tH = aPlayer.worldObj.getHeight(); (tY < tH)
                     && (aPlayer.worldObj.getBlock(aX, tY, aZ) == aBlock); tY++) {
@@ -161,15 +161,15 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_LV;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java b/src/main/java/gregtech/common/tools/ToolChainsawMV.java
index 6c88895e48..48fc79f86d 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java
+++ b/src/main/java/gregtech/common/tools/ToolChainsawMV.java
@@ -4,8 +4,9 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Chainsaw_MV extends GT_Tool_Chainsaw_LV {
+public class ToolChainsawMV extends ToolChainsawLV {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -50,7 +51,7 @@ public class GT_Tool_Chainsaw_MV extends GT_Tool_Chainsaw_LV {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_MV;
     }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java b/src/main/java/gregtech/common/tools/ToolCrowbar.java
index 3db30faca1..db72d65a6d 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java
+++ b/src/main/java/gregtech/common/tools/ToolCrowbar.java
@@ -13,11 +13,11 @@ import com.google.common.base.Strings;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.IToolStats;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.behaviors.Behaviour_Crowbar;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.MetaGeneratedTool01;
+import gregtech.common.items.behaviors.BehaviourCrowbar;
 
-public class GT_Tool_Crowbar extends GT_Tool {
+public class ToolCrowbar extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -96,8 +96,8 @@ public class GT_Tool_Crowbar extends GT_Tool {
         }
         String tTool = aBlock.getHarvestTool(aMetaData);
         if (Strings.isNullOrEmpty(tTool)) {
-            for (IToolStats i : GT_MetaGenerated_Tool_01.INSTANCE.mToolStats.values()) {
-                if (i instanceof GT_Tool_Crowbar && i != this && !i.isMinableBlock(aBlock, aMetaData)) {
+            for (IToolStats i : MetaGeneratedTool01.INSTANCE.mToolStats.values()) {
+                if (i instanceof ToolCrowbar && i != this && !i.isMinableBlock(aBlock, aMetaData)) {
                     return false;
                 }
             }
@@ -118,12 +118,12 @@ public class GT_Tool_Crowbar extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : null;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa : null;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Crowbar(1, 1000));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourCrowbar(1, 1000));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java b/src/main/java/gregtech/common/tools/ToolDrillHV.java
index 597e8b0725..fb1d2b421a 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java
+++ b/src/main/java/gregtech/common/tools/ToolDrillHV.java
@@ -3,11 +3,12 @@ package gregtech.common.tools;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Drill_HV extends GT_Tool_Drill_LV {
+public class ToolDrillHV extends ToolDrillLV {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -53,15 +54,15 @@ public class GT_Tool_Drill_HV extends GT_Tool_Drill_LV {
     public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
         super.onToolCrafted(aStack, aPlayer);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "highpowerdrill");
-            GT_Mod.achievements.issueAchievement(aPlayer, "buildDDrill");
+            GTMod.achievements.issueAchievement(aPlayer, "highpowerdrill");
+            GTMod.achievements.issueAchievement(aPlayer, "buildDDrill");
         } catch (Exception ignored) {}
     }
 
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadDrill.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_HV;
     }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java b/src/main/java/gregtech/common/tools/ToolDrillLV.java
index f06c2c812d..1c6dfd7de3 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java
+++ b/src/main/java/gregtech/common/tools/ToolDrillLV.java
@@ -10,14 +10,14 @@ import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_Drill_LV extends GT_Tool {
+public class ToolDrillLV extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -91,8 +91,8 @@ public class GT_Tool_Drill_LV extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "pickaxe", "shovel")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "pickaxe", "shovel")
+            || GTToolHarvestHelper.isAppropriateMaterial(
                 aBlock,
                 Material.rock,
                 Material.iron,
@@ -113,19 +113,19 @@ public class GT_Tool_Drill_LV extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadDrill.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_LV;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
@@ -133,8 +133,8 @@ public class GT_Tool_Drill_LV extends GT_Tool {
         aPlayer.triggerAchievement(AchievementList.buildPickaxe);
         aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "driltime");
-            GT_Mod.achievements.issueAchievement(aPlayer, "buildDrill");
+            GTMod.achievements.issueAchievement(aPlayer, "driltime");
+            GTMod.achievements.issueAchievement(aPlayer, "buildDrill");
         } catch (Exception ignored) {}
     }
 
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java b/src/main/java/gregtech/common/tools/ToolDrillMV.java
index 7b6b54d4b5..b1694ee74d 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java
+++ b/src/main/java/gregtech/common/tools/ToolDrillMV.java
@@ -4,8 +4,9 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Drill_MV extends GT_Tool_Drill_LV {
+public class ToolDrillMV extends ToolDrillLV {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -50,7 +51,7 @@ public class GT_Tool_Drill_MV extends GT_Tool_Drill_LV {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadDrill.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_MV;
     }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_File.java b/src/main/java/gregtech/common/tools/ToolFile.java
index 0a8610a462..8e64dafdd2 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_File.java
+++ b/src/main/java/gregtech/common/tools/ToolFile.java
@@ -9,10 +9,10 @@ import net.minecraft.util.IChatComponent;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_File extends GT_Tool {
+public class ToolFile extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -86,7 +86,7 @@ public class GT_Tool_File extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "file");
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "file");
     }
 
     @Override
@@ -97,19 +97,19 @@ public class GT_Tool_File extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return !aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadFile.mTextureIndex]
             : Textures.ItemIcons.HANDLE_FILE;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return !aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java b/src/main/java/gregtech/common/tools/ToolHardHammer.java
index 066abd48b8..d26fe2b43d 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java
+++ b/src/main/java/gregtech/common/tools/ToolHardHammer.java
@@ -1,6 +1,6 @@
 package gregtech.common.tools;
 
-import static gregtech.GT_Mod.MAX_IC2;
+import static gregtech.GTMod.MAX_IC2;
 
 import java.util.Arrays;
 import java.util.List;
@@ -17,17 +17,17 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 import net.minecraftforge.event.world.BlockEvent;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.items.behaviors.Behaviour_Prospecting;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.api.util.GTUtility;
+import gregtech.common.items.behaviors.BehaviourProspecting;
 
-public class GT_Tool_HardHammer extends GT_Tool {
+public class ToolHardHammer extends GTTool {
 
     public static final List<String> mEffectiveList = Arrays
         .asList(EntityIronGolem.class.getName(), "EntityTowerGuardian");
@@ -123,8 +123,8 @@ public class GT_Tool_HardHammer extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "hammer", "pickaxe")
-            || GT_ToolHarvestHelper
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "hammer", "pickaxe")
+            || GTToolHarvestHelper
                 .isAppropriateMaterial(aBlock, Material.rock, Material.glass, Material.ice, Material.packedIce)
             || RecipeMaps.hammerRecipes.containsInput(new ItemStack(aBlock, 1, aMetaData));
     }
@@ -133,19 +133,19 @@ public class GT_Tool_HardHammer extends GT_Tool {
     public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
         int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
         int rConversions = 0;
-        GT_Recipe tRecipe = RecipeMaps.hammerRecipes
+        GTRecipe tRecipe = RecipeMaps.hammerRecipes
             .findRecipe(null, true, MAX_IC2, null, new ItemStack(aBlock, 1, aMetaData));
         if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) {
             for (ItemStack tDrop : aDrops) {
                 tRecipe = RecipeMaps.hammerRecipes
-                    .findRecipe(null, true, MAX_IC2, null, GT_Utility.copyAmount(1, tDrop));
+                    .findRecipe(null, true, MAX_IC2, null, GTUtility.copyAmount(1, tDrop));
                 if (tRecipe != null) {
                     ItemStack tHammeringOutput = tRecipe.getOutput(0);
                     if (tHammeringOutput != null) {
                         rConversions += tDrop.stackSize;
                         tDrop.stackSize *= tHammeringOutput.stackSize;
                         tHammeringOutput.stackSize = tDrop.stackSize;
-                        GT_Utility.setStack(tDrop, tHammeringOutput);
+                        GTUtility.setStack(tDrop, tHammeringOutput);
                     }
                 }
             }
@@ -165,21 +165,21 @@ public class GT_Tool_HardHammer extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadHammer.mTextureIndex]
-            : GT_MetaGenerated_Tool
+            : MetaGeneratedTool
                 .getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Prospecting(1, 1000));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourProspecting(1, 1000));
     }
 
     @Override
@@ -197,7 +197,7 @@ public class GT_Tool_HardHammer extends GT_Tool {
     public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
         super.onToolCrafted(aStack, aPlayer);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "tools");
+            GTMod.achievements.issueAchievement(aPlayer, "tools");
         } catch (Exception ignored) {}
     }
 }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Hoe.java b/src/main/java/gregtech/common/tools/ToolHoe.java
index 2dc5496176..8c68d41b44 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Hoe.java
+++ b/src/main/java/gregtech/common/tools/ToolHoe.java
@@ -11,11 +11,11 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.common.items.behaviors.Behaviour_Hoe;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.common.items.behaviors.BehaviourHoe;
 
-public class GT_Tool_Hoe extends GT_Tool {
+public class ToolHoe extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -84,8 +84,8 @@ public class GT_Tool_Hoe extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "hoe")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.gourd);
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "hoe")
+            || GTToolHarvestHelper.isAppropriateMaterial(aBlock, Material.gourd);
     }
 
     @Override
@@ -96,21 +96,21 @@ public class GT_Tool_Hoe extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool
+            ? MetaGeneratedTool
                 .getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadHoe.mTextureIndex]
-            : GT_MetaGenerated_Tool
+            : MetaGeneratedTool
                 .getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Hoe(100));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourHoe(100));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java b/src/main/java/gregtech/common/tools/ToolJackHammer.java
index 7c8b17f711..6c46a4c9be 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java
+++ b/src/main/java/gregtech/common/tools/ToolJackHammer.java
@@ -12,15 +12,15 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 import net.minecraftforge.event.world.BlockEvent;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.api.util.GTUtility;
 
-public class GT_Tool_JackHammer extends GT_Tool_Drill_LV {
+public class ToolJackHammer extends ToolDrillLV {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -64,8 +64,8 @@ public class GT_Tool_JackHammer extends GT_Tool_Drill_LV {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "pickaxe") //
-            || GT_ToolHarvestHelper.isAppropriateMaterial(
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "pickaxe") //
+            || GTToolHarvestHelper.isAppropriateMaterial(
                 aBlock, //
                 Material.rock, //
                 Material.glass, //
@@ -78,19 +78,19 @@ public class GT_Tool_JackHammer extends GT_Tool_Drill_LV {
     public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
         int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
         int rConversions = 0;
-        GT_Recipe tRecipe = RecipeMaps.hammerRecipes
+        GTRecipe tRecipe = RecipeMaps.hammerRecipes
             .findRecipe(null, true, 2147483647L, null, new ItemStack(aBlock, 1, aMetaData));
         if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) {
             for (ItemStack tDrop : aDrops) {
                 tRecipe = RecipeMaps.hammerRecipes
-                    .findRecipe(null, true, 2147483647L, null, GT_Utility.copyAmount(1, tDrop));
+                    .findRecipe(null, true, 2147483647L, null, GTUtility.copyAmount(1, tDrop));
                 if (tRecipe != null) {
                     ItemStack tHammeringOutput = tRecipe.getOutput(0);
                     if (tHammeringOutput != null) {
                         rConversions += tDrop.stackSize;
                         tDrop.stackSize *= tHammeringOutput.stackSize;
                         tHammeringOutput.stackSize = tDrop.stackSize;
-                        GT_Utility.setStack(tDrop, tHammeringOutput);
+                        GTUtility.setStack(tDrop, tHammeringOutput);
                     }
                 }
             }
@@ -106,7 +106,7 @@ public class GT_Tool_JackHammer extends GT_Tool_Drill_LV {
     public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
         super.onToolCrafted(aStack, aPlayer);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "hammertime");
+            GTMod.achievements.issueAchievement(aPlayer, "hammertime");
         } catch (Exception ignored) {}
     }
 
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Knife.java b/src/main/java/gregtech/common/tools/ToolKnife.java
index 152476fa2d..908a9daaad 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Knife.java
+++ b/src/main/java/gregtech/common/tools/ToolKnife.java
@@ -10,7 +10,7 @@ import net.minecraft.util.IChatComponent;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 
-public class GT_Tool_Knife extends GT_Tool_Sword {
+public class ToolKnife extends ToolSword {
 
     @Override
     public int getToolDamagePerBlockBreak() {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Mortar.java b/src/main/java/gregtech/common/tools/ToolMortar.java
index 8e74d3bcc1..e67e5924de 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Mortar.java
+++ b/src/main/java/gregtech/common/tools/ToolMortar.java
@@ -10,9 +10,9 @@ import net.minecraft.util.IChatComponent;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Mortar extends GT_Tool {
+public class ToolMortar extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -101,11 +101,11 @@ public class GT_Tool_Mortar extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Dyes._NULL.mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa : Dyes._NULL.mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java b/src/main/java/gregtech/common/tools/ToolPickaxe.java
index b755869112..91be7dae29 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java
+++ b/src/main/java/gregtech/common/tools/ToolPickaxe.java
@@ -10,12 +10,12 @@ import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_Pickaxe extends GT_Tool {
+public class ToolPickaxe extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -84,8 +84,8 @@ public class GT_Tool_Pickaxe extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "pickaxe") //
-            || GT_ToolHarvestHelper.isAppropriateMaterial(
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "pickaxe") //
+            || GTToolHarvestHelper.isAppropriateMaterial(
                 aBlock, //
                 Material.rock,
                 Material.iron,
@@ -101,20 +101,20 @@ public class GT_Tool_Pickaxe extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadPickaxe.mTextureIndex]
-            : GT_MetaGenerated_Tool
+            : MetaGeneratedTool
                 .getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
@@ -122,7 +122,7 @@ public class GT_Tool_Pickaxe extends GT_Tool {
         aPlayer.triggerAchievement(AchievementList.buildPickaxe);
         aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "flintpick");
+            GTMod.achievements.issueAchievement(aPlayer, "flintpick");
         } catch (Exception ignored) {}
     }
 
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plow.java b/src/main/java/gregtech/common/tools/ToolPlow.java
index b6f4be25b5..e0f25fa2f1 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Plow.java
+++ b/src/main/java/gregtech/common/tools/ToolPlow.java
@@ -17,10 +17,10 @@ import net.minecraft.world.World;
 import net.minecraftforge.event.world.BlockEvent;
 
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_Plow extends GT_Tool {
+public class ToolPlow extends GTTool {
 
     private final ThreadLocal<Object> sIsHarvestingRightNow = new ThreadLocal<>();
 
@@ -37,8 +37,8 @@ public class GT_Tool_Plow extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "plow")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.snow, Material.craftedSnow);
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "plow")
+            || GTToolHarvestHelper.isAppropriateMaterial(aBlock, Material.snow, Material.craftedSnow);
     }
 
     @Override
@@ -85,16 +85,16 @@ public class GT_Tool_Plow extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadPlow.mTextureIndex]
-            : GT_MetaGenerated_Tool
+            : MetaGeneratedTool
                 .getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java b/src/main/java/gregtech/common/tools/ToolPlunger.java
index 76c1ccbc24..f4dc8bd77d 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java
+++ b/src/main/java/gregtech/common/tools/ToolPlunger.java
@@ -11,14 +11,14 @@ import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.IItemBehaviour;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.items.behaviors.Behaviour_Plunger_Fluid;
-import gregtech.common.items.behaviors.Behaviour_Plunger_Item;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.api.util.GTUtility;
+import gregtech.common.items.behaviors.BehaviourPlungerFluid;
+import gregtech.common.items.behaviors.BehaviourPlungerItem;
 
-public class GT_Tool_Plunger extends GT_Tool {
+public class ToolPlunger extends GTTool {
 
     @Override
     public float getBaseDamage() {
@@ -47,7 +47,7 @@ public class GT_Tool_Plunger extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "plunger");
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "plunger");
     }
 
     @Override
@@ -57,24 +57,24 @@ public class GT_Tool_Plunger extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
     @SuppressWarnings("unchecked") // the IItemBehaviour cast cannot be expressed strictly via generics
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Plunger_Item(getToolDamagePerDropConversion()));
-        aItem.addItemBehavior(aID, new Behaviour_Plunger_Fluid(getToolDamagePerDropConversion()));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourPlungerItem(getToolDamagePerDropConversion()));
+        aItem.addItemBehavior(aID, new BehaviourPlungerFluid(getToolDamagePerDropConversion()));
         try {
-            Object tObject = GT_Utility.callConstructor(
+            Object tObject = GTUtility.callConstructor(
                 "gregtech.common.items.behaviors.Behaviour_Plunger_Essentia",
                 0,
                 null,
                 false,
                 getToolDamagePerDropConversion());
             if ((tObject instanceof IItemBehaviour)) {
-                aItem.addItemBehavior(aID, (IItemBehaviour<GT_MetaBase_Item>) tObject);
+                aItem.addItemBehavior(aID, (IItemBehaviour<MetaBaseItem>) tObject);
             }
         } catch (Throwable ignored) {}
     }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_RollingPin.java b/src/main/java/gregtech/common/tools/ToolRollingPin.java
index 9933c4eb13..1af17f3072 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_RollingPin.java
+++ b/src/main/java/gregtech/common/tools/ToolRollingPin.java
@@ -10,9 +10,9 @@ import net.minecraft.util.IChatComponent;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_RollingPin extends GT_Tool {
+public class ToolRollingPin extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -46,11 +46,11 @@ public class GT_Tool_RollingPin extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Dyes._NULL.mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa : Dyes._NULL.mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Saw.java b/src/main/java/gregtech/common/tools/ToolSaw.java
index b2c85e2a5e..ca1ec81b13 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Saw.java
+++ b/src/main/java/gregtech/common/tools/ToolSaw.java
@@ -17,10 +17,10 @@ import net.minecraftforge.event.world.BlockEvent;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_Saw extends GT_Tool {
+public class ToolSaw extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -102,8 +102,8 @@ public class GT_Tool_Saw extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "axe", "saw")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "axe", "saw")
+            || GTToolHarvestHelper.isAppropriateMaterial(
                 aBlock,
                 Material.leaves,
                 Material.vine,
@@ -111,7 +111,7 @@ public class GT_Tool_Saw extends GT_Tool {
                 Material.cactus,
                 Material.ice,
                 Material.packedIce)
-            || GT_ToolHarvestHelper.isSpecialBlock(aBlock, Blocks.ladder);
+            || GTToolHarvestHelper.isSpecialBlock(aBlock, Blocks.ladder);
     }
 
     @Override
@@ -122,19 +122,19 @@ public class GT_Tool_Saw extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool
+            ? MetaGeneratedTool
                 .getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadSaw.mTextureIndex]
             : Textures.ItemIcons.HANDLE_SAW;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java b/src/main/java/gregtech/common/tools/ToolScoop.java
index 3181e108bf..6f740da95e 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
+++ b/src/main/java/gregtech/common/tools/ToolScoop.java
@@ -12,12 +12,12 @@ import net.minecraft.util.IChatComponent;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.common.items.behaviors.Behaviour_None;
-import gregtech.common.items.behaviors.Behaviour_Scoop;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.common.items.behaviors.BehaviourNone;
+import gregtech.common.items.behaviors.BehaviourScoop;
 
-public class GT_Tool_Scoop extends GT_Tool {
+public class ToolScoop extends GTTool {
 
     public static Material sBeeHiveMaterial;
 
@@ -88,8 +88,8 @@ public class GT_Tool_Scoop extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "scoop")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, sBeeHiveMaterial);
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "scoop")
+            || GTToolHarvestHelper.isAppropriateMaterial(aBlock, sBeeHiveMaterial);
     }
 
     @Override
@@ -104,16 +104,16 @@ public class GT_Tool_Scoop extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         if (Forestry.isModLoaded()) {
-            aItem.addItemBehavior(aID, new Behaviour_Scoop(200));
+            aItem.addItemBehavior(aID, new BehaviourScoop(200));
         } else {
-            aItem.addItemBehavior(aID, new Behaviour_None());
+            aItem.addItemBehavior(aID, new BehaviourNone());
         }
     }
 
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java b/src/main/java/gregtech/common/tools/ToolScrewdriver.java
index 1d7f4e655d..b73f1371aa 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java
+++ b/src/main/java/gregtech/common/tools/ToolScrewdriver.java
@@ -18,11 +18,11 @@ import net.minecraft.util.IChatComponent;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.common.items.behaviors.Behaviour_Screwdriver;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.common.items.behaviors.BehaviourScrewdriver;
 
-public class GT_Tool_Screwdriver extends GT_Tool {
+public class ToolScrewdriver extends GTTool {
 
     public static final List<String> mEffectiveList = Arrays.asList(
         EntityCaveSpider.class.getName(),
@@ -118,8 +118,8 @@ public class GT_Tool_Screwdriver extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "screwdriver")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.circuits);
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "screwdriver")
+            || GTToolHarvestHelper.isAppropriateMaterial(aBlock, Material.circuits);
     }
 
     @Override
@@ -130,20 +130,20 @@ public class GT_Tool_Screwdriver extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return !aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadScrewdriver.mTextureIndex]
             : Textures.ItemIcons.HANDLE_SCREWDRIVER;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return !aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Screwdriver(1, 200));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourScrewdriver(1, 200));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver_LV.java b/src/main/java/gregtech/common/tools/ToolScrewdriverLV.java
index e49e020b7b..31a4ffaad2 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver_LV.java
+++ b/src/main/java/gregtech/common/tools/ToolScrewdriverLV.java
@@ -4,9 +4,9 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Screwdriver_LV extends GT_Tool_Screwdriver {
+public class ToolScrewdriverLV extends ToolScrewdriver {
 
     @Override
     public float getMaxDurabilityMultiplier() {
@@ -21,14 +21,14 @@ public class GT_Tool_Screwdriver_LV extends GT_Tool_Screwdriver {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return !aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadScrewdriver.mTextureIndex]
             : Textures.ItemIcons.HANDLE_ELECTRIC_SCREWDRIVER;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return !aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Sense.java b/src/main/java/gregtech/common/tools/ToolSense.java
index 013c0f800c..55a3882db5 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Sense.java
+++ b/src/main/java/gregtech/common/tools/ToolSense.java
@@ -15,11 +15,11 @@ import net.minecraft.world.World;
 import net.minecraftforge.event.world.BlockEvent;
 
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.common.items.behaviors.Behaviour_Sense;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.common.items.behaviors.BehaviourSense;
 
-public class GT_Tool_Sense extends GT_Tool {
+public class ToolSense extends GTTool {
 
     private final ThreadLocal<Object> sIsHarvestingRightNow = new ThreadLocal<>();
 
@@ -35,8 +35,8 @@ public class GT_Tool_Sense extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "sense", "scythe")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.plants, Material.leaves);
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "sense", "scythe")
+            || GTToolHarvestHelper.isAppropriateMaterial(aBlock, Material.plants, Material.leaves);
     }
 
     @Override
@@ -83,21 +83,21 @@ public class GT_Tool_Sense extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadSense.mTextureIndex]
-            : GT_MetaGenerated_Tool
+            : MetaGeneratedTool
                 .getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Sense(getToolDamagePerBlockBreak()));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourSense(getToolDamagePerBlockBreak()));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Shovel.java b/src/main/java/gregtech/common/tools/ToolShovel.java
index 886ca126e0..d4676efeed 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Shovel.java
+++ b/src/main/java/gregtech/common/tools/ToolShovel.java
@@ -9,10 +9,10 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_Shovel extends GT_Tool {
+public class ToolShovel extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -81,8 +81,8 @@ public class GT_Tool_Shovel extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "shovel")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "shovel")
+            || GTToolHarvestHelper.isAppropriateMaterial(
                 aBlock,
                 Material.sand,
                 Material.grass,
@@ -99,20 +99,20 @@ public class GT_Tool_Shovel extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadShovel.mTextureIndex]
-            : GT_MetaGenerated_Tool
+            : MetaGeneratedTool
                 .getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java b/src/main/java/gregtech/common/tools/ToolSoftHammer.java
index cc3f5e738b..0cd3aa2eac 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java
+++ b/src/main/java/gregtech/common/tools/ToolSoftHammer.java
@@ -10,11 +10,11 @@ import net.minecraft.util.IChatComponent;
 
 import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.common.items.behaviors.Behaviour_SoftHammer;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.common.items.behaviors.BehaviourSoftHammer;
 
-public class GT_Tool_SoftHammer extends GT_Tool {
+public class ToolSoftHammer extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -98,7 +98,7 @@ public class GT_Tool_SoftHammer extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "softhammer");
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "softhammer");
     }
 
     @Override
@@ -109,21 +109,21 @@ public class GT_Tool_SoftHammer extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadMallet.mTextureIndex]
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(
+            : MetaGeneratedTool.getSecondaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.handleMallet.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_SoftHammer(100));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourSoftHammer(100));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java b/src/main/java/gregtech/common/tools/ToolSolderingIron.java
index 9b5ef3a638..9ae4fade4c 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java
+++ b/src/main/java/gregtech/common/tools/ToolSolderingIron.java
@@ -18,11 +18,11 @@ import net.minecraft.util.IChatComponent;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.common.items.behaviors.Behaviour_Screwdriver;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.common.items.behaviors.BehaviourScrewdriver;
 
-public class GT_Tool_Soldering_Iron extends GT_Tool {
+public class ToolSolderingIron extends GTTool {
 
     public static final List<String> mEffectiveList = Arrays.asList(
         EntityCaveSpider.class.getName(),
@@ -113,8 +113,8 @@ public class GT_Tool_Soldering_Iron extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "soldering_iron")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.circuits);
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "soldering_iron")
+            || GTToolHarvestHelper.isAppropriateMaterial(aBlock, Material.circuits);
     }
 
     @Override
@@ -124,19 +124,19 @@ public class GT_Tool_Soldering_Iron extends GT_Tool {
 
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[49]
+        return !aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mIconSet.mTextures[49]
             : Textures.ItemIcons.HANDLE_SOLDERING;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return !aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Screwdriver(1, 200));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourScrewdriver(1, 200));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Sword.java b/src/main/java/gregtech/common/tools/ToolSword.java
index 7bfaaee797..03c76f92c6 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Sword.java
+++ b/src/main/java/gregtech/common/tools/ToolSword.java
@@ -8,10 +8,10 @@ import net.minecraft.stats.AchievementList;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_Sword extends GT_Tool {
+public class ToolSword extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -85,8 +85,8 @@ public class GT_Tool_Sword extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "sword")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "sword")
+            || GTToolHarvestHelper.isAppropriateMaterial(
                 aBlock,
                 Material.leaves,
                 Material.gourd,
@@ -109,15 +109,15 @@ public class GT_Tool_Sword extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return !aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadSword.mTextureIndex]
             : Textures.ItemIcons.HANDLE_SWORD;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return !aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Turbine.java b/src/main/java/gregtech/common/tools/ToolTurbine.java
index daaf2c4438..ace22b06ba 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Turbine.java
+++ b/src/main/java/gregtech/common/tools/ToolTurbine.java
@@ -8,9 +8,9 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public abstract class GT_Tool_Turbine extends GT_Tool {
+public abstract class ToolTurbine extends GTTool {
 
     @Override
     public abstract float getBaseDamage();
@@ -27,7 +27,7 @@ public abstract class GT_Tool_Turbine extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : null;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa : null;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java b/src/main/java/gregtech/common/tools/ToolTurbineHuge.java
index 46b0de72d9..94b85f0d5c 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java
+++ b/src/main/java/gregtech/common/tools/ToolTurbineHuge.java
@@ -3,7 +3,7 @@ package gregtech.common.tools;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 
-public class GT_Tool_Turbine_Huge extends GT_Tool_Turbine {
+public class ToolTurbineHuge extends ToolTurbine {
 
     @Override
     public float getSpeedMultiplier() {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java b/src/main/java/gregtech/common/tools/ToolTurbineLarge.java
index 7e8307f6b0..59b6a3afe1 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java
+++ b/src/main/java/gregtech/common/tools/ToolTurbineLarge.java
@@ -3,7 +3,7 @@ package gregtech.common.tools;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 
-public class GT_Tool_Turbine_Large extends GT_Tool_Turbine {
+public class ToolTurbineLarge extends ToolTurbine {
 
     @Override
     public float getSpeedMultiplier() {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java b/src/main/java/gregtech/common/tools/ToolTurbineNormal.java
index ac2fc29a89..33328db96e 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java
+++ b/src/main/java/gregtech/common/tools/ToolTurbineNormal.java
@@ -3,7 +3,7 @@ package gregtech.common.tools;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 
-public class GT_Tool_Turbine_Normal extends GT_Tool_Turbine {
+public class ToolTurbineNormal extends ToolTurbine {
 
     @Override
     public float getSpeedMultiplier() {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java b/src/main/java/gregtech/common/tools/ToolTurbineSmall.java
index fab527386e..8313ed1818 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java
+++ b/src/main/java/gregtech/common/tools/ToolTurbineSmall.java
@@ -3,7 +3,7 @@ package gregtech.common.tools;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 
-public class GT_Tool_Turbine_Small extends GT_Tool_Turbine {
+public class ToolTurbineSmall extends ToolTurbine {
 
     @Override
     public float getSpeedMultiplier() {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java b/src/main/java/gregtech/common/tools/ToolUniversalSpade.java
index 184d506872..9333e1f19c 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java
+++ b/src/main/java/gregtech/common/tools/ToolUniversalSpade.java
@@ -10,13 +10,13 @@ import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.common.items.behaviors.Behaviour_Crowbar;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.common.items.behaviors.BehaviourCrowbar;
 
-public class GT_Tool_UniversalSpade extends GT_Tool {
+public class ToolUniversalSpade extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -90,8 +90,8 @@ public class GT_Tool_UniversalSpade extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "shovel", "axe", "saw", "sword", "crowbar")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "shovel", "axe", "saw", "sword", "crowbar")
+            || GTToolHarvestHelper.isAppropriateMaterial(
                 aBlock,
                 Material.sand,
                 Material.grass,
@@ -121,21 +121,21 @@ public class GT_Tool_UniversalSpade extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadUniversalSpade.mTextureIndex]
-            : GT_MetaGenerated_Tool
+            : MetaGeneratedTool
                 .getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Crowbar(2, 2000));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourCrowbar(2, 2000));
     }
 
     @Override
@@ -143,7 +143,7 @@ public class GT_Tool_UniversalSpade extends GT_Tool {
         super.onToolCrafted(aStack, aPlayer);
         aPlayer.triggerAchievement(AchievementList.buildSword);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "unitool");
+            GTMod.achievements.issueAchievement(aPlayer, "unitool");
         } catch (Exception ignored) {}
     }
 
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_WireCutter.java b/src/main/java/gregtech/common/tools/ToolWireCutter.java
index 54b76e6d81..6009504d80 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_WireCutter.java
+++ b/src/main/java/gregtech/common/tools/ToolWireCutter.java
@@ -10,10 +10,10 @@ import net.minecraft.util.IChatComponent;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_WireCutter extends GT_Tool {
+public class ToolWireCutter extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -82,7 +82,7 @@ public class GT_Tool_WireCutter extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "cutter");
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "cutter");
     }
 
     @Override
@@ -97,12 +97,12 @@ public class GT_Tool_WireCutter extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java b/src/main/java/gregtech/common/tools/ToolWrench.java
index fbca109f21..3d2adf4896 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java
+++ b/src/main/java/gregtech/common/tools/ToolWrench.java
@@ -1,6 +1,6 @@
 package gregtech.common.tools;
 
-import static gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial;
+import static gregtech.api.items.MetaGeneratedTool.getPrimaryMaterial;
 
 import java.util.Arrays;
 import java.util.List;
@@ -30,13 +30,13 @@ import appeng.util.Platform;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.common.items.behaviors.Behaviour_Switch_Mode;
-import gregtech.common.items.behaviors.Behaviour_Wrench;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.common.items.behaviors.BehaviourSwitchMode;
+import gregtech.common.items.behaviors.BehaviourWrench;
 import ic2.api.tile.IWrenchable;
 
-public class GT_Tool_Wrench extends GT_Tool {
+public class ToolWrench extends GTTool {
 
     public static final List<String> mEffectiveList = Arrays
         .asList(EntityIronGolem.class.getName(), "EntityTowerGuardian");
@@ -127,12 +127,12 @@ public class GT_Tool_Wrench extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block block, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(block, aMetaData, "wrench")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(block, Material.piston)
+        return GTToolHarvestHelper.isAppropriateTool(block, aMetaData, "wrench")
+            || GTToolHarvestHelper.isAppropriateMaterial(block, Material.piston)
             || block instanceof AEBaseTileBlock
-            || GT_ToolHarvestHelper.isSpecialBlock(block, Blocks.crafting_table, Blocks.bookshelf)
-            || Behaviour_Wrench.isVanillaRotatable(block)
-            || GT_ToolHarvestHelper.isIC2Wrenchable(block);
+            || GTToolHarvestHelper.isSpecialBlock(block, Blocks.crafting_table, Blocks.bookshelf)
+            || BehaviourWrench.isVanillaRotatable(block)
+            || GTToolHarvestHelper.isIC2Wrenchable(block);
     }
 
     @Override
@@ -151,9 +151,9 @@ public class GT_Tool_Wrench extends GT_Tool {
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Mode());
-        aItem.addItemBehavior(aID, new Behaviour_Wrench(100));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourSwitchMode());
+        aItem.addItemBehavior(aID, new BehaviourWrench(100));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_HV.java b/src/main/java/gregtech/common/tools/ToolWrenchHV.java
index 7a7c725f8f..f8e9e11244 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_HV.java
+++ b/src/main/java/gregtech/common/tools/ToolWrenchHV.java
@@ -4,9 +4,9 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Wrench_HV extends GT_Tool_Wrench_LV {
+public class ToolWrenchHV extends ToolWrenchLV {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -56,14 +56,14 @@ public class GT_Tool_Wrench_HV extends GT_Tool_Wrench_LV {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadWrench.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_HV;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_LV.java b/src/main/java/gregtech/common/tools/ToolWrenchLV.java
index 5f82a7d5b1..69e9b9f230 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_LV.java
+++ b/src/main/java/gregtech/common/tools/ToolWrenchLV.java
@@ -6,9 +6,9 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Wrench_LV extends GT_Tool_Wrench {
+public class ToolWrenchLV extends ToolWrench {
 
     @Override
     public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
@@ -64,14 +64,14 @@ public class GT_Tool_Wrench_LV extends GT_Tool_Wrench {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadWrench.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_LV;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_MV.java b/src/main/java/gregtech/common/tools/ToolWrenchMV.java
index cc5b649647..e1f1cf223d 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_MV.java
+++ b/src/main/java/gregtech/common/tools/ToolWrenchMV.java
@@ -4,9 +4,9 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Wrench_MV extends GT_Tool_Wrench_LV {
+public class ToolWrenchMV extends ToolWrenchLV {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -56,14 +56,14 @@ public class GT_Tool_Wrench_MV extends GT_Tool_Wrench_LV {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadWrench.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_MV;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_BranchCutter.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketBranchCutter.java
index b831306df9..a1bf6d9c8b 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_BranchCutter.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketBranchCutter.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_BranchCutter;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolBranchCutter;
 
-public class GT_Tool_Pocket_BranchCutter extends GT_Tool_BranchCutter {
+public class ToolPocketBranchCutter extends ToolBranchCutter {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_BranchCutter(int aSwitchIndex) {
+    public ToolPocketBranchCutter(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_BranchCutter extends GT_Tool_BranchCutter {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_File.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketFile.java
index 84372b1d98..cd598437ab 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_File.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketFile.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_File;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolFile;
 
-public class GT_Tool_Pocket_File extends GT_Tool_File {
+public class ToolPocketFile extends ToolFile {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_File(int aSwitchIndex) {
+    public ToolPocketFile(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_File extends GT_Tool_File {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Knife.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketKnife.java
index 2b43984c51..9dd2492a89 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Knife.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketKnife.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_Knife;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolKnife;
 
-public class GT_Tool_Pocket_Knife extends GT_Tool_Knife {
+public class ToolPocketKnife extends ToolKnife {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_Knife(int aSwitchIndex) {
+    public ToolPocketKnife(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_Knife extends GT_Tool_Knife {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Multitool.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketMultitool.java
index 16ab9229c6..e55671d486 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Multitool.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketMultitool.java
@@ -5,15 +5,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.GTTool;
 
-public class GT_Tool_Pocket_Multitool extends GT_Tool {
+public class ToolPocketMultitool extends GTTool {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_Multitool(int aSwitchIndex) {
+    public ToolPocketMultitool(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -29,13 +29,13 @@ public class GT_Tool_Pocket_Multitool extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Saw.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketSaw.java
index 579f809f2a..4f73109d59 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Saw.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketSaw.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_Saw;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolSaw;
 
-public class GT_Tool_Pocket_Saw extends GT_Tool_Saw {
+public class ToolPocketSaw extends ToolSaw {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_Saw(int aSwitchIndex) {
+    public ToolPocketSaw(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_Saw extends GT_Tool_Saw {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Screwdriver.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketScrewdriver.java
index ce04ba2d15..f4a53ed6f6 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Screwdriver.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketScrewdriver.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_Screwdriver;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolScrewdriver;
 
-public class GT_Tool_Pocket_Screwdriver extends GT_Tool_Screwdriver {
+public class ToolPocketScrewdriver extends ToolScrewdriver {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_Screwdriver(int aSwitchIndex) {
+    public ToolPocketScrewdriver(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_Screwdriver extends GT_Tool_Screwdriver {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_WireCutter.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketWireCutter.java
index 6907ff6735..5dcd03c53b 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_WireCutter.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketWireCutter.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_WireCutter;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolWireCutter;
 
-public class GT_Tool_Pocket_WireCutter extends GT_Tool_WireCutter {
+public class ToolPocketWireCutter extends ToolWireCutter {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_WireCutter(int aSwitchIndex) {
+    public ToolPocketWireCutter(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_WireCutter extends GT_Tool_WireCutter {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }