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

65 files changed, 1048 insertions, 1054 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java b/src/main/java/gregtech/common/blocks/BlockCasings1.java
index 897011eba9..5410847176 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings1.java
@@ -6,13 +6,13 @@ import net.minecraft.world.IBlockAccess;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings1 extends GT_Block_Casings_Abstract {
+public class BlockCasings1 extends BlockCasingsAbstract {
 
     /**
      * Texture Index Information Textures.BlockIcons.casingTexturePages[0][0-63] - Gregtech
@@ -22,26 +22,25 @@ public class GT_Block_Casings1 extends GT_Block_Casings_Abstract {
      * Free Textures.BlockIcons.casingTexturePages[6][0-127] - Free Textures.BlockIcons.casingTexturePages[7][0-127] -
      * TecTech Textures.BlockIcons.casingTexturePages[8][0-127] - TecTech
      */
-    public GT_Block_Casings1() {
-        super(GT_Item_Casings1.class, "gt.blockcasings", GT_Material_Casings.INSTANCE, 16);
+    public BlockCasings1() {
+        super(ItemCasings1.class, "gt.blockcasings", MaterialCasings.INSTANCE, 16);
 
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "ULV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "LV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "MV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "HV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "EV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "IV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "LuV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "ZPM Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "UV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "UHV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Bronze Plated Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Heat Proof Machine Casing");
-        GT_LanguageManager
-            .addStringLocalization(getUnlocalizedName() + ".12.name", "Dimensionally Transcendent Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Dimensional Injection Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Dimensional Bridge");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Superconducting Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "ULV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "LV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "MV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "HV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "EV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "IV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "LuV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "ZPM Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "UV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "UHV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Bronze Plated Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Heat Proof Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Dimensionally Transcendent Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Dimensional Injection Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Dimensional Bridge");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Superconducting Coil Block");
         ItemList.Casing_ULV.set(new ItemStack(this, 1, 0));
         ItemList.Casing_LV.set(new ItemStack(this, 1, 1));
         ItemList.Casing_MV.set(new ItemStack(this, 1, 2));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings10.java b/src/main/java/gregtech/common/blocks/BlockCasings10.java
index 1a0902da97..11c3f81f01 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings10.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings10.java
@@ -7,30 +7,30 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings10 extends GT_Block_Casings_Abstract {
+public class BlockCasings10 extends BlockCasingsAbstract {
 
-    public GT_Block_Casings10() {
-        super(GT_Item_Casings10.class, "gt.blockcasings10", GT_Material_Casings.INSTANCE, 16);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "MagTech Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Laser Containment Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Quark Exclusion Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Pressure Containment Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Electric Compressor Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Compression Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Neutronium Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Active Neutronium Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Neutronium Stabilization Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Coolant Duct");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Heating Duct");
-        GT_LanguageManager
+    public BlockCasings10() {
+        super(ItemCasings10.class, "gt.blockcasings10", MaterialCasings.INSTANCE, 16);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "MagTech Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Laser Containment Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Quark Exclusion Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Pressure Containment Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Electric Compressor Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Compression Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Neutronium Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Active Neutronium Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Neutronium Stabilization Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Coolant Duct");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Heating Duct");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".11.name", "Extreme Density Space-Bending Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".12.name", "Background Radiation Absorbent Casing");
 
         ItemList.Casing_Electromagnetic_Separator.set(new ItemStack(this, 1, 0));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings11.java b/src/main/java/gregtech/common/blocks/BlockCasings11.java
index b4ec07ab70..a654aae3d7 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings11.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings11.java
@@ -7,24 +7,24 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings11 extends GT_Block_Casings_Abstract {
+public class BlockCasings11 extends BlockCasingsAbstract {
 
-    public GT_Block_Casings11() {
-        super(GT_Item_Casings11.class, "gt.blockcasings11", GT_Material_Casings.INSTANCE, 16);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Tin Item Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Brass Item Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Electrum Item Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Platinum Item Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Osmium Item Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Quantium Item Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Fluxed Electrum Item Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Black Plutonium Item Pipe Casing");
+    public BlockCasings11() {
+        super(ItemCasings11.class, "gt.blockcasings11", MaterialCasings.INSTANCE, 16);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Tin Item Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Brass Item Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Electrum Item Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Platinum Item Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Osmium Item Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Quantium Item Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Fluxed Electrum Item Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Black Plutonium Item Pipe Casing");
 
         ItemList.Casing_Item_Pipe_Tin.set(new ItemStack(this, 1, 0));
         ItemList.Casing_Item_Pipe_Brass.set(new ItemStack(this, 1, 1));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java b/src/main/java/gregtech/common/blocks/BlockCasings2.java
index f1fbc30236..441bbd9b82 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings2.java
@@ -12,16 +12,16 @@ import gregtech.api.enums.Dyes;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings2 extends GT_Block_Casings_Abstract {
+public class BlockCasings2 extends BlockCasingsAbstract {
 
-    public GT_Block_Casings2() {
-        super(GT_Item_Casings2.class, "gt.blockcasings2", GT_Material_Casings.INSTANCE, 96);
+    public BlockCasings2() {
+        super(ItemCasings2.class, "gt.blockcasings2", MaterialCasings.INSTANCE, 96);
         // Special handler for Pyrolyse Oven Casing on hatches...
         Textures.BlockIcons.casingTexturePages[0][22] = TextureFactory.of(
             Block.getBlockFromItem(
@@ -31,22 +31,22 @@ public class GT_Block_Casings2 extends GT_Block_Casings_Abstract {
             ForgeDirection.UNKNOWN,
             Dyes.MACHINE_METAL.mRGBa);
 
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Solid Steel Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Frost Proof Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Bronze Gear Box Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Steel Gear Box Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Titanium Gear Box Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Assembling Line Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Processor Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Data Drive Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Containment Field Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Assembler Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Pump Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Motor Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Bronze Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Steel Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Titanium Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Tungstensteel Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Solid Steel Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Frost Proof Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Bronze Gear Box Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Steel Gear Box Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Titanium Gear Box Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Assembling Line Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Processor Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Data Drive Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Containment Field Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Assembler Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Pump Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Motor Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Bronze Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Steel Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Titanium Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Tungstensteel Pipe Casing");
         ItemList.Casing_SolidSteel.set(new ItemStack(this, 1, 0));
         ItemList.Casing_FrostProof.set(new ItemStack(this, 1, 1));
         ItemList.Casing_Gearbox_Bronze.set(new ItemStack(this, 1, 2));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings3.java b/src/main/java/gregtech/common/blocks/BlockCasings3.java
index ada77814c8..fdd48b62ed 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings3.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings3.java
@@ -5,32 +5,32 @@ import net.minecraft.util.IIcon;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings3 extends GT_Block_Casings_Abstract {
+public class BlockCasings3 extends BlockCasingsAbstract {
 
-    public GT_Block_Casings3() {
-        super(GT_Item_Casings3.class, "gt.blockcasings3", GT_Material_Casings.INSTANCE, 16);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Yellow Stripes Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Yellow Stripes Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Radioactive Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Bio Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Explosion Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Fire Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Acid Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Magic Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Frost Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Noise Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Grate Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Filter Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Radiation Proof Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Bronze Firebox Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Steel Firebox Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Tungstensteel Firebox Casing");
+    public BlockCasings3() {
+        super(ItemCasings3.class, "gt.blockcasings3", MaterialCasings.INSTANCE, 16);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Yellow Stripes Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Yellow Stripes Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Radioactive Hazard Sign Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Bio Hazard Sign Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Explosion Hazard Sign Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Fire Hazard Sign Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Acid Hazard Sign Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Magic Hazard Sign Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Frost Hazard Sign Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Noise Hazard Sign Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Grate Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Filter Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Radiation Proof Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Bronze Firebox Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Steel Firebox Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Tungstensteel Firebox Casing");
         ItemList.Casing_Stripes_A.set(new ItemStack(this, 1, 0));
         ItemList.Casing_Stripes_B.set(new ItemStack(this, 1, 1));
         ItemList.Casing_RadioactiveHazard.set(new ItemStack(this, 1, 2));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java b/src/main/java/gregtech/common/blocks/BlockCasings4.java
index 77f36a4523..0cba916548 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings4.java
@@ -7,19 +7,19 @@ import net.minecraft.world.IBlockAccess;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_RenderingWorld;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTRenderingWorld;
+import gregtech.common.tileentities.machines.multi.MTELargeTurbine;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings4 extends GT_Block_Casings_Abstract {
+public class BlockCasings4 extends BlockCasingsAbstract {
 
     /**
      * This mapping is used to look up which texture should be used to render the connected texture for fusion casings.
@@ -44,24 +44,24 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract {
 
     public static boolean mConnectedMachineTextures = true;
 
-    public GT_Block_Casings4() {
-        super(GT_Item_Casings4.class, "gt.blockcasings4", GT_Material_Casings.INSTANCE, 16);
-        GT_LanguageManager
+    public BlockCasings4() {
+        super(ItemCasings4.class, "gt.blockcasings4", MaterialCasings.INSTANCE, 16);
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".0.name", "Robust Tungstensteel Machine Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".1.name", "Clean Stainless Steel Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Stable Titanium Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Titanium Firebox Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Fusion Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Fusion Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Fusion Machine Casing MK II");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Turbine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Stainless Steel Turbine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Titanium Turbine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Tungstensteel Turbine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Engine Intake Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Mining Osmiridium Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Firebricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Stable Titanium Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Titanium Firebox Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Fusion Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Fusion Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Fusion Machine Casing MK II");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Turbine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Stainless Steel Turbine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Titanium Turbine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Tungstensteel Turbine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Engine Intake Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Mining Osmiridium Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Firebricks");
 
         ItemList.Casing_RobustTungstenSteel.set(new ItemStack(this, 1, 0));
         ItemList.Casing_CleanStainlessSteel.set(new ItemStack(this, 1, 1));
@@ -78,8 +78,8 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract {
         ItemList.Casing_MiningOsmiridium.set(new ItemStack(this, 1, 14));
         ItemList.Casing_Firebricks.set(new ItemStack(this, 1, 15));
 
-        GT_Mod.gregtechproxy.mCTMBlockCache.put(this, (byte) 6, true);
-        GT_Mod.gregtechproxy.mCTMBlockCache.put(this, (byte) 8, true);
+        GTMod.gregtechproxy.mCTMBlockCache.put(this, (byte) 6, true);
+        GTMod.gregtechproxy.mCTMBlockCache.put(this, (byte) 8, true);
     }
 
     @Override
@@ -136,7 +136,7 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract {
     private static int isTurbineControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, int ordinalSide) {
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (!(tTileEntity instanceof IGregTechTileEntity tTile)) return 0;
-        if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine turbine && tTile.getFrontFacing()
+        if (tTile.getMetaTileEntity() instanceof MTELargeTurbine turbine && tTile.getFrontFacing()
             .ordinal() == ordinalSide) {
             if (turbine.isNewStyleRendering()) return 0;
             if (tTile.isActive()) return 1;
@@ -148,7 +148,7 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract {
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int ordinalSide) {
-        aWorld = GT_RenderingWorld.getInstance(aWorld);
+        aWorld = GTRenderingWorld.getInstance(aWorld);
         int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
         if (tMeta != 6 && tMeta != 8 && tMeta != 9 && tMeta != 10 && tMeta != 11 && tMeta != 12
             || !mConnectedMachineTextures) {
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java b/src/main/java/gregtech/common/blocks/BlockCasings5.java
index 0cb1934dec..15b3eedcba 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings5.java
@@ -27,30 +27,30 @@ import gregtech.api.enums.HeatingCoilLevel;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IHeatingCoil;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings5 extends GT_Block_Casings_Abstract implements IHeatingCoil {
-
-    public GT_Block_Casings5() {
-        super(GT_Item_Casings5.class, "gt.blockcasings5", GT_Material_Casings.INSTANCE, 16);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Cupronickel Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Kanthal Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Nichrome Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "TPV-Alloy Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "HSS-G Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Naquadah Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Naquadah Alloy Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Electrum Flux Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Awakened Draconium Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "HSS-S Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Trinium Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Infinity Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hypogen Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Eternal Coil Block");
+public class BlockCasings5 extends BlockCasingsAbstract implements IHeatingCoil {
+
+    public BlockCasings5() {
+        super(ItemCasings5.class, "gt.blockcasings5", MaterialCasings.INSTANCE, 16);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Cupronickel Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Kanthal Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Nichrome Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "TPV-Alloy Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "HSS-G Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Naquadah Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Naquadah Alloy Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Electrum Flux Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Awakened Draconium Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "HSS-S Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Trinium Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Infinity Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hypogen Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Eternal Coil Block");
 
         ItemList.Casing_Coil_Cupronickel.set(new ItemStack(this, 1, 0));
         ItemList.Casing_Coil_Kanthal.set(new ItemStack(this, 1, 1));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java b/src/main/java/gregtech/common/blocks/BlockCasings6.java
index 9bdbf256cc..e638f36547 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings6.java
@@ -8,32 +8,32 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings6 extends GT_Block_Casings_Abstract {
+public class BlockCasings6 extends BlockCasingsAbstract {
 
-    public GT_Block_Casings6() {
-        super(GT_Item_Casings6.class, "gt.blockcasings6", GT_Material_Casings.INSTANCE, 16);
+    public BlockCasings6() {
+        super(ItemCasings6.class, "gt.blockcasings6", MaterialCasings.INSTANCE, 16);
 
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Hermetic Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Hermetic Casing I");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Hermetic Casing II");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Hermetic Casing III");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Hermetic Casing IV");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Hermetic Casing V");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Hermetic Casing VI");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Hermetic Casing VII");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Hermetic Casing VIII");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Hermetic Casing IX");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Hermetic Casing X");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Hermetic Casing XI");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hermetic Casing XII");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Hermetic Casing XIII");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Hermetic Casing XIV");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Hermetic Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Hermetic Casing I");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Hermetic Casing II");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Hermetic Casing III");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Hermetic Casing IV");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Hermetic Casing V");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Hermetic Casing VI");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Hermetic Casing VII");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Hermetic Casing VIII");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Hermetic Casing IX");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Hermetic Casing X");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Hermetic Casing XI");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hermetic Casing XII");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Hermetic Casing XIII");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Hermetic Casing XIV");
 
         ItemList.Casing_Tank_0.set(new ItemStack(this, 1, 0));
         ItemList.Casing_Tank_1.set(new ItemStack(this, 1, 1));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java b/src/main/java/gregtech/common/blocks/BlockCasings8.java
index 0baeea1411..2e8781bca1 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings8.java
@@ -10,49 +10,49 @@ import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_RenderingWorld;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTRenderingWorld;
+import gregtech.common.tileentities.machines.multi.MTELargeTurbine;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings8 extends GT_Block_Casings_Abstract {
+public class BlockCasings8 extends BlockCasingsAbstract {
 
     public static boolean mConnectedMachineTextures = true;
 
     // WATCH OUT FOR TEXTURE ID's
-    public GT_Block_Casings8() {
-        super(GT_Item_Casings8.class, "gt.blockcasings8", GT_Material_Casings.INSTANCE, 15);
+    public BlockCasings8() {
+        super(ItemCasings8.class, "gt.blockcasings8", MaterialCasings.INSTANCE, 15);
         /*
          * DO NOT USE INDEX 15 ! USED HERE: https://github.com/GTNewHorizons/KubaTech/pull/101
          */
 
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Chemically Inert Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "PTFE Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mining Neutronium Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Mining Black Plutonium Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Extreme Engine Intake Casing");
-        GT_LanguageManager.addStringLocalization(
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Chemically Inert Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "PTFE Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mining Neutronium Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Mining Black Plutonium Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Extreme Engine Intake Casing");
+        GTLanguageManager.addStringLocalization(
             getUnlocalizedName() + ".5.name",
             "Europium Reinforced Radiation Proof Machine Casing");
-        GT_LanguageManager.addStringLocalization(
+        GTLanguageManager.addStringLocalization(
             getUnlocalizedName() + ".6.name",
             "Advanced Rhodium Plated Palladium Machine Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".7.name", "Advanced Iridium Plated Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Magical Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "HSS-S Turbine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Radiant Naquadah Alloy Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Magical Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "HSS-S Turbine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Radiant Naquadah Alloy Casing");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".11.name", "Basic Photolithographic Framework Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".12.name", "Reinforced Photolithographic Framework Casing");
-        GT_LanguageManager.addStringLocalization(
+        GTLanguageManager.addStringLocalization(
             getUnlocalizedName() + ".13.name",
             "Radiation Proof Photolithographic Framework Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Infinity Cooled Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Infinity Cooled Casing");
 
         ItemList.Casing_Chemically_Inert.set(new ItemStack(this, 1, 0));
         ItemList.Casing_Pipe_Polytetrafluoroethylene.set(new ItemStack(this, 1, 1));
@@ -115,7 +115,7 @@ public class GT_Block_Casings8 extends GT_Block_Casings_Abstract {
     private static int isTurbineControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, int ordinalSide) {
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (!(tTileEntity instanceof IGregTechTileEntity tTile)) return 0;
-        if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine turbine && tTile.getFrontFacing()
+        if (tTile.getMetaTileEntity() instanceof MTELargeTurbine turbine && tTile.getFrontFacing()
             .ordinal() == ordinalSide) {
             if (turbine.isNewStyleRendering()) return 0;
             if (tTile.isActive()) return 1;
@@ -127,7 +127,7 @@ public class GT_Block_Casings8 extends GT_Block_Casings_Abstract {
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int ordinalSide) {
-        aWorld = GT_RenderingWorld.getInstance(aWorld);
+        aWorld = GTRenderingWorld.getInstance(aWorld);
         final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
 
         if (tMeta != 9 || !mConnectedMachineTextures) {
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java b/src/main/java/gregtech/common/blocks/BlockCasings9.java
index 6f33cda013..a58ac1f25c 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings9.java
@@ -7,43 +7,43 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings9 extends GT_Block_Casings_Abstract {
+public class BlockCasings9 extends BlockCasingsAbstract {
 
-    public GT_Block_Casings9() {
-        super(GT_Item_Casings9.class, "gt.blockcasings9", GT_Material_Casings.INSTANCE, 16);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "PBI Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Advanced Filter Casing");
-        GT_LanguageManager
+    public BlockCasings9() {
+        super(ItemCasings9.class, "gt.blockcasings9", MaterialCasings.INSTANCE, 16);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "PBI Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Advanced Filter Casing");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".1.tooltip", "Less than five 0.1μm particles per m^3");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Primitive Wooden Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Primitive Wooden Casing");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".3.name", "Superplasticizer-Treated High Strength Concrete");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Sterile Water Plant Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Sterile Water Plant Casing");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".5.name", "Reinforced Sterile Water Plant Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Slick Sterile Flocculation Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Slick Sterile Flocculation Casing");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".7.name", "Stabilized Naquadah Water Plant Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".8.name", "Inert Neutralization Water Plant Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Reactive Gas Containment Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Inert Filtration Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Reactive Gas Containment Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Inert Filtration Casing");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".11.name", "Heat-Resistant Trinium Plated Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".12.name", "Naquadria-Reinforced Water Plant Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".13.name", "High Energy Ultraviolet Emitter Casing");
         // placeholder name
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".14.name", "Particle Beam Guidance Pipe Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".15.name", "Femtometer-Calibrated Particle Beam Casing");
 
         ItemList.Casing_Pipe_Polybenzimidazole.set(new ItemStack(this, 1, 0));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/BlockCasingsAbstract.java
index cfa51f8e99..5481f1f058 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasingsAbstract.java
@@ -18,28 +18,27 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Textures;
-import gregtech.api.items.GT_Generic_Block;
+import gregtech.api.items.GTGenericBlock;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The base class for casings. Casings are the blocks that are mainly used to build multiblocks.
  */
-public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block
+public abstract class BlockCasingsAbstract extends GTGenericBlock
     implements gregtech.api.interfaces.IHasIndexedTexture {
 
-    public GT_Block_Casings_Abstract(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) {
+    public BlockCasingsAbstract(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) {
         super(aItemClass, aName, aMaterial);
         setStepSound(soundTypeMetal);
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
-        GregTech_API.registerMachineBlock(this, -1);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this");
+        setCreativeTab(GregTechAPI.TAB_GREGTECH);
+        GregTechAPI.registerMachineBlock(this, -1);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this");
     }
 
-    public GT_Block_Casings_Abstract(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial,
-        int aMaxMeta) {
+    public BlockCasingsAbstract(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial, int aMaxMeta) {
         this(aItemClass, aName, aMaterial);
         for (int i = 0; i < aMaxMeta; i++) {
             Textures.BlockIcons.setCasingTextureForId(getTextureIndex(i), TextureFactory.of(this, i));
@@ -73,8 +72,8 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block
 
     @Override
     public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
-        if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
+            GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         }
     }
 
@@ -100,8 +99,8 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block
 
     @Override
     public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) {
-        if (GregTech_API.isMachineBlock(this, aMetaData)) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        if (GregTechAPI.isMachineBlock(this, aMetaData)) {
+            GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/gregtech/common/blocks/BlockConcretes.java b/src/main/java/gregtech/common/blocks/BlockConcretes.java
new file mode 100644
index 0000000000..1bf8dcf2fe
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/BlockConcretes.java
@@ -0,0 +1,83 @@
+package gregtech.common.blocks;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.interfaces.IBlockOnWalkOver;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
+
+public class BlockConcretes extends BlockStonesAbstract implements IBlockOnWalkOver {
+
+    public BlockConcretes() {
+        super(ItemConcretes.class, "gt.blockconcretes");
+        setResistance(20.0F);
+        // this.slipperiness = 0.9F;
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Dark Concrete");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Dark Concrete Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mossy Dark Concrete Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Dark Concrete Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Cracked Dark Concrete Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Mossy Dark Concrete Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Chiseled Dark Concrete");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Smooth Dark Concrete");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Light Concrete");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Light Concrete Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Mossy Light Concrete Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Light Concrete Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cracked Light Concrete Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Mossy Light Concrete Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chiseled Light Concrete");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Smooth Light Concrete");
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 0));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 1));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 2));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 3));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 4));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 5));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 6));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 7));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 8));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 9));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 10));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 11));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 12));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 13));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 14));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 15));
+    }
+
+    @Override
+    public int getHarvestLevel(int aMeta) {
+        return 1;
+    }
+
+    @Override
+    public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
+        return this.blockHardness = Blocks.stone.getBlockHardness(aWorld, aX, aY, aZ);
+    }
+
+    @Override
+    public IIcon getIcon(int ordinalSide, int aMeta) {
+        if ((aMeta >= 0) && (aMeta < 16)) {
+            return gregtech.api.enums.Textures.BlockIcons.CONCRETES[aMeta].getIcon();
+        }
+        return gregtech.api.enums.Textures.BlockIcons.CONCRETES[0].getIcon();
+    }
+
+    @Override
+    public void onWalkOver(EntityLivingBase aEntity, World aWorld, int aX, int aY, int aZ) {
+        if ((aEntity.motionX != 0 || aEntity.motionZ != 0) && !aEntity.isInWater()
+            && !aEntity.isWet()
+            && !aEntity.isSneaking()) {
+            double tSpeed = (aWorld.getBlock(aX, aY - 1, aZ).slipperiness >= 0.8 ? 1.5 : 1.2);
+            aEntity.motionX *= tSpeed;
+            aEntity.motionZ *= tSpeed;
+        }
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java b/src/main/java/gregtech/common/blocks/BlockCyclotronCoils.java
index 3c4250540c..437e48a37a 100644
--- a/src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java
+++ b/src/main/java/gregtech/common/blocks/BlockCyclotronCoils.java
@@ -6,24 +6,24 @@ import net.minecraft.world.IBlockAccess;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_Cyclotron_Coils extends GT_Block_Casings_Abstract {
+public class BlockCyclotronCoils extends BlockCasingsAbstract {
 
-    public GT_Cyclotron_Coils() {
-        super(GT_Cyclotron_Item_Casings.class, "gt.blockcasings.cyclotron_coils", GT_Material_Casings.INSTANCE, 16);
+    public BlockCyclotronCoils() {
+        super(ItemCyclotronCasings.class, "gt.blockcasings.cyclotron_coils", MaterialCasings.INSTANCE, 16);
 
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "MV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "HV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "EV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "IV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "LuV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "ZPM Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "UV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "UHV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "UEV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "UIV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "UMV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "MV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "HV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "EV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "IV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "LuV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "ZPM Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "UV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "UHV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "UEV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "UIV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "UMV Solenoid Superconductor Coil");
 
         ItemList.Superconducting_Magnet_Solenoid_MV.set(new ItemStack(this, 1, 0));
         ItemList.Superconducting_Magnet_Solenoid_HV.set(new ItemStack(this, 1, 1));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Drone.java b/src/main/java/gregtech/common/blocks/BlockDrone.java
index 81d1acc228..2d1bedff9a 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Drone.java
+++ b/src/main/java/gregtech/common/blocks/BlockDrone.java
@@ -12,16 +12,16 @@ import net.minecraft.world.World;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
-import gregtech.common.tileentities.render.TileDrone;
+import gregtech.api.GregTechAPI;
+import gregtech.common.tileentities.render.TileEntityDrone;
 
-public class GT_Block_Drone extends Block {
+public class BlockDrone extends Block {
 
-    public GT_Block_Drone() {
+    public BlockDrone() {
         super(Material.iron);
         this.setResistance(20f);
         this.setHardness(-1.0f);
-        this.setCreativeTab(GregTech_API.TAB_GREGTECH);
+        this.setCreativeTab(GregTechAPI.TAB_GREGTECH);
         this.setBlockName("gt.dronerender");
         this.setLightLevel(100.0f);
         GameRegistry.registerBlock(this, getUnlocalizedName());
@@ -55,7 +55,7 @@ public class GT_Block_Drone extends Block {
 
     @Override
     public TileEntity createTileEntity(World world, int metadata) {
-        return new TileDrone();
+        return new TileEntityDrone();
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java b/src/main/java/gregtech/common/blocks/BlockFrameBox.java
index 76e3180d58..59ca98ef8e 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java
+++ b/src/main/java/gregtech/common/blocks/BlockFrameBox.java
@@ -1,6 +1,6 @@
 package gregtech.common.blocks;
 
-import static gregtech.api.enums.GT_Values.W;
+import static gregtech.api.enums.GTValues.W;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,7 +23,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -34,13 +34,13 @@ import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.BaseTileEntity;
 import gregtech.api.metatileentity.CoverableTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame;
+import gregtech.api.metatileentity.implementations.MTEFrame;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.render.GT_Renderer_Block;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
+import gregtech.common.render.GTRendererBlock;
 
-public class GT_Block_FrameBox extends BlockContainer {
+public class BlockFrameBox extends BlockContainer {
 
     protected final String mUnlocalizedName;
 
@@ -51,21 +51,21 @@ public class GT_Block_FrameBox extends BlockContainer {
     // properly call getDrops() on it
     private static final ThreadLocal<IGregTechTileEntity> mTemporaryTileEntity = new ThreadLocal<>();
 
-    public GT_Block_FrameBox() {
-        super(new GT_Material_Machines());
+    public BlockFrameBox() {
+        super(new MaterialMachines());
         this.mUnlocalizedName = "gt.blockframes";
         setBlockName(this.mUnlocalizedName);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + W + ".name", "Any Sub Block of this one");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + "." + W + ".name", "Any Sub Block of this one");
 
-        GameRegistry.registerBlock(this, GT_Item_Frames.class, getUnlocalizedName());
+        GameRegistry.registerBlock(this, ItemFrames.class, getUnlocalizedName());
 
-        for (int meta = 1; meta < GregTech_API.sGeneratedMaterials.length; meta++) {
-            Materials material = GregTech_API.sGeneratedMaterials[meta];
+        for (int meta = 1; meta < GregTechAPI.sGeneratedMaterials.length; meta++) {
+            Materials material = GregTechAPI.sGeneratedMaterials[meta];
             if (material != null && (material.mTypes & 0x02) != 0) {
-                GT_LanguageManager.addStringLocalization(
+                GTLanguageManager.addStringLocalization(
                     getUnlocalizedName() + "." + meta + DOT_NAME,
-                    GT_LanguageManager.i18nPlaceholder ? getLocalizedNameFormat(material) : getLocalizedName(material));
-                GT_LanguageManager
+                    GTLanguageManager.i18nPlaceholder ? getLocalizedNameFormat(material) : getLocalizedName(material));
+                GTLanguageManager
                     .addStringLocalization(getUnlocalizedName() + "." + meta + DOT_TOOLTIP, material.getToolTip());
             }
         }
@@ -93,14 +93,14 @@ public class GT_Block_FrameBox extends BlockContainer {
     }
 
     private boolean isCover(ItemStack item) {
-        return GT_Utility.isStackInList(item, GregTech_API.sCovers.keySet());
+        return GTUtility.isStackInList(item, GregTechAPI.sCovers.keySet());
     }
 
     private void createFrame(World worldIn, int x, int y, int z, BaseMetaPipeEntity baseMte) {
         // Obtain metadata to grab proper material identifier
         int meta = worldIn.getBlockMetadata(x, y, z);
         Materials material = getMaterial(meta);
-        GT_MetaPipeEntity_Frame frame = new GT_MetaPipeEntity_Frame("GT_Frame_" + material, material);
+        MTEFrame frame = new MTEFrame("GT_Frame_" + material, material);
         baseMte.setMetaTileEntity(frame);
         frame.setBaseMetaTileEntity(baseMte);
     }
@@ -115,7 +115,7 @@ public class GT_Block_FrameBox extends BlockContainer {
 
     // Get the material that this frame box is made of
     public static Materials getMaterial(int meta) {
-        return GregTech_API.sGeneratedMaterials[meta];
+        return GregTechAPI.sGeneratedMaterials[meta];
     }
 
     @Override
@@ -148,10 +148,10 @@ public class GT_Block_FrameBox extends BlockContainer {
 
     @Override
     public int getRenderType() {
-        if (GT_Renderer_Block.INSTANCE == null) {
+        if (GTRendererBlock.INSTANCE == null) {
             return super.getRenderType();
         }
-        return GT_Renderer_Block.mRenderID;
+        return GTRendererBlock.mRenderID;
     }
 
     @Override
@@ -167,8 +167,8 @@ public class GT_Block_FrameBox extends BlockContainer {
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(Item aItem, CreativeTabs aTab, List<ItemStack> aList) {
-        for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) {
-            Materials tMaterial = GregTech_API.sGeneratedMaterials[i];
+        for (int i = 0; i < GregTechAPI.sGeneratedMaterials.length; i++) {
+            Materials tMaterial = GregTechAPI.sGeneratedMaterials[i];
             // If material is not null and has a frame box item associated with it
             if ((tMaterial != null) && ((tMaterial.mTypes & 0x02) != 0)) {
                 aList.add(new ItemStack(aItem, 1, i));
@@ -215,14 +215,14 @@ public class GT_Block_FrameBox extends BlockContainer {
             mTemporaryTileEntity.set(gtTE);
         }
         // Cause structure update
-        GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         super.breakBlock(aWorld, aX, aY, aZ, aBlock, aMetadata);
     }
 
     @Override
     public void onBlockAdded(World worldIn, int x, int y, int z) {
         // Cause structure update
-        GregTech_API.causeMachineUpdate(worldIn, x, y, z);
+        GregTechAPI.causeMachineUpdate(worldIn, x, y, z);
         super.onBlockAdded(worldIn, x, y, z);
     }
 
@@ -426,7 +426,7 @@ public class GT_Block_FrameBox extends BlockContainer {
 
     @Override
     public IIcon getIcon(int side, int meta) {
-        Materials material = GregTech_API.sGeneratedMaterials[meta];
+        Materials material = GregTechAPI.sGeneratedMaterials[meta];
         if (material == null) return null;
         return material.mIconSet.mTextures[OrePrefixes.frameGt.mTextureIndex].getIcon();
     }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Glass1.java b/src/main/java/gregtech/common/blocks/BlockGlass1.java
index 2aa5613d11..a8a287248b 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Glass1.java
+++ b/src/main/java/gregtech/common/blocks/BlockGlass1.java
@@ -11,7 +11,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The glass is split into separate files because they are registered as regular blocks, and a regular block can have
@@ -19,19 +19,19 @@ import gregtech.api.util.GT_LanguageManager;
  *
  * This class hosts various special types of tiered glass with not many tiers.
  */
-public class GT_Block_Glass1 extends GT_Block_Casings_Abstract {
+public class BlockGlass1 extends BlockCasingsAbstract {
 
-    public GT_Block_Glass1() {
-        super(GT_Item_Glass1.class, "gt.blockglass1", Material.glass, 4);
+    public BlockGlass1() {
+        super(ItemGlass1.class, "gt.blockglass1", Material.glass, 4);
         this.opaque = false;
 
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Chemical Grade Glass");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Chemical Grade Glass");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".1.name", "Electron-Permeable Neutronium Coated Glass");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Omni-Purpose Infinity Fused Glass");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Omni-Purpose Infinity Fused Glass");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".3.name", "Non-Photonic Matter Exclusion Glass");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".4.name", "Hawking Radiation Realignment Focus");
 
         ItemList.GlassPHResistant.set(new ItemStack(this, 1, 0));
diff --git a/src/main/java/gregtech/common/blocks/BlockGranites.java b/src/main/java/gregtech/common/blocks/BlockGranites.java
new file mode 100644
index 0000000000..43a3f7a7e2
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/BlockGranites.java
@@ -0,0 +1,77 @@
+package gregtech.common.blocks;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.boss.EntityWither;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
+
+public class BlockGranites extends BlockStonesAbstract {
+
+    public BlockGranites() {
+        super(ItemGranites.class, "gt.blockgranites");
+        setResistance(60.0F);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Black Granite");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Black Granite Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mossy Black Granite Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Black Granite Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Cracked Black Granite Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Mossy Black Granite Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Chiseled Black Granite");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Smooth Black Granite");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Red Granite");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Red Granite Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Mossy Red Granite Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Red Granite Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cracked Red Granite Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Mossy Red Granite Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chiseled Red Granite");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Smooth Red Granite");
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 0));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 1));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 2));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 3));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 4));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 5));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 6));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 7));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 8));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 9));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 10));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 11));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 12));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 13));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 14));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 15));
+    }
+
+    @Override
+    public int getHarvestLevel(int aMeta) {
+        return 3;
+    }
+
+    @Override
+    public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
+        return this.blockHardness = Blocks.stone.getBlockHardness(aWorld, aX, aY, aZ) * 3.0F;
+    }
+
+    @Override
+    public IIcon getIcon(int ordinalSide, int aMeta) {
+        if ((aMeta >= 0) && (aMeta < 16)) {
+            return gregtech.api.enums.Textures.BlockIcons.GRANITES[aMeta].getIcon();
+        }
+        return gregtech.api.enums.Textures.BlockIcons.GRANITES[0].getIcon();
+    }
+
+    @Override
+    public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) {
+        return !(entity instanceof EntityWither);
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Laser.java b/src/main/java/gregtech/common/blocks/BlockLaser.java
index 038b114284..8a67ed6bc9 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Laser.java
+++ b/src/main/java/gregtech/common/blocks/BlockLaser.java
@@ -12,37 +12,37 @@ import net.minecraft.world.World;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.tileentities.render.TileLaser;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.common.tileentities.render.TileEntityLaser;
 
-public class GT_Block_Laser extends Block implements ITileEntityProvider {
+public class BlockLaser extends Block implements ITileEntityProvider {
 
     public static IIcon[] textures;
 
-    public GT_Block_Laser() {
+    public BlockLaser() {
         super(Material.iron);
         setBlockName("LaserPlate");
-        this.setCreativeTab(GregTech_API.TAB_GREGTECH);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".name", "Laser Resistant Plate");
-        GregTech_API.registerMachineBlock(this, -1);
-        GameRegistry.registerBlock(this, GT_Item_Block_Laser.class, getUnlocalizedName());
+        this.setCreativeTab(GregTechAPI.TAB_GREGTECH);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".name", "Laser Resistant Plate");
+        GregTechAPI.registerMachineBlock(this, -1);
+        GameRegistry.registerBlock(this, ItemBlockLaser.class, getUnlocalizedName());
         ItemList.Laser_Plate.set(new ItemStack(this, 1));
     }
 
     @Override
     public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
-        if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
+            GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         }
     }
 
     @Override
     public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) {
-        if (GregTech_API.isMachineBlock(this, aMetaData)) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        if (GregTechAPI.isMachineBlock(this, aMetaData)) {
+            GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         }
     }
 
@@ -99,6 +99,6 @@ public class GT_Block_Laser extends Block implements ITileEntityProvider {
 
     @Override
     public TileEntity createNewTileEntity(World world, int meta) {
-        return new TileLaser();
+        return new TileEntityLaser();
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/BlockMachines.java
index 2f80929d94..1db6f51730 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
+++ b/src/main/java/gregtech/common/blocks/BlockMachines.java
@@ -1,6 +1,6 @@
 package gregtech.common.blocks;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
 
 import java.util.ArrayList;
@@ -34,39 +34,39 @@ import com.cricketcraft.chisel.api.IFacade;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IDebugableBlock;
 import gregtech.api.interfaces.tileentity.IColoredTileEntity;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IDebugableTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_Generic_Block;
+import gregtech.api.items.GTGenericBlock;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.BaseTileEntity;
 import gregtech.api.metatileentity.CoverableTileEntity;
-import gregtech.api.util.GT_BaseCrop;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTBaseCrop;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 import gregtech.common.covers.CoverInfo;
-import gregtech.common.render.GT_Renderer_Block;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumChest;
-import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneBase;
+import gregtech.common.render.GTRendererBlock;
+import gregtech.common.tileentities.storage.MTEQuantumChest;
+import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneBase;
 
 @Optional.Interface(iface = "com.cricketcraft.chisel.api.IFacade", modid = "ChiselAPI")
-public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlock, ITileEntityProvider, IFacade {
+public class BlockMachines extends GTGenericBlock implements IDebugableBlock, ITileEntityProvider, IFacade {
 
     private static final ThreadLocal<IGregTechTileEntity> mTemporaryTileEntity = new ThreadLocal<>();
     private boolean renderAsNormalBlock;
 
-    public GT_Block_Machines() {
-        super(GT_Item_Machines.class, "gt.blockmachines", new GT_Material_Machines());
-        GregTech_API.registerMachineBlock(this, -1);
+    public BlockMachines() {
+        super(ItemMachines.class, "gt.blockmachines", new MaterialMachines());
+        GregTechAPI.registerMachineBlock(this, -1);
         setHardness(1.0F);
         setResistance(10.0F);
         setStepSound(soundTypeMetal);
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH);
         this.isBlockContainer = true;
         this.renderAsNormalBlock = true;
         this.useNeighborBrightness = true;
@@ -109,8 +109,8 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     @Override
     public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
         super.onBlockAdded(aWorld, aX, aY, aZ);
-        if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
+            GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         }
     }
 
@@ -131,25 +131,25 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
 
     @Override
     public int getFireSpreadSpeed(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection face) {
-        return GregTech_API.sMachineFlammable && (aWorld.getBlockMetadata(aX, aY, aZ) == 0) ? 100 : 0;
+        return GregTechAPI.sMachineFlammable && (aWorld.getBlockMetadata(aX, aY, aZ) == 0) ? 100 : 0;
     }
 
     @Override
     public int getRenderType() {
-        if (GT_Renderer_Block.INSTANCE == null) {
+        if (GTRendererBlock.INSTANCE == null) {
             return super.getRenderType();
         }
-        return GT_Renderer_Block.INSTANCE.mRenderID;
+        return GTRendererBlock.INSTANCE.mRenderID;
     }
 
     @Override
     public boolean isFireSource(World aWorld, int aX, int aY, int aZ, ForgeDirection side) {
-        return GregTech_API.sMachineFlammable && (aWorld.getBlockMetadata(aX, aY, aZ) == 0);
+        return GregTechAPI.sMachineFlammable && (aWorld.getBlockMetadata(aX, aY, aZ) == 0);
     }
 
     @Override
     public boolean isFlammable(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection face) {
-        return GregTech_API.sMachineFlammable && (aWorld.getBlockMetadata(aX, aY, aZ) == 0);
+        return GregTechAPI.sMachineFlammable && (aWorld.getBlockMetadata(aX, aY, aZ) == 0);
     }
 
     @Override
@@ -170,7 +170,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
         };
         final TileEntity machineEntity = aWorld.getTileEntity(aX, aY, aZ);
         return machineEntity instanceof BaseMetaTileEntity bmte && (bmte.getCoverInfoAtSide(forgeSide)
-            .getCoverID() != 0 || bmte.getMetaTileEntity() instanceof GT_MetaTileEntity_RedstoneBase);
+            .getCoverID() != 0 || bmte.getMetaTileEntity() instanceof MTERedstoneBase);
     }
 
     @Override
@@ -198,7 +198,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
         return renderAsNormalBlock;
     }
 
-    public GT_Block_Machines setRenderAsNormalBlock(boolean aBool) {
+    public BlockMachines setRenderAsNormalBlock(boolean aBool) {
         renderAsNormalBlock = aBool;
         return this;
     }
@@ -308,39 +308,39 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     @SideOnly(Side.CLIENT)
     @Override
     public void registerBlockIcons(IIconRegister aIconRegister) {
-        if (!GregTech_API.sPostloadFinished) return;
-        GT_Log.out.println("GT_Mod: Setting up Icon Register for Blocks");
-        GregTech_API.setBlockIconRegister(aIconRegister);
+        if (!GregTechAPI.sPostloadFinished) return;
+        GTLog.out.println("GTMod: Setting up Icon Register for Blocks");
+        GregTechAPI.setBlockIconRegister(aIconRegister);
 
-        GT_Log.out.println("GT_Mod: Registering MetaTileEntity specific Textures");
+        GTLog.out.println("GTMod: Registering MetaTileEntity specific Textures");
         try {
-            for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
-                if (GregTech_API.METATILEENTITIES[i] != null) {
-                    GregTech_API.METATILEENTITIES[i].registerIcons(aIconRegister);
+            for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) {
+                if (GregTechAPI.METATILEENTITIES[i] != null) {
+                    GregTechAPI.METATILEENTITIES[i].registerIcons(aIconRegister);
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
-        GT_Log.out.println("GT_Mod: Registering Crop specific Textures");
+        GTLog.out.println("GTMod: Registering Crop specific Textures");
         try {
-            for (GT_BaseCrop tCrop : GT_BaseCrop.sCropList) {
+            for (GTBaseCrop tCrop : GTBaseCrop.sCropList) {
                 tCrop.registerSprites(aIconRegister);
             }
         } catch (Exception e) {
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
-        GT_Log.out.println("GT_Mod: Starting Block Icon Load Phase");
-        GT_FML_LOGGER.info("GT_Mod: Starting Block Icon Load Phase");
+        GTLog.out.println("GTMod: Starting Block Icon Load Phase");
+        GT_FML_LOGGER.info("GTMod: Starting Block Icon Load Phase");
         try {
-            for (Runnable tRunnable : GregTech_API.sGTBlockIconload) {
+            for (Runnable tRunnable : GregTechAPI.sGTBlockIconload) {
                 tRunnable.run();
             }
         } catch (Exception e) {
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
-        GT_Log.out.println("GT_Mod: Finished Block Icon Load Phase");
-        GT_FML_LOGGER.info("GT_Mod: Finished Block Icon Load Phase");
+        GTLog.out.println("GTMod: Finished Block Icon Load Phase");
+        GT_FML_LOGGER.info("GTMod: Finished Block Icon Load Phase");
     }
 
     @Override
@@ -360,11 +360,11 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
         }
         if (aPlayer.isSneaking()) {
             final ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
-            if (tCurrentItem != null && !GT_Utility.isStackInList(tCurrentItem, GregTech_API.sScrewdriverList)
-                && !GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWrenchList)
-                && !GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWireCutterList)
-                && !GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList)
-                && !GT_Utility.isStackInList(tCurrentItem, GregTech_API.sJackhammerList)) return false;
+            if (tCurrentItem != null && !GTUtility.isStackInList(tCurrentItem, GregTechAPI.sScrewdriverList)
+                && !GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWrenchList)
+                && !GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWireCutterList)
+                && !GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSolderingToolList)
+                && !GTUtility.isStackInList(tCurrentItem, GregTechAPI.sJackhammerList)) return false;
         }
         if (tTileEntity instanceof IGregTechTileEntity gtTE) {
             if (gtTE.getTimer() < 1L) {
@@ -400,7 +400,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     public void onBlockExploded(World aWorld, int aX, int aY, int aZ, Explosion aExplosion) {
         final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (tTileEntity instanceof BaseMetaTileEntity baseTE) {
-            GT_Log.exp.printf(
+            GTLog.exp.printf(
                 "Explosion at : %d | %d | %d DIMID: %s due to near explosion!%n",
                 aX,
                 aY,
@@ -413,12 +413,12 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
 
     @Override
     public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetadata) {
-        GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (tTileEntity instanceof IGregTechTileEntity gtTE) {
             gtTE.onBlockDestroyed();
             mTemporaryTileEntity.set(gtTE);
-            if (!(gtTE.getMetaTileEntity() instanceof GT_MetaTileEntity_QuantumChest)) {
+            if (!(gtTE.getMetaTileEntity() instanceof MTEQuantumChest)) {
                 for (int i = 0; i < gtTE.getSizeInventory(); i++) {
                     final ItemStack tItem = gtTE.getStackInSlot(i);
                     if ((tItem != null) && (tItem.stackSize > 0) && (gtTE.isValidSlot(i)) && gtTE.shouldDropItemAt(i)) {
@@ -520,8 +520,8 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
         if (!aWorld.isRemote) {
             final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
             if (tTileEntity != null && (chance < 1.0F)) {
-                if (tTileEntity instanceof BaseMetaTileEntity bmte && (GregTech_API.sMachineNonWrenchExplosions)) {
-                    GT_Log.exp.printf(
+                if (tTileEntity instanceof BaseMetaTileEntity bmte && (GregTechAPI.sMachineNonWrenchExplosions)) {
+                    GTLog.exp.printf(
                         "Explosion at : %d | %d | %d DIMID: %s NonWrench picking/Rain!%n",
                         aX,
                         aY,
@@ -600,7 +600,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
 
     @Override
     public TileEntity createTileEntity(World aWorld, int aMeta) {
-        return GregTech_API.createTileEntity(aMeta);
+        return GregTechAPI.createTileEntity(aMeta);
     }
 
     @Override
@@ -616,8 +616,8 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     @SideOnly(Side.CLIENT)
     @Override
     public void getSubBlocks(Item item, CreativeTabs aCreativeTab, List<ItemStack> outputSubBlocks) {
-        for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
-            if (GregTech_API.METATILEENTITIES[i] != null) {
+        for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) {
+            if (GregTechAPI.METATILEENTITIES[i] != null) {
                 outputSubBlocks.add(new ItemStack(item, 1, i));
             }
         }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java b/src/main/java/gregtech/common/blocks/BlockMetal.java
index 753c590e51..642de8b39c 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java
+++ b/src/main/java/gregtech/common/blocks/BlockMetal.java
@@ -8,14 +8,14 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
 
-public class GT_Block_Metal extends GT_Block_Storage {
+public class BlockMetal extends BlockStorage {
 
     public Materials[] mMats;
     public OrePrefixes mPrefix;
@@ -23,8 +23,8 @@ public class GT_Block_Metal extends GT_Block_Storage {
     public boolean mHideBlocks;
     public static boolean mNEIisLoaded = NotEnoughItems.isModLoaded();
 
-    public GT_Block_Metal(String aName, Materials[] aMats, OrePrefixes aPrefix, IIconContainer[] aBlockIcons) {
-        super(GT_Item_Storage.class, aName, Material.iron);
+    public BlockMetal(String aName, Materials[] aMats, OrePrefixes aPrefix, IIconContainer[] aBlockIcons) {
+        super(ItemStorage.class, aName, Material.iron);
         mMats = aMats;
         mPrefix = aPrefix;
         mBlockIcons = aBlockIcons;
@@ -32,10 +32,10 @@ public class GT_Block_Metal extends GT_Block_Storage {
 
         for (int i = 0; i < aMats.length; i++) {
             if (aMats[i].mMetaItemSubID > 0 && aMats[i].mHasParentMod) {
-                GT_LanguageManager.addStringLocalization(
+                GTLanguageManager.addStringLocalization(
                     getUnlocalizedName() + "." + i + ".name",
-                    "Block of " + (GT_LanguageManager.i18nPlaceholder ? "%material" : aMats[i].mDefaultLocalName));
-                GT_OreDictUnificator.registerOre(aPrefix, aMats[i], new ItemStack(this, 1, i));
+                    "Block of " + (GTLanguageManager.i18nPlaceholder ? "%material" : aMats[i].mDefaultLocalName));
+                GTOreDictUnificator.registerOre(aPrefix, aMats[i], new ItemStack(this, 1, i));
             }
         }
         if (aMats.length < 16 && mNEIisLoaded) {
@@ -53,15 +53,15 @@ public class GT_Block_Metal extends GT_Block_Storage {
 
     @Override
     public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
-        if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
+            GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         }
     }
 
     @Override
     public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) {
-        if (GregTech_API.isMachineBlock(this, aMetaData)) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        if (GregTechAPI.isMachineBlock(this, aMetaData)) {
+            GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java b/src/main/java/gregtech/common/blocks/BlockOres.java
index 015baa2319..f2ae18f195 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java
+++ b/src/main/java/gregtech/common/blocks/BlockOres.java
@@ -20,18 +20,18 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.render.TextureFactory;
 
-public class GT_Block_Ores extends GT_Block_Ores_Abstract {
+public class BlockOres extends BlockOresAbstract {
 
     private static final String UNLOCALIZED_NAME = "gt.blockores";
 
-    public GT_Block_Ores() {
+    public BlockOres() {
         super(UNLOCALIZED_NAME, 7, false, Material.rock);
     }
 
@@ -89,7 +89,7 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract {
 
     @Override
     public Block getDroppedBlock() {
-        return GregTech_API.sBlockOres1;
+        return GregTechAPI.sBlockOres1;
     }
 
     @Override
@@ -100,9 +100,9 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract {
 
     @Override
     public boolean[] getEnabledMetas() {
-        return new boolean[] { true, true, true, GT_Mod.gregtechproxy.enableBlackGraniteOres,
-            GT_Mod.gregtechproxy.enableRedGraniteOres, GT_Mod.gregtechproxy.enableMarbleOres,
-            GT_Mod.gregtechproxy.enableBasaltOres, true };
+        return new boolean[] { true, true, true, GTMod.gregtechproxy.enableBlackGraniteOres,
+            GTMod.gregtechproxy.enableRedGraniteOres, GTMod.gregtechproxy.enableMarbleOres,
+            GTMod.gregtechproxy.enableBasaltOres, true };
     }
 
     @Override
@@ -134,21 +134,21 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract {
     public void harvestBlock(World worldIn, EntityPlayer player, int x, int y, int z, int meta) {
 
         if (EnchantmentHelper.getSilkTouchModifier(player)) {
-            GT_TileEntity_Ores.shouldSilkTouch = true;
+            TileEntityOres.shouldSilkTouch = true;
             super.harvestBlock(worldIn, player, x, y, z, meta);
 
-            if (GT_TileEntity_Ores.shouldSilkTouch) {
-                GT_TileEntity_Ores.shouldSilkTouch = false;
+            if (TileEntityOres.shouldSilkTouch) {
+                TileEntityOres.shouldSilkTouch = false;
             }
             return;
         }
 
         if (!(player instanceof FakePlayer)) {
-            GT_TileEntity_Ores.shouldFortune = true;
+            TileEntityOres.shouldFortune = true;
         }
         super.harvestBlock(worldIn, player, x, y, z, meta);
-        if (GT_TileEntity_Ores.shouldFortune) {
-            GT_TileEntity_Ores.shouldFortune = false;
+        if (TileEntityOres.shouldFortune) {
+            TileEntityOres.shouldFortune = false;
         }
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/BlockOresAbstract.java
index 8e68c5c39a..f147c1c41d 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/BlockOresAbstract.java
@@ -28,63 +28,63 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.items.GT_Generic_Block;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.render.GT_Renderer_Block;
+import gregtech.api.items.GTGenericBlock;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.render.GTRendererBlock;
 
-public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements ITileEntityProvider {
+public abstract class BlockOresAbstract extends GTGenericBlock implements ITileEntityProvider {
 
     private static final String DOT_NAME = ".name";
     private static final String DOT_TOOLTIP = ".tooltip";
-    public static ThreadLocal<GT_TileEntity_Ores> mTemporaryTileEntity = new ThreadLocal<>();
+    public static ThreadLocal<TileEntityOres> mTemporaryTileEntity = new ThreadLocal<>();
     public static boolean FUCKING_LOCK = false;
     public static boolean tHideOres;
     public static Set<Materials> aBlockedOres = new HashSet<>();
 
-    protected GT_Block_Ores_Abstract(String aUnlocalizedName, int aOreMetaCount, boolean aHideFirstMeta,
+    protected BlockOresAbstract(String aUnlocalizedName, int aOreMetaCount, boolean aHideFirstMeta,
         Material aMaterial) {
-        super(GT_Item_Ores.class, aUnlocalizedName, aMaterial);
+        super(ItemOres.class, aUnlocalizedName, aMaterial);
         this.isBlockContainer = true;
         setStepSound(soundTypeStone);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_ORES);
-        tHideOres = NotEnoughItems.isModLoaded() && GT_Mod.gregtechproxy.mHideUnusedOres;
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_ORES);
+        tHideOres = NotEnoughItems.isModLoaded() && GTMod.gregtechproxy.mHideUnusedOres;
         if (aOreMetaCount > 8 || aOreMetaCount < 0) aOreMetaCount = 8;
 
         for (int i = 0; i < 16; i++) {
-            GT_ModHandler.addValuableOre(this, i, 1);
+            GTModHandler.addValuableOre(this, i, 1);
         }
-        for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) {
-            if (GregTech_API.sGeneratedMaterials[i] != null) {
+        for (int i = 1; i < GregTechAPI.sGeneratedMaterials.length; i++) {
+            if (GregTechAPI.sGeneratedMaterials[i] != null) {
                 for (int j = 0; j < aOreMetaCount; j++) {
                     if (!this.getEnabledMetas()[j]) continue;
-                    GT_LanguageManager.addStringLocalization(
+                    GTLanguageManager.addStringLocalization(
                         getUnlocalizedName() + "." + (i + (j * 1000)) + DOT_NAME,
-                        GT_LanguageManager.i18nPlaceholder ? getLocalizedNameFormat(GregTech_API.sGeneratedMaterials[i])
-                            : getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                    GT_LanguageManager.addStringLocalization(
+                        GTLanguageManager.i18nPlaceholder ? getLocalizedNameFormat(GregTechAPI.sGeneratedMaterials[i])
+                            : getLocalizedName(GregTechAPI.sGeneratedMaterials[i]));
+                    GTLanguageManager.addStringLocalization(
                         getUnlocalizedName() + "." + (i + (j * 1000)) + DOT_TOOLTIP,
-                        GregTech_API.sGeneratedMaterials[i].getToolTip());
-                    GT_LanguageManager.addStringLocalization(
+                        GregTechAPI.sGeneratedMaterials[i].getToolTip());
+                    GTLanguageManager.addStringLocalization(
                         getUnlocalizedName() + "." + ((i + 16000) + (j * 1000)) + DOT_NAME,
-                        "Small " + (GT_LanguageManager.i18nPlaceholder
-                            ? getLocalizedNameFormat(GregTech_API.sGeneratedMaterials[i])
-                            : getLocalizedName(GregTech_API.sGeneratedMaterials[i])));
-                    GT_LanguageManager.addStringLocalization(
+                        "Small " + (GTLanguageManager.i18nPlaceholder
+                            ? getLocalizedNameFormat(GregTechAPI.sGeneratedMaterials[i])
+                            : getLocalizedName(GregTechAPI.sGeneratedMaterials[i])));
+                    GTLanguageManager.addStringLocalization(
                         getUnlocalizedName() + "." + ((i + 16000) + (j * 1000)) + DOT_TOOLTIP,
-                        GregTech_API.sGeneratedMaterials[i].getToolTip());
-                    if ((GregTech_API.sGeneratedMaterials[i].mTypes & 0x8) != 0
-                        && !aBlockedOres.contains(GregTech_API.sGeneratedMaterials[i])) {
-                        GT_OreDictUnificator.registerOre(
+                        GregTechAPI.sGeneratedMaterials[i].getToolTip());
+                    if ((GregTechAPI.sGeneratedMaterials[i].mTypes & 0x8) != 0
+                        && !aBlockedOres.contains(GregTechAPI.sGeneratedMaterials[i])) {
+                        GTOreDictUnificator.registerOre(
                             this.getProcessingPrefix()[j] != null
-                                ? this.getProcessingPrefix()[j].get(GregTech_API.sGeneratedMaterials[i])
+                                ? this.getProcessingPrefix()[j].get(GregTechAPI.sGeneratedMaterials[i])
                                 : "",
                             new ItemStack(this, 1, i + (j * 1000)));
                         if (tHideOres) {
@@ -108,8 +108,8 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
         if (!FUCKING_LOCK) {
             FUCKING_LOCK = true;
             TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-            if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-                ((GT_TileEntity_Ores) tTileEntity).onUpdated();
+            if ((tTileEntity instanceof TileEntityOres)) {
+                ((TileEntityOres) tTileEntity).onUpdated();
             }
         }
         FUCKING_LOCK = false;
@@ -120,8 +120,8 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
         if (!FUCKING_LOCK) {
             FUCKING_LOCK = true;
             TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-            if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-                ((GT_TileEntity_Ores) tTileEntity).onUpdated();
+            if ((tTileEntity instanceof TileEntityOres)) {
+                ((TileEntityOres) tTileEntity).onUpdated();
             }
         }
         FUCKING_LOCK = false;
@@ -147,12 +147,12 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
         }
 
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if (!(tTileEntity instanceof GT_TileEntity_Ores)) {
+        if (!(tTileEntity instanceof TileEntityOres)) {
             return false;
         }
 
-        boolean tNatural = (((GT_TileEntity_Ores) tTileEntity).mNatural = !((GT_TileEntity_Ores) tTileEntity).mNatural);
-        GT_Utility.sendChatToPlayer(aPlayer, "Ore \"mNatural\" flag set to: " + tNatural);
+        boolean tNatural = (((TileEntityOres) tTileEntity).mNatural = !((TileEntityOres) tTileEntity).mNatural);
+        GTUtility.sendChatToPlayer(aPlayer, "Ore \"mNatural\" flag set to: " + tNatural);
         return true;
     }
 
@@ -205,10 +205,10 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
 
     @Override
     public int getRenderType() {
-        if (GT_Renderer_Block.INSTANCE == null) {
+        if (GTRendererBlock.INSTANCE == null) {
             return super.getRenderType();
         }
-        return GT_Renderer_Block.INSTANCE.mRenderID;
+        return GTRendererBlock.INSTANCE.mRenderID;
     }
 
     @Override
@@ -250,7 +250,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     @Override
     @SideOnly(Side.CLIENT)
     public boolean addHitEffects(World worldObj, MovingObjectPosition target, EffectRenderer effectRenderer) {
-        GT_Renderer_Block
+        GTRendererBlock
             .addHitEffects(effectRenderer, this, worldObj, target.blockX, target.blockY, target.blockZ, target.sideHit);
         return true;
     }
@@ -258,15 +258,15 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     @Override
     @SideOnly(Side.CLIENT)
     public boolean addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) {
-        GT_Renderer_Block.addDestroyEffects(effectRenderer, this, world, x, y, z);
+        GTRendererBlock.addDestroyEffects(effectRenderer, this, world, x, y, z);
         return true;
     }
 
     @Override
     public int getDamageValue(World aWorld, int aX, int aY, int aZ) {
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if (((tTileEntity instanceof GT_TileEntity_Ores))) {
-            return ((GT_TileEntity_Ores) tTileEntity).getMetaData();
+        if (((tTileEntity instanceof TileEntityOres))) {
+            return ((TileEntityOres) tTileEntity).getMetaData();
         }
         return 0;
     }
@@ -274,8 +274,8 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     @Override
     public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetadata) {
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-            mTemporaryTileEntity.set((GT_TileEntity_Ores) tTileEntity);
+        if ((tTileEntity instanceof TileEntityOres)) {
+            mTemporaryTileEntity.set((TileEntityOres) tTileEntity);
         }
         super.breakBlock(aWorld, aX, aY, aZ, aBlock, aMetadata);
         aWorld.removeTileEntity(aX, aY, aZ);
@@ -293,8 +293,8 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     @Override
     public ArrayList<ItemStack> getDrops(World aWorld, int aX, int aY, int aZ, int aMeta, int aFortune) {
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-            return ((GT_TileEntity_Ores) tTileEntity).getDrops(getDroppedBlock(), aFortune);
+        if ((tTileEntity instanceof TileEntityOres)) {
+            return ((TileEntityOres) tTileEntity).getDrops(getDroppedBlock(), aFortune);
         }
         return mTemporaryTileEntity.get() == null ? new ArrayList<>()
             : mTemporaryTileEntity.get()
@@ -303,7 +303,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
 
     @Override
     public TileEntity createTileEntity(World aWorld, int aMeta) {
-        return new GT_TileEntity_Ores();
+        return new TileEntityOres();
     }
 
     public abstract ITexture[] getTextureSet(); // Must have 16 entries.
@@ -311,8 +311,8 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(Item aItem, CreativeTabs aTab, List<ItemStack> aList) {
-        for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) {
-            Materials tMaterial = GregTech_API.sGeneratedMaterials[i];
+        for (int i = 0; i < GregTechAPI.sGeneratedMaterials.length; i++) {
+            Materials tMaterial = GregTechAPI.sGeneratedMaterials[i];
             if ((tMaterial != null) && ((tMaterial.mTypes & 0x8) != 0) && !aBlockedOres.contains(tMaterial)) {
                 for (int meta = i; meta < 23000 + i; meta += 1000) {
                     if (!(new ItemStack(aItem, 1, meta).getDisplayName()
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java b/src/main/java/gregtech/common/blocks/BlockReinforced.java
index a78fe5b70d..034d18e62e 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java
+++ b/src/main/java/gregtech/common/blocks/BlockReinforced.java
@@ -24,40 +24,40 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
-import gregtech.api.items.GT_Generic_Block;
+import gregtech.api.items.GTGenericBlock;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
 import gregtech.api.util.WorldSpawnedEventBuilder;
 
-public class GT_Block_Reinforced extends GT_Generic_Block {
+public class BlockReinforced extends GTGenericBlock {
 
-    public GT_Block_Reinforced(String aName) {
-        super(GT_Item_Storage.class, aName, new GT_Material_Reinforced());
+    public BlockReinforced(String aName) {
+        super(ItemStorage.class, aName, new MaterialReinforced());
         for (int i = 0; i < 16; i++) {
             Textures.BlockIcons.casingTexturePages[1][i + 80] = TextureFactory.of(this, i);
         }
         setStepSound(soundTypeStone);
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Bronzeplate Reinforced Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Iridium Reinforced Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Plascrete Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Tungstensteel Reinforced Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Brittle Charcoal");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Powderbarrel");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Solid Super Fuel");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Magic Solid Super Fuel");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Steel Reinforced Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Titanium Reinforced Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Naquadah Reinforced Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Neutronium Reinforced Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Raw Deep Dark Portal Block");
+        setCreativeTab(GregTechAPI.TAB_GREGTECH);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Bronzeplate Reinforced Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Iridium Reinforced Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Plascrete Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Tungstensteel Reinforced Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Brittle Charcoal");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Powderbarrel");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Solid Super Fuel");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Magic Solid Super Fuel");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Steel Reinforced Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Titanium Reinforced Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Naquadah Reinforced Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Neutronium Reinforced Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Raw Deep Dark Portal Block");
         ItemList.Block_BronzePlate.set(
             new ItemStack(
                 this.setHardness(60.0f)
@@ -136,12 +136,12 @@ public class GT_Block_Reinforced extends GT_Generic_Block {
                     .setResistance(5000.0f),
                 1,
                 12));
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Items.coal, 1, 1),
             new Object[] { ItemList.Block_BrittleCharcoal.get(1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Block_Powderbarrel.get(1L),
-            GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "WSW", "GGG", "WGW", 'W', OrePrefixes.plate.get(Materials.Wood), 'G',
                 new ItemStack(Items.gunpowder, 1), 'S', new ItemStack(Items.string, 1) });
     }
diff --git a/src/main/java/gregtech/common/blocks/BlockStones.java b/src/main/java/gregtech/common/blocks/BlockStones.java
new file mode 100644
index 0000000000..895a103016
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/BlockStones.java
@@ -0,0 +1,62 @@
+package gregtech.common.blocks;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
+
+public class BlockStones extends BlockStonesAbstract {
+
+    public BlockStones() {
+        super(ItemGranites.class, "gt.blockstones");
+        setResistance(60.0F);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Marble");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Marble Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mossy Marble Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Marble Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Cracked Marble Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Mossy Marble Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Chiseled Marble");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Smooth Marble");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Basalt");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Basalt Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Mossy Basalt Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Basalt Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cracked Basalt Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Mossy Basalt Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chiseled Basalt");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Smooth Basalt");
+        for (int i = 0; i < 16; i++) {
+            GTOreDictUnificator
+                .registerOre(OrePrefixes.stone, i < 8 ? Materials.Marble : Materials.Basalt, new ItemStack(this, 1, i));
+            GTOreDictUnificator
+                .registerOre(OrePrefixes.block, i < 8 ? Materials.Marble : Materials.Basalt, new ItemStack(this, 1, i));
+            GTOreDictUnificator.registerOre(
+                (i < 8 ? Materials.Marble.mName.toLowerCase() : Materials.Basalt.mName.toLowerCase()),
+                new ItemStack(this, 1, i));
+        }
+    }
+
+    @Override
+    public int getHarvestLevel(int aMeta) {
+        return 2;
+    }
+
+    @Override
+    public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
+        return this.blockHardness = Blocks.stone.getBlockHardness(aWorld, aX, aY, aZ) * 3.0F;
+    }
+
+    @Override
+    public IIcon getIcon(int ordinalSide, int aMeta) {
+        if ((aMeta >= 0) && (aMeta < 16)) {
+            return gregtech.api.enums.Textures.BlockIcons.STONES[aMeta].getIcon();
+        }
+        return gregtech.api.enums.Textures.BlockIcons.STONES[0].getIcon();
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java b/src/main/java/gregtech/common/blocks/BlockStonesAbstract.java
index 4a5bb9456e..3d8c4e9feb 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/BlockStonesAbstract.java
@@ -3,8 +3,8 @@ package gregtech.common.blocks;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import java.util.List;
 
@@ -23,23 +23,23 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OreDictNames;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IOreRecipeRegistrator;
-import gregtech.api.items.GT_Generic_Block;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.GTGenericBlock;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 
-public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRecipeRegistrator {
+public class BlockStonesAbstract extends GTGenericBlock implements IOreRecipeRegistrator {
 
-    public GT_Block_Stones_Abstract(Class<? extends ItemBlock> aItemClass, String aName) {
+    public BlockStonesAbstract(Class<? extends ItemBlock> aItemClass, String aName) {
         super(aItemClass, aName, Material.rock);
         OrePrefixes.crafting.add(this);
         setStepSound(soundTypeStone);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
 
         this.registerSmeltingRecipes();
         this.registerAssemblerRecipes();
@@ -49,34 +49,34 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe
     }
 
     private void registerSmeltingRecipes() {
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 0), new ItemStack(this, 1, 7));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 1), new ItemStack(this, 1, 0));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 2), new ItemStack(this, 1, 0));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 3), new ItemStack(this, 1, 0));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 4), new ItemStack(this, 1, 0));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 5), new ItemStack(this, 1, 0));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 6), new ItemStack(this, 1, 0));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 7), new ItemStack(this, 1, 0));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 8), new ItemStack(this, 1, 15));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 9), new ItemStack(this, 1, 8));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 10), new ItemStack(this, 1, 8));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 11), new ItemStack(this, 1, 8));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 12), new ItemStack(this, 1, 8));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 13), new ItemStack(this, 1, 8));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 14), new ItemStack(this, 1, 8));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 15), new ItemStack(this, 1, 8));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 0), new ItemStack(this, 1, 7));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 1), new ItemStack(this, 1, 0));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 2), new ItemStack(this, 1, 0));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 3), new ItemStack(this, 1, 0));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 4), new ItemStack(this, 1, 0));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 5), new ItemStack(this, 1, 0));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 6), new ItemStack(this, 1, 0));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 7), new ItemStack(this, 1, 0));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 8), new ItemStack(this, 1, 15));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 9), new ItemStack(this, 1, 8));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 10), new ItemStack(this, 1, 8));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 11), new ItemStack(this, 1, 8));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 12), new ItemStack(this, 1, 8));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 13), new ItemStack(this, 1, 8));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 14), new ItemStack(this, 1, 8));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 15), new ItemStack(this, 1, 8));
 
     }
 
     private void registerAssemblerRecipes() {
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(this, 1, 0), GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(this, 1, 0), GTUtility.getIntegratedCircuit(4))
             .itemOutputs(new ItemStack(this, 1, 3))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(4)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(this, 1, 8), GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(this, 1, 8), GTUtility.getIntegratedCircuit(4))
             .itemOutputs(new ItemStack(this, 1, 11))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(4)
@@ -84,71 +84,71 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe
     }
 
     private void registerCraftingRecipes() {
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 1, 6),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "f", "X", 'X', new ItemStack(this, 1, 7) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 1, 14),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "f", "X", 'X', new ItemStack(this, 1, 15) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 1, 4),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "h", "X", 'X', new ItemStack(this, 1, 3) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 1, 12),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "h", "X", 'X', new ItemStack(this, 1, 11) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 1, 1),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "h", "X", 'X', new ItemStack(this, 1, 0) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 1, 9),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "h", "X", 'X', new ItemStack(this, 1, 8) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 4, 3),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "XX", "XX", 'X', new ItemStack(this, 4, 0) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 4, 11),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "XX", "XX", 'X', new ItemStack(this, 4, 8) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 4, 3),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "XX", "XX", 'X', new ItemStack(this, 4, 7) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 4, 11),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "XX", "XX", 'X', new ItemStack(this, 4, 15) });
     }
 
     private void registerForgeHammerRecipes() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(this, 1, 3))
             .itemOutputs(new ItemStack(this, 1, 4))
             .duration(16 * TICKS)
             .eut(10)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(this, 1, 11))
             .itemOutputs(new ItemStack(this, 1, 12))
             .duration(16 * TICKS)
             .eut(10)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(this, 1, 0))
             .itemOutputs(new ItemStack(this, 1, 1))
             .duration(16 * TICKS)
             .eut(10)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(this, 1, 8))
             .itemOutputs(new ItemStack(this, 1, 9))
             .duration(16 * TICKS)
@@ -161,15 +161,15 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe
         ItemStack aStack) {
         if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) {
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(this, 1, 7), GT_Utility.copyAmount(0, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(this, 1, 7), GTUtility.copyAmount(0, aStack))
                 .itemOutputs(new ItemStack(this, 1, 6))
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
                 .addTo(laserEngraverRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(this, 1, 15), GT_Utility.copyAmount(0, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(this, 1, 15), GTUtility.copyAmount(0, aStack))
                 .itemOutputs(new ItemStack(this, 1, 14))
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Storage.java b/src/main/java/gregtech/common/blocks/BlockStorage.java
index ada3f01cde..1886d25d9b 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Storage.java
+++ b/src/main/java/gregtech/common/blocks/BlockStorage.java
@@ -17,15 +17,15 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
-import gregtech.api.items.GT_Generic_Block;
+import gregtech.api.GregTechAPI;
+import gregtech.api.items.GTGenericBlock;
 
-public class GT_Block_Storage extends GT_Generic_Block {
+public class BlockStorage extends GTGenericBlock {
 
-    protected GT_Block_Storage(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) {
+    protected BlockStorage(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) {
         super(aItemClass, aName, aMaterial);
         setStepSound(soundTypeMetal);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_TintedIndustrialGlass.java b/src/main/java/gregtech/common/blocks/BlockTintedIndustrialGlass.java
index 93c6ebb298..16a22e7c35 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_TintedIndustrialGlass.java
+++ b/src/main/java/gregtech/common/blocks/BlockTintedIndustrialGlass.java
@@ -12,17 +12,17 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_Block_TintedIndustrialGlass extends GT_Block_Casings_Abstract {
+public class BlockTintedIndustrialGlass extends BlockCasingsAbstract {
 
-    public GT_Block_TintedIndustrialGlass() {
-        super(GT_Item_Glass1.class, "gt.blocktintedglass", Material.glass, 4);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Tinted Industrial Glass (White)");
-        GT_LanguageManager
+    public BlockTintedIndustrialGlass() {
+        super(ItemGlass1.class, "gt.blocktintedglass", Material.glass, 4);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Tinted Industrial Glass (White)");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".1.name", "Tinted Industrial Glass (Light Gray)");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Tinted Industrial Glass (Gray)");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Tinted Industrial Glass (Black)");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Tinted Industrial Glass (Gray)");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Tinted Industrial Glass (Black)");
         ItemList.GlassTintedIndustrialWhite.set(new ItemStack(this, 1, 0));
         ItemList.GlassTintedIndustrialLightGray.set(new ItemStack(this, 1, 1));
         ItemList.GlassTintedIndustrialGray.set(new ItemStack(this, 1, 2));
diff --git a/src/main/java/gregtech/common/blocks/GT_WormholeRenderBlock.java b/src/main/java/gregtech/common/blocks/BlockWormholeRender.java
index 1c6e434477..7ae7615639 100644
--- a/src/main/java/gregtech/common/blocks/GT_WormholeRenderBlock.java
+++ b/src/main/java/gregtech/common/blocks/BlockWormholeRender.java
@@ -12,11 +12,11 @@ import net.minecraft.world.World;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.common.tileentities.render.TileWormhole;
+import gregtech.common.tileentities.render.TileEntityWormhole;
 
-public class GT_WormholeRenderBlock extends Block {
+public class BlockWormholeRender extends Block {
 
-    public GT_WormholeRenderBlock() {
+    public BlockWormholeRender() {
         super(Material.iron);
         this.setResistance(20f);
         this.setHardness(-1.0f);
@@ -59,7 +59,7 @@ public class GT_WormholeRenderBlock extends Block {
 
     @Override
     public TileEntity createTileEntity(World world, int metadata) {
-        return new TileWormhole();
+        return new TileEntityWormhole();
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Concretes.java b/src/main/java/gregtech/common/blocks/GT_Block_Concretes.java
deleted file mode 100644
index c7b7e2bb04..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Block_Concretes.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.interfaces.IBlockOnWalkOver;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
-
-public class GT_Block_Concretes extends GT_Block_Stones_Abstract implements IBlockOnWalkOver {
-
-    public GT_Block_Concretes() {
-        super(GT_Item_Concretes.class, "gt.blockconcretes");
-        setResistance(20.0F);
-        // this.slipperiness = 0.9F;
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Dark Concrete");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Dark Concrete Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mossy Dark Concrete Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Dark Concrete Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Cracked Dark Concrete Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Mossy Dark Concrete Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Chiseled Dark Concrete");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Smooth Dark Concrete");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Light Concrete");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Light Concrete Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Mossy Light Concrete Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Light Concrete Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cracked Light Concrete Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Mossy Light Concrete Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chiseled Light Concrete");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Smooth Light Concrete");
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 0));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 1));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 2));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 3));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 4));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 5));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 6));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 7));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 8));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 9));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 10));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 11));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 12));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 13));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 14));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 15));
-    }
-
-    @Override
-    public int getHarvestLevel(int aMeta) {
-        return 1;
-    }
-
-    @Override
-    public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
-        return this.blockHardness = Blocks.stone.getBlockHardness(aWorld, aX, aY, aZ);
-    }
-
-    @Override
-    public IIcon getIcon(int ordinalSide, int aMeta) {
-        if ((aMeta >= 0) && (aMeta < 16)) {
-            return gregtech.api.enums.Textures.BlockIcons.CONCRETES[aMeta].getIcon();
-        }
-        return gregtech.api.enums.Textures.BlockIcons.CONCRETES[0].getIcon();
-    }
-
-    @Override
-    public void onWalkOver(EntityLivingBase aEntity, World aWorld, int aX, int aY, int aZ) {
-        if ((aEntity.motionX != 0 || aEntity.motionZ != 0) && !aEntity.isInWater()
-            && !aEntity.isWet()
-            && !aEntity.isSneaking()) {
-            double tSpeed = (aWorld.getBlock(aX, aY - 1, aZ).slipperiness >= 0.8 ? 1.5 : 1.2);
-            aEntity.motionX *= tSpeed;
-            aEntity.motionZ *= tSpeed;
-        }
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Granites.java b/src/main/java/gregtech/common/blocks/GT_Block_Granites.java
deleted file mode 100644
index 69ebc2e733..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Block_Granites.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.boss.EntityWither;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
-
-public class GT_Block_Granites extends GT_Block_Stones_Abstract {
-
-    public GT_Block_Granites() {
-        super(GT_Item_Granites.class, "gt.blockgranites");
-        setResistance(60.0F);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Black Granite");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Black Granite Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mossy Black Granite Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Black Granite Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Cracked Black Granite Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Mossy Black Granite Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Chiseled Black Granite");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Smooth Black Granite");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Red Granite");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Red Granite Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Mossy Red Granite Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Red Granite Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cracked Red Granite Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Mossy Red Granite Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chiseled Red Granite");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Smooth Red Granite");
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 0));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 1));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 2));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 3));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 4));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 5));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 6));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 7));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 8));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 9));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 10));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 11));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 12));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 13));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 14));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 15));
-    }
-
-    @Override
-    public int getHarvestLevel(int aMeta) {
-        return 3;
-    }
-
-    @Override
-    public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
-        return this.blockHardness = Blocks.stone.getBlockHardness(aWorld, aX, aY, aZ) * 3.0F;
-    }
-
-    @Override
-    public IIcon getIcon(int ordinalSide, int aMeta) {
-        if ((aMeta >= 0) && (aMeta < 16)) {
-            return gregtech.api.enums.Textures.BlockIcons.GRANITES[aMeta].getIcon();
-        }
-        return gregtech.api.enums.Textures.BlockIcons.GRANITES[0].getIcon();
-    }
-
-    @Override
-    public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) {
-        return !(entity instanceof EntityWither);
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Stones.java b/src/main/java/gregtech/common/blocks/GT_Block_Stones.java
deleted file mode 100644
index 4ca52aee56..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Block_Stones.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
-
-public class GT_Block_Stones extends GT_Block_Stones_Abstract {
-
-    public GT_Block_Stones() {
-        super(GT_Item_Granites.class, "gt.blockstones");
-        setResistance(60.0F);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Marble");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Marble Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mossy Marble Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Marble Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Cracked Marble Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Mossy Marble Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Chiseled Marble");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Smooth Marble");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Basalt");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Basalt Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Mossy Basalt Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Basalt Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cracked Basalt Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Mossy Basalt Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chiseled Basalt");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Smooth Basalt");
-        for (int i = 0; i < 16; i++) {
-            GT_OreDictUnificator
-                .registerOre(OrePrefixes.stone, i < 8 ? Materials.Marble : Materials.Basalt, new ItemStack(this, 1, i));
-            GT_OreDictUnificator
-                .registerOre(OrePrefixes.block, i < 8 ? Materials.Marble : Materials.Basalt, new ItemStack(this, 1, i));
-            GT_OreDictUnificator.registerOre(
-                (i < 8 ? Materials.Marble.mName.toLowerCase() : Materials.Basalt.mName.toLowerCase()),
-                new ItemStack(this, 1, i));
-        }
-    }
-
-    @Override
-    public int getHarvestLevel(int aMeta) {
-        return 2;
-    }
-
-    @Override
-    public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
-        return this.blockHardness = Blocks.stone.getBlockHardness(aWorld, aX, aY, aZ) * 3.0F;
-    }
-
-    @Override
-    public IIcon getIcon(int ordinalSide, int aMeta) {
-        if ((aMeta >= 0) && (aMeta < 16)) {
-            return gregtech.api.enums.Textures.BlockIcons.STONES[aMeta].getIcon();
-        }
-        return gregtech.api.enums.Textures.BlockIcons.STONES[0].getIcon();
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Cyclotron_Item_Casings.java b/src/main/java/gregtech/common/blocks/GT_Cyclotron_Item_Casings.java
deleted file mode 100644
index f1ca45a805..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Cyclotron_Item_Casings.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.block.Block;
-
-public class GT_Cyclotron_Item_Casings extends GT_Item_Casings_Abstract {
-
-    public GT_Cyclotron_Item_Casings(Block block) {
-        super(block);
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings10.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings10.java
deleted file mode 100644
index 519549ce6b..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings10.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.block.Block;
-
-/**
- * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
- * 16 subtypes at most.
- */
-public class GT_Item_Casings10 extends GT_Item_Casings_Abstract {
-
-    public GT_Item_Casings10(Block block) {
-        super(block);
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings11.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings11.java
deleted file mode 100644
index 2941022b9c..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings11.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.block.Block;
-
-/**
- * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
- * 16 subtypes at most.
- */
-public class GT_Item_Casings11 extends GT_Item_Casings_Abstract {
-
-    public GT_Item_Casings11(Block block) {
-        super(block);
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java
deleted file mode 100644
index e3f3bbdf97..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.block.Block;
-
-/**
- * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
- * 16 subtypes at most.
- */
-public class GT_Item_Casings8 extends GT_Item_Casings_Abstract {
-
-    public GT_Item_Casings8(Block block) {
-        super(block);
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Granites.java b/src/main/java/gregtech/common/blocks/GT_Item_Granites.java
deleted file mode 100644
index 6e3eb8f12c..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Item_Granites.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.block.Block;
-
-public class GT_Item_Granites extends GT_Item_Stones_Abstract {
-
-    public GT_Item_Granites(Block block) {
-        super(block);
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_TintedIndustrialGlass.java b/src/main/java/gregtech/common/blocks/GT_Item_TintedIndustrialGlass.java
deleted file mode 100644
index 9f633922ac..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Item_TintedIndustrialGlass.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.block.Block;
-
-public class GT_Item_TintedIndustrialGlass extends GT_Item_Casings_Abstract {
-
-    public GT_Item_TintedIndustrialGlass(Block block) {
-        super(block);
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Block_Laser.java b/src/main/java/gregtech/common/blocks/ItemBlockLaser.java
index db4f6ddddc..c8b4d4ce06 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Block_Laser.java
+++ b/src/main/java/gregtech/common/blocks/ItemBlockLaser.java
@@ -7,18 +7,18 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_Item_Block_Laser extends ItemBlock {
+public class ItemBlockLaser extends ItemBlock {
 
-    public GT_Item_Block_Laser(Block block) {
+    public ItemBlockLaser(Block block) {
         super(block);
     }
 
     @Override
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean f3_h) {
         tooltip.add(
-            GT_LanguageManager
+            GTLanguageManager
                 .addStringLocalization("gt.laserplatingtooltip", "Engineered to withstand extreme temperatures"));
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings3.java b/src/main/java/gregtech/common/blocks/ItemCasings1.java
index 861774d96f..ad1c8c09e1 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings3.java
+++ b/src/main/java/gregtech/common/blocks/ItemCasings1.java
@@ -6,9 +6,9 @@ import net.minecraft.block.Block;
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Item_Casings3 extends GT_Item_Casings_Abstract {
+public class ItemCasings1 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings3(Block block) {
+    public ItemCasings1(Block block) {
         super(block);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java b/src/main/java/gregtech/common/blocks/ItemCasings10.java
index e2badca2cb..0931987cd4 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java
+++ b/src/main/java/gregtech/common/blocks/ItemCasings10.java
@@ -6,9 +6,9 @@ import net.minecraft.block.Block;
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Item_Casings4 extends GT_Item_Casings_Abstract {
+public class ItemCasings10 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings4(Block block) {
+    public ItemCasings10(Block block) {
         super(block);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java b/src/main/java/gregtech/common/blocks/ItemCasings11.java
index 1a86a2e534..5cae92a55d 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
+++ b/src/main/java/gregtech/common/blocks/ItemCasings11.java
@@ -6,9 +6,9 @@ import net.minecraft.block.Block;
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Item_Casings1 extends GT_Item_Casings_Abstract {
+public class ItemCasings11 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings1(Block block) {
+    public ItemCasings11(Block block) {
         super(block);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java b/src/main/java/gregtech/common/blocks/ItemCasings2.java
index f98c169c7f..b0981c0dc3 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java
+++ b/src/main/java/gregtech/common/blocks/ItemCasings2.java
@@ -10,9 +10,9 @@ import net.minecraft.item.ItemStack;
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Item_Casings2 extends GT_Item_Casings_Abstract {
+public class ItemCasings2 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings2(Block block) {
+    public ItemCasings2(Block block) {
         super(block);
     }
 
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java b/src/main/java/gregtech/common/blocks/ItemCasings3.java
index af533acfa8..737c9e5145 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java
+++ b/src/main/java/gregtech/common/blocks/ItemCasings3.java
@@ -6,9 +6,9 @@ import net.minecraft.block.Block;
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Item_Casings6 extends GT_Item_Casings_Abstract {
+public class ItemCasings3 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings6(Block block) {
+    public ItemCasings3(Block block) {
         super(block);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/ItemCasings4.java b/src/main/java/gregtech/common/blocks/ItemCasings4.java
new file mode 100644
index 0000000000..97d160105a
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/ItemCasings4.java
@@ -0,0 +1,14 @@
+package gregtech.common.blocks;
+
+import net.minecraft.block.Block;
+
+/**
+ * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
+ * 16 subtypes at most.
+ */
+public class ItemCasings4 extends ItemCasingsAbstract {
+
+    public ItemCasings4(Block block) {
+        super(block);
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java b/src/main/java/gregtech/common/blocks/ItemCasings5.java
index 3b3ab68cb1..4192fb2a64 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
+++ b/src/main/java/gregtech/common/blocks/ItemCasings5.java
@@ -9,28 +9,28 @@ import net.minecraft.item.ItemStack;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.HeatingCoilLevel;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Item_Casings5 extends GT_Item_Casings_Abstract {
+public class ItemCasings5 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings5(Block block) {
+    public ItemCasings5(Block block) {
         super(block);
     }
 
-    protected static final String mCoilHeatTooltip = GT_LanguageManager
+    protected static final String mCoilHeatTooltip = GTLanguageManager
         .addStringLocalization("gt.coilheattooltip", "Base Heating Capacity = ");
-    protected static final String mCoilUnitTooltip = GT_LanguageManager
+    protected static final String mCoilUnitTooltip = GTLanguageManager
         .addStringLocalization("gt.coilunittooltip", " Kelvin");
 
     @Override
     @SideOnly(Side.CLIENT)
     public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) {
         super.addInformation(aStack, aPlayer, aList, aF3_H);
-        HeatingCoilLevel coilLevel = GT_Block_Casings5.getCoilHeatFromDamage(aStack.getItemDamage());
+        HeatingCoilLevel coilLevel = BlockCasings5.getCoilHeatFromDamage(aStack.getItemDamage());
         aList.add(mCoilHeatTooltip + coilLevel.getHeat() + mCoilUnitTooltip);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/ItemCasings6.java b/src/main/java/gregtech/common/blocks/ItemCasings6.java
new file mode 100644
index 0000000000..36a25f7796
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/ItemCasings6.java
@@ -0,0 +1,14 @@
+package gregtech.common.blocks;
+
+import net.minecraft.block.Block;
+
+/**
+ * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
+ * 16 subtypes at most.
+ */
+public class ItemCasings6 extends ItemCasingsAbstract {
+
+    public ItemCasings6(Block block) {
+        super(block);
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/ItemCasings8.java b/src/main/java/gregtech/common/blocks/ItemCasings8.java
new file mode 100644
index 0000000000..7183d78986
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/ItemCasings8.java
@@ -0,0 +1,14 @@
+package gregtech.common.blocks;
+
+import net.minecraft.block.Block;
+
+/**
+ * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
+ * 16 subtypes at most.
+ */
+public class ItemCasings8 extends ItemCasingsAbstract {
+
+    public ItemCasings8(Block block) {
+        super(block);
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings9.java b/src/main/java/gregtech/common/blocks/ItemCasings9.java
index e9b39ee2cd..c4ae95a2f7 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings9.java
+++ b/src/main/java/gregtech/common/blocks/ItemCasings9.java
@@ -6,9 +6,9 @@ import net.minecraft.block.Block;
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Item_Casings9 extends GT_Item_Casings_Abstract {
+public class ItemCasings9 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings9(Block block) {
+    public ItemCasings9(Block block) {
         super(block);
     }
 
@@ -16,7 +16,7 @@ public class GT_Item_Casings9 extends GT_Item_Casings_Abstract {
      * @Override
      * public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) {
      * // Add tooltip info if it was given
-     * String localizedTooltip = GT_LanguageManager.getTranslation(aStack.getUnlocalizedName() + ".tooltip");
+     * String localizedTooltip = GTLanguageManager.getTranslation(aStack.getUnlocalizedName() + ".tooltip");
      * // getTranslation returns the key if no translation was found, but this just means
      * // no tooltip was set.
      * if (localizedTooltip.startsWith("gt.")) {
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/ItemCasingsAbstract.java
index 46b0aba237..577b1fb821 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/ItemCasingsAbstract.java
@@ -7,41 +7,41 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTLanguageManager;
 
-public abstract class GT_Item_Casings_Abstract extends ItemBlock {
+public abstract class ItemCasingsAbstract extends ItemBlock {
 
-    protected final String mNoMobsToolTip = GT_LanguageManager
+    protected final String mNoMobsToolTip = GTLanguageManager
         .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block");
-    protected final String mNoTileEntityToolTip = GT_LanguageManager
+    protected final String mNoTileEntityToolTip = GTLanguageManager
         .addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!");
-    protected final String mCoil01Tooltip = GT_LanguageManager
+    protected final String mCoil01Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil01tooltip", "Base Heating Capacity = 1800 Kelvin");
-    protected final String mCoil02Tooltip = GT_LanguageManager
+    protected final String mCoil02Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil02tooltip", "Base Heating Capacity = 2700 Kelvin");
-    protected final String mCoil03Tooltip = GT_LanguageManager
+    protected final String mCoil03Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil03tooltip", "Base Heating Capacity = 3600 Kelvin");
-    protected final String mCoil04Tooltip = GT_LanguageManager
+    protected final String mCoil04Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil04tooltip", "Base Heating Capacity = 4500 Kelvin");
-    protected final String mCoil05Tooltip = GT_LanguageManager
+    protected final String mCoil05Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil05tooltip", "Base Heating Capacity = 5400 Kelvin");
-    protected final String mCoil06Tooltip = GT_LanguageManager
+    protected final String mCoil06Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil06tooltip", "Base Heating Capacity = 7200 Kelvin");
-    protected final String mCoil07Tooltip = GT_LanguageManager
+    protected final String mCoil07Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil07tooltip", "Base Heating Capacity = 9001 Kelvin");
-    protected final String mCoil08Tooltip = GT_LanguageManager
+    protected final String mCoil08Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil08tooltip", "Base Heating Capacity = 9900 Kelvin");
-    protected final String mCoil09Tooltip = GT_LanguageManager
+    protected final String mCoil09Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil09tooltip", "Base Heating Capacity = 10800 Kelvin");
-    protected final String mBlastProofTooltip = GT_LanguageManager
+    protected final String mBlastProofTooltip = GTLanguageManager
         .addStringLocalization("gt.blastprooftooltip", "This Block is Blast Proof");
 
-    public GT_Item_Casings_Abstract(Block block) {
+    public ItemCasingsAbstract(Block block) {
         super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java b/src/main/java/gregtech/common/blocks/ItemConcretes.java
index 44c094aa41..64f778d5d4 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java
+++ b/src/main/java/gregtech/common/blocks/ItemConcretes.java
@@ -6,14 +6,14 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_Item_Concretes extends GT_Item_Stones_Abstract {
+public class ItemConcretes extends ItemStonesAbstract {
 
-    private final String mRunFasterToolTip = GT_LanguageManager
+    private final String mRunFasterToolTip = GTLanguageManager
         .addStringLocalization("gt.runfastertooltip", "You can walk faster on this Block");
 
-    public GT_Item_Concretes(Block block) {
+    public ItemConcretes(Block block) {
         super(block);
     }
 
diff --git a/src/main/java/gregtech/common/blocks/ItemCyclotronCasings.java b/src/main/java/gregtech/common/blocks/ItemCyclotronCasings.java
new file mode 100644
index 0000000000..febd101e0f
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/ItemCyclotronCasings.java
@@ -0,0 +1,10 @@
+package gregtech.common.blocks;
+
+import net.minecraft.block.Block;
+
+public class ItemCyclotronCasings extends ItemCasingsAbstract {
+
+    public ItemCyclotronCasings(Block block) {
+        super(block);
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Frames.java b/src/main/java/gregtech/common/blocks/ItemFrames.java
index 002e19f5a6..daa6ca2d2e 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Frames.java
+++ b/src/main/java/gregtech/common/blocks/ItemFrames.java
@@ -7,17 +7,17 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_Item_Frames extends ItemBlock {
+public class ItemFrames extends ItemBlock {
 
-    public GT_Item_Frames(Block block) {
+    public ItemFrames(Block block) {
         super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
     }
 
     private Block block() {
@@ -34,7 +34,7 @@ public class GT_Item_Frames extends ItemBlock {
     @Override
     public String getItemStackDisplayName(ItemStack aStack) {
         String aName = super.getItemStackDisplayName(aStack);
-        if (this.block() instanceof GT_Block_FrameBox) {
+        if (this.block() instanceof BlockFrameBox) {
             aName = Materials.getLocalizedNameForItem(aName, aStack.getItemDamage());
         }
         return aName;
@@ -43,14 +43,14 @@ public class GT_Item_Frames extends ItemBlock {
     @Override
     public int getColorFromItemStack(ItemStack aStack, int aPass) {
         int meta = aStack.getItemDamage();
-        Materials material = GT_Block_FrameBox.getMaterial(meta);
+        Materials material = BlockFrameBox.getMaterial(meta);
         return (material.mRGBa[0] << 16) | (material.mRGBa[1] << 8) | material.mRGBa[2];
     }
 
     @Override
     public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) {
-        aList.add(GT_LanguageManager.getTranslation("gt.blockframes." + aStack.getItemDamage() + ".tooltip"));
-        aList.add(GT_LanguageManager.getTranslation("gt.blockmachines.gt_frame.desc.format"));
+        aList.add(GTLanguageManager.getTranslation("gt.blockframes." + aStack.getItemDamage() + ".tooltip"));
+        aList.add(GTLanguageManager.getTranslation("gt.blockmachines.gt_frame.desc.format"));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Glass1.java b/src/main/java/gregtech/common/blocks/ItemGlass1.java
index e8d0b6c236..5605bba48d 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Glass1.java
+++ b/src/main/java/gregtech/common/blocks/ItemGlass1.java
@@ -6,23 +6,23 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The glass types are split into separate files because they are registered as regular blocks, and a regular block can
  * have
  * 16 subtypes at most.
  */
-public class GT_Item_Glass1 extends GT_Item_Casings_Abstract {
+public class ItemGlass1 extends ItemCasingsAbstract {
 
-    protected final String chemicalGlassTooltip = GT_LanguageManager.addStringLocalization(
+    protected final String chemicalGlassTooltip = GTLanguageManager.addStringLocalization(
         getUnlocalizedName() + ".0.tooltip",
         "Able to resist the most extreme chemical conditions.");
-    protected final String hawkingGlassTooltip = GT_LanguageManager.addStringLocalization(
+    protected final String hawkingGlassTooltip = GTLanguageManager.addStringLocalization(
         getUnlocalizedName() + ".4.tooltip",
         "Controls the outward flow of Hawking Radiation to stabilize a black hole.");
 
-    public GT_Item_Glass1(Block block) {
+    public ItemGlass1(Block block) {
         super(block);
     }
 
diff --git a/src/main/java/gregtech/common/blocks/ItemGranites.java b/src/main/java/gregtech/common/blocks/ItemGranites.java
new file mode 100644
index 0000000000..090ebc2a5a
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/ItemGranites.java
@@ -0,0 +1,10 @@
+package gregtech.common.blocks;
+
+import net.minecraft.block.Block;
+
+public class ItemGranites extends ItemStonesAbstract {
+
+    public ItemGranites(Block block) {
+        super(block);
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java b/src/main/java/gregtech/common/blocks/ItemLongDistancePipe.java
index 52d0db5165..55f5c2c768 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java
+++ b/src/main/java/gregtech/common/blocks/ItemLongDistancePipe.java
@@ -7,21 +7,21 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_Item_LongDistancePipe extends ItemBlock {
+public class ItemLongDistancePipe extends ItemBlock {
 
-    protected final String mNoMobsToolTip = GT_LanguageManager
+    protected final String mNoMobsToolTip = GTLanguageManager
         .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block");
-    protected final String mNoTileEntityToolTip = GT_LanguageManager
+    protected final String mNoTileEntityToolTip = GTLanguageManager
         .addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!");
 
-    public GT_Item_LongDistancePipe(Block block) {
+    public ItemLongDistancePipe(Block block) {
         super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/ItemMachines.java
index 059a3fda94..ff031c8456 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
+++ b/src/main/java/gregtech/common/blocks/ItemMachines.java
@@ -1,6 +1,6 @@
 package gregtech.common.blocks;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 
 import java.util.List;
 
@@ -26,7 +26,7 @@ import net.minecraftforge.fluids.IFluidContainerItem;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.ISecondaryDescribable;
@@ -34,44 +34,44 @@ import gregtech.api.interfaces.metatileentity.IConnectable;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.CoverableTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Item;
-import gregtech.api.util.GT_ItsNotMyFaultException;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalTankBase;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperChest;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperTank;
+import gregtech.api.metatileentity.implementations.MTECable;
+import gregtech.api.metatileentity.implementations.MTEFluid;
+import gregtech.api.metatileentity.implementations.MTEFrame;
+import gregtech.api.metatileentity.implementations.MTEItem;
+import gregtech.api.util.GTItsNotMyFaultException;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
+import gregtech.common.tileentities.storage.MTEDigitalTankBase;
+import gregtech.common.tileentities.storage.MTESuperChest;
+import gregtech.common.tileentities.storage.MTESuperTank;
 
-public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
+public class ItemMachines extends ItemBlock implements IFluidContainerItem {
 
-    public GT_Item_Machines(Block block) {
+    public ItemMachines(Block block) {
         super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH);
     }
 
     public static IMetaTileEntity getMetaTileEntity(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return null;
-        if (!(aStack.getItem() instanceof GT_Item_Machines)) return null;
-        if (aStack.getItemDamage() < 0 || aStack.getItemDamage() > GregTech_API.METATILEENTITIES.length) return null;
-        return GregTech_API.METATILEENTITIES[aStack.getItemDamage()];
+        if (GTUtility.isStackInvalid(aStack)) return null;
+        if (!(aStack.getItem() instanceof ItemMachines)) return null;
+        if (aStack.getItemDamage() < 0 || aStack.getItemDamage() > GregTechAPI.METATILEENTITIES.length) return null;
+        return GregTechAPI.METATILEENTITIES[aStack.getItemDamage()];
     }
 
     @Override
     public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) {
         try {
             final int tDamage = getDamage(aStack);
-            if ((tDamage <= 0) || (tDamage >= GregTech_API.METATILEENTITIES.length)) {
+            if ((tDamage <= 0) || (tDamage >= GregTechAPI.METATILEENTITIES.length)) {
                 return;
             }
 
-            if (GregTech_API.METATILEENTITIES[tDamage] != null) {
-                final IGregTechTileEntity tTileEntity = GregTech_API.METATILEENTITIES[tDamage].getBaseMetaTileEntity();
-                if (!GregTech_API.sPostloadFinished
+            if (GregTechAPI.METATILEENTITIES[tDamage] != null) {
+                final IGregTechTileEntity tTileEntity = GregTechAPI.METATILEENTITIES[tDamage].getBaseMetaTileEntity();
+                if (!GregTechAPI.sPostloadFinished
                     && tTileEntity.getMetaTileEntity() instanceof ISecondaryDescribable) {
                     final String[] tSecondaryDescription = ((ISecondaryDescribable) tTileEntity.getMetaTileEntity())
                         .getSecondaryDescription();
@@ -87,40 +87,40 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
                 }
                 if (tTileEntity.getEUCapacity() > 0L) {
                     if (tTileEntity.getInputVoltage() > 0L) {
-                        final byte inputTier = GT_Utility.getTier(tTileEntity.getInputVoltage());
+                        final byte inputTier = GTUtility.getTier(tTileEntity.getInputVoltage());
                         aList.add(
-                            GT_LanguageManager.addStringLocalization("TileEntity_EUp_IN", "Voltage IN: ")
+                            GTLanguageManager.addStringLocalization("TileEntity_EUp_IN", "Voltage IN: ")
                                 + EnumChatFormatting.GREEN
-                                + GT_Utility.formatNumbers(tTileEntity.getInputVoltage())
+                                + GTUtility.formatNumbers(tTileEntity.getInputVoltage())
                                 + " ("
-                                + GT_Utility.getColoredTierNameFromTier(inputTier)
+                                + GTUtility.getColoredTierNameFromTier(inputTier)
                                 + EnumChatFormatting.GREEN
                                 + ")"
                                 + EnumChatFormatting.GRAY);
                     }
                     if (tTileEntity.getOutputVoltage() > 0L) {
-                        final byte outputTier = GT_Utility.getTier(tTileEntity.getOutputVoltage());
+                        final byte outputTier = GTUtility.getTier(tTileEntity.getOutputVoltage());
                         aList.add(
-                            GT_LanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Voltage OUT: ")
+                            GTLanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Voltage OUT: ")
                                 + EnumChatFormatting.GREEN
-                                + GT_Utility.formatNumbers(tTileEntity.getOutputVoltage())
+                                + GTUtility.formatNumbers(tTileEntity.getOutputVoltage())
                                 + " ("
-                                + GT_Utility.getColoredTierNameFromTier(outputTier)
+                                + GTUtility.getColoredTierNameFromTier(outputTier)
                                 + EnumChatFormatting.GREEN
                                 + ")"
                                 + EnumChatFormatting.GRAY);
                     }
                     if (tTileEntity.getOutputAmperage() > 1L) {
                         aList.add(
-                            GT_LanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amperage: ")
+                            GTLanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amperage: ")
                                 + EnumChatFormatting.YELLOW
-                                + GT_Utility.formatNumbers(tTileEntity.getOutputAmperage())
+                                + GTUtility.formatNumbers(tTileEntity.getOutputAmperage())
                                 + EnumChatFormatting.GRAY);
                     }
                     aList.add(
-                        GT_LanguageManager.addStringLocalization("TileEntity_EUp_STORE", "Capacity: ")
+                        GTLanguageManager.addStringLocalization("TileEntity_EUp_STORE", "Capacity: ")
                             + EnumChatFormatting.BLUE
-                            + GT_Utility.formatNumbers(tTileEntity.getEUCapacity())
+                            + GTUtility.formatNumbers(tTileEntity.getEUCapacity())
                             + EnumChatFormatting.GRAY
                             + " EU");
                 }
@@ -128,24 +128,24 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
             final NBTTagCompound aNBT = aStack.getTagCompound();
             if (aNBT != null) {
                 if (aNBT.getBoolean("mMuffler")) {
-                    aList.add(GT_LanguageManager.addStringLocalization("GT_TileEntity_MUFFLER", "has Muffler Upgrade"));
+                    aList.add(GTLanguageManager.addStringLocalization("GT_TileEntity_MUFFLER", "has Muffler Upgrade"));
                 }
                 if (aNBT.getBoolean("mSteamConverter")) {
                     aList.add(
-                        GT_LanguageManager.addStringLocalization("GT_TileEntity_STEAMCONVERTER", "has Steam Upgrade"));
+                        GTLanguageManager.addStringLocalization("GT_TileEntity_STEAMCONVERTER", "has Steam Upgrade"));
                 }
                 int tAmount = 0;
                 if ((tAmount = aNBT.getByte("mSteamTanks")) > 0) {
                     aList.add(
                         tAmount + " "
-                            + GT_LanguageManager
+                            + GTLanguageManager
                                 .addStringLocalization("GT_TileEntity_STEAMTANKS", "Steam Tank Upgrades"));
                 }
 
                 CoverableTileEntity.addInstalledCoversInformation(aNBT, aList);
                 if (aNBT.hasKey("mColor") && aNBT.getByte("mColor") != -1) {
                     aList.add(
-                        GT_LanguageManager.addStringLocalization("GT_TileEntity_COLORED", "Colored") + " ("
+                        GTLanguageManager.addStringLocalization("GT_TileEntity_COLORED", "Colored") + " ("
                             + Dyes.get(aNBT.getByte("mColor") - 1).formatting
                             + Dyes.get(aNBT.getByte("mColor") - 1).mName
                             + EnumChatFormatting.GRAY
@@ -162,7 +162,7 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
         if (aDescription == null) return;
         for (int i = 0, tLength = aDescription.length; i < tLength; i++) {
             String tDescLine = aDescription[i];
-            if (!GT_Utility.isStringValid(tDescLine)) continue;
+            if (!GTUtility.isStringValid(tDescLine)) continue;
 
             String tKey = String.format("TileEntity_DESCRIPTION_%05d%s_Index_%02d", aDamage, aSuffix, i);
             if (tDescLine.contains("%%%")) {
@@ -175,10 +175,10 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
                     tRep[j / 2] = tSplitStrings[j];
                 }
                 final String tTranslated = String
-                    .format(GT_LanguageManager.addStringLocalization(tKey, tBuffer.toString()), (Object[]) tRep);
+                    .format(GTLanguageManager.addStringLocalization(tKey, tBuffer.toString()), (Object[]) tRep);
                 if (aList != null) aList.add(tTranslated);
             } else {
-                String tTranslated = GT_LanguageManager.addStringLocalization(tKey, tDescLine);
+                String tTranslated = GTLanguageManager.addStringLocalization(tKey, tDescLine);
                 if (aList != null) aList.add(tTranslated.equals("") ? tDescLine : tTranslated);
             }
         }
@@ -186,9 +186,9 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
 
     @SideOnly(Side.CLIENT)
     public void registerDescription(int aDamage) {
-        if (aDamage >= GregTech_API.METATILEENTITIES.length) return;
-        if (GregTech_API.METATILEENTITIES[aDamage] != null) {
-            final IMetaTileEntity tMetaTileEntity = GregTech_API.METATILEENTITIES[aDamage].getBaseMetaTileEntity()
+        if (aDamage >= GregTechAPI.METATILEENTITIES.length) return;
+        if (GregTechAPI.METATILEENTITIES[aDamage] != null) {
+            final IMetaTileEntity tMetaTileEntity = GregTechAPI.METATILEENTITIES[aDamage].getBaseMetaTileEntity()
                 .getMetaTileEntity();
             if (tMetaTileEntity instanceof ISecondaryDescribable) {
                 final String[] tSecondaryDescription = ((ISecondaryDescribable) tMetaTileEntity)
@@ -208,11 +208,11 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
     @Override
     public String getUnlocalizedName(ItemStack aStack) {
         final short tDamage = (short) getDamage(aStack);
-        if ((tDamage < 0) || (tDamage >= GregTech_API.METATILEENTITIES.length)) {
+        if ((tDamage < 0) || (tDamage >= GregTechAPI.METATILEENTITIES.length)) {
             return "";
         }
-        if (GregTech_API.METATILEENTITIES[tDamage] != null) {
-            return getUnlocalizedName() + "." + GregTech_API.METATILEENTITIES[tDamage].getMetaName();
+        if (GregTechAPI.METATILEENTITIES[tDamage] != null) {
+            return getUnlocalizedName() + "." + GregTechAPI.METATILEENTITIES[tDamage].getMetaName();
         }
         return "";
     }
@@ -221,17 +221,17 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
     public String getItemStackDisplayName(ItemStack aStack) {
         String aName = super.getItemStackDisplayName(aStack);
         final short aDamage = (short) getDamage(aStack);
-        if (aDamage >= 0 && aDamage < GregTech_API.METATILEENTITIES.length
-            && GregTech_API.METATILEENTITIES[aDamage] != null) {
+        if (aDamage >= 0 && aDamage < GregTechAPI.METATILEENTITIES.length
+            && GregTechAPI.METATILEENTITIES[aDamage] != null) {
             Materials aMaterial = null;
-            if (GregTech_API.METATILEENTITIES[aDamage] instanceof GT_MetaPipeEntity_Item) {
-                aMaterial = ((GT_MetaPipeEntity_Item) GregTech_API.METATILEENTITIES[aDamage]).mMaterial;
-            } else if (GregTech_API.METATILEENTITIES[aDamage] instanceof GT_MetaPipeEntity_Fluid) {
-                aMaterial = ((GT_MetaPipeEntity_Fluid) GregTech_API.METATILEENTITIES[aDamage]).mMaterial;
-            } else if (GregTech_API.METATILEENTITIES[aDamage] instanceof GT_MetaPipeEntity_Cable) {
-                aMaterial = ((GT_MetaPipeEntity_Cable) GregTech_API.METATILEENTITIES[aDamage]).mMaterial;
-            } else if (GregTech_API.METATILEENTITIES[aDamage] instanceof GT_MetaPipeEntity_Frame) {
-                aMaterial = ((GT_MetaPipeEntity_Frame) GregTech_API.METATILEENTITIES[aDamage]).mMaterial;
+            if (GregTechAPI.METATILEENTITIES[aDamage] instanceof MTEItem) {
+                aMaterial = ((MTEItem) GregTechAPI.METATILEENTITIES[aDamage]).mMaterial;
+            } else if (GregTechAPI.METATILEENTITIES[aDamage] instanceof MTEFluid) {
+                aMaterial = ((MTEFluid) GregTechAPI.METATILEENTITIES[aDamage]).mMaterial;
+            } else if (GregTechAPI.METATILEENTITIES[aDamage] instanceof MTECable) {
+                aMaterial = ((MTECable) GregTechAPI.METATILEENTITIES[aDamage]).mMaterial;
+            } else if (GregTechAPI.METATILEENTITIES[aDamage] instanceof MTEFrame) {
+                aMaterial = ((MTEFrame) GregTechAPI.METATILEENTITIES[aDamage]).mMaterial;
             }
             if (aMaterial != null) {
                 aName = aMaterial.getLocalizedNameForItem(aName);
@@ -244,9 +244,9 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
     public void onCreated(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
         super.onCreated(aStack, aWorld, aPlayer);
         final short tDamage = (short) getDamage(aStack);
-        if ((tDamage < 0) || ((tDamage >= GregTech_API.METATILEENTITIES.length)
-            && (GregTech_API.METATILEENTITIES[tDamage] != null))) {
-            GregTech_API.METATILEENTITIES[tDamage].onCreated(aStack, aWorld, aPlayer);
+        if ((tDamage < 0)
+            || ((tDamage >= GregTechAPI.METATILEENTITIES.length) && (GregTechAPI.METATILEENTITIES[tDamage] != null))) {
+            GregTechAPI.METATILEENTITIES[tDamage].onCreated(aStack, aWorld, aPlayer);
         }
     }
 
@@ -256,19 +256,19 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
         final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide);
         final short tDamage = (short) getDamage(aStack);
         if (tDamage > 0) {
-            if (GregTech_API.METATILEENTITIES[tDamage] == null) {
+            if (GregTechAPI.METATILEENTITIES[tDamage] == null) {
                 return false;
             }
-            final int tMetaData = GregTech_API.METATILEENTITIES[tDamage].getTileEntityBaseType();
+            final int tMetaData = GregTechAPI.METATILEENTITIES[tDamage].getTileEntityBaseType();
             if (!aWorld.setBlock(aX, aY, aZ, this.field_150939_a, tMetaData, 3)) {
                 return false;
             }
             if (aWorld.getBlock(aX, aY, aZ) != this.field_150939_a) {
-                throw new GT_ItsNotMyFaultException(
+                throw new GTItsNotMyFaultException(
                     "Failed to place Block even though World.setBlock returned true. It COULD be MCPC/Bukkit causing that. In case you really have that installed, don't report this Bug to me, I don't know how to fix it.");
             }
             if (aWorld.getBlockMetadata(aX, aY, aZ) != tMetaData) {
-                throw new GT_ItsNotMyFaultException(
+                throw new GTItsNotMyFaultException(
                     "Failed to set the MetaValue of the Block even though World.setBlock returned true. It COULD be MCPC/Bukkit causing that. In case you really have that installed, don't report this Bug to me, I don't know how to fix it.");
             }
             final IGregTechTileEntity tTileEntity = (IGregTechTileEntity) aWorld.getTileEntity(aX, aY, aZ);
@@ -307,8 +307,8 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
         super.onUpdate(aStack, aWorld, aPlayer, aTimer, aIsInHand);
         final short tDamage = (short) getDamage(aStack);
         final EntityLivingBase tPlayer = (EntityPlayer) aPlayer;
-        if (GregTech_API.METATILEENTITIES[tDamage] instanceof GT_MetaTileEntity_SuperChest
-            || GregTech_API.METATILEENTITIES[tDamage] instanceof GT_MetaTileEntity_SuperTank) {
+        if (GregTechAPI.METATILEENTITIES[tDamage] instanceof MTESuperChest
+            || GregTechAPI.METATILEENTITIES[tDamage] instanceof MTESuperTank) {
             final NBTTagCompound tNBT = aStack.stackTagCompound;
             if (tNBT == null) return;
             if (tNBT.hasNoTags()) {
@@ -350,7 +350,7 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
     public int getCapacity(ItemStack container) {
         if (container != null) {
             final int tDamage = container.getItemDamage();
-            final IMetaTileEntity tMetaTile = GregTech_API.METATILEENTITIES[tDamage];
+            final IMetaTileEntity tMetaTile = GregTechAPI.METATILEENTITIES[tDamage];
             if (tMetaTile != null) return tMetaTile.getCapacity();
         }
         return 0;
@@ -361,7 +361,7 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
         final NBTTagCompound tag = container.stackTagCompound;
         if (tag == null) return null;
         String lockedName = tag.getString("lockedFluidName");
-        if (GT_Utility.isStringInvalid(lockedName)) return null;
+        if (GTUtility.isStringInvalid(lockedName)) return null;
         return FluidRegistry.getFluid(lockedName);
     }
 
@@ -369,8 +369,8 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
     public int fill(ItemStack container, FluidStack resource, boolean doFill) {
         if (container != null && resource != null) {
             final int tDamage = container.getItemDamage();
-            final IMetaTileEntity tMetaTile = GregTech_API.METATILEENTITIES[tDamage];
-            if (!(tMetaTile instanceof GT_MetaTileEntity_DigitalTankBase)) {
+            final IMetaTileEntity tMetaTile = GregTechAPI.METATILEENTITIES[tDamage];
+            if (!(tMetaTile instanceof MTEDigitalTankBase)) {
                 return 0;
             }
             if (container.stackTagCompound == null) container.stackTagCompound = new NBTTagCompound();
@@ -405,8 +405,8 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
     public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain) {
         if (container != null && container.hasTagCompound()) {
             final int tDamage = container.getItemDamage();
-            final IMetaTileEntity tMetaTile = GregTech_API.METATILEENTITIES[tDamage];
-            if (!(tMetaTile instanceof GT_MetaTileEntity_DigitalTankBase)) {
+            final IMetaTileEntity tMetaTile = GregTechAPI.METATILEENTITIES[tDamage];
+            if (!(tMetaTile instanceof MTEDigitalTankBase)) {
                 return null;
             }
             final FluidStack tStoredFluid = getFluid(container);
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java b/src/main/java/gregtech/common/blocks/ItemOres.java
index 2ba78572b3..0691142bc3 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java
+++ b/src/main/java/gregtech/common/blocks/ItemOres.java
@@ -11,16 +11,16 @@ import net.minecraft.world.World;
 
 import org.apache.commons.lang3.StringUtils;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 
-public class GT_Item_Ores extends ItemBlock {
+public class ItemOres extends ItemBlock {
 
-    public GT_Item_Ores(Block block) {
+    public ItemOres(Block block) {
         super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
     }
 
     @Override
@@ -37,7 +37,7 @@ public class GT_Item_Ores extends ItemBlock {
     @Override
     public String getItemStackDisplayName(ItemStack aStack) {
         String aName = super.getItemStackDisplayName(aStack);
-        if (this.field_150939_a instanceof GT_Block_Ores_Abstract) {
+        if (this.field_150939_a instanceof BlockOresAbstract) {
             aName = Materials.getLocalizedNameForItem(aName, aStack.getItemDamage() % 1000);
         }
         return aName;
@@ -53,13 +53,13 @@ public class GT_Item_Ores extends ItemBlock {
                 aY,
                 aZ,
                 this.field_150939_a,
-                GT_TileEntity_Ores.getHarvestData(
+                TileEntityOres.getHarvestData(
                     tDamage,
-                    ((GT_Block_Ores_Abstract) field_150939_a).getBaseBlockHarvestLevel(aMeta % 16000 / 1000)),
+                    ((BlockOresAbstract) field_150939_a).getBaseBlockHarvestLevel(aMeta % 16000 / 1000)),
                 3)) {
                 return false;
             }
-            GT_TileEntity_Ores tTileEntity = (GT_TileEntity_Ores) aWorld.getTileEntity(aX, aY, aZ);
+            TileEntityOres tTileEntity = (TileEntityOres) aWorld.getTileEntity(aX, aY, aZ);
             tTileEntity.mMetaData = tDamage;
             tTileEntity.mNatural = false;
         } else if (!aWorld.setBlock(aX, aY, aZ, this.field_150939_a, 0, 3)) {
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java b/src/main/java/gregtech/common/blocks/ItemStonesAbstract.java
index 5b73108301..b8f924b609 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/ItemStonesAbstract.java
@@ -7,19 +7,19 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_Item_Stones_Abstract extends ItemBlock {
+public class ItemStonesAbstract extends ItemBlock {
 
-    private final String mNoMobsToolTip = GT_LanguageManager
+    private final String mNoMobsToolTip = GTLanguageManager
         .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block");
 
-    public GT_Item_Stones_Abstract(Block block) {
+    public ItemStonesAbstract(Block block) {
         super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Storage.java b/src/main/java/gregtech/common/blocks/ItemStorage.java
index 4ac1b9cdfd..6dd0a2a6b4 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Storage.java
+++ b/src/main/java/gregtech/common/blocks/ItemStorage.java
@@ -7,15 +7,15 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 
-public class GT_Item_Storage extends ItemBlock {
+public class ItemStorage extends ItemBlock {
 
-    public GT_Item_Storage(Block block) {
+    public ItemStorage(Block block) {
         super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
     }
 
     @Override
@@ -26,10 +26,10 @@ public class GT_Item_Storage extends ItemBlock {
     @Override
     public String getItemStackDisplayName(ItemStack aStack) {
         String aName = super.getItemStackDisplayName(aStack);
-        if (this.field_150939_a instanceof GT_Block_Metal) {
+        if (this.field_150939_a instanceof BlockMetal) {
             int aDamage = aStack.getItemDamage();
-            if (aDamage >= 0 && aDamage < ((GT_Block_Metal) this.field_150939_a).mMats.length) {
-                aName = ((GT_Block_Metal) this.field_150939_a).mMats[aDamage].getLocalizedNameForItem(aName);
+            if (aDamage >= 0 && aDamage < ((BlockMetal) this.field_150939_a).mMats.length) {
+                aName = ((BlockMetal) this.field_150939_a).mMats[aDamage].getLocalizedNameForItem(aName);
             }
         }
         return aName;
diff --git a/src/main/java/gregtech/common/blocks/ItemTintedIndustrialGlass.java b/src/main/java/gregtech/common/blocks/ItemTintedIndustrialGlass.java
new file mode 100644
index 0000000000..bba737ad15
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/ItemTintedIndustrialGlass.java
@@ -0,0 +1,10 @@
+package gregtech.common.blocks;
+
+import net.minecraft.block.Block;
+
+public class ItemTintedIndustrialGlass extends ItemCasingsAbstract {
+
+    public ItemTintedIndustrialGlass(Block block) {
+        super(block);
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Material_Casings.java b/src/main/java/gregtech/common/blocks/MaterialCasings.java
index 2fc839768f..cde784d137 100644
--- a/src/main/java/gregtech/common/blocks/GT_Material_Casings.java
+++ b/src/main/java/gregtech/common/blocks/MaterialCasings.java
@@ -3,11 +3,11 @@ package gregtech.common.blocks;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
 
-public class GT_Material_Casings extends Material {
+public class MaterialCasings extends Material {
 
-    public static final Material INSTANCE = new GT_Material_Casings();
+    public static final Material INSTANCE = new MaterialCasings();
 
-    private GT_Material_Casings() {
+    private MaterialCasings() {
         super(MapColor.ironColor);
         setRequiresTool();
     }
diff --git a/src/main/java/gregtech/common/blocks/GT_Material_Machines.java b/src/main/java/gregtech/common/blocks/MaterialMachines.java
index df8b57226c..311b72c764 100644
--- a/src/main/java/gregtech/common/blocks/GT_Material_Machines.java
+++ b/src/main/java/gregtech/common/blocks/MaterialMachines.java
@@ -3,9 +3,9 @@ package gregtech.common.blocks;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
 
-public class GT_Material_Machines extends Material {
+public class MaterialMachines extends Material {
 
-    public GT_Material_Machines() {
+    public MaterialMachines() {
         super(MapColor.ironColor);
         setRequiresTool();
         setImmovableMobility();
diff --git a/src/main/java/gregtech/common/blocks/GT_Material_Reinforced.java b/src/main/java/gregtech/common/blocks/MaterialReinforced.java
index 2e3301bb60..b5256d306d 100644
--- a/src/main/java/gregtech/common/blocks/GT_Material_Reinforced.java
+++ b/src/main/java/gregtech/common/blocks/MaterialReinforced.java
@@ -3,9 +3,9 @@ package gregtech.common.blocks;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
 
-public class GT_Material_Reinforced extends Material {
+public class MaterialReinforced extends Material {
 
-    public GT_Material_Reinforced() {
+    public MaterialReinforced() {
         super(MapColor.stoneColor);
         setRequiresTool();
         setAdventureModeExempt();
diff --git a/src/main/java/gregtech/common/blocks/GT_Packet_Ores.java b/src/main/java/gregtech/common/blocks/PacketOres.java
index a65ac47c44..6548f8ae66 100644
--- a/src/main/java/gregtech/common/blocks/GT_Packet_Ores.java
+++ b/src/main/java/gregtech/common/blocks/PacketOres.java
@@ -6,22 +6,22 @@ import net.minecraft.world.World;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.api.net.GT_PacketTypes;
-import gregtech.api.net.GT_Packet_New;
+import gregtech.api.net.GTPacketNew;
+import gregtech.api.net.GTPacketTypes;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Packet_Ores extends GT_Packet_New {
+public class PacketOres extends GTPacketNew {
 
     private int mX;
     private int mZ;
     private short mY;
     private short mMetaData;
 
-    public GT_Packet_Ores() {
+    public PacketOres() {
         super(true);
     }
 
-    public GT_Packet_Ores(int aX, short aY, int aZ, short aMetaData) {
+    public PacketOres(int aX, short aY, int aZ, short aMetaData) {
         super(false);
         this.mX = aX;
         this.mY = aY;
@@ -38,16 +38,16 @@ public class GT_Packet_Ores extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_Ores(aData.readInt(), aData.readShort(), aData.readInt(), aData.readShort());
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new PacketOres(aData.readInt(), aData.readShort(), aData.readInt(), aData.readShort());
     }
 
     @Override
     public void process(IBlockAccess aWorld) {
         if (aWorld != null) {
             TileEntity tTileEntity = aWorld.getTileEntity(this.mX, this.mY, this.mZ);
-            if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-                ((GT_TileEntity_Ores) tTileEntity).mMetaData = this.mMetaData;
+            if ((tTileEntity instanceof TileEntityOres)) {
+                ((TileEntityOres) tTileEntity).mMetaData = this.mMetaData;
             }
             if (((aWorld instanceof World)) && (((World) aWorld).isRemote)) {
                 ((World) aWorld).markBlockForUpdate(this.mX, this.mY, this.mZ);
@@ -57,6 +57,6 @@ public class GT_Packet_Ores extends GT_Packet_New {
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.ORES.id;
+        return GTPacketTypes.ORES.id;
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java b/src/main/java/gregtech/common/blocks/TileEntityOres.java
index de69c011a2..9ddcbcc19c 100644
--- a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
+++ b/src/main/java/gregtech/common/blocks/TileEntityOres.java
@@ -15,19 +15,19 @@ import net.minecraft.world.World;
 
 import org.jetbrains.annotations.NotNull;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IAllSidedTexturedTileEntity;
 import gregtech.api.objects.XSTR;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
-public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedTileEntity {
+public class TileEntityOres extends TileEntity implements IAllSidedTexturedTileEntity {
 
     public short mMetaData = 0;
     protected static boolean shouldFortune = false;
@@ -39,17 +39,17 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
     private ITexture[] mCachedTexture;
 
     public static byte getHarvestData(short aMetaData, int aBaseBlockHarvestLevel) {
-        Materials aMaterial = GregTech_API.sGeneratedMaterials[(aMetaData % 1000)];
+        Materials aMaterial = GregTechAPI.sGeneratedMaterials[(aMetaData % 1000)];
         byte tByte = aMaterial == null ? 0
             : (byte) Math
                 .max(aBaseBlockHarvestLevel, Math.min(7, aMaterial.mToolQuality - (aMetaData < 16000 ? 0 : 1)));
-        if (GT_Mod.gregtechproxy.mChangeHarvestLevels) {
+        if (GTMod.gregtechproxy.mChangeHarvestLevels) {
             tByte = aMaterial == null ? 0
                 : (byte) Math.max(
                     aBaseBlockHarvestLevel,
                     Math.min(
-                        GT_Mod.gregtechproxy.mMaxHarvestLevel,
-                        GT_Mod.gregtechproxy.mHarvestLevel[aMaterial.mMetaItemSubID] - (aMetaData < 16000 ? 0 : 1)));
+                        GTMod.gregtechproxy.mMaxHarvestLevel,
+                        GTMod.gregtechproxy.mHarvestLevel[aMaterial.mMetaItemSubID] - (aMetaData < 16000 ? 0 : 1)));
         }
         return tByte;
     }
@@ -64,7 +64,7 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
             aY = Math.min(aWorld.getActualHeight(), Math.max(aY, 1));
         }
         Block tBlock = aWorld.getBlock(aX, aY, aZ);
-        Block tOreBlock = GregTech_API.sBlockOres1;
+        Block tOreBlock = GregTechAPI.sBlockOres1;
         int BlockMeta = aWorld.getBlockMetadata(aX, aY, aZ);
         String BlockName = tBlock.getUnlocalizedName();
         aMetaData += isSmallOre ? 16000 : 0;
@@ -76,8 +76,8 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                 aMetaData += 1000;
             } else if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.end_stone)) {
                 aMetaData += 2000;
-            } else if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites)) {
-                if (tBlock == GregTech_API.sBlockGranites) {
+            } else if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTechAPI.sBlockGranites)) {
+                if (tBlock == GregTechAPI.sBlockGranites) {
                     if (aWorld.getBlockMetadata(aX, aY, aZ) < 8) {
                         aMetaData += 3000;
                     } else {
@@ -86,8 +86,8 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                 } else {
                     aMetaData += 3000;
                 }
-            } else if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockStones)) {
-                if (tBlock == GregTech_API.sBlockStones) {
+            } else if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTechAPI.sBlockStones)) {
+                if (tBlock == GregTechAPI.sBlockStones) {
                     if (aWorld.getBlockMetadata(aX, aY, aZ) < 8) {
                         aMetaData += 5000;
                     } else {
@@ -97,20 +97,20 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                     aMetaData += 5000;
                 }
             } else if (BlockName.equals("tile.igneousStone")) {
-                if (GregTech_API.sBlockOresUb1 != null) {
-                    tOreBlock = GregTech_API.sBlockOresUb1;
+                if (GregTechAPI.sBlockOresUb1 != null) {
+                    tOreBlock = GregTechAPI.sBlockOresUb1;
                     aMetaData += (BlockMeta * 1000);
                     // GT_FML_LOGGER.info("Block changed to UB1");
                 }
             } else if (BlockName.equals("tile.metamorphicStone")) {
-                if (GregTech_API.sBlockOresUb2 != null) {
-                    tOreBlock = GregTech_API.sBlockOresUb2;
+                if (GregTechAPI.sBlockOresUb2 != null) {
+                    tOreBlock = GregTechAPI.sBlockOresUb2;
                     aMetaData += (BlockMeta * 1000);
                     // GT_FML_LOGGER.info("Block changed to UB2");
                 }
             } else if (BlockName.equals("tile.sedimentaryStone")) {
-                if (GregTech_API.sBlockOresUb3 != null) {
-                    tOreBlock = GregTech_API.sBlockOresUb3;
+                if (GregTechAPI.sBlockOresUb3 != null) {
+                    tOreBlock = GregTechAPI.sBlockOresUb3;
                     aMetaData += (BlockMeta * 1000);
                     // GT_FML_LOGGER.info("Block changed to UB3");
                 }
@@ -125,12 +125,12 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                 tOreBlock,
                 getHarvestData(
                     (short) aMetaData,
-                    ((GT_Block_Ores_Abstract) tOreBlock).getBaseBlockHarvestLevel(aMetaData % 16000 / 1000)),
+                    ((BlockOresAbstract) tOreBlock).getBaseBlockHarvestLevel(aMetaData % 16000 / 1000)),
                 0);
             TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-            if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-                ((GT_TileEntity_Ores) tTileEntity).mMetaData = ((short) aMetaData);
-                ((GT_TileEntity_Ores) tTileEntity).mNatural = true;
+            if ((tTileEntity instanceof TileEntityOres)) {
+                ((TileEntityOres) tTileEntity).mMetaData = ((short) aMetaData);
+                ((TileEntityOres) tTileEntity).mNatural = true;
             }
             return true;
         }
@@ -154,9 +154,9 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
     public void onUpdated() {
         if ((!this.worldObj.isRemote) && (this.mBlocked)) {
             this.mBlocked = false;
-            GT_Values.NW.sendPacketToAllPlayersInRange(
+            GTValues.NW.sendPacketToAllPlayersInRange(
                 this.worldObj,
-                new GT_Packet_Ores(this.xCoord, (short) this.yCoord, this.zCoord, this.mMetaData),
+                new PacketOres(this.xCoord, (short) this.yCoord, this.zCoord, this.mMetaData),
                 this.xCoord,
                 this.zCoord);
         }
@@ -167,9 +167,9 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
         if (!this.worldObj.isRemote) {
             boolean sendUpdate = mBlockedChecked ? !mBlocked : checkBlocked();
             if (sendUpdate) {
-                GT_Values.NW.sendPacketToAllPlayersInRange(
+                GTValues.NW.sendPacketToAllPlayersInRange(
                     this.worldObj,
-                    new GT_Packet_Ores(this.xCoord, (short) this.yCoord, this.zCoord, this.mMetaData),
+                    new PacketOres(this.xCoord, (short) this.yCoord, this.zCoord, this.mMetaData),
                     this.xCoord,
                     this.zCoord);
             }
@@ -182,37 +182,37 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
         mBlockedChecked = true;
         if (!worldObj.blockExists(xCoord + 1, yCoord, zCoord)) {
             mBlockedChecked = false;
-        } else if (!GT_Utility.isOpaqueBlock(worldObj, xCoord + 1, yCoord, zCoord)) {
+        } else if (!GTUtility.isOpaqueBlock(worldObj, xCoord + 1, yCoord, zCoord)) {
             mBlocked = false;
             return true;
         }
         if (!worldObj.blockExists(xCoord - 1, yCoord, zCoord)) {
             mBlockedChecked = false;
-        } else if (!GT_Utility.isOpaqueBlock(worldObj, xCoord - 1, yCoord, zCoord)) {
+        } else if (!GTUtility.isOpaqueBlock(worldObj, xCoord - 1, yCoord, zCoord)) {
             mBlocked = false;
             return true;
         }
         if (!worldObj.blockExists(xCoord, yCoord + 1, zCoord)) {
             mBlockedChecked = false;
-        } else if (!GT_Utility.isOpaqueBlock(worldObj, xCoord, yCoord + 1, zCoord)) {
+        } else if (!GTUtility.isOpaqueBlock(worldObj, xCoord, yCoord + 1, zCoord)) {
             mBlocked = false;
             return true;
         }
         if (!worldObj.blockExists(xCoord, yCoord - 1, zCoord)) {
             mBlockedChecked = false;
-        } else if (!GT_Utility.isOpaqueBlock(worldObj, xCoord, yCoord - 1, zCoord)) {
+        } else if (!GTUtility.isOpaqueBlock(worldObj, xCoord, yCoord - 1, zCoord)) {
             mBlocked = false;
             return true;
         }
         if (!worldObj.blockExists(xCoord, yCoord, zCoord + 1)) {
             mBlockedChecked = false;
-        } else if (!GT_Utility.isOpaqueBlock(worldObj, xCoord, yCoord, zCoord + 1)) {
+        } else if (!GTUtility.isOpaqueBlock(worldObj, xCoord, yCoord, zCoord + 1)) {
             mBlocked = false;
             return true;
         }
         if (!worldObj.blockExists(xCoord, yCoord, zCoord - 1)) {
             mBlockedChecked = false;
-        } else if (!GT_Utility.isOpaqueBlock(worldObj, xCoord, yCoord, zCoord - 1)) {
+        } else if (!GTUtility.isOpaqueBlock(worldObj, xCoord, yCoord, zCoord - 1)) {
             mBlocked = false;
             return true;
         }
@@ -234,8 +234,8 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                 this.xCoord,
                 this.yCoord,
                 this.zCoord,
-                GregTech_API.sBlockGranites)) {
-                    if (aOverridingStoneBlock == GregTech_API.sBlockGranites) {
+                GregTechAPI.sBlockGranites)) {
+                    if (aOverridingStoneBlock == GregTechAPI.sBlockGranites) {
                         if (aOverridingStoneMeta < 8) {
                             this.mMetaData = ((short) (this.mMetaData + 3000));
                         } else {
@@ -249,8 +249,8 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                     this.xCoord,
                     this.yCoord,
                     this.zCoord,
-                    GregTech_API.sBlockStones)) {
-                        if (aOverridingStoneBlock == GregTech_API.sBlockStones) {
+                    GregTechAPI.sBlockStones)) {
+                        if (aOverridingStoneBlock == GregTechAPI.sBlockStones) {
                             if (aOverridingStoneMeta < 8) {
                                 this.mMetaData = ((short) (this.mMetaData + 5000));
                             } else {
@@ -266,23 +266,23 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
             this.zCoord,
             getHarvestData(
                 this.mMetaData,
-                ((GT_Block_Ores_Abstract) blockType).getBaseBlockHarvestLevel(mMetaData % 16000 / 1000)),
+                ((BlockOresAbstract) blockType).getBaseBlockHarvestLevel(mMetaData % 16000 / 1000)),
             0);
     }
 
     public void convertOreBlock(World aWorld, int aX, int aY, int aZ) {
         short aMeta = ((short) (this.mMetaData % 1000 + (this.mMetaData / 16000 * 16000)));
-        aWorld.setBlock(aX, aY, aZ, GregTech_API.sBlockOres1);
+        aWorld.setBlock(aX, aY, aZ, GregTechAPI.sBlockOres1);
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if (tTileEntity instanceof GT_TileEntity_Ores) {
-            ((GT_TileEntity_Ores) tTileEntity).mMetaData = aMeta;
+        if (tTileEntity instanceof TileEntityOres) {
+            ((TileEntityOres) tTileEntity).mMetaData = aMeta;
             this.worldObj.setBlockMetadataWithNotify(
                 this.xCoord,
                 this.yCoord,
                 this.zCoord,
                 getHarvestData(
                     aMeta,
-                    ((GT_Block_Ores_Abstract) tTileEntity.blockType).getBaseBlockHarvestLevel(aMeta % 16000 / 1000)),
+                    ((BlockOresAbstract) tTileEntity.blockType).getBaseBlockHarvestLevel(aMeta % 16000 / 1000)),
                 0);
         }
     }
@@ -302,7 +302,7 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
             rList.add(new ItemStack(Blocks.cobblestone, 1, 0));
             return rList;
         }
-        Materials aOreMaterial = GregTech_API.sGeneratedMaterials[(this.mMetaData % 1000)];
+        Materials aOreMaterial = GregTechAPI.sGeneratedMaterials[(this.mMetaData % 1000)];
         if (this.mMetaData < 16000) {
             boolean tIsRich = false;
 
@@ -311,11 +311,11 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
             // Dense ore
 
             // NetherOre
-            if (GT_Mod.gregtechproxy.mNetherOreYieldMultiplier && !tIsRich) {
+            if (GTMod.gregtechproxy.mNetherOreYieldMultiplier && !tIsRich) {
                 tIsRich = (this.mMetaData >= 1000 && this.mMetaData < 2000);
             }
             // EndOre
-            if (GT_Mod.gregtechproxy.mEndOreYieldMultiplier && !tIsRich) {
+            if (GTMod.gregtechproxy.mEndOreYieldMultiplier && !tIsRich) {
                 tIsRich = (this.mMetaData >= 2000 && this.mMetaData < 3000);
             }
 
@@ -324,9 +324,9 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                 rList.add(new ItemStack(aDroppedOre, 1, this.mMetaData));
 
             } else {
-                switch (GT_Mod.gregtechproxy.oreDropSystem) {
+                switch (GTMod.gregtechproxy.oreDropSystem) {
                     case Item -> {
-                        rList.add(GT_OreDictUnificator.get(OrePrefixes.rawOre, aOreMaterial, (tIsRich ? 2 : 1)));
+                        rList.add(GTOreDictUnificator.get(OrePrefixes.rawOre, aOreMaterial, (tIsRich ? 2 : 1)));
                     }
                     // TODO: Test
                     case FortuneItem -> {
@@ -341,11 +341,11 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                             int amount = aMinAmount
                                 + Math.max(worldObj.rand.nextInt(aFortune * (tIsRich ? 2 : 1) + 2) - 1, 0);
                             for (int i = 0; i < amount; i++) {
-                                rList.add(GT_OreDictUnificator.get(OrePrefixes.rawOre, aOreMaterial, 1));
+                                rList.add(GTOreDictUnificator.get(OrePrefixes.rawOre, aOreMaterial, 1));
                             }
                         } else {
                             for (int i = 0; i < (tIsRich ? 2 : 1); i++) {
-                                rList.add(GT_OreDictUnificator.get(OrePrefixes.rawOre, aOreMaterial, 1));
+                                rList.add(GTOreDictUnificator.get(OrePrefixes.rawOre, aOreMaterial, 1));
                             }
                         }
                     }
@@ -383,53 +383,50 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
 
             Materials aMaterial = aOreMaterial.mOreReplacement;
 
-            ItemStack tStack = GT_OreDictUnificator
-                .get(OrePrefixes.gemExquisite, aMaterial, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), 1L);
+            ItemStack tStack = GTOreDictUnificator
+                .get(OrePrefixes.gemExquisite, aMaterial, GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), 1L);
             if (tStack != null) {
                 for (int i = 0; i < 1; i++) {
                     tSelector.add(tStack);
                 }
             }
-            tStack = GT_OreDictUnificator
-                .get(OrePrefixes.gemFlawless, aMaterial, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), 1L);
+            tStack = GTOreDictUnificator
+                .get(OrePrefixes.gemFlawless, aMaterial, GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), 1L);
             if (tStack != null) {
                 for (int i = 0; i < 2; i++) {
                     tSelector.add(tStack);
                 }
             }
-            tStack = GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L);
+            tStack = GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L);
             if (tStack != null) {
                 for (int i = 0; i < 12; i++) {
                     tSelector.add(tStack);
                 }
             }
-            tStack = GT_OreDictUnificator.get(
-                OrePrefixes.gemFlawed,
-                aMaterial,
-                GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1L),
-                1L);
+            tStack = GTOreDictUnificator
+                .get(OrePrefixes.gemFlawed, aMaterial, GTOreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1L), 1L);
             if (tStack != null) {
                 for (int i = 0; i < 5; i++) {
                     tSelector.add(tStack);
                 }
             }
-            tStack = GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1L);
+            tStack = GTOreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1L);
             if (tStack != null) {
                 for (int i = 0; i < 10; i++) {
                     tSelector.add(tStack);
                 }
             }
-            tStack = GT_OreDictUnificator.get(
+            tStack = GTOreDictUnificator.get(
                 OrePrefixes.gemChipped,
                 aMaterial,
-                GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L),
                 1L);
             if (tStack != null) {
                 for (int i = 0; i < 5; i++) {
                     tSelector.add(tStack);
                 }
             }
-            tStack = GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L);
+            tStack = GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L);
             if (tStack != null) {
                 for (int i = 0; i < 10; i++) {
                     tSelector.add(tStack);
@@ -442,14 +439,13 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                     aMaterial.mOreMultiplier
                         + (aFortune > 0 ? tRandom.nextInt(1 + aFortune * aMaterial.mOreMultiplier) : 0) / 2); i
                             < j; i++) {
-                    rList.add(GT_Utility.copyAmount(1, tSelector.get(tRandom.nextInt(tSelector.size()))));
+                    rList.add(GTUtility.copyAmount(1, tSelector.get(tRandom.nextInt(tSelector.size()))));
                 }
             }
             if (tRandom.nextInt(3 + aFortune) > 1) {
-                Materials dustMat = ((GT_Block_Ores_Abstract) aDroppedOre).getDroppedDusts()[this.mMetaData / 1000
-                    % 16];
+                Materials dustMat = ((BlockOresAbstract) aDroppedOre).getDroppedDusts()[this.mMetaData / 1000 % 16];
                 if (dustMat != null) rList.add(
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(tRandom.nextInt(3) > 0 ? OrePrefixes.dustImpure : OrePrefixes.dust, dustMat, 1L));
             }
         }
@@ -466,8 +462,8 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
     }
 
     private ITexture @NotNull [] getTextureInternal(Block aBlock) {
-        Materials aMaterial = GregTech_API.sGeneratedMaterials[(this.mMetaData % 1000)];
-        if ((aMaterial != null) && (this.mMetaData < 32000) && (aBlock instanceof GT_Block_Ores_Abstract)) {
+        Materials aMaterial = GregTechAPI.sGeneratedMaterials[(this.mMetaData % 1000)];
+        if ((aMaterial != null) && (this.mMetaData < 32000) && (aBlock instanceof BlockOresAbstract)) {
             ITexture iTexture = TextureFactory.builder()
                 .addIcon(
                     aMaterial.mIconSet.mTextures[this.mMetaData / 16000 == 0 ? OrePrefixes.ore.mTextureIndex
@@ -475,7 +471,7 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                 .setRGBA(aMaterial.mRGBa)
                 .stdOrient()
                 .build();
-            return new ITexture[] { ((GT_Block_Ores_Abstract) aBlock).getTextureSet()[((this.mMetaData / 1000) % 16)],
+            return new ITexture[] { ((BlockOresAbstract) aBlock).getTextureSet()[((this.mMetaData / 1000) % 16)],
                 iTexture };
         }
         return new ITexture[] { TextureFactory.of(Blocks.stone, 0), TextureFactory.builder()