The Great Renaming (#3014)

* move kekztech to a single root dir

* move detrav to a single root dir

* move gtnh-lanthanides to a single root dir

* move tectech and delete some gross reflection in gt++

* remove more reflection inside gt5u

* delete more reflection in gt++

* fix imports

* move bartworks and bwcrossmod

* fix proxies

* move galactigreg and ggfab

* move gtneioreplugin

* try to fix gt++ bee loader

* apply the rename rules to BW

* apply rename rules to bwcrossmod

* apply rename rules to detrav scanner mod

* apply rename rules to galacticgreg

* apply rename rules to ggfab

* apply rename rules to goodgenerator

* apply rename rules to gtnh-lanthanides

* apply rename rules to gt++

* apply rename rules to kekztech

* apply rename rules to kubatech

* apply rename rules to tectech

* apply rename rules to gt

apply the rename rules to gt

* fix tt import

* fix mui hopefully

* fix coremod except intergalactic

* rename assline recipe class

* fix a class name i stumbled on

* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib

* temporary rename of GTTooltipDataCache to old name

* fix gt client/server proxy names

8 files changed, 244 insertions, 238 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
index 8edb8c2cf9..a6cd63ca19 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
@@ -16,17 +16,17 @@ import net.minecraft.world.World;
 import org.apache.commons.lang3.StringUtils;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_MultiTexture;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.GTMultiTexture;
+import gregtech.api.objects.GTRenderedTexture;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
-import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_ToggleVisual;
+import gtPlusPlus.xmod.gregtech.common.covers.CoverToggleVisual;
 
 public class MetaCustomCoverItem extends Item {
 
@@ -72,10 +72,10 @@ public class MetaCustomCoverItem extends Item {
             if (i > 0 && hide()) {
                 ItemUtils.hideItemFromNEI(thisStack);
             }
-            GregTech_API.registerCover(
+            GregTechAPI.registerCover(
                 thisStack,
-                new GT_MultiTexture(new ITexture[] { new GT_RenderedTexture(mTextures[i]) }),
-                new GTPP_Cover_ToggleVisual());
+                new GTMultiTexture(new ITexture[] { new GTRenderedTexture(mTextures[i]) }),
+                new CoverToggleVisual());
         }
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index ec9416be02..a787e4c4ce 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -1,64 +1,64 @@
 package gtPlusPlus.xmod.gregtech.common.items;
 
-import static gregtech.api.util.GT_RecipeConstants.RTG_DURATION_IN_DAYS;
-import static gregtech.client.GT_TooltipHandler.Tier.EV;
-import static gregtech.client.GT_TooltipHandler.registerTieredTooltip;
+import static gregtech.api.util.GTRecipeConstants.RTG_DURATION_IN_DAYS;
+import static gregtech.client.GTTooltipHandler.Tier.EV;
+import static gregtech.client.GTTooltipHandler.registerTieredTooltip;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.rtgFuels;
 import static gtPlusPlus.core.util.Utils.getTcAspectStack;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_1;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_2;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_3;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_4;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Gem_1;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Gem_2;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Gem_3;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Gem_4;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_RE_EV_Cadmium;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_RE_EV_Lithium;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_RE_EV_Sodium;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Compressed_Fusion_Reactor;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_EV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_HV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_IV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_LV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_MV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Distillus_Upgrade_Chip;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Gregtech_Computer_Cube;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Laser_Lens_Special;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Laser_Lens_WoodsGlass;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Maceration_Upgrade_Chip;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Pellet_RTG_AM241;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Pellet_RTG_PO210;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Pellet_RTG_PU238;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Pellet_RTG_SR90;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Shape_Extruder_WindmillShaft;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_EV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_HV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_IV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_LV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_LuV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_MV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_UHV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_UV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_ZPM;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Casing_Gem_1;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Casing_Gem_2;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Casing_Gem_3;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Casing_Gem_4;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Gem_1;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Gem_2;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Gem_3;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Gem_4;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_RE_EV_Cadmium;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_RE_EV_Lithium;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_RE_EV_Sodium;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Compressed_Fusion_Reactor;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_EV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_HV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_IV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_LV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_MV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Distillus_Upgrade_Chip;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Gregtech_Computer_Cube;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Laser_Lens_Special;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Laser_Lens_WoodsGlass;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Maceration_Upgrade_Chip;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Pellet_RTG_AM241;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Pellet_RTG_PO210;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Pellet_RTG_PU238;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Pellet_RTG_SR90;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Shape_Extruder_WindmillShaft;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_EV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_HV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_IV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_LV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_LuV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_MV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_UHV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_UV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_ZPM;
+
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.TC_Aspects;
+import gregtech.api.enums.TCAspects;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.TierEU;
-import gregtech.api.objects.GT_MultiTexture;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.objects.GTMultiTexture;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTModHandler;
 import gtPlusPlus.core.util.data.StringUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_X32;
+import gtPlusPlus.xmod.gregtech.api.items.GTMetaItemX32;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_Overflow;
+import gtPlusPlus.xmod.gregtech.common.covers.CoverOverflow;
 
-public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
+public class MetaGeneratedGregtechItems extends GTMetaItemX32 {
 
     public static final MetaGeneratedGregtechItems INSTANCE;
 
@@ -85,27 +85,27 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 Battery_RE_EV_Sodium.ID,
                 "Quad Cell Sodium Battery",
                 "Reusable",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
-                getTcAspectStack(TC_Aspects.METALLUM, 2L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 2L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 2L),
+                getTcAspectStack(TCAspects.METALLUM, 2L),
+                getTcAspectStack(TCAspects.POTENTIA, 2L)));
 
         GregtechItemList.Battery_RE_EV_Cadmium.set(
             this.addItem(
                 Battery_RE_EV_Cadmium.ID,
                 "Quad Cell Cadmium Battery",
                 "Reusable",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                getTcAspectStack(TC_Aspects.METALLUM, 1L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 1L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 1L),
+                getTcAspectStack(TCAspects.METALLUM, 1L),
+                getTcAspectStack(TCAspects.POTENTIA, 1L)));
 
         GregtechItemList.Battery_RE_EV_Lithium.set(
             this.addItem(
                 Battery_RE_EV_Lithium.ID,
                 "Quad Cell Lithium Battery",
                 "Reusable",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 3L),
-                getTcAspectStack(TC_Aspects.METALLUM, 3L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 3L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 3L),
+                getTcAspectStack(TCAspects.METALLUM, 3L),
+                getTcAspectStack(TCAspects.POTENTIA, 3L)));
 
         /**
          * Power Gems
@@ -115,27 +115,27 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 Battery_Gem_1.ID,
                 "Proton Cell",
                 "Reusable",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                getTcAspectStack(TC_Aspects.METALLUM, 24L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 16L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 8L),
+                getTcAspectStack(TCAspects.METALLUM, 24L),
+                getTcAspectStack(TCAspects.POTENTIA, 16L)));
 
         GregtechItemList.Battery_Gem_2.set(
             this.addItem(
                 Battery_Gem_2.ID,
                 "Electron Cell",
                 "Reusable",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 16L),
-                getTcAspectStack(TC_Aspects.METALLUM, 32L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 32L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 16L),
+                getTcAspectStack(TCAspects.METALLUM, 32L),
+                getTcAspectStack(TCAspects.POTENTIA, 32L)));
 
         GregtechItemList.Battery_Gem_3.set(
             this.addItem(
                 Battery_Gem_3.ID,
                 "Quark Entanglement",
                 "Reusable",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 32L),
-                getTcAspectStack(TC_Aspects.METALLUM, 48L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 64L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 32L),
+                getTcAspectStack(TCAspects.METALLUM, 48L),
+                getTcAspectStack(TCAspects.POTENTIA, 64L)));
 
         // RTG Pellet
         GregtechItemList.Pellet_RTG_PU238.set(
@@ -143,36 +143,36 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 Pellet_RTG_PU238.ID,
                 StringUtils.superscript("238") + "Pu Pellet",
                 "",
-                getTcAspectStack(TC_Aspects.RADIO, 4L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 2L),
-                getTcAspectStack(TC_Aspects.METALLUM, 2L)));
+                getTcAspectStack(TCAspects.RADIO, 4L),
+                getTcAspectStack(TCAspects.POTENTIA, 2L),
+                getTcAspectStack(TCAspects.METALLUM, 2L)));
 
         GregtechItemList.Pellet_RTG_SR90.set(
             this.addItem(
                 Pellet_RTG_SR90.ID,
                 StringUtils.superscript("90") + "Sr Pellet",
                 "",
-                getTcAspectStack(TC_Aspects.RADIO, 4L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 2L),
-                getTcAspectStack(TC_Aspects.METALLUM, 2L)));
+                getTcAspectStack(TCAspects.RADIO, 4L),
+                getTcAspectStack(TCAspects.POTENTIA, 2L),
+                getTcAspectStack(TCAspects.METALLUM, 2L)));
 
         GregtechItemList.Pellet_RTG_PO210.set(
             this.addItem(
                 Pellet_RTG_PO210.ID,
                 StringUtils.superscript("210") + "Po Pellet",
                 "",
-                getTcAspectStack(TC_Aspects.RADIO, 4L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 2L),
-                getTcAspectStack(TC_Aspects.METALLUM, 2L)));
+                getTcAspectStack(TCAspects.RADIO, 4L),
+                getTcAspectStack(TCAspects.POTENTIA, 2L),
+                getTcAspectStack(TCAspects.METALLUM, 2L)));
 
         GregtechItemList.Pellet_RTG_AM241.set(
             this.addItem(
                 Pellet_RTG_AM241.ID,
                 StringUtils.superscript("241") + "Am Pellet",
                 "",
-                getTcAspectStack(TC_Aspects.RADIO, 4L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 2L),
-                getTcAspectStack(TC_Aspects.METALLUM, 2L)));
+                getTcAspectStack(TCAspects.RADIO, 4L),
+                getTcAspectStack(TCAspects.POTENTIA, 2L),
+                getTcAspectStack(TCAspects.METALLUM, 2L)));
 
         // Computer Cube
         GregtechItemList.Gregtech_Computer_Cube.set(
@@ -180,59 +180,59 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 Gregtech_Computer_Cube.ID,
                 "Gregtech Computer Cube",
                 "Reusable",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                getTcAspectStack(TC_Aspects.METALLUM, 8L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 8L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 8L),
+                getTcAspectStack(TCAspects.METALLUM, 8L),
+                getTcAspectStack(TCAspects.POTENTIA, 8L)));
 
         GregtechItemList.Cover_Overflow_LV.set(
             this.addItem(
                 Cover_Overflow_LV.ID,
                 "Overflow Valve (LV)",
                 "Maximum void amount: 64,000",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                getTcAspectStack(TC_Aspects.MACHINA, 1L),
-                getTcAspectStack(TC_Aspects.ITER, 1L),
-                getTcAspectStack(TC_Aspects.AQUA, 1L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 1L),
+                getTcAspectStack(TCAspects.MACHINA, 1L),
+                getTcAspectStack(TCAspects.ITER, 1L),
+                getTcAspectStack(TCAspects.AQUA, 1L)));
 
         GregtechItemList.Cover_Overflow_MV.set(
             this.addItem(
                 Cover_Overflow_MV.ID,
                 "Overflow Valve (MV)",
                 "Maximum void amount: 512,000",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                getTcAspectStack(TC_Aspects.MACHINA, 1L),
-                getTcAspectStack(TC_Aspects.ITER, 1L),
-                getTcAspectStack(TC_Aspects.AQUA, 1L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 1L),
+                getTcAspectStack(TCAspects.MACHINA, 1L),
+                getTcAspectStack(TCAspects.ITER, 1L),
+                getTcAspectStack(TCAspects.AQUA, 1L)));
 
         GregtechItemList.Cover_Overflow_HV.set(
             this.addItem(
                 Cover_Overflow_HV.ID,
                 "Overflow Valve (HV)",
                 "Maximum void amount: 4,096,000",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                getTcAspectStack(TC_Aspects.MACHINA, 1L),
-                getTcAspectStack(TC_Aspects.ITER, 1L),
-                getTcAspectStack(TC_Aspects.AQUA, 1L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 1L),
+                getTcAspectStack(TCAspects.MACHINA, 1L),
+                getTcAspectStack(TCAspects.ITER, 1L),
+                getTcAspectStack(TCAspects.AQUA, 1L)));
 
         GregtechItemList.Cover_Overflow_EV.set(
             this.addItem(
                 Cover_Overflow_EV.ID,
                 "Overflow Valve (EV)",
                 "Maximum void amount: 32,768,000",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                getTcAspectStack(TC_Aspects.MACHINA, 1L),
-                getTcAspectStack(TC_Aspects.ITER, 1L),
-                getTcAspectStack(TC_Aspects.AQUA, 1L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 1L),
+                getTcAspectStack(TCAspects.MACHINA, 1L),
+                getTcAspectStack(TCAspects.ITER, 1L),
+                getTcAspectStack(TCAspects.AQUA, 1L)));
 
         GregtechItemList.Cover_Overflow_IV.set(
             this.addItem(
                 Cover_Overflow_IV.ID,
                 "Overflow Valve (IV)",
                 "Maximum void amount: 262,144,000",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                getTcAspectStack(TC_Aspects.MACHINA, 1L),
-                getTcAspectStack(TC_Aspects.ITER, 1L),
-                getTcAspectStack(TC_Aspects.AQUA, 1L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 1L),
+                getTcAspectStack(TCAspects.MACHINA, 1L),
+                getTcAspectStack(TCAspects.ITER, 1L),
+                getTcAspectStack(TCAspects.AQUA, 1L)));
 
         // Fusion Reactor MK4 Singularity
         GregtechItemList.Compressed_Fusion_Reactor.set(
@@ -258,9 +258,9 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 Battery_Gem_4.ID,
                 "Graviton Anomaly",
                 "Reusable",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 64L),
-                getTcAspectStack(TC_Aspects.METALLUM, 64L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 64L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 64L),
+                getTcAspectStack(TCAspects.METALLUM, 64L),
+                getTcAspectStack(TCAspects.POTENTIA, 64L)));
 
         /*
          * High Tier 'Saws' for the tree Farm
@@ -285,11 +285,11 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
             aTransParts[tier - 1].set(
                 this.addItem(
                     IDs[tier - 1],
-                    "Transmission Component (" + GT_Values.VN[tier] + ")",
+                    "Transmission Component (" + GTValues.VN[tier] + ")",
                     "",
-                    getTcAspectStack(TC_Aspects.ELECTRUM, tier),
-                    getTcAspectStack(TC_Aspects.MACHINA, tier),
-                    getTcAspectStack(TC_Aspects.MAGNETO, tier)));
+                    getTcAspectStack(TCAspects.ELECTRUM, tier),
+                    getTcAspectStack(TCAspects.MACHINA, tier),
+                    getTcAspectStack(TCAspects.MAGNETO, tier)));
         }
 
         // Distillus Chip
@@ -308,17 +308,17 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
     }
 
     private void setAllElectricStats() {
-        this.setElectricStats(32000 + Battery_RE_EV_Cadmium.ID, 4800000L, GT_Values.V[4], 4L, -3L, true);
-        this.setElectricStats(32000 + Battery_RE_EV_Sodium.ID, 3200000L, GT_Values.V[4], 4L, -3L, true);
-        this.setElectricStats(32000 + Battery_RE_EV_Lithium.ID, 6400000L, GT_Values.V[4], 4L, -3L, true);
-        this.setElectricStats(32000 + Battery_Gem_1.ID, GT_Values.V[6] * 20 * 300 / 4, GT_Values.V[6], 6L, -3L, false);
-        this.setElectricStats(32000 + Battery_Gem_2.ID, GT_Values.V[7] * 20 * 300 / 4, GT_Values.V[7], 7L, -3L, false);
-        this.setElectricStats(32000 + Battery_Gem_3.ID, GT_Values.V[8] * 20 * 300 / 4, GT_Values.V[8], 8L, -3L, false);
-        this.setElectricStats(32000 + Battery_Casing_Gem_4.ID, (64000000000L * 16), GT_Values.V[9], 9L, -3L, false);
+        this.setElectricStats(32000 + Battery_RE_EV_Cadmium.ID, 4800000L, GTValues.V[4], 4L, -3L, true);
+        this.setElectricStats(32000 + Battery_RE_EV_Sodium.ID, 3200000L, GTValues.V[4], 4L, -3L, true);
+        this.setElectricStats(32000 + Battery_RE_EV_Lithium.ID, 6400000L, GTValues.V[4], 4L, -3L, true);
+        this.setElectricStats(32000 + Battery_Gem_1.ID, GTValues.V[6] * 20 * 300 / 4, GTValues.V[6], 6L, -3L, false);
+        this.setElectricStats(32000 + Battery_Gem_2.ID, GTValues.V[7] * 20 * 300 / 4, GTValues.V[7], 7L, -3L, false);
+        this.setElectricStats(32000 + Battery_Gem_3.ID, GTValues.V[8] * 20 * 300 / 4, GTValues.V[8], 8L, -3L, false);
+        this.setElectricStats(32000 + Battery_Casing_Gem_4.ID, (64000000000L * 16), GTValues.V[9], 9L, -3L, false);
         this.setElectricStats(
             32000 + Gregtech_Computer_Cube.ID,
-            GT_Values.V[6] * 10 * 60 * 20,
-            GT_Values.V[5],
+            GTValues.V[6] * 10 * 60 * 20,
+            GTValues.V[5],
             5L,
             -3L,
             false);
@@ -331,36 +331,36 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
     }
 
     private void registerFuelRTGRecipes() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(GregtechItemList.Pellet_RTG_PU238.get(1))
             .duration(0)
             .eut(64)
             .metadata(RTG_DURATION_IN_DAYS, MathUtils.roundToClosestInt(87.7f))
             .addTo(rtgFuels);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(GregtechItemList.Pellet_RTG_SR90.get(1))
             .duration(0)
             .eut(TierEU.RECIPE_LV)
             .metadata(RTG_DURATION_IN_DAYS, MathUtils.roundToClosestInt(28.8f))
             .addTo(rtgFuels);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(GregtechItemList.Pellet_RTG_PO210.get(1))
             .duration(0)
             .eut(TierEU.RECIPE_HV)
             .metadata(RTG_DURATION_IN_DAYS, 1)
             .addTo(rtgFuels);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(GregtechItemList.Pellet_RTG_AM241.get(1))
             .duration(0)
             .eut(16)
             .metadata(RTG_DURATION_IN_DAYS, 216)
             .addTo(rtgFuels);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("RTGPellets", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("RTGPellets", 1))
             .duration(0)
             .eut(8)
             .metadata(RTG_DURATION_IN_DAYS, MathUtils.roundToClosestInt(2.6f))
@@ -368,36 +368,36 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
     }
 
     private void registerCovers() {
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             GregtechItemList.Cover_Overflow_LV.get(1L),
-            new GT_MultiTexture(
+            new GTMultiTexture(
                 Textures.BlockIcons.MACHINE_CASINGS[4][0],
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
-            new GTPP_Cover_Overflow(64));
-        GregTech_API.registerCover(
+                new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
+            new CoverOverflow(64));
+        GregTechAPI.registerCover(
             GregtechItemList.Cover_Overflow_MV.get(1L),
-            new GT_MultiTexture(
+            new GTMultiTexture(
                 Textures.BlockIcons.MACHINE_CASINGS[5][0],
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
-            new GTPP_Cover_Overflow(512));
-        GregTech_API.registerCover(
+                new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
+            new CoverOverflow(512));
+        GregTechAPI.registerCover(
             GregtechItemList.Cover_Overflow_HV.get(1L),
-            new GT_MultiTexture(
+            new GTMultiTexture(
                 Textures.BlockIcons.MACHINE_CASINGS[5][0],
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
-            new GTPP_Cover_Overflow(4096));
-        GregTech_API.registerCover(
+                new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
+            new CoverOverflow(4096));
+        GregTechAPI.registerCover(
             GregtechItemList.Cover_Overflow_EV.get(1L),
-            new GT_MultiTexture(
+            new GTMultiTexture(
                 Textures.BlockIcons.MACHINE_CASINGS[8][0],
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
-            new GTPP_Cover_Overflow(32768));
-        GregTech_API.registerCover(
+                new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
+            new CoverOverflow(32768));
+        GregTechAPI.registerCover(
             GregtechItemList.Cover_Overflow_IV.get(1L),
-            new GT_MultiTexture(
+            new GTMultiTexture(
                 Textures.BlockIcons.MACHINE_CASINGS[8][0],
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
-            new GTPP_Cover_Overflow(262144));
+                new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
+            new CoverOverflow(262144));
     }
 
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
index 30250a46f3..ddc90a0183 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
@@ -1,24 +1,24 @@
 package gtPlusPlus.xmod.gregtech.common.items;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.TC_Aspects;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.TCAspects;
 import gregtech.api.enums.ToolDictNames;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechToolDictNames;
-import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_AngleGrinder;
-import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricSnips;
+import gtPlusPlus.xmod.gregtech.common.tools.ToolAngleGrinder;
+import gtPlusPlus.xmod.gregtech.common.tools.ToolElectricSnips;
 
-public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
+public class MetaGeneratedGregtechTools extends MetaGeneratedTool {
 
     public static final short ANGLE_GRINDER = 7834;
     public static final short ELECTRIC_SNIPS = 7934;
-    public static GT_MetaGenerated_Tool INSTANCE;
+    public static MetaGeneratedTool INSTANCE;
 
     static {
         INSTANCE = new MetaGeneratedGregtechTools();
     }
 
-    public static GT_MetaGenerated_Tool getInstance() {
+    public static MetaGeneratedTool getInstance() {
         return INSTANCE;
     }
 
@@ -30,25 +30,25 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
             ANGLE_GRINDER,
             "Angle Grinder",
             "Hand-held electric filing device",
-            new TOOL_Gregtech_AngleGrinder(),
+            new ToolAngleGrinder(),
             GregtechToolDictNames.craftingToolAngleGrinder,
             ToolDictNames.craftingToolFile,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L));
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L));
 
         // Electric Wire Cutter
-        GregTech_API.registerWireCutter(
+        GregTechAPI.registerWireCutter(
             this.addTool(
                 ELECTRIC_SNIPS,
                 "Automatic Snips",
                 "Hand-held electric wire cutter",
-                new TOOL_Gregtech_ElectricSnips(),
+                new ToolElectricSnips(),
                 GregtechToolDictNames.craftingToolElectricSnips,
                 ToolDictNames.craftingToolWireCutter,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 4L)));
 
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/Ids_MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedItemIDs.java
index 5a9e9db772..72f5c66c58 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/Ids_MetaGeneratedGregtechItems.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedItemIDs.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.gregtech.common.items;
 
-public enum Ids_MetaGeneratedGregtechItems {
+public enum MetaGeneratedItemIDs {
 
     Shape_Extruder_WindmillShaft(40),
     Pellet_RTG_PU238(41),
@@ -41,7 +41,7 @@ public enum Ids_MetaGeneratedGregtechItems {
 
     public final int ID;
 
-    Ids_MetaGeneratedGregtechItems(int ID) {
+    MetaGeneratedItemIDs(int ID) {
         this.ID = ID;
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
index f85822750d..be7a0f1c99 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
@@ -7,31 +7,31 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.items.behaviors.Behaviour_None;
-import gregtech.common.items.behaviors.Behaviour_Wrench;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.common.items.behaviors.BehaviourNone;
+import gregtech.common.items.behaviors.BehaviourWrench;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
-public class Behaviour_Choocher extends Behaviour_None {
+public class Behaviour_Choocher extends BehaviourNone {
 
     private boolean isWrench = true;
-    private final Behaviour_Wrench wrench = new Behaviour_Wrench(150);
+    private final BehaviourWrench wrench = new BehaviourWrench(150);
     private final Behaviour_Prospecting_Ex prospecting = new Behaviour_Prospecting_Ex(10, 1250);
-    private final String mTooltip1 = GT_LanguageManager
+    private final String mTooltip1 = GTLanguageManager
         .addStringLocalization("gt.behaviour.choochering1", "Current tool mode: ");
-    private final String mTooltip2 = GT_LanguageManager
+    private final String mTooltip2 = GTLanguageManager
         .addStringLocalization("gt.behaviour.choochering2", "Change tool mode using Shift+Rightclick.");
-    private final String mTooltipH = GT_LanguageManager
+    private final String mTooltipH = GTLanguageManager
         .addStringLocalization("gt.behaviour.prospectingEx", "Usable for Prospecting large areas.");
-    private final String mTooltipW = GT_LanguageManager
+    private final String mTooltipW = GTLanguageManager
         .addStringLocalization("gt.behaviour.wrench", "Rotates Blocks on Rightclick.");
 
     public Behaviour_Choocher() {}
 
     @Override
-    public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer,
+    public boolean onItemUseFirst(final MetaBaseItem aItem, final ItemStack aStack, final EntityPlayer aPlayer,
         final World aWorld, final int aX, final int aY, final int aZ, final ForgeDirection side, final float hitX,
         final float hitY, final float hitZ) {
         if (aWorld.isRemote) {
@@ -64,7 +64,7 @@ public class Behaviour_Choocher extends Behaviour_None {
     }
 
     @Override
-    public List<String> getAdditionalToolTips(final GT_MetaBase_Item aItem, final List<String> aList,
+    public List<String> getAdditionalToolTips(final MetaBaseItem aItem, final List<String> aList,
         final ItemStack aStack) {
 
         boolean inWrenchMode;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
index f3d7f87a86..c458d237bd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
@@ -13,37 +13,37 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import codechicken.lib.math.MathHelper;
 import gregtech.api.enums.SoundResource;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.items.behaviors.Behaviour_None;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
+import gregtech.common.items.behaviors.BehaviourNone;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.entity.projectile.EntityLightningAttack;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
 import ic2.api.item.IElectricItemManager;
 
-public class Behaviour_Electric_Lighter extends Behaviour_None {
+public class Behaviour_Electric_Lighter extends BehaviourNone {
 
-    private final String mTooltip = GT_LanguageManager
+    private final String mTooltip = GTLanguageManager
         .addStringLocalization("gt.behaviour.lighter.tooltip", "Can light things on Fire");
-    private final String mTooltipUses = GT_LanguageManager
+    private final String mTooltipUses = GTLanguageManager
         .addStringLocalization("gt.behaviour.lighter.uses", "Remaining Uses:");
-    private final String mTooltipUnstackable = GT_LanguageManager
+    private final String mTooltipUnstackable = GTLanguageManager
         .addStringLocalization("gt.behaviour.unstackable", "Not usable when stacked!");
 
     public Behaviour_Electric_Lighter() {}
 
     @Override
-    public boolean onLeftClickEntity(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {
+    public boolean onLeftClickEntity(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {
         if (!aPlayer.worldObj.isRemote && aStack != null && aStack.stackSize == 1) {
             boolean rOutput = false;
             if (aEntity instanceof EntityCreeper) {
                 if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
-                    GT_Utility.sendSoundToPlayers(
+                    GTUtility.sendSoundToPlayers(
                         aPlayer.worldObj,
                         SoundResource.FIRE_IGNITE,
                         1.0F,
@@ -62,8 +62,8 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
     }
 
     @Override
-    public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
-        int aY, int aZ, int ordinalSide, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY,
+        int aZ, int ordinalSide, float hitX, float hitY, float hitZ) {
         if (!aWorld.isRemote && aStack != null && aStack.stackSize == 1) {
             if (aPlayer.isSneaking()) {
                 Logger.INFO("Changing Mode");
@@ -81,8 +81,11 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
                 boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode");
                 if (aCurrentMode) {
                     // Shoot Lightning Attack
-                    aWorld
-                        .playSoundAtEntity(aPlayer, "random.bow", 0.5F, 0.4F / (CORE.RANDOM.nextFloat() * 0.4F + 0.8F));
+                    aWorld.playSoundAtEntity(
+                        aPlayer,
+                        "random.bow",
+                        0.5F,
+                        0.4F / (GTPPCore.RANDOM.nextFloat() * 0.4F + 0.8F));
                     if (!aWorld.isRemote) {
                         aWorld.spawnEntityInWorld(new EntityLightningAttack(aWorld, aPlayer, hitX, hitY, hitZ));
                     }
@@ -94,12 +97,12 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
                     aX += tDirection.offsetX;
                     aY += tDirection.offsetY;
                     aZ += tDirection.offsetZ;
-                    if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ)
+                    if (GTUtility.isBlockAir(aWorld, aX, aY, aZ)
                         && aPlayer.canPlayerEdit(aX, aY, aZ, ordinalSide, aStack)) {
                         Logger.WARNING("Preparing Lighter b");
                         if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
                             Logger.WARNING("Preparing Lighter c");
-                            GT_Utility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ);
+                            GTUtility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ);
                             aWorld.setBlock(aX, aY, aZ, Blocks.fire);
                             rOutput = true;
                             // ItemNBT.setLighterFuel(aStack, tFuelAmount);
@@ -113,7 +116,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
         return false;
     }
 
-    public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
+    public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
         int aY, int aZ, int ordinalSide, float hitX, float hitY, float hitZ) {
         if (!aWorld.isRemote && aStack != null && aStack.stackSize == 1) {
             if (aPlayer.isSneaking()) {
@@ -132,8 +135,11 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
                 boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode");
                 if (aCurrentMode) {
                     // Shoot Lightning Attack
-                    aWorld
-                        .playSoundAtEntity(aPlayer, "random.bow", 0.5F, 0.4F / (CORE.RANDOM.nextFloat() * 0.4F + 0.8F));
+                    aWorld.playSoundAtEntity(
+                        aPlayer,
+                        "random.bow",
+                        0.5F,
+                        0.4F / (GTPPCore.RANDOM.nextFloat() * 0.4F + 0.8F));
                     if (!aWorld.isRemote) {
                         aWorld.spawnEntityInWorld(new EntityLightningAttack(aWorld, aPlayer, hitX, hitY, hitZ));
                     }
@@ -145,12 +151,12 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
                     aX += tDirection.offsetX;
                     aY += tDirection.offsetY;
                     aZ += tDirection.offsetZ;
-                    if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ)
+                    if (GTUtility.isBlockAir(aWorld, aX, aY, aZ)
                         && aPlayer.canPlayerEdit(aX, aY, aZ, ordinalSide, aStack)) {
                         Logger.WARNING("Preparing Lighter b");
                         if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
                             Logger.WARNING("Preparing Lighter c");
-                            GT_Utility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ);
+                            GTUtility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ);
                             aWorld.setBlock(aX, aY, aZ, Blocks.fire);
                             rOutput = true;
                             // ItemNBT.setLighterFuel(aStack, tFuelAmount);
@@ -191,7 +197,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
     private void useUp(ItemStack aStack) {}
 
     @Override
-    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
+    public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) {
         aList.add(this.mTooltip);
         int aUses = 0;
         if (aStack != null) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
index 5749204296..f63da57f1c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
@@ -11,20 +11,20 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.IFluidBlock;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.SoundResource;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.items.MetaGeneratedTool;
 import gregtech.api.objects.ItemData;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Ores;
-import gregtech.common.blocks.GT_TileEntity_Ores;
-import gregtech.common.items.behaviors.Behaviour_Prospecting;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.blocks.BlockOres;
+import gregtech.common.blocks.TileEntityOres;
+import gregtech.common.items.behaviors.BehaviourProspecting;
 
-public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
+public class Behaviour_Prospecting_Ex extends BehaviourProspecting {
 
     private final int mVanillaCosts;
     private final int mEUCosts;
@@ -36,7 +36,7 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
     }
 
     @Override
-    public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer,
+    public boolean onItemUseFirst(final MetaBaseItem aItem, final ItemStack aStack, final EntityPlayer aPlayer,
         final World aWorld, final int aX, final int aY, final int aZ, final ForgeDirection side, final float hitX,
         final float hitY, final float hitZ) {
         if (aWorld.isRemote) {
@@ -48,28 +48,28 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
         }
         final byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ);
 
-        ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta));
+        ItemData tAssotiation = GTOreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta));
         if ((tAssotiation != null) && (tAssotiation.mPrefix.toString()
             .startsWith("ore"))) {
-            GT_Utility
+            GTUtility
                 .sendChatToPlayer(aPlayer, "This is " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore.");
-            GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ);
+            GTUtility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ);
             return true;
         }
         if ((aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone))
-            || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites))
+            || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTechAPI.sBlockGranites))
             || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.netherrack))
             || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.end_stone))
             || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.dirt))
             || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.grass))) {
-            if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
-                GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ);
+            if (GTModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
+                GTUtility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ);
                 int tX = aX;
                 int tY = aY;
                 int tZ = aZ;
                 int tMetaID = 0;
-                final int tQuality = ((aItem instanceof GT_MetaGenerated_Tool)
-                    ? ((GT_MetaGenerated_Tool) aItem).getHarvestLevel(aStack, "")
+                final int tQuality = ((aItem instanceof MetaGeneratedTool)
+                    ? ((MetaGeneratedTool) aItem).getHarvestLevel(aStack, "")
                     : 0) * 3;
 
                 int i = 0;
@@ -80,23 +80,23 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
 
                     final Block tBlock = aWorld.getBlock(tX, tY, tZ);
                     if ((tBlock == Blocks.lava) || (tBlock == Blocks.flowing_lava)) {
-                        GT_Utility.sendChatToPlayer(aPlayer, "There is Lava behind this Block.");
+                        GTUtility.sendChatToPlayer(aPlayer, "There is Lava behind this Block.");
                         break;
                     }
                     if ((tBlock == Blocks.water) || (tBlock == Blocks.flowing_water)
                         || ((tBlock instanceof IFluidBlock))) {
-                        GT_Utility.sendChatToPlayer(aPlayer, "There is a Liquid behind this Block.");
+                        GTUtility.sendChatToPlayer(aPlayer, "There is a Liquid behind this Block.");
                         break;
                     }
-                    if ((tBlock == Blocks.monster_egg) || (!GT_Utility.hasBlockHitBox(aWorld, tX, tY, tZ))) {
-                        GT_Utility.sendChatToPlayer(aPlayer, "There is an Air Pocket behind this Block.");
+                    if ((tBlock == Blocks.monster_egg) || (!GTUtility.hasBlockHitBox(aWorld, tX, tY, tZ))) {
+                        GTUtility.sendChatToPlayer(aPlayer, "There is an Air Pocket behind this Block.");
                         break;
                     }
                     if (tBlock != aBlock) {
                         if (i >= 4) {
                             break;
                         }
-                        GT_Utility.sendChatToPlayer(aPlayer, "Material is changing behind this Block.");
+                        GTUtility.sendChatToPlayer(aPlayer, "Material is changing behind this Block.");
                         break;
                     }
                 }
@@ -107,13 +107,13 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
                     tY = (aY - 4 - tQuality) + tRandom.nextInt(j);
                     tZ = (aZ - 4 - tQuality) + tRandom.nextInt(j);
                     final Block tBlock = aWorld.getBlock(tX, tY, tZ);
-                    if ((tBlock instanceof GT_Block_Ores)) {
+                    if ((tBlock instanceof BlockOres)) {
                         final TileEntity tTileEntity = aWorld.getTileEntity(tX, tY, tZ);
-                        if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-                            final Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData
+                        if ((tTileEntity instanceof TileEntityOres)) {
+                            final Materials tMaterial = GregTechAPI.sGeneratedMaterials[(((TileEntityOres) tTileEntity).mMetaData
                                 % 1000)];
                             if ((tMaterial != null) && (tMaterial != Materials._NULL)) {
-                                GT_Utility.sendChatToPlayer(
+                                GTUtility.sendChatToPlayer(
                                     aPlayer,
                                     "Found traces of " + tMaterial.mDefaultLocalName + " Ore.");
                                 return true;
@@ -121,17 +121,17 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
                         }
                     } else {
                         tMetaID = aWorld.getBlockMetadata(tX, tY, tZ);
-                        tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
+                        tAssotiation = GTOreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
                         if ((tAssotiation != null) && (tAssotiation.mPrefix.toString()
                             .startsWith("ore"))) {
-                            GT_Utility.sendChatToPlayer(
+                            GTUtility.sendChatToPlayer(
                                 aPlayer,
                                 "Found traces of " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore.");
                             return true;
                         }
                     }
                 }
-                GT_Utility.sendChatToPlayer(aPlayer, "No Ores found.");
+                GTUtility.sendChatToPlayer(aPlayer, "No Ores found.");
             }
             return true;
         }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
index 987924952a..399554d306 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
@@ -8,7 +8,7 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.StatCollector;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Textures;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem;
@@ -45,6 +45,6 @@ public class MetaItemCoverCasings extends MetaCustomCoverItem {
     public String getItemStackDisplayName(final ItemStack tItem) {
         return EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocalFormatted(
             "item.itemCustomMetaCover.miscutils.GtMachineCasings",
-            GT_Values.VOLTAGE_NAMES[MathUtils.balance(tItem.getItemDamage(), 0, GT_Values.VOLTAGE_NAMES.length - 1)]); // super.getItemStackDisplayName(tItem);
+            GTValues.VOLTAGE_NAMES[MathUtils.balance(tItem.getItemDamage(), 0, GTValues.VOLTAGE_NAMES.length - 1)]); // super.getItemStackDisplayName(tItem);
     }
 }