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

27 files changed, 182 insertions, 178 deletions

diff --git a/src/main/java/gregtech/api/interfaces/ICleanroomReceiver.java b/src/main/java/gregtech/api/interfaces/ICleanroomReceiver.java
index b0d42f9aec..b26c7035c7 100644
--- a/src/main/java/gregtech/api/interfaces/ICleanroomReceiver.java
+++ b/src/main/java/gregtech/api/interfaces/ICleanroomReceiver.java
@@ -4,9 +4,11 @@ import javax.annotation.Nullable;
 
 import net.minecraft.tileentity.TileEntity;
 
+import gregtech.common.Pollution;
+
 /**
  * Implement this interface for TileEntities that can have association to cleanroom.
- * Calling {@link gregtech.common.GT_Pollution#addPollution(TileEntity, int)} from this machine
+ * Calling {@link Pollution#addPollution(TileEntity, int)} from this machine
  * will pollute associated cleanroom.
  */
 public interface ICleanroomReceiver {
diff --git a/src/main/java/gregtech/api/interfaces/IConfigurationCircuitSupport.java b/src/main/java/gregtech/api/interfaces/IConfigurationCircuitSupport.java
index 8dde8163c8..5f225b0b4f 100644
--- a/src/main/java/gregtech/api/interfaces/IConfigurationCircuitSupport.java
+++ b/src/main/java/gregtech/api/interfaces/IConfigurationCircuitSupport.java
@@ -4,7 +4,7 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 
 /**
  * Implement this interface if your tileentity (or metatileentity) supports configuration circuits to resolve recipe
@@ -24,7 +24,7 @@ public interface IConfigurationCircuitSupport {
      * This list is unmodifiable. Its elements are not supposed to be modified in any way!
      */
     default List<ItemStack> getConfigurationCircuits() {
-        return GregTech_API.getConfigurationCircuitList(100);
+        return GregTechAPI.getConfigurationCircuitList(100);
     }
 
     /**
diff --git a/src/main/java/gregtech/api/interfaces/IFoodStat.java b/src/main/java/gregtech/api/interfaces/IFoodStat.java
index c768c5ca1c..4b1bd121e9 100644
--- a/src/main/java/gregtech/api/interfaces/IFoodStat.java
+++ b/src/main/java/gregtech/api/interfaces/IFoodStat.java
@@ -4,34 +4,34 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.items.MetaBaseItem;
 
 public interface IFoodStat {
 
     /**
      * Warning the "aPlayer" Parameter may be null!
      */
-    int getFoodLevel(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer);
+    int getFoodLevel(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer);
 
     /**
      * Warning the "aPlayer" Parameter may be null!
      */
-    float getSaturation(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer);
+    float getSaturation(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer);
 
     /**
      * Warning the "aPlayer" Parameter may be null!
      */
-    boolean alwaysEdible(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer);
+    boolean alwaysEdible(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer);
 
     /**
      * Warning the "aPlayer" Parameter may be null!
      */
-    boolean isRotten(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer);
+    boolean isRotten(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer);
 
     /**
      * Warning the "aPlayer" Parameter may be null!
      */
-    EnumAction getFoodAction(GT_MetaBase_Item aItem, ItemStack aStack);
+    EnumAction getFoodAction(MetaBaseItem aItem, ItemStack aStack);
 
-    void onEaten(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer);
+    void onEaten(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer);
 }
diff --git a/src/main/java/gregtech/api/interfaces/IGT_ItemWithMaterialRenderer.java b/src/main/java/gregtech/api/interfaces/IGT_ItemWithMaterialRenderer.java
index 4bf0311544..1dc460f3de 100644
--- a/src/main/java/gregtech/api/interfaces/IGT_ItemWithMaterialRenderer.java
+++ b/src/main/java/gregtech/api/interfaces/IGT_ItemWithMaterialRenderer.java
@@ -6,22 +6,24 @@ import net.minecraft.util.IIcon;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.common.render.items.GT_GeneratedMaterial_Renderer;
+import gregtech.common.render.items.GeneratedItemRenderer;
+import gregtech.common.render.items.GeneratedMaterialRenderer;
+import gregtech.common.render.items.MetaGeneratedItemRenderer;
 
 public interface IGT_ItemWithMaterialRenderer {
 
     /**
-     * @return If allow using {@link gregtech.common.render.items.GT_MetaGenerated_Item_Renderer} to render item
+     * @return If allow using {@link MetaGeneratedItemRenderer} to render item
      */
     boolean shouldUseCustomRenderer(int aMetaData);
 
     /**
      * @return Custom renderer of the Material with offset < 32000
      */
-    GT_GeneratedMaterial_Renderer getMaterialRenderer(int aMetaData);
+    GeneratedMaterialRenderer getMaterialRenderer(int aMetaData);
 
     /**
-     * If this returns false, renderer falls back to {@link gregtech.common.render.items.GT_GeneratedItem_Renderer}
+     * If this returns false, renderer falls back to {@link GeneratedItemRenderer}
      */
     boolean allowMaterialRenderer(int aMetaData);
 
diff --git a/src/main/java/gregtech/api/interfaces/IHatchElement.java b/src/main/java/gregtech/api/interfaces/IHatchElement.java
index 482b7899ab..9618c1ee1b 100644
--- a/src/main/java/gregtech/api/interfaces/IHatchElement.java
+++ b/src/main/java/gregtech/api/interfaces/IHatchElement.java
@@ -11,18 +11,17 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import com.google.common.collect.ImmutableList;
 import com.gtnewhorizon.structurelib.structure.IStructureElement;
-import com.gtnewhorizon.structurelib.structure.StructureUtility;
 
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_StructureUtility;
-import gregtech.api.util.IGT_HatchAdder;
+import gregtech.api.util.GTStructureUtility;
+import gregtech.api.util.IGTHatchAdder;
 
 public interface IHatchElement<T> {
 
     List<? extends Class<? extends IMetaTileEntity>> mteClasses();
 
-    IGT_HatchAdder<? super T> adder();
+    IGTHatchAdder<? super T> adder();
 
     String name();
 
@@ -44,7 +43,7 @@ public interface IHatchElement<T> {
         return new HatchElement<>(aClasses, null, null, null, this);
     }
 
-    default <T2 extends T> IHatchElement<T2> withAdder(IGT_HatchAdder<T2> aAdder) {
+    default <T2 extends T> IHatchElement<T2> withAdder(IGTHatchAdder<T2> aAdder) {
         if (aAdder == null) throw new IllegalArgumentException();
         return new HatchElement<>(null, aAdder, null, null, this);
     }
@@ -61,7 +60,7 @@ public interface IHatchElement<T> {
 
     default <T2 extends T> IStructureElement<T2> newAny(int aCasingIndex, int aDot) {
         if (aCasingIndex < 0 || aDot < 0) throw new IllegalArgumentException();
-        return GT_StructureUtility.<T2>buildHatchAdder()
+        return GTStructureUtility.<T2>buildHatchAdder()
             .anyOf(this)
             .casingIndex(aCasingIndex)
             .dot(aDot)
@@ -73,17 +72,17 @@ public interface IHatchElement<T> {
     default <T2 extends T> IStructureElement<T2> newAnyOrCasing(int aCasingIndex, int aDot, Block casingBlock,
         int casingMeta) {
         if (aCasingIndex < 0 || aDot < 0) throw new IllegalArgumentException();
-        return GT_StructureUtility.<T2>buildHatchAdder()
+        return GTStructureUtility.<T2>buildHatchAdder()
             .anyOf(this)
             .casingIndex(aCasingIndex)
             .dot(aDot)
             .continueIfSuccess()
-            .buildAndChain(StructureUtility.ofBlock(casingBlock, casingMeta));
+            .buildAndChain(com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock(casingBlock, casingMeta));
     }
 
     default <T2 extends T> IStructureElement<T2> newAny(int aCasingIndex, int aDot, ForgeDirection... allowedFacings) {
         if (aCasingIndex < 0 || aDot < 0) throw new IllegalArgumentException();
-        return GT_StructureUtility.<T2>buildHatchAdder()
+        return GTStructureUtility.<T2>buildHatchAdder()
             .anyOf(this)
             .casingIndex(aCasingIndex)
             .dot(aDot)
@@ -96,7 +95,7 @@ public interface IHatchElement<T> {
     default <T2 extends T> IStructureElement<T2> newAny(int aCasingIndex, int aDot,
         BiPredicate<? super T2, ? super IGregTechTileEntity> aShouldSkip) {
         if (aCasingIndex < 0 || aDot < 0 || aShouldSkip == null) throw new IllegalArgumentException();
-        return GT_StructureUtility.<T2>buildHatchAdder()
+        return GTStructureUtility.<T2>buildHatchAdder()
             .anyOf(this)
             .casingIndex(aCasingIndex)
             .dot(aDot)
@@ -131,7 +130,7 @@ class HatchElementEither<T> implements IHatchElement<T> {
     }
 
     @Override
-    public IGT_HatchAdder<? super T> adder() {
+    public IGTHatchAdder<? super T> adder() {
         return ((t, te, i) -> first.adder()
             .apply(t, te, i)
             || second.adder()
@@ -153,12 +152,12 @@ class HatchElementEither<T> implements IHatchElement<T> {
 class HatchElement<T> implements IHatchElement<T> {
 
     private final List<Class<? extends IMetaTileEntity>> mClasses;
-    private final IGT_HatchAdder<? super T> mAdder;
+    private final IGTHatchAdder<? super T> mAdder;
     private final String mName;
     private final IHatchElement<? super T> mBacking;
     private final ToLongFunction<? super T> mCount;
 
-    public HatchElement(List<Class<? extends IMetaTileEntity>> aMteClasses, IGT_HatchAdder<? super T> aAdder,
+    public HatchElement(List<Class<? extends IMetaTileEntity>> aMteClasses, IGTHatchAdder<? super T> aAdder,
         String aName, ToLongFunction<? super T> aCount, IHatchElement<? super T> aBacking) {
         this.mClasses = aMteClasses;
         this.mAdder = aAdder;
@@ -173,7 +172,7 @@ class HatchElement<T> implements IHatchElement<T> {
     }
 
     @Override
-    public IGT_HatchAdder<? super T> adder() {
+    public IGTHatchAdder<? super T> adder() {
         return mAdder == null ? mBacking.adder() : mAdder;
     }
 
@@ -194,7 +193,7 @@ class HatchElement<T> implements IHatchElement<T> {
     }
 
     @Override
-    public <T2 extends T> IHatchElement<T2> withAdder(IGT_HatchAdder<T2> aAdder) {
+    public <T2 extends T> IHatchElement<T2> withAdder(IGTHatchAdder<T2> aAdder) {
         if (aAdder == null) throw new IllegalArgumentException();
         return new HatchElement<>(mClasses, aAdder, mName, mCount, mBacking);
     }
diff --git a/src/main/java/gregtech/api/interfaces/IIconContainer.java b/src/main/java/gregtech/api/interfaces/IIconContainer.java
index 525721bb5c..319615b58d 100644
--- a/src/main/java/gregtech/api/interfaces/IIconContainer.java
+++ b/src/main/java/gregtech/api/interfaces/IIconContainer.java
@@ -1,6 +1,6 @@
 package gregtech.api.interfaces;
 
-import static gregtech.api.enums.GT_Values.UNCOLORED_RGBA;
+import static gregtech.api.enums.GTValues.UNCOLORED_RGBA;
 
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
diff --git a/src/main/java/gregtech/api/interfaces/IItemBehaviour.java b/src/main/java/gregtech/api/interfaces/IItemBehaviour.java
index 67bb505c6b..d9f8706824 100644
--- a/src/main/java/gregtech/api/interfaces/IItemBehaviour.java
+++ b/src/main/java/gregtech/api/interfaces/IItemBehaviour.java
@@ -13,7 +13,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.enums.SubTag;
-import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.items.MetaBaseItem;
 
 public interface IItemBehaviour<E extends Item> {
 
@@ -37,7 +37,7 @@ public interface IItemBehaviour<E extends Item> {
 
     ItemStack onDispense(E aItem, IBlockSource aSource, ItemStack aStack);
 
-    boolean hasProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack);
+    boolean hasProjectile(MetaBaseItem aItem, SubTag aProjectileType, ItemStack aStack);
 
     EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY,
         double aZ);
diff --git a/src/main/java/gregtech/api/interfaces/INetworkUpdatableItem.java b/src/main/java/gregtech/api/interfaces/INetworkUpdatableItem.java
index 1dd36d9998..4af8ec232c 100644
--- a/src/main/java/gregtech/api/interfaces/INetworkUpdatableItem.java
+++ b/src/main/java/gregtech/api/interfaces/INetworkUpdatableItem.java
@@ -4,8 +4,10 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
+import gregtech.api.net.GTPacketUpdateItem;
+
 /**
- * Together with {@link gregtech.api.net.GT_Packet_UpdateItem} you can request server side to update item in hand with a
+ * Together with {@link GTPacketUpdateItem} you can request server side to update item in hand with a
  * NBT tag.
  * <p>
  * Usual NBT tag size limit applies.
diff --git a/src/main/java/gregtech/api/interfaces/IRecipeMap.java b/src/main/java/gregtech/api/interfaces/IRecipeMap.java
index ce48b29927..c6184bee34 100644
--- a/src/main/java/gregtech/api/interfaces/IRecipeMap.java
+++ b/src/main/java/gregtech/api/interfaces/IRecipeMap.java
@@ -7,9 +7,9 @@ import java.util.function.Function;
 
 import javax.annotation.Nonnull;
 
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTUtility;
 
 /**
  * Represents the target of a recipe adding action, usually, but not necessarily, is a recipe map itself.
@@ -33,7 +33,7 @@ public interface IRecipeMap {
      * Actually add the recipe represented by the builder. CAN modify the builder's internal states!!!
      */
     @Nonnull
-    Collection<GT_Recipe> doAdd(GT_RecipeBuilder builder);
+    Collection<GTRecipe> doAdd(GTRecipeBuilder builder);
 
     /**
      * Return a variant of this recipe map that will perform a deep copy on input recipe builder before doing anything
@@ -45,7 +45,7 @@ public interface IRecipeMap {
         return newRecipeMap(b -> doAdd(b.copy()));
     }
 
-    static IRecipeMap newRecipeMap(Function<? super GT_RecipeBuilder, Collection<GT_Recipe>> func) {
+    static IRecipeMap newRecipeMap(Function<? super GTRecipeBuilder, Collection<GTRecipe>> func) {
         return new IRecipeMap() {
 
             private final Collection<IRecipeMap> downstreams = new ArrayList<>();
@@ -57,9 +57,9 @@ public interface IRecipeMap {
 
             @Nonnull
             @Override
-            public Collection<GT_Recipe> doAdd(GT_RecipeBuilder builder) {
-                List<Collection<GT_Recipe>> ret = new ArrayList<>();
-                Collection<GT_Recipe> out = func.apply(builder);
+            public Collection<GTRecipe> doAdd(GTRecipeBuilder builder) {
+                List<Collection<GTRecipe>> ret = new ArrayList<>();
+                Collection<GTRecipe> out = func.apply(builder);
                 ret.add(out);
                 builder.clearInvalid();
                 if (!out.isEmpty()) {
@@ -67,7 +67,7 @@ public interface IRecipeMap {
                         ret.add(downstream.doAdd(builder));
                     }
                 }
-                return GT_Utility.concat(ret);
+                return GTUtility.concat(ret);
             }
         };
     }
diff --git a/src/main/java/gregtech/api/interfaces/IRedstoneCircuitBlock.java b/src/main/java/gregtech/api/interfaces/IRedstoneCircuitBlock.java
index 0eea6ca3a4..a0a362c4e5 100644
--- a/src/main/java/gregtech/api/interfaces/IRedstoneCircuitBlock.java
+++ b/src/main/java/gregtech/api/interfaces/IRedstoneCircuitBlock.java
@@ -5,7 +5,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehavior;
+import gregtech.api.util.CoverBehavior;
 
 /**
  * Implemented by the MetaTileEntity of the Redstone Circuit Block
@@ -36,7 +36,7 @@ public interface IRedstoneCircuitBlock {
     /**
      * If this Side is Covered up and therefor not doing any Redstone
      */
-    GT_CoverBehavior getCover(ForgeDirection side);
+    CoverBehavior getCover(ForgeDirection side);
 
     int getCoverID(ForgeDirection side);
 
diff --git a/src/main/java/gregtech/api/interfaces/IToolStats.java b/src/main/java/gregtech/api/interfaces/IToolStats.java
index 9d8da63b6c..6f506a6ee1 100644
--- a/src/main/java/gregtech/api/interfaces/IToolStats.java
+++ b/src/main/java/gregtech/api/interfaces/IToolStats.java
@@ -16,7 +16,7 @@ import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
 import net.minecraftforge.event.world.BlockEvent;
 
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
 /**
  * The Stats for GT Tools. Not including any Material Modifiers.
@@ -33,7 +33,7 @@ public interface IToolStats {
     /**
      * Called when this gets added to a Tool Item
      */
-    void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID);
+    void onStatsAddedToTool(MetaGeneratedTool aItem, int aID);
 
     /**
      * @implNote if you are only modifying drops, override
diff --git a/src/main/java/gregtech/api/interfaces/fluid/IGTFluid.java b/src/main/java/gregtech/api/interfaces/fluid/IGTFluid.java
new file mode 100644
index 0000000000..b3765d37db
--- /dev/null
+++ b/src/main/java/gregtech/api/interfaces/fluid/IGTFluid.java
@@ -0,0 +1,14 @@
+package gregtech.api.interfaces.fluid;
+
+import net.minecraftforge.fluids.FluidRegistry;
+
+@SuppressWarnings("unused") // API might legitimately expose unused methods within this local project's scope
+public interface IGTFluid {
+
+    /**
+     * Adds this {@link IGTFluid} to the {@link FluidRegistry} and internally-implemented registrations
+     *
+     * @return {@link IGTRegisteredFluid} The GregTech registered fluid
+     */
+    IGTRegisteredFluid addFluid();
+}
diff --git a/src/main/java/gregtech/api/interfaces/fluid/IGT_FluidBuilder.java b/src/main/java/gregtech/api/interfaces/fluid/IGTFluidBuilder.java
index f15b148fcb..2902824873 100644
--- a/src/main/java/gregtech/api/interfaces/fluid/IGT_FluidBuilder.java
+++ b/src/main/java/gregtech/api/interfaces/fluid/IGTFluidBuilder.java
@@ -10,87 +10,87 @@ import net.minecraftforge.fluids.FluidRegistry;
 import gregtech.api.enums.FluidState;
 
 @SuppressWarnings("unused") // API might legitimately expose unused methods within this local project's scope
-public interface IGT_FluidBuilder {
+public interface IGTFluidBuilder {
 
     /**
      * @param colorRGBA The {@code short[]} RGBA color of the {@link Fluid} or {@code null} for no defined RGBA color
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withColorRGBA(final short[] colorRGBA);
+    IGTFluidBuilder withColorRGBA(final short[] colorRGBA);
 
     /**
-     * @param localizedName The localized name of this {@link IGT_FluidBuilder}
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @param localizedName The localized name of this {@link IGTFluidBuilder}
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withLocalizedName(final String localizedName);
+    IGTFluidBuilder withLocalizedName(final String localizedName);
 
     /**
-     * @param fluidState  The {@link FluidState} of this {@link IGT_FluidBuilder}
-     * @param temperature The Kelvin temperature of this {@link IGT_FluidBuilder}
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @param fluidState  The {@link FluidState} of this {@link IGTFluidBuilder}
+     * @param temperature The Kelvin temperature of this {@link IGTFluidBuilder}
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withStateAndTemperature(final FluidState fluidState, final int temperature);
+    IGTFluidBuilder withStateAndTemperature(final FluidState fluidState, final int temperature);
 
     /**
      * @param stillIconResourceLocation the {@link ResourceLocation} of the still fluid icon
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withStillIconResourceLocation(final ResourceLocation stillIconResourceLocation);
+    IGTFluidBuilder withStillIconResourceLocation(final ResourceLocation stillIconResourceLocation);
 
     /**
      * @param flowingIconResourceLocation the {@link ResourceLocation} of the flowing fluid icon
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withFlowingIconResourceLocation(final ResourceLocation flowingIconResourceLocation);
+    IGTFluidBuilder withFlowingIconResourceLocation(final ResourceLocation flowingIconResourceLocation);
 
     /**
-     * @param textureName The name of the GregTech mod texture of this {@link IGT_FluidBuilder}
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @param textureName The name of the GregTech mod texture of this {@link IGTFluidBuilder}
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withTextureName(final String textureName);
+    IGTFluidBuilder withTextureName(final String textureName);
 
     /**
-     * @param fluidBlock the {@link Block} implementation of the {@link IGT_Fluid}
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @param fluidBlock the {@link Block} implementation of the {@link IGTFluid}
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withFluidBlock(final Block fluidBlock);
+    IGTFluidBuilder withFluidBlock(final Block fluidBlock);
 
     /**
      * @param fromFluid the {@link Fluid} to copy the icons from
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withIconsFrom(@Nonnull final Fluid fromFluid);
+    IGTFluidBuilder withIconsFrom(@Nonnull final Fluid fromFluid);
 
     /**
      * @param stillIconResourceLocation   The {@link ResourceLocation} of the still fluid texture
      * @param flowingIconResourceLocation The {@link ResourceLocation} of the flowing fluid texture
-     * @return {@link IGT_FluidBuilder} self for call chaining
+     * @return {@link IGTFluidBuilder} self for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_FluidBuilder withTextures(final ResourceLocation stillIconResourceLocation,
+    IGTFluidBuilder withTextures(final ResourceLocation stillIconResourceLocation,
         final ResourceLocation flowingIconResourceLocation);
 
     /**
-     * Builds the {@link IGT_Fluid}
+     * Builds the {@link IGTFluid}
      *
-     * @return the built {@link IGT_Fluid}
+     * @return the built {@link IGTFluid}
      */
-    IGT_Fluid build();
+    IGTFluid build();
 
     /**
-     * Builds, then adds the {@link IGT_Fluid} to the {@link FluidRegistry}
+     * Builds, then adds the {@link IGTFluid} to the {@link FluidRegistry}
      *
-     * @return the {@link IGT_Fluid}
+     * @return the {@link IGTFluid}
      * @see #build()
-     * @see IGT_Fluid#addFluid()
+     * @see IGTFluid#addFluid()
      */
-    IGT_RegisteredFluid buildAndRegister();
+    IGTRegisteredFluid buildAndRegister();
 }
diff --git a/src/main/java/gregtech/api/interfaces/fluid/IGT_RegisteredFluid.java b/src/main/java/gregtech/api/interfaces/fluid/IGTRegisteredFluid.java
index 181824874c..b2796ed3f7 100644
--- a/src/main/java/gregtech/api/interfaces/fluid/IGT_RegisteredFluid.java
+++ b/src/main/java/gregtech/api/interfaces/fluid/IGTRegisteredFluid.java
@@ -7,54 +7,54 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 import gregtech.api.enums.FluidState;
 import gregtech.api.enums.Materials;
 
-public interface IGT_RegisteredFluid {
+public interface IGTRegisteredFluid {
 
     /**
-     * Registers the containers in the {@link FluidContainerRegistry} for this {@link IGT_RegisteredFluid}
+     * Registers the containers in the {@link FluidContainerRegistry} for this {@link IGTRegisteredFluid}
      *
      * @param fullContainer  The full fluid container
      * @param emptyContainer The empty fluid container
      * @param containerSize  The size of the container
-     * @return The {@link IGT_RegisteredFluid} for call chaining
+     * @return The {@link IGTRegisteredFluid} for call chaining
      */
     @SuppressWarnings("UnusedReturnValue") // Last call in chain, may not use this returned value
-    IGT_RegisteredFluid registerContainers(final ItemStack fullContainer, final ItemStack emptyContainer,
+    IGTRegisteredFluid registerContainers(final ItemStack fullContainer, final ItemStack emptyContainer,
         final int containerSize);
 
     /**
      * Registers the bucket-sized 1000L containers in the {@link FluidContainerRegistry} for this
-     * {@link IGT_RegisteredFluid}
+     * {@link IGTRegisteredFluid}
      *
-     * @param fullContainer  The full container to associate with this {@link IGT_RegisteredFluid}
-     * @param emptyContainer The empty container associate with this {@link IGT_RegisteredFluid}